diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-14 19:23:49 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-14 19:23:49 +0200 |
| commit | b8cb48aae1b8c50b37dcb7710363aa69a7a0d9ca (patch) | |
| tree | c7b04bfc8ece8b0121a9030c7f49e7bf9bf570d1 /arch/x86/xen/Makefile | |
| parent | Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | x86: split __phys_addr out into separate file (diff) | |
| download | linux-b8cb48aae1b8c50b37dcb7710363aa69a7a0d9ca.tar.xz linux-b8cb48aae1b8c50b37dcb7710363aa69a7a0d9ca.zip | |
Merge branch 'x86-xen-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-xen-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: split __phys_addr out into separate file
xen: use stronger barrier after unlocking lock
xen: only enable interrupts while actually blocking for spinlock
xen: make -fstack-protector work under Xen
Diffstat (limited to 'arch/x86/xen/Makefile')
| -rw-r--r-- | arch/x86/xen/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile index 7410640db173..3bb4fc21f4f2 100644 --- a/arch/x86/xen/Makefile +++ b/arch/x86/xen/Makefile @@ -8,6 +8,7 @@ endif # Make sure early boot has no stackprotector nostackp := $(call cc-option, -fno-stack-protector) CFLAGS_enlighten.o := $(nostackp) +CFLAGS_mmu.o := $(nostackp) obj-y := enlighten.o setup.o multicalls.o mmu.o irq.o \ time.o xen-asm.o xen-asm_$(BITS).o \ @@ -16,3 +17,4 @@ obj-y := enlighten.o setup.o multicalls.o mmu.o irq.o \ obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o obj-$(CONFIG_XEN_DEBUG_FS) += debugfs.o + |