diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-11 04:46:50 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-11 04:46:50 -0400 |
| commit | 0c81b2a1448bc6a2a9b2d6469fb0669fb4b25e5b (patch) | |
| tree | 6f82579cae6d6e39fa9f837a3c349ded51e19d14 /arch/um/Makefile-x86_64 | |
| parent | 0729fbf3bc70870370b4f43d652f05a468dc68b8 (diff) | |
| parent | 70ff05554f91a1edda1f11684da1dbde09e2feea (diff) | |
Merge branch 'linus' into core/rcu
Conflicts:
include/linux/rculist.h
kernel/rcupreempt.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/um/Makefile-x86_64')
| -rw-r--r-- | arch/um/Makefile-x86_64 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/um/Makefile-x86_64 b/arch/um/Makefile-x86_64 index 8ed362f93582..a9cd7e77a7ab 100644 --- a/arch/um/Makefile-x86_64 +++ b/arch/um/Makefile-x86_64 | |||
| @@ -21,3 +21,6 @@ HEADER_ARCH := x86 | |||
| 21 | 21 | ||
| 22 | LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib64 | 22 | LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib64 |
| 23 | LINK-y += -m64 | 23 | LINK-y += -m64 |
| 24 | |||
| 25 | # Do unit-at-a-time unconditionally on x86_64, following the host | ||
| 26 | KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time) | ||