diff options
| author | Anton Blanchard <anton@samba.org> | 2003-02-07 10:38:32 +1100 |
|---|---|---|
| committer | Anton Blanchard <anton@samba.org> | 2003-02-07 10:38:32 +1100 |
| commit | 3970d19e31e54d7a437075bc8573e31479b4aefe (patch) | |
| tree | 791436715d3ed6d4a5da771015c604f710826d52 /include | |
| parent | 518a829fb0d43a0cad5dbd730e1edf24d6365772 (diff) | |
| parent | 7d5bea384ce13d3f435ec587e5b96a5324b16fd3 (diff) | |
Merge samba.org:/scratch/anton/linux-2.5
into samba.org:/scratch/anton/sfr
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-i386/edd.h | 2 | ||||
| -rw-r--r-- | include/linux/seqlock.h | 3 |
2 files changed, 3 insertions, 2 deletions
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__ */ 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; \ }) |