Commit ca9f672f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Merge branch 'ida-fixes-4.19-rc8' of git://git.infradead.org/users/willy/linux-dax

Matthew writes:
  "IDA/IDR fixes for 4.19

   I have two tiny fixes, one for the IDA test-suite and one for the IDR
   documentation license."

* 'ida-fixes-4.19-rc8' of git://git.infradead.org/users/willy/linux-dax:
  idr: Change documentation license
  test_ida: Fix lockdep warning
parents 9bd871df a309d5db
.. SPDX-License-Identifier: CC-BY-SA-4.0 .. SPDX-License-Identifier: GPL-2.0+
============= =============
ID Allocation ID Allocation
......
...@@ -150,10 +150,10 @@ static void ida_check_conv(struct ida *ida) ...@@ -150,10 +150,10 @@ static void ida_check_conv(struct ida *ida)
IDA_BUG_ON(ida, !ida_is_empty(ida)); IDA_BUG_ON(ida, !ida_is_empty(ida));
} }
static DEFINE_IDA(ida);
static int ida_checks(void) static int ida_checks(void)
{ {
DEFINE_IDA(ida);
IDA_BUG_ON(&ida, !ida_is_empty(&ida)); IDA_BUG_ON(&ida, !ida_is_empty(&ida));
ida_check_alloc(&ida); ida_check_alloc(&ida);
ida_check_destroy(&ida); ida_check_destroy(&ida);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment