aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
Diffstat (limited to 'include/net')
-rw-r--r--include/net/sock.h2
1 files changed, 1 insertions, 1 deletions
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
1309static inline gfp_t gfp_any(void) 1309static 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
1314static inline long sock_rcvtimeo(const struct sock *sk, int noblock) 1314static inline long sock_rcvtimeo(const struct sock *sk, int noblock)