The patch titled
Subject: bitops.h: move out get_count_order[_long]() from __KERNEL__ scope
has been removed from the -mm tree. Its filename was
mm-vmalloc-fix-align-value-calculation-error-v2-fix-fix-fix.patch
This patch was dropped because it was folded into mm-vmalloc-fix-align-value-calculation-error.patch
------------------------------------------------------
From: zijun_hu <zijun_hu@xxxxxxx>
Subject: bitops.h: move out get_count_order[_long]() from __KERNEL__ scope
move out get_count_order[_long]() definitions from scope limited by macro
__KERNEL__
it not only make both functions available in wider region regardless of
whether __KERNEL__ is defined but also keep original region for
get_count_order() before the recent commit c513b4cd2fe9
("mm-vmalloc-fix-align-value-calculation-error-v2-fix-fix")
Link: http://lkml.kernel.org/r/57B2C4CE.80303@xxxxxxxx
Signed-off-by: zijun_hu <zijun_hu@xxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/bitops.h | 52 +++++++++++++++++++--------------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff -puN include/linux/bitops.h~mm-vmalloc-fix-align-value-calculation-error-v2-fix-fix-fix include/linux/bitops.h
--- a/include/linux/bitops.h~mm-vmalloc-fix-align-value-calculation-error-v2-fix-fix-fix
+++ a/include/linux/bitops.h
@@ -181,6 +181,32 @@ static inline unsigned fls_long(unsigned
return fls64(l);
}
+static inline int get_count_order(unsigned int count)
+{
+ int order;
+
+ order = fls(count) - 1;
+ if (count & (count - 1))
+ order++;
+ return order;
+}
+
+/**
+ * get_count_order_long - get order after rounding @l up to power of 2
+ * @l: parameter
+ *
+ * it is same as get_count_order() but with long type parameter
+ */
+static inline int get_count_order_long(unsigned long l)
+{
+ if (l == 0UL)
+ return -1;
+ else if (l & (l - 1UL))
+ return (int)fls_long(l);
+ else
+ return (int)fls_long(l) - 1;
+}
+
/**
* __ffs64 - find first set bit in a 64 bit word
* @word: The 64 bit word
@@ -233,32 +259,6 @@ static inline unsigned long __ffs64(u64
})
#endif
-static inline int get_count_order(unsigned int count)
-{
- int order;
-
- order = fls(count) - 1;
- if (count & (count - 1))
- order++;
- return order;
-}
-
-/**
- * get_count_order_long - get order after rounding @l up to power of 2
- * @l: parameter
- *
- * it is same as get_count_order() but with long type parameter
- */
-static inline int get_count_order_long(unsigned long l)
-{
- if (l == 0UL)
- return -1;
- else if (l & (l - 1UL))
- return (int)fls_long(l);
- else
- return (int)fls_long(l) - 1;
-}
-
#ifndef find_last_bit
/**
* find_last_bit - find the last set bit in a memory region
_
Patches currently in -mm which might be from zijun_hu@xxxxxxx are
mm-vmalloc-fix-align-value-calculation-error.patch
mm-nobootmemc-remove-duplicate-macro-arch_low_address_limit-statements.patch
mm-bootmemc-replace-kzalloc-by-kzalloc_node.patch
linux-mmh-canonicalize-macro-page_aligned-definition.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
