OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  chmc: Mark %ver register inline asm with __volatile__
  sparc64: Add missing notify_cpu_starting() call.
  sparc32: fix build errors
This commit is contained in:
Linus Torvalds 2008-10-13 10:07:53 -07:00
parent be3bfbba8f 615c9136b3
commit 5723ff931a
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/sparc/kernel/sun4d_smp.c
View File

@ -20,6 +20,7 @@
#include <linux/swap.h> #include <linux/swap.h>
#include <linux/profile.h> #include <linux/profile.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/cpu.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/atomic.h> #include <asm/atomic.h>

1
arch/sparc/kernel/sun4m_smp.c
View File

@ -17,6 +17,7 @@
#include <linux/swap.h> #include <linux/swap.h>
#include <linux/profile.h> #include <linux/profile.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/cpu.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>

2
arch/sparc64/kernel/chmc.c
View File

@ -831,7 +831,7 @@ static int __init us3mc_init(void)
if (!us3mc_platform()) if (!us3mc_platform())
return -ENODEV; return -ENODEV;
__asm__ ("rdpr %%ver, %0" : "=r" (ver)); __asm__ __volatile__("rdpr %%ver, %0" : "=r" (ver));
if ((ver >> 32UL) == __JALAPENO_ID || if ((ver >> 32UL) == __JALAPENO_ID ||
(ver >> 32UL) == __SERRANO_ID) { (ver >> 32UL) == __SERRANO_ID) {
mc_type = MC_TYPE_JBUS; mc_type = MC_TYPE_JBUS;

4
arch/sparc64/kernel/smp.c
View File

@ -21,6 +21,7 @@
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/profile.h> #include <linux/profile.h>
#include <linux/lmb.h> #include <linux/lmb.h>
#include <linux/cpu.h>
#include <asm/head.h> #include <asm/head.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
@ -115,6 +116,9 @@ void __cpuinit smp_callin(void)
atomic_inc(&init_mm.mm_count); atomic_inc(&init_mm.mm_count);
current->active_mm = &init_mm; current->active_mm = &init_mm;
/* inform the notifiers about the new cpu */
notify_cpu_starting(cpuid);
while (!cpu_isset(cpuid, smp_commenced_mask)) while (!cpu_isset(cpuid, smp_commenced_mask))
rmb(); rmb();