Commit d31605dc authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'core-types-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull hweight type fix from Ingo Molnar:
 "This lone commit makes sure that __const_hweight8() is unsigned, which
  addresses a build warning if code is built with -Wsign-compare.

  I hope the type cast in this cleanup is fine - another option would be
  to eliminate the double unary negation and use a construct with more
  obvious integer type characteristics, along the lines of:

        ((w) & (1ULL << 1) ? 1U : 0U)

  or so"

* 'core-types-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  bitops: Fix signedness of compile-time hweight implementations
parents b3fd4ea9 c32fa99f
...@@ -5,14 +5,15 @@ ...@@ -5,14 +5,15 @@
* Compile time versions of __arch_hweightN() * Compile time versions of __arch_hweightN()
*/ */
#define __const_hweight8(w) \ #define __const_hweight8(w) \
( (!!((w) & (1ULL << 0))) + \ ((unsigned int) \
(!!((w) & (1ULL << 1))) + \ ((!!((w) & (1ULL << 0))) + \
(!!((w) & (1ULL << 2))) + \ (!!((w) & (1ULL << 1))) + \
(!!((w) & (1ULL << 3))) + \ (!!((w) & (1ULL << 2))) + \
(!!((w) & (1ULL << 4))) + \ (!!((w) & (1ULL << 3))) + \
(!!((w) & (1ULL << 5))) + \ (!!((w) & (1ULL << 4))) + \
(!!((w) & (1ULL << 6))) + \ (!!((w) & (1ULL << 5))) + \
(!!((w) & (1ULL << 7))) ) (!!((w) & (1ULL << 6))) + \
(!!((w) & (1ULL << 7)))))
#define __const_hweight16(w) (__const_hweight8(w) + __const_hweight8((w) >> 8 )) #define __const_hweight16(w) (__const_hweight8(w) + __const_hweight8((w) >> 8 ))
#define __const_hweight32(w) (__const_hweight16(w) + __const_hweight16((w) >> 16)) #define __const_hweight32(w) (__const_hweight16(w) + __const_hweight16((w) >> 16))
......
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