Skip to contentSkip to conversation

Fix user return notifier build

PATCH Applied Avi Kivity 2 participants 4 messages Oct 25, 2009 – Nov 2, 2009 KVM

lore
Share & tools
lore

Avi Kivity

author
#0 lore raw

PATCH 1/1 Fix user return notifier build

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

---
 kernel/Makefile |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
kernel/Makefile +1 -0
index b8d4cd8..0ae57a8 100644
@@ -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 <[email protected]>, the -fno-omit-frame-pointer is
Signature · 1 line
1.6.4.1
Applied
#1 lore raw
Quoted 7 lines · Avi Kivity

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

---
 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

author
#2 lore raw
Quoted 3 lines · Ingo Molnar

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

Yup.

Signature · 1 line
error compiling committee.c: too many arguments to function
#3 lore raw

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

In reply to Avi Kivity
Commit-ID:  7a041097518a120f92af631a83db4d41e07ee51b
Gitweb:     http://git.kernel.org/tip/7a041097518a120f92af631a83db4d41e07ee51b
Author:     Avi Kivity <[email protected]>
AuthorDate: Sun, 25 Oct 2009 14:24:45 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Sun, 25 Oct 2009 17:37:57 +0100

x86: Fix user return notifier build

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

LKML-Reference: <[email protected]>

---
 kernel/Makefile |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
kernel/Makefile +1 -0
index b8d4cd8..0ae57a8 100644
@@ -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 <[email protected]>, the -fno-omit-frame-pointer is