From c501274adfe3fbec6d20385983fa6655bf0282f0 Mon Sep 17 00:00:00 2001 From: Matt Domsch Date: Tue, 21 Jan 2003 10:08:08 -0600 Subject: EDD: don't over-allocate EDD data block Found by Kevin Lawton. --- include/asm-i386/edd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/asm-i386/edd.h b/include/asm-i386/edd.h index d606a9588b47..061373b28782 100644 --- a/include/asm-i386/edd.h +++ b/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__ */ -- cgit v1.2.3 From 7d5bea384ce13d3f435ec587e5b96a5324b16fd3 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 5 Feb 2003 00:34:08 -0800 Subject: [PATCH] seqlock fix: read_seqretry_irqrestore() --- include/linux/seqlock.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h index 2660cf7634c1..f1a059f6de9b 100644 --- a/include/linux/seqlock.h +++ b/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; \ }) -- cgit v1.2.3