Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	Documentation/kernel-parameters.txt
	arch/sh/include/asm/elf.h

2 files changed, 2 insertions, 2 deletions

diff --git a/arch/sh/include/asm/elf.h b/arch/sh/include/asm/elf.h
index 4da3a0b10911..f7d0b8e6aa84 100644
--- a/arch/sh/include/asm/elf.h
+++ b/arch/sh/include/asm/elf.h
@@ -197,8 +197,6 @@ do {									\
 } while (0)
 #endif
 
-#define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX_32BIT)
-
 #ifdef CONFIG_VSYSCALL
 /* vDSO has arch_setup_additional_pages */
 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES
diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c
index c55d314166c7..508dfb023628 100644
--- a/arch/sh/kernel/smp.c
+++ b/arch/sh/kernel/smp.c
@@ -82,6 +82,8 @@ asmlinkage void __cpuinit start_secondary(void)
 
         preempt_disable();
 
+        notify_cpu_starting(smp_processor_id());
+
         local_irq_enable();
 
         cpu = smp_processor_id();