The patch titled
Subject: asm-generic-fix-wtype-limits-compiler-warnings-v2
has been removed from the -mm tree. Its filename was
asm-generic-fix-wtype-limits-compiler-warnings-v2.patch
This patch was dropped because it was folded into asm-generic-fix-wtype-limits-compiler-warnings.patch
------------------------------------------------------
From: Qian Cai <cai@xxxxxx>
Subject: asm-generic-fix-wtype-limits-compiler-warnings-v2
Kill off __get_order() per Andrew.
Update the comments per David.
Remove a variable "order" to be consistent with the rest of return statements.
Link: http://lkml.kernel.org/r/1564000166-31428-1-git-send-email-cai@xxxxxx
Fixes: d66acc39c7ce ("bitops: Optimise get_order()")
Signed-off-by: Qian Cai <cai@xxxxxx>
Cc: Nathan Chancellor <natechancellor@xxxxxxxxx>
Cc: David S. Miller <davem@xxxxxxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Cc: David Howells <dhowells@xxxxxxxxxx>
Cc: Jakub Jelinek <jakub@xxxxxxxxxx>
Cc: Nick Desaulniers <ndesaulniers@xxxxxxxxxx>
Cc: Bill Wendling <morbo@xxxxxxxxxx>
Cc: James Y Knight <jyknight@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/asm-generic/getorder.h | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
--- a/include/asm-generic/getorder.h~asm-generic-fix-wtype-limits-compiler-warnings-v2
+++ a/include/asm-generic/getorder.h
@@ -25,14 +25,9 @@
* to hold an object of the specified size.
*
* The result is undefined if the size is 0.
- *
- * This function may be used to initialise variables with compile time
- * evaluations of constants.
*/
static inline __attribute_const__ int get_order(unsigned long size)
{
- int order;
-
if (__builtin_constant_p(size)) {
if (!size)
return BITS_PER_LONG - PAGE_SHIFT;
@@ -46,11 +41,10 @@ static inline __attribute_const__ int ge
size--;
size >>= PAGE_SHIFT;
#if BITS_PER_LONG == 32
- order = fls(size);
+ return fls(size);
#else
- order = fls64(size);
+ return fls64(size);
#endif
- return order;
}
#endif /* __ASSEMBLY__ */
_
Patches currently in -mm which might be from cai@xxxxxx are
asm-generic-fix-wtype-limits-compiler-warnings.patch
mm-memcontrol-fix-use-after-free-in-mem_cgroup_iter-fix.patch
asm-generic-fix-variable-p4d-set-but-not-used.patch
writeback-fix-wstringop-truncation-warnings.patch
