diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/pkt_sched.h | 2 | ||||
-rw-r--r-- | include/net/sock.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h index b2648e8e4987..d51a2b3e221e 100644 --- a/include/linux/pkt_sched.h +++ b/include/linux/pkt_sched.h | |||
@@ -515,7 +515,7 @@ enum | |||
515 | 515 | ||
516 | struct tc_drr_stats | 516 | struct tc_drr_stats |
517 | { | 517 | { |
518 | u32 deficit; | 518 | __u32 deficit; |
519 | }; | 519 | }; |
520 | 520 | ||
521 | #endif | 521 | #endif |
diff --git a/include/net/sock.h b/include/net/sock.h index 5a3a151bd730..ce3b5b622683 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
@@ -1308,7 +1308,7 @@ static inline int sock_writeable(const struct sock *sk) | |||
1308 | 1308 | ||
1309 | static inline gfp_t gfp_any(void) | 1309 | static inline gfp_t gfp_any(void) |
1310 | { | 1310 | { |
1311 | return in_atomic() ? GFP_ATOMIC : GFP_KERNEL; | 1311 | return in_softirq() ? GFP_ATOMIC : GFP_KERNEL; |
1312 | } | 1312 | } |
1313 | 1313 | ||
1314 | static inline long sock_rcvtimeo(const struct sock *sk, int noblock) | 1314 | static inline long sock_rcvtimeo(const struct sock *sk, int noblock) |