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

torvalds · torvalds · commit 4883d11e06b5 · 2016-05-06T11:05:07.000-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()
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ static inline unsigned long create_zero_mask(unsigned long bits)`
`82`	`82`	`"andc %1,%1,%2\n\t"`
`83`	`83`	`"popcntd %0,%1"`
`84`	`84`	`: "=r" (leading_zero_bits), "=&r" (trailing_zero_bit_mask)`
`85`		`- : "r" (bits));`
	`85`	`+ : "b" (bits));`
`86`	`86`
`87`	`87`	`return leading_zero_bits;`
`88`	`88`	`}`