diff options
| author |  David S. Miller <davem@davemloft.net>
| 2012-04-26 20:00:35 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net>
| 2012-04-26 20:00:35 -0700 |
| commit | 8fe5f56c8a203a7a83d1b621c369655d914f3752 (patch) | |
| tree | ec865efb2d577d1e536720a28ae18b10bdbfd973 /arch/sparc/kernel/leon_smp.c | |
| parent | sparc32: fix build of pcic (diff) | |
| parent | Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetca... (diff) | |
| download | linux-8fe5f56c8a203a7a83d1b621c369655d914f3752.tar.gz linux-8fe5f56c8a203a7a83d1b621c369655d914f3752.tar.bz2 linux-8fe5f56c8a203a7a83d1b621c369655d914f3752.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Conflicts:
arch/sparc/kernel/leon_smp.c
Merge mainline to get the nobootmem.c bug fix, for the sake
of the sparc64 NO_BOOTMEM conversion.
Resolve a small include line conflict in leon_smp.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/leon_smp.c')
| -rw-r--r-- | arch/sparc/kernel/leon_smp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc/kernel/leon_smp.c b/arch/sparc/kernel/leon_smp.c index 6173f4d82ded..356dfc45cdd0 100644 --- a/arch/sparc/kernel/leon_smp.c +++ b/arch/sparc/kernel/leon_smp.c @@ -79,6 +79,8 @@ void __cpuinit leon_callin(void) local_flush_tlb_all(); leon_configure_cache_smp(); + notify_cpu_starting(cpuid); + /* Get our local ticker going. */ register_percpu_ce(cpuid); |