---

yaml --- r: 118301 b: refs/heads/master c: 42c0202 h: refs/heads/master i: 118299: c6c6f01 v: v3
git-mirror · Nov 1, 2008 · 0b74ee9 · 0b74ee9
1 parent 76f9dbf
commit 0b74ee9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;