diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 17:10:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 17:10:09 -0700 |
| commit | 2fb9e96cada81e7288579e14c3d56f1f969354a5 (patch) | |
| tree | acfe7e7a1455f06ce462fdeb22d4755dd9517393 /arch/x86/boot/Makefile | |
| parent | Merge branch 'akpm' (Andrew's patch-bomb) (diff) | |
| parent | x86-32: Fix endless loop when processing signals for kernel tasks (diff) | |
| download | linux-dev-2fb9e96cada81e7288579e14c3d56f1f969354a5.tar.xz linux-dev-2fb9e96cada81e7288579e14c3d56f1f969354a5.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull additional x86 fixes from Peter Anvin:
- address a long-standing bug related to when a kernel-spawned process
gets a signal on an i386 kernel compiled without CONFIG_VM86.
- fix the newly introduced build warning in arch/x86/boot.
- fix a typo in the i386 system call table which affects building some
libcs.
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86-32: Fix endless loop when processing signals for kernel tasks
x86, boot: Correct CFLAGS for hostprogs
x86-32: Fix typo for mq_getsetattr in syscall table
Diffstat (limited to 'arch/x86/boot/Makefile')
| -rw-r--r-- | arch/x86/boot/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index 3e02148bb774..5a747dd884db 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -37,9 +37,9 @@ setup-y += video-bios.o targets += $(setup-y) hostprogs-y := mkcpustr tools/build -HOSTCFLAGS_mkcpustr.o := -I$(srctree)/arch/$(SRCARCH)/include -HOST_EXTRACFLAGS += -I$(objtree)/include -I$(srctree)/tools/include \ - -include $(srctree)/include/linux/kconfig.h +HOST_EXTRACFLAGS += -I$(srctree)/tools/include $(LINUXINCLUDE) \ + -D__EXPORTED_HEADERS__ + $(obj)/cpu.o: $(obj)/cpustr.h quiet_cmd_cpustr = CPUSTR $@ |