diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-06-22 22:01:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-06-22 22:01:51 -0700 |
| commit | 2e7f53ec14475d56559bcdd07acfb737b7bff1e9 (patch) | |
| tree | 964fee6f7bfc40bae796fe137e293c6831103919 /include/linux/bitops.h | |
| parent | 5cb7db89366c7c64c5476bec0a2939c7c75af4c9 (diff) | |
| parent | 8514206eb4e65262f50d6f18293dc3175ab05693 (diff) | |
Merge home.transmeta.com:/home/torvalds/v2.5/xfs
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux/bitops.h')
| -rw-r--r-- | include/linux/bitops.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/bitops.h b/include/linux/bitops.h index b7487acd00cb..c23ac5fc0a53 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h @@ -108,7 +108,7 @@ static inline unsigned int generic_hweight8(unsigned int w) return (res & 0x0F) + ((res >> 4) & 0x0F); } -static inline unsigned long generic_hweight64(u64 w) +static inline unsigned long generic_hweight64(__u64 w) { #if BITS_PER_LONG < 64 return generic_hweight32((unsigned int)(w >> 32)) + |