diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-05-21 08:27:15 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-05-21 08:27:15 +0200 |
commit | c049ffb35ac4a393919a001f8f468c43cb185a34 (patch) | |
tree | 3d8835848724bebf6326aaed3ae5e4dd8d302057 /lib/test_bitmap.c | |
parent | baf12d6ddeae74dfcfd5d19fce86260a2e1e44f2 (diff) | |
parent | 771c577c23bac90597c685971d7297ea00f99d11 (diff) | |
download | op-kernel-dev-c049ffb35ac4a393919a001f8f468c43cb185a34.zip op-kernel-dev-c049ffb35ac4a393919a001f8f468c43cb185a34.tar.gz |
Merge 4.17-rc6 into usb-next
We want the bug fixes and this resolves the merge issues with the usbip
driver.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'lib/test_bitmap.c')
-rw-r--r-- | lib/test_bitmap.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/lib/test_bitmap.c b/lib/test_bitmap.c index de16f78..6cd7d07 100644 --- a/lib/test_bitmap.c +++ b/lib/test_bitmap.c @@ -331,23 +331,32 @@ static void noinline __init test_mem_optimisations(void) unsigned int start, nbits; for (start = 0; start < 1024; start += 8) { - memset(bmap1, 0x5a, sizeof(bmap1)); - memset(bmap2, 0x5a, sizeof(bmap2)); for (nbits = 0; nbits < 1024 - start; nbits += 8) { + memset(bmap1, 0x5a, sizeof(bmap1)); + memset(bmap2, 0x5a, sizeof(bmap2)); + bitmap_set(bmap1, start, nbits); __bitmap_set(bmap2, start, nbits); - if (!bitmap_equal(bmap1, bmap2, 1024)) + if (!bitmap_equal(bmap1, bmap2, 1024)) { printk("set not equal %d %d\n", start, nbits); - if (!__bitmap_equal(bmap1, bmap2, 1024)) + failed_tests++; + } + if (!__bitmap_equal(bmap1, bmap2, 1024)) { printk("set not __equal %d %d\n", start, nbits); + failed_tests++; + } bitmap_clear(bmap1, start, nbits); __bitmap_clear(bmap2, start, nbits); - if (!bitmap_equal(bmap1, bmap2, 1024)) + if (!bitmap_equal(bmap1, bmap2, 1024)) { printk("clear not equal %d %d\n", start, nbits); - if (!__bitmap_equal(bmap1, bmap2, 1024)) + failed_tests++; + } + if (!__bitmap_equal(bmap1, bmap2, 1024)) { printk("clear not __equal %d %d\n", start, nbits); + failed_tests++; + } } } } |