From: Michael Ellerman Date: Tue, 11 Oct 2016 09:07:56 +0000 (+1100) Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux... X-Git-Tag: v4.9-rc1~26^2~4 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=065397a969a0f80624598c5030c2551abbd986fd;p=karo-tx-linux.git Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next Freescale updates from Scott: "Highlights include qbman support (a prerequisite for datapath drivers such as ethernet), a PCI DMA fix+improvement, reset handler changes, more 8xx optimizations, and some cleanups and fixes." --- 065397a969a0f80624598c5030c2551abbd986fd diff --cc arch/powerpc/include/asm/reg.h index a8f63bcb71af,b320c8fb0450..cff79885c2fd --- a/arch/powerpc/include/asm/reg.h +++ b/arch/powerpc/include/asm/reg.h @@@ -1249,8 -1249,10 +1249,10 @@@ static inline void mtmsr_isync(unsigne : "r" ((unsigned long)(v)) \ : "memory") #endif + #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)