Pull ibm into release branch

[sfrench/cifs-2.6.git] / include / net / sock.h

diff --git a/include/net/sock.h b/include/net/sock.h
index 03684e702d13464cbc0a48b95354dc540341f504..2c7d60ca354858ac75ead88773d0886aedcc185c 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1278,7 +1278,7 @@ static inline int sock_writeable(const struct sock *sk)
 
 static inline gfp_t gfp_any(void)
 {
-       return in_softirq() ? GFP_ATOMIC : GFP_KERNEL;
+       return in_atomic() ? GFP_ATOMIC : GFP_KERNEL;
 }
 
 static inline long sock_rcvtimeo(const struct sock *sk, int noblock)