diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 12:24:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 12:24:04 -0400 |
| commit | ac1d426e825ab5778995f2f6f053ca2e6b45c622 (patch) | |
| tree | 75b91356ca39463e0112931aa6790802fb1e07a2 /arch/sh/kernel/smp.c | |
| parent | fda0e18c8a7a3e02747c2b045b4fcd2c920410b9 (diff) | |
| parent | a3685f00652af83f12b63e3b4ef48f29581ba48b (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/Kconfig
arch/arm/include/asm/system.h
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/sh/kernel/smp.c')
| -rw-r--r-- | arch/sh/kernel/smp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c index e124cf7008df..002cc612deef 100644 --- a/arch/sh/kernel/smp.c +++ b/arch/sh/kernel/smp.c | |||
| @@ -69,6 +69,7 @@ asmlinkage void __cpuinit start_secondary(void) | |||
| 69 | unsigned int cpu; | 69 | unsigned int cpu; |
| 70 | struct mm_struct *mm = &init_mm; | 70 | struct mm_struct *mm = &init_mm; |
| 71 | 71 | ||
| 72 | enable_mmu(); | ||
| 72 | atomic_inc(&mm->mm_count); | 73 | atomic_inc(&mm->mm_count); |
| 73 | atomic_inc(&mm->mm_users); | 74 | atomic_inc(&mm->mm_users); |
| 74 | current->active_mm = mm; | 75 | current->active_mm = mm; |