From aa44437374c9da966894e8231dfdfeaf167e2334 Mon Sep 17 00:00:00 2001
From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date: Thu, 22 Sep 2005 21:44:20 -0700
Subject: [PATCH] --- yaml --- r: 9249 b: refs/heads/master c:
 46db4a42dd1190a311c2fb45106dfd0842c65a94 h: refs/heads/master i:   9247:
 c5122907223e7e66d916c6b79f1c323c7f399bda v: v3

---
 [refs]                              | 2 +-
 trunk/arch/um/kernel/process_kern.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5561ce1e6101..035e9c8de545 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fea03cb40a15e3c6647c0927300202e062e6792a
+refs/heads/master: 46db4a42dd1190a311c2fb45106dfd0842c65a94
diff --git a/trunk/arch/um/kernel/process_kern.c b/trunk/arch/um/kernel/process_kern.c
index 39cf568ccfaf..ea65db679e9c 100644
--- a/trunk/arch/um/kernel/process_kern.c
+++ b/trunk/arch/um/kernel/process_kern.c
@@ -82,7 +82,8 @@ unsigned long alloc_stack(int order, int atomic)
 	unsigned long page;
 	int flags = GFP_KERNEL;
 
-	if(atomic) flags |= GFP_ATOMIC;
+	if (atomic)
+		flags = GFP_ATOMIC;
 	page = __get_free_pages(flags, order);
 	if(page == 0)
 		return(0);