diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-06 20:05:07 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-06 20:05:07 +0200 |
commit | 4883d11e06b5a02a73ee3a554168ec92ab44c0f5 (patch) | |
tree | 1ce4633caa2418af4f7407dd9177990db9e0b30d /arch | |
parent | Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff) | |
parent | powerpc: Fix bad inline asm constraint in create_zero_mask() (diff) | |
download | linux-4883d11e06b5a02a73ee3a554168ec92ab44c0f5.tar.xz linux-4883d11e06b5a02a73ee3a554168ec92ab44c0f5.zip |
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()
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/include/asm/word-at-a-time.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/word-at-a-time.h b/arch/powerpc/include/asm/word-at-a-time.h index e4396a7d0f7c..4afe66aa1400 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; } |