diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 17:36:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 17:36:21 -0700 |
| commit | 6bb597507f9839b13498781e481f5458aea33620 (patch) | |
| tree | 33e6cbc66736e221217356c7120465be10dbaa1e /arch/x86/boot | |
| parent | 09f38dc19deba9eae1d668dde8bdd2aaed3479ed (diff) | |
| parent | c5c67c7cba6a652d1c62dce45b0c130e5cb2a802 (diff) | |
| download | linux-6bb597507f9839b13498781e481f5458aea33620.tar.bz2 | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, mtrr: remove debug message
x86: disable stack-protector for __restore_processor_state()
x86: fix is_io_mapping_possible() build warning on i386 allnoconfig
x86, setup: compile with -DDISABLE_BRANCH_PROFILING
x86/dma: unify definition of pci_unmap_addr* and pci_unmap_len macros
x86, mm: fix misuse of debug_kmap_atomic
x86: remove duplicated code with pcpu_need_numa()
x86,percpu: fix inverted NUMA test in setup_pcpu_remap()
x86: signal: check sas_ss_size instead of sas_ss_flags()
Diffstat (limited to 'arch/x86/boot')
| -rw-r--r-- | arch/x86/boot/Makefile | 3 | ||||
| -rw-r--r-- | arch/x86/boot/compressed/Makefile | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index fb737ce5888d..6633b6e7505a 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -57,6 +57,7 @@ $(obj)/cpustr.h: $(obj)/mkcpustr FORCE # How to compile the 16-bit code. Note we always compile for -march=i386, # that way we can complain to the user if the CPU is insufficient. KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \ + -DDISABLE_BRANCH_PROFILING \ -Wall -Wstrict-prototypes \ -march=i386 -mregparm=3 \ -include $(srctree)/$(src)/code16gcc.h \ @@ -66,7 +67,7 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \ $(call cc-option, -fno-unit-at-a-time)) \ $(call cc-option, -fno-stack-protector) \ $(call cc-option, -mpreferred-stack-boundary=2) -KBUILD_CFLAGS += $(call cc-option,-m32) +KBUILD_CFLAGS += $(call cc-option, -m32) KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__ $(obj)/bzImage: asflags-y := $(SVGA_MODE) diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile index 3ca4c194b8e5..65551c9f8571 100644 --- a/arch/x86/boot/compressed/Makefile +++ b/arch/x86/boot/compressed/Makefile @@ -8,6 +8,7 @@ targets := vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma h KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2 KBUILD_CFLAGS += -fno-strict-aliasing -fPIC +KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING cflags-$(CONFIG_X86_64) := -mcmodel=small KBUILD_CFLAGS += $(cflags-y) KBUILD_CFLAGS += $(call cc-option,-ffreestanding) |