diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-14 10:23:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-14 10:23:49 -0700 |
| commit | b8cb48aae1b8c50b37dcb7710363aa69a7a0d9ca (patch) | |
| tree | c7b04bfc8ece8b0121a9030c7f49e7bf9bf570d1 /drivers | |
| parent | 0cc6d77e55eca9557bbe41bf2db94b31aa8fcb2a (diff) | |
| parent | 78c86e5e5691fc84d5fbea0cd4ac7147e87b7490 (diff) | |
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 'drivers')
| -rw-r--r-- | drivers/xen/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index ec2a39b1e26..7c284342f30 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -1,6 +1,9 @@ obj-y += grant-table.o features.o events.o manage.o obj-y += xenbus/ +nostackp := $(call cc-option, -fno-stack-protector) +CFLAGS_features.o := $(nostackp) + obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o obj-$(CONFIG_XEN_XENCOMM) += xencomm.o obj-$(CONFIG_XEN_BALLOON) += balloon.o |