From 0b74ee96a3b5920b8559c35a70105dbd291dbaa8 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 1 Nov 2008 09:53:58 -0700
Subject: [PATCH] --- yaml --- r: 118301 b: refs/heads/master c:
 42c0202363194007a1ac377d047a95aa39246eb0 h: refs/heads/master i:   118299:
 c6c6f018db2d3e86aa904deb2648bbc8d19f31e2 v: v3

---
 [refs]                  | 2 +-
 trunk/kernel/resource.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index eec36d43c08c..e164c2817048 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cdce1f0931831cebfbeb811a266a2f4adf5c8a35
+refs/heads/master: 42c0202363194007a1ac377d047a95aa39246eb0
diff --git a/trunk/kernel/resource.c b/trunk/kernel/resource.c
index 6aac5c60b25d..4337063663ef 100644
--- a/trunk/kernel/resource.c
+++ b/trunk/kernel/resource.c
@@ -523,7 +523,7 @@ static void __init __reserve_region_with_split(struct resource *root,
 {
 	struct resource *parent = root;
 	struct resource *conflict;
-	struct resource *res = kzalloc(sizeof(*res), GFP_KERNEL);
+	struct resource *res = kzalloc(sizeof(*res), GFP_ATOMIC);
 
 	if (!res)
 		return;