diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 13:23:51 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 13:23:51 +1100 |
| commit | 81062a190e2e78bac24e657168605cd6bde84514 (patch) | |
| tree | df539c24a59d643e80b163d6ad3ba73848695acc /kernel/Makefile | |
| parent | 577d7f1a9a54913946e67bdac733857ef8ac8e07 (diff) | |
| parent | 0b3d6a50aa8bd56f80e70139463a462776425d71 (diff) | |
Merge remote branch 'kvm/linux-next'
Diffstat (limited to 'kernel/Makefile')
| -rw-r--r-- | kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index b8d4cd8ac0b9..0ae57a83d481 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -95,6 +95,7 @@ obj-$(CONFIG_RING_BUFFER) += trace/ obj-$(CONFIG_SMP) += sched_cpupri.o obj-$(CONFIG_SLOW_WORK) += slow-work.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 |