From: Paolo 'Blaisorblade' Giarrusso Date: Wed, 11 Oct 2006 08:21:31 +0000 (-0700) Subject: [PATCH] uml: revert wrong patch X-Git-Tag: v2.6.19-rc2~97 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1875a48fed4239769bacb039175a52e42b0ebd71;p=linux-2.6-omap-h63xx.git [PATCH] uml: revert wrong patch Andi Kleen pointed out that -mcmodel=kernel does not make sense for userspace code and would stop everything from working, and pointed out the correct fix for the original bug (not easy to do for me). Reverts part of commit 06837504de7b4883e92af207dbbab4310d0db0ed. Cc: Andi Kleen Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/arch/um/Makefile-x86_64 b/arch/um/Makefile-x86_64 index 11154b6773e..87d63737eb7 100644 --- a/arch/um/Makefile-x86_64 +++ b/arch/um/Makefile-x86_64 @@ -4,7 +4,7 @@ core-y += arch/um/sys-x86_64/ START := 0x60000000 -_extra_flags_ = -fno-builtin -m64 -mcmodel=kernel +_extra_flags_ = -fno-builtin -m64 #We #undef __x86_64__ for kernelspace, not for userspace where #it's needed for headers to work!