diff options
| author | Paul Mundt | 2008-10-20 04:17:52 +0200 |
|---|---|---|
| committer | Paul Mundt | 2008-10-20 04:17:52 +0200 |
| commit | 4cb40f795af36b3deb743f6ccf6c3fd542c61c8d (patch) | |
| tree | db3d7519932549bf528f5b8e4cb8350356cd544d /arch/sh | |
| parent | Merge branch 'sh/gpiolib' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff) | |
| download | kernel-qcow2-linux-4cb40f795af36b3deb743f6ccf6c3fd542c61c8d.tar.gz kernel-qcow2-linux-4cb40f795af36b3deb743f6ccf6c3fd542c61c8d.tar.xz kernel-qcow2-linux-4cb40f795af36b3deb743f6ccf6c3fd542c61c8d.zip | |
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
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/include/asm/elf.h | 2 | ||||
| -rw-r--r-- | arch/sh/kernel/smp.c | 2 |
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(); |