Merge remote branch 'tip/x86/entry' into kvm-updates/2.6.33
Avi Kivity [Thu, 3 Dec 2009 07:30:06 +0000 (09:30 +0200)]
Signed-off-by: Avi Kivity <avi@redhat.com>

1  2 
arch/x86/Kconfig
kernel/Makefile
kernel/fork.c

Simple merge
diff --cc 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
diff --cc kernel/fork.c
Simple merge