Merge samba.org:/scratch/anton/linux-2.5

into samba.org:/scratch/anton/sfr

arch/i386/kernel/setup.c

@@ -474,7 +474,7 @@ static int __init copy_e820_map(struct e820entry * biosmap, int nr_map)
 
 #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE)
 unsigned char eddnr;
-struct edd_info edd[EDDNR];
+struct edd_info edd[EDDMAXNR];
 /**
  * copy_edd() - Copy the BIOS EDD information
  *              from empty_zero_page into a safe place.

include/asm-i386/edd.h

@@ -165,7 +165,7 @@ struct edd_info {
 	struct edd_device_params params;
 } __attribute__ ((packed));
 
-extern struct edd_info edd[EDDNR];
+extern struct edd_info edd[EDDMAXNR];
 extern unsigned char eddnr;
 #endif				/*!__ASSEMBLY__ */
 

include/linux/seqlock.h

@@ -115,7 +115,8 @@ static inline int read_seqretry(const seqlock_t *sl, unsigned iv)
 	({ local_irq_save(flags);   read_seqbegin(lock); })
 
 #define read_seqretry_irqrestore(lock, iv, flags)			\
-	({int ret = read_seqretry(&(lock)->seq, iv);			\
+	({								\
+		int ret = read_seqretry(lock, iv);			\
 		local_irq_restore(flags);				\
 		ret;							\
 	})