projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/mfasheh...
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
bitops.h
diff --git
a/include/linux/bitops.h
b/include/linux/bitops.h
index 5d1eabcde5d5f273e6b3e9450c23e0861f69c84c..638165f571dacedf7455f0bc9d87e3390b8ee781 100644
(file)
--- a/
include/linux/bitops.h
+++ b/
include/linux/bitops.h
@@
-31,9
+31,8
@@
static inline unsigned long hweight_long(unsigned long w)
return sizeof(w) == 4 ? hweight32(w) : hweight64(w);
}
return sizeof(w) == 4 ? hweight32(w) : hweight64(w);
}
-/*
+/*
*
* rol32 - rotate a 32-bit value left
* rol32 - rotate a 32-bit value left
- *
* @word: value to rotate
* @shift: bits to roll
*/
* @word: value to rotate
* @shift: bits to roll
*/
@@
-42,9
+41,8
@@
static inline __u32 rol32(__u32 word, unsigned int shift)
return (word << shift) | (word >> (32 - shift));
}
return (word << shift) | (word >> (32 - shift));
}
-/*
+/*
*
* ror32 - rotate a 32-bit value right
* ror32 - rotate a 32-bit value right
- *
* @word: value to rotate
* @shift: bits to roll
*/
* @word: value to rotate
* @shift: bits to roll
*/