From b9fd1bdca0afd9258e5aad795500e949d08a7038 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 12 Feb 2009 16:43:17 -0800
Subject: [PATCH] --- yaml --- r: 131326 b: refs/heads/master c:
 99709372736a216f99eb32b76fba835a2bfc93a8 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/include/net/sock.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5fde3299ef36..7c14958723b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb0886745a75ce98bde3aac421adc69fe61a1905
+refs/heads/master: 99709372736a216f99eb32b76fba835a2bfc93a8
diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h
index 5a3a151bd730..ce3b5b622683 100644
--- a/trunk/include/net/sock.h
+++ b/trunk/include/net/sock.h
@@ -1308,7 +1308,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)