Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux...

[platform/kernel/linux-rpi.git] / arch / powerpc / include / asm / reg.h

diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
index b320c8f..cff7988 100644 (file)
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@ -1252,7 +1252,7 @@ static inline void mtmsr_isync(unsigned long val)
 #define wrtspr(rn)     asm volatile("mtspr " __stringify(rn) ",0" : \
                                     : : "memory")
 
-extern void msr_check_and_set(unsigned long bits);
+extern unsigned long msr_check_and_set(unsigned long bits);
 extern bool strict_msr_control;
 extern void __msr_check_and_clear(unsigned long bits);
 static inline void msr_check_and_clear(unsigned long bits)