[PATCH tip/x86/entry] Fix user return notifier build

[PATCH tip/x86/entry] Fix user return notifier build

[Avi Kivity]

When CONFIG_USER_RETURN_NOTIFIER is set, we need to link
kernel/user-return-notifier.o.

Signed-off-by: Avi Kivity <avi@redhat.com>
---
 kernel/Makefile |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/kernel/Makefile b/kernel/Makefile
index b8d4cd8..0ae57a8 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
-- 
1.6.4.1

Re: [PATCH tip/x86/entry] Fix user return notifier build

[Ingo Molnar]

* Avi Kivity <avi@redhat.com> wrote:

> When CONFIG_USER_RETURN_NOTIFIER is set, we need to link
> kernel/user-return-notifier.o.
> 
> Signed-off-by: Avi Kivity <avi@redhat.com>
> ---
>  kernel/Makefile |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)

Applied, thanks.

I suspect you want to pull x86/entry into kvm.git? The base patch itself 
has not caused any trouble.

	Ingo

Re: [PATCH tip/x86/entry] Fix user return notifier build

[Avi Kivity]

On 10/25/2009 06:38 PM, Ingo Molnar wrote:
> I suspect you want to pull x86/entry into kvm.git? The base patch itself
> has not caused any trouble.
>    

Yup.

-- 
error compiling committee.c: too many arguments to function