aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/Makefile
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-12-03 09:30:06 +0200
committerAvi Kivity <avi@redhat.com>2009-12-03 09:30:06 +0200
commit58988b07cfe2ebe9f9b39d973fd8a083390e749f (patch)
treef7a164abe85b8aa768c58a80c1261208372fb4b0 /kernel/Makefile
parent22763c5cf3690a681551162c15d34d935308c8d7 (diff)
parent8e7cac79808b62f242069a6ac88d364d35621371 (diff)
Merge remote branch 'tip/x86/entry' into kvm-updates/2.6.33
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'kernel/Makefile')
-rw-r--r--kernel/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/Makefile b/kernel/Makefile
index d7c13d249b2d..6c5112844980 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -96,6 +96,7 @@ obj-$(CONFIG_SMP) += sched_cpupri.o
obj-$(CONFIG_SLOW_WORK) += slow-work.o
obj-$(CONFIG_SLOW_WORK_DEBUG) += slow-work-debugfs.o
obj-$(CONFIG_PERF_EVENTS) += perf_event.o
+obj-$(CONFIG_USER_RETURN_NOTIFIER) += user-return-notifier.o
ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y)
# According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is

Privacy Policy