X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=kernel%2Fresource.c;h=4337063663efe39f8de666d16c591c84f66db0f7;hb=bc9c4068388eea01d3b5da31016879f2341ecec5;hp=6aac5c60b25d7954f963c40fa15205e7705b02b4;hpb=0803d540db06f53acd2fabf1347d5b665218f14a;p=linux-2.6-omap-h63xx.git

diff --git a/kernel/resource.c b/kernel/resource.c
index 6aac5c60b25..4337063663e 100644
--- a/kernel/resource.c
+++ b/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;