52 lines
1.5 KiB
Diff
52 lines
1.5 KiB
Diff
|
diff --git a/include/linux/log2.h b/include/linux/log2.h
|
||
|
|
index fd7ff3d91e6a..4b0c8edcb947 100644
|
||
|
|
--- a/include/linux/log2.h
|
||
|
|
+++ b/include/linux/log2.h
|
||
|
|
@@ -15,12 +15,6 @@
|
||
|
|
#include <linux/types.h>
|
||
|
|
#include <linux/bitops.h>
|
||
|
|
|
||
|
|
-/*
|
||
|
|
- * deal with unrepresentable constant logarithms
|
||
|
|
- */
|
||
|
|
-extern __attribute__((const, noreturn))
|
||
|
|
-int ____ilog2_NaN(void);
|
||
|
|
-
|
||
|
|
/*
|
||
|
|
* non-constant log of base 2 calculators
|
||
|
|
* - the arch may override these in asm/bitops.h if they can be implemented
|
||
|
|
@@ -85,7 +79,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n)
|
||
|
|
#define ilog2(n) \
|
||
|
|
( \
|
||
|
|
__builtin_constant_p(n) ? ( \
|
||
|
|
- (n) < 1 ? ____ilog2_NaN() : \
|
||
|
|
+ (n) < 2 ? 0 : \
|
||
|
|
(n) & (1ULL << 63) ? 63 : \
|
||
|
|
(n) & (1ULL << 62) ? 62 : \
|
||
|
|
(n) & (1ULL << 61) ? 61 : \
|
||
|
|
@@ -148,10 +142,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n)
|
||
|
|
(n) & (1ULL << 4) ? 4 : \
|
||
|
|
(n) & (1ULL << 3) ? 3 : \
|
||
|
|
(n) & (1ULL << 2) ? 2 : \
|
||
|
|
- (n) & (1ULL << 1) ? 1 : \
|
||
|
|
- (n) & (1ULL << 0) ? 0 : \
|
||
|
|
- ____ilog2_NaN() \
|
||
|
|
- ) : \
|
||
|
|
+ 1 ) : \
|
||
|
|
(sizeof(n) <= 4) ? \
|
||
|
|
__ilog2_u32(n) : \
|
||
|
|
__ilog2_u64(n) \
|
||
|
|
|
||
|
|
diff --git a/Makefile b/Makefile
|
||
|
|
index 591a38331223..8d15418cd7e7 100644
|
||
|
|
--- a/Makefile
|
||
|
|
+++ b/Makefile
|
||
|
|
@@ -610,6 +610,7 @@ all: vmlinux
|
||
|
|
include $(srctree)/arch/$(SRCARCH)/Makefile
|
||
|
|
|
||
|
|
KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks,)
|
||
|
|
+KBUILD_CFLAGS += $(call cc-disable-warning, attribute-alias)
|
||
|
|
|
||
|
|
ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
|
||
|
|
KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,)
|