diff options
Diffstat (limited to 'arch/powerpc/kernel/vdso.c')
| -rw-r--r-- | arch/powerpc/kernel/vdso.c | 11 | 
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c index 1d9c92621b3..ce74c335a6a 100644 --- a/arch/powerpc/kernel/vdso.c +++ b/arch/powerpc/kernel/vdso.c @@ -34,8 +34,7 @@  #include <asm/firmware.h>  #include <asm/vdso.h>  #include <asm/vdso_datapage.h> - -#include "setup.h" +#include <asm/setup.h>  #undef DEBUG @@ -716,8 +715,8 @@ int vdso_getcpu_init(void)  	unsigned long cpu, node, val;  	/* -	 * SPRG3 contains the CPU in the bottom 16 bits and the NUMA node in -	 * the next 16 bits. The VDSO uses this to implement getcpu(). +	 * SPRG_VDSO contains the CPU in the bottom 16 bits and the NUMA node +	 * in the next 16 bits.  The VDSO uses this to implement getcpu().  	 */  	cpu = get_cpu();  	WARN_ON_ONCE(cpu > 0xffff); @@ -726,8 +725,8 @@ int vdso_getcpu_init(void)  	WARN_ON_ONCE(node > 0xffff);  	val = (cpu & 0xfff) | ((node & 0xffff) << 16); -	mtspr(SPRN_SPRG3, val); -	get_paca()->sprg3 = val; +	mtspr(SPRN_SPRG_VDSO_WRITE, val); +	get_paca()->sprg_vdso = val;  	put_cpu();  | 
