diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2012-05-22 11:19:51 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-05-22 11:19:51 -0400 |
| commit | 465ba9575e0db6b2655d3a01c05f4c0de2548fc2 (patch) | |
| tree | bd51ebe34f1e22c5b1926c6245ed399dd808b2fb /include | |
| parent | f4162227ef21455c1b1bd74565e49e4c596cecb0 (diff) | |
| parent | 091ce3d38e5e57cf7dd44d66335725910e928f59 (diff) | |
Merge tag 'v3.0.32' into v3.0-rt
This is the 3.0.32 stable release
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/statfs.h | 2 | ||||
| -rw-r--r-- | include/linux/seqlock.h | 2 | ||||
| -rw-r--r-- | include/linux/usb/usbnet.h | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/include/asm-generic/statfs.h b/include/asm-generic/statfs.h index 0fd28e028de1..c749af9c0983 100644 --- a/include/asm-generic/statfs.h +++ b/include/asm-generic/statfs.h @@ -15,7 +15,7 @@ typedef __kernel_fsid_t fsid_t; * with a 10' pole. */ #ifndef __statfs_word -#if BITS_PER_LONG == 64 +#if __BITS_PER_LONG == 64 #define __statfs_word long #else #define __statfs_word __u32 diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h index 29ffd4f54d03..b911868e8ab8 100644 --- a/include/linux/seqlock.h +++ b/include/linux/seqlock.h @@ -61,7 +61,7 @@ static inline unsigned __read_seqcount_begin(const seqcount_t *s) unsigned ret; repeat: - ret = s->sequence; + ret = ACCESS_ONCE(s->sequence); if (unlikely(ret & 1)) { cpu_relax(); goto repeat; diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h index 605b0aa8d852..76f439647c4b 100644 --- a/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h @@ -191,7 +191,8 @@ extern void usbnet_cdc_status(struct usbnet *, struct urb *); enum skb_state { illegal = 0, tx_start, tx_done, - rx_start, rx_done, rx_cleanup + rx_start, rx_done, rx_cleanup, + unlink_start }; struct skb_data { /* skb->cb is one of these */ |