commit 46db4a42dd1190a311c2fb45106dfd0842c65a94
author Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Thu Sep 22 21:44:20 2005 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Thu Sep 22 22:17:37 2005 -0700
tree 2542832bf69acd1b55d0d93f67e01c34bf445b25
parent fea03cb40a15e3c6647c0927300202e062e6792a

[PATCH] uml: Fix GFP_ flags usage

GFP_ATOMIC | GFP_KERNEL is meaningless and won't work.  Actually it never
worked, even in 2.4.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

arch/um/kernel/process_kern.c

diff --git a/arch/um/kernel/process_kern.c b/arch/um/kernel/process_kern.c
index 39cf568..ea65db6 100644
--- a/arch/um/kernel/process_kern.c
+++ b/arch/um/kernel/process_kern.c
@@ -82,7 +82,8 @@
 	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);