Merge RCU / oprofile clashes

diff --cc init/main.c
index 1850a1c3686d75e9d8e3f4040561ed0cce5be65a,e94bba3f7f44dfd1663733342dfa1239a02d22f4..97d88c50366b9a71aa00cbcf96a2af2491f3e7e4
--- 1/init/main.c
--- 2/init/main.c
+++ b/init/main.c
@@@ -30,7 -31,7 +30,8 @@@
  #include <linux/kernel_stat.h>
  #include <linux/security.h>
  #include <linux/workqueue.h>
 +#include <linux/profile.h>
+ #include <linux/rcupdate.h>
  
  #include <asm/io.h>
  #include <asm/bugs.h>

diff --cc kernel/Makefile
index 8e18771791dee429ae4cbeff8c6d5f88f18c199e,f862dedfabe99f24bc31d0553f4be842b567b978..daf6cbd5d42af4f8a3c95f089c7aabd2cffcf1e5
--- 1/kernel/Makefile
--- 2/kernel/Makefile
+++ b/kernel/Makefile
@@@ -3,13 -3,13 +3,14 @@@
  #
  
  export-objs = signal.o sys.o kmod.o workqueue.o ksyms.o pm.o exec_domain.o \
 -            printk.o platform.o suspend.o dma.o module.o cpufreq.o rcupdate.o
 +              printk.o platform.o suspend.o dma.o module.o cpufreq.o \
-               profile.o
++              profile.o rcupdate.o
  
 -obj-y     = sched.o fork.o exec_domain.o panic.o printk.o \
 +obj-y     = sched.o fork.o exec_domain.o panic.o printk.o profile.o \
            module.o exit.o itimer.o time.o softirq.o resource.o \
            sysctl.o capability.o ptrace.o timer.o user.o \
-           signal.o sys.o kmod.o workqueue.o futex.o platform.o pid.o
+           signal.o sys.o kmod.o workqueue.o futex.o platform.o pid.o \
+           rcupdate.o
  
  obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o
  obj-$(CONFIG_SMP) += cpu.o