Merge tag 'powerpc-4.6-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

4883d11e · Linus Torvalds <[email protected]> · 2016-05-06 11:05:07 -07:00

Pull powerpc fix from Michael Ellerman:
 "Fix bad inline asm constraint in create_zero_mask() from Anton
  Blanchard"

* tag 'powerpc-4.6-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc: Fix bad inline asm constraint in create_zero_mask()

Commit: 4883d11e06b5a02a73ee3a554168ec92ab44c0f5
Parents: 659a1823 · b4c11211

Merge commit. Changes below are compared with the first parent: 659a1823.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
arch/powerpc/include/asm/word-at-a-time.h	modified	+1	−1	View file

arch/powerpc/include/asm/word-at-a-time.h

View file

diff --git a/arch/powerpc/include/asm/word-at-a-time.h b/arch/powerpc/include/asm/word-at-a-time.h
index e4396a7..4afe66a 100644
--- a/arch/powerpc/include/asm/word-at-a-time.h
+++ b/arch/powerpc/include/asm/word-at-a-time.h
@@ -82,7 +82,7 @@ static inline unsigned long create_zero_mask(unsigned long bits)
 	    "andc	%1,%1,%2\n\t"
 	    "popcntd	%0,%1"
 		: "=r" (leading_zero_bits), "=&r" (trailing_zero_bit_mask)
-		: "r" (bits));
+		: "b" (bits));
 
 	return leading_zero_bits;
 }