The patch titled
Subject: lib-test-get_count_order-long-in-test_bitopsc-fix
has been removed from the -mm tree. Its filename was
lib-test-get_count_order-long-in-test_bitopsc-fix.patch
This patch was dropped because it was folded into lib-test-get_count_order-long-in-test_bitopsc.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: lib-test-get_count_order-long-in-test_bitopsc-fix
- use order_comb[] to test get_count_order_long() as well, per Geert
- avoid warnings on 32-bit, reported by Geert
- coding-style cleanups
Cc: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Cc: Christian Brauner <christian.brauner@xxxxxxxxxx>
Cc: Wei Yang <richard.weiyang@xxxxxxxxx>
Cc: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
lib/test_bitops.c | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
--- a/lib/test_bitops.c~lib-test-get_count_order-long-in-test_bitopsc-fix
+++ a/lib/test_bitops.c
@@ -28,7 +28,7 @@ enum bitops_fun {
static DECLARE_BITMAP(g_bitmap, BITOPS_LENGTH);
-unsigned int order_comb[][2] = {
+static unsigned int order_comb[][2] = {
{0x00000003, 2},
{0x00000004, 2},
{0x00001fff, 13},
@@ -38,7 +38,8 @@ unsigned int order_comb[][2] = {
{0x80003000, 32},
};
-unsigned long order_comb_long[][2] = {
+#ifdef CONFIG_64BIT
+static unsigned long order_comb_long[][2] = {
{0x0000000300000000, 34},
{0x0000000400000000, 34},
{0x00001fff00000000, 45},
@@ -47,6 +48,7 @@ unsigned long order_comb_long[][2] = {
{0x8000000000000000, 63},
{0x8000300000000000, 64},
};
+#endif
static int __init test_bitops_startup(void)
{
@@ -62,14 +64,23 @@ static int __init test_bitops_startup(vo
for (i = 0; i < ARRAY_SIZE(order_comb); i++) {
if (order_comb[i][1] != get_count_order(order_comb[i][0]))
pr_warn("get_count_order wrong for %x\n",
- order_comb[i][0]); }
+ order_comb[i][0]);
+ }
- for (i = 0; i < ARRAY_SIZE(order_comb_long); i++) {
+ for (i = 0; i < ARRAY_SIZE(order_comb); i++) {
+ if (order_comb[i][1] != get_count_order_long(order_comb[i][0]))
+ pr_warn("get_count_order_long wrong for %x\n",
+ order_comb[i][0]);
+ }
+
+#ifdef CONFIG_64BIT
+ for (i = 0; i < ARRAY_SIZE(order_comb); i++) {
if (order_comb_long[i][1] !=
get_count_order_long(order_comb_long[i][0]))
pr_warn("get_count_order_long wrong for %lx\n",
- order_comb_long[i][0]); }
-
+ order_comb_long[i][0]);
+ }
+#endif
return 0;
}
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
lib-test-get_count_order-long-in-test_bitopsc.patch
lib-test-get_count_order-long-in-test_bitopsc-fix-fix.patch
mm-pass-task-and-mm-to-do_madvise.patch
mm-introduce-external-memory-hinting-api-fix-2-fix.patch
mm-support-vector-address-ranges-for-process_madvise-fix-fix-fix-fix-fix.patch
arch-powerpc-mm-pgtablec-another-missed-conversion.patch
drivers-tty-serial-sh-scic-suppress-uninitialized-var-warning.patch
mm.patch
kernel-forkc-export-kernel_thread-to-modules.patch
