Commit 4883d11e authored by Linus Torvalds's avatar Linus Torvalds

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

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()
parents 659a1823 b4c11211
...@@ -82,7 +82,7 @@ static inline unsigned long create_zero_mask(unsigned long bits) ...@@ -82,7 +82,7 @@ static inline unsigned long create_zero_mask(unsigned long bits)
"andc %1,%1,%2\n\t" "andc %1,%1,%2\n\t"
"popcntd %0,%1" "popcntd %0,%1"
: "=r" (leading_zero_bits), "=&r" (trailing_zero_bit_mask) : "=r" (leading_zero_bits), "=&r" (trailing_zero_bit_mask)
: "r" (bits)); : "b" (bits));
return leading_zero_bits; return leading_zero_bits;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment