diff options
| author | Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> | 2006-10-11 04:21:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-11 14:14:19 -0400 |
| commit | 1875a48fed4239769bacb039175a52e42b0ebd71 (patch) | |
| tree | c2f77d6ba2f9be0c459e7dd75dc701ca63356ad9 /arch | |
| parent | 9858db504caedb2424b9a32744c23f9a81ec1731 (diff) | |
[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 <ak@suse.de>
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/um/Makefile-x86_64 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/Makefile-x86_64 b/arch/um/Makefile-x86_64 index 11154b6773ec..87d63737eb7e 100644 --- a/arch/um/Makefile-x86_64 +++ b/arch/um/Makefile-x86_64 | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | core-y += arch/um/sys-x86_64/ | 4 | core-y += arch/um/sys-x86_64/ |
| 5 | START := 0x60000000 | 5 | START := 0x60000000 |
| 6 | 6 | ||
| 7 | _extra_flags_ = -fno-builtin -m64 -mcmodel=kernel | 7 | _extra_flags_ = -fno-builtin -m64 |
| 8 | 8 | ||
| 9 | #We #undef __x86_64__ for kernelspace, not for userspace where | 9 | #We #undef __x86_64__ for kernelspace, not for userspace where |
| 10 | #it's needed for headers to work! | 10 | #it's needed for headers to work! |