From: Avi Kivity <avi@redhat.com>
Date: Thu, 3 Dec 2009 07:30:06 +0000 (+0200)
Subject: Merge remote branch 'tip/x86/entry' into kvm-updates/2.6.33
X-Git-Tag: v2.6.33-rc1~387^2~80
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=58988b07cfe2ebe9f9b39d973fd8a083390e749f;p=net-next-2.6.git

Merge remote branch 'tip/x86/entry' into kvm-updates/2.6.33

Signed-off-by: Avi Kivity <avi@redhat.com>
---

58988b07cfe2ebe9f9b39d973fd8a083390e749f
diff --cc kernel/Makefile
index d7c13d249b2,0ae57a83d48..6c511284498
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@@ -94,8 -94,8 +94,9 @@@ obj-$(CONFIG_X86_DS) += trace
  obj-$(CONFIG_RING_BUFFER) += trace/
  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