Merge branch 'topic/get-cpu-var' into next

2014-11-05 21:00:31 +11:00
parent 8418804ef2 69111bac42
commit dd521d1eb4
32 changed files with 108 additions and 103 deletions
--- a/arch/powerpc/sysdev/xics/xics-common.c
+++ b/arch/powerpc/sysdev/xics/xics-common.c
@@ -155,7 +155,7 @@ int __init xics_smp_probe(void)

 void xics_teardown_cpu(void)
 {
-	struct xics_cppr *os_cppr = &__get_cpu_var(xics_cppr);
+	struct xics_cppr *os_cppr = this_cpu_ptr(&xics_cppr);

 	/*
 	 * we have to reset the cppr index to 0 because we're