X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=lib%2Fhweight.c;h=2c819d6a41a85f4965123aa7c7b109dbcce36ce9;hp=bc9b51bc22704cb6b285aa227779c43397e5e661;hb=04ba61dfa67784d4dfcc22a2b3de7ede28e22e40;hpb=def823d406ad78d3f9690ee8804e743e1d5a8aff diff --git a/lib/hweight.c b/lib/hweight.c index bc9b51bc..2c819d6a 100644 --- a/lib/hweight.c +++ b/lib/hweight.c @@ -23,11 +23,11 @@ unsigned int hweight64(uint64_t w) #if BITS_PER_LONG == 32 return hweight32((unsigned int)(w >> 32)) + hweight32((unsigned int)w); #else - uint64_t res = w - ((w >> 1) & 0x5555555555555555ul); - res = (res & 0x3333333333333333ul) + ((res >> 2) & 0x3333333333333333ul); - res = (res + (res >> 4)) & 0x0F0F0F0F0F0F0F0Ful; + uint64_t res = w - ((w >> 1) & 0x5555555555555555ULL); + res = (res & 0x3333333333333333ULL) + ((res >> 2) & 0x3333333333333333ULL); + res = (res + (res >> 4)) & 0x0F0F0F0F0F0F0F0FULL; res = res + (res >> 8); res = res + (res >> 16); - return (res + (res >> 32)) & 0x00000000000000FFul; + return (res + (res >> 32)) & 0x00000000000000FFULL; #endif }