summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYury Norov <yury.norov@gmail.com>2020-01-03 16:25:22 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2020-01-06 16:49:08 +1100
commitf0c9f30d90eb3d93dc898de33b3e3ee265d22b77 (patch)
tree973f8e94ddfb04a775b70f066cabc23b1be08ac1
parent79d83a93d3b27a490bf9ba51b45ae29727ea5878 (diff)
downloadlinux-next-f0c9f30d90eb3d93dc898de33b3e3ee265d22b77.tar.gz
fix rebase issue
Link: http://lkml.kernel.org/r/20200102182659.6685-1-yury.norov@gmail.com Signed-off-by: Yury Norov <yury.norov@gmail.com> Cc: Amritha Nambiar <amritha.nambiar@intel.com> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Kees Cook <keescook@chromium.org> Cc: Matthew Wilcox <willy@infradead.org> Cc: Miklos Szeredi <mszeredi@redhat.com> Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk> Cc: Steffen Klassert <steffen.klassert@secunet.com> Cc: "Tobin C . Harding" <tobin@kernel.org> Cc: Vineet Gupta <vineet.gupta1@synopsys.com> Cc: Will Deacon <will.deacon@arm.com> Cc: Willem de Bruijn <willemb@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
-rw-r--r--lib/test_bitmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/test_bitmap.c b/lib/test_bitmap.c
index 830c9b195e40..a4ecf6f04a5b 100644
--- a/lib/test_bitmap.c
+++ b/lib/test_bitmap.c
@@ -349,7 +349,6 @@ static const struct test_bitmap_parselist parselist_tests[] __initconst = {
{-EINVAL, "0-31:a/1", NULL, 8, 0},
{-EINVAL, "0-\n", NULL, 8, 0},
-#undef step
};
static void __init __test_bitmap_parselist(int is_user)
@@ -430,6 +429,7 @@ static const struct test_bitmap_parselist parse_tests[] __initconst = {
{-EOVERFLOW, "badf00d,deadbeef,1,0", NULL, 90, 0},
{-EOVERFLOW, "fbadf00d,deadbeef,1,0", NULL, 95, 0},
{-EOVERFLOW, "badf00d,deadbeef,1,0", NULL, 100, 0},
+#undef step
};
static void __init __test_bitmap_parse(int is_user)