diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /arch/alpha | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/kernel/smp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c index 83df541650fc..06b6fdab639f 100644 --- a/arch/alpha/kernel/smp.c +++ b/arch/alpha/kernel/smp.c | |||
| @@ -149,6 +149,9 @@ smp_callin(void) | |||
| 149 | atomic_inc(&init_mm.mm_count); | 149 | atomic_inc(&init_mm.mm_count); |
| 150 | current->active_mm = &init_mm; | 150 | current->active_mm = &init_mm; |
| 151 | 151 | ||
| 152 | /* inform the notifiers about the new cpu */ | ||
| 153 | notify_cpu_starting(cpuid); | ||
| 154 | |||
| 152 | /* Must have completely accurate bogos. */ | 155 | /* Must have completely accurate bogos. */ |
| 153 | local_irq_enable(); | 156 | local_irq_enable(); |
| 154 | 157 | ||