diff options
author | David S. Miller <davem@davemloft.net> | 2009-02-15 08:12:00 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-15 08:12:00 +0100 |
commit | 5e30589521518bff36fd2638b3c3d69679c50436 (patch) | |
tree | 6ac985658a06b0787e4354d0d16d380ea9b16a5a /include/net/sock.h | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
parent | Linux 2.6.29-rc5 (diff) | |
download | linux-5e30589521518bff36fd2638b3c3d69679c50436.tar.xz linux-5e30589521518bff36fd2638b3c3d69679c50436.zip |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
Diffstat (limited to 'include/net/sock.h')
-rw-r--r-- | include/net/sock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index c047def9cf10..ded6854e3e4a 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1313,7 +1313,7 @@ static inline int sock_writeable(const struct sock *sk) static inline gfp_t gfp_any(void) { - return in_atomic() ? GFP_ATOMIC : GFP_KERNEL; + return in_softirq() ? GFP_ATOMIC : GFP_KERNEL; } static inline long sock_rcvtimeo(const struct sock *sk, int noblock) |