Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / arch / powerpc / include / asm / xics.h

diff --git a/arch/powerpc/include/asm/xics.h b/arch/powerpc/include/asm/xics.h
index 0d050ea..6997f4a 100644 (file)
--- a/arch/powerpc/include/asm/xics.h
+++ b/arch/powerpc/include/asm/xics.h
@@ -98,7 +98,7 @@ DECLARE_PER_CPU(struct xics_cppr, xics_cppr);
 
 static inline void xics_push_cppr(unsigned int vec)
 {
-       struct xics_cppr *os_cppr = &__get_cpu_var(xics_cppr);
+       struct xics_cppr *os_cppr = this_cpu_ptr(&xics_cppr);
 
        if (WARN_ON(os_cppr->index >= MAX_NUM_PRIORITIES - 1))
                return;
@@ -111,7 +111,7 @@ static inline void xics_push_cppr(unsigned int vec)
 
 static inline unsigned char xics_pop_cppr(void)
 {
-       struct xics_cppr *os_cppr = &__get_cpu_var(xics_cppr);
+       struct xics_cppr *os_cppr = this_cpu_ptr(&xics_cppr);
 
        if (WARN_ON(os_cppr->index < 1))
                return LOWEST_PRIORITY;
@@ -121,7 +121,7 @@ static inline unsigned char xics_pop_cppr(void)
 
 static inline void xics_set_base_cppr(unsigned char cppr)
 {
-       struct xics_cppr *os_cppr = &__get_cpu_var(xics_cppr);
+       struct xics_cppr *os_cppr = this_cpu_ptr(&xics_cppr);
 
        /* we only really want to set the priority when there's
         * just one cppr value on the stack
@@ -133,7 +133,7 @@ static inline void xics_set_base_cppr(unsigned char cppr)
 
 static inline unsigned char xics_cppr_top(void)
 {
-       struct xics_cppr *os_cppr = &__get_cpu_var(xics_cppr);
+       struct xics_cppr *os_cppr = this_cpu_ptr(&xics_cppr);
        
        return os_cppr->stack[os_cppr->index];
 }