diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-18 11:24:32 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-18 11:24:32 +0200 |
| commit | ca9f672f7c6b4f23b9b88600aaa285f35f07386e (patch) | |
| tree | 8806e0d233be62d39f831c9d5881247ac434d4a3 | |
| parent | 9bd871df56a752029b07dde326d799648994b992 (diff) | |
| parent | a309d5db58793d4d91f5a346e3fa58aa6bf60b12 (diff) | |
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
| -rw-r--r-- | Documentation/core-api/idr.rst | 2 | ||||
| -rw-r--r-- | lib/test_ida.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/core-api/idr.rst b/Documentation/core-api/idr.rst index d351e880a2f6..a2738050c4f0 100644 --- a/Documentation/core-api/idr.rst +++ b/Documentation/core-api/idr.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: CC-BY-SA-4.0 +.. SPDX-License-Identifier: GPL-2.0+ ============= ID Allocation diff --git a/lib/test_ida.c b/lib/test_ida.c index 2d1637d8136b..b06880625961 100644 --- a/lib/test_ida.c +++ b/lib/test_ida.c @@ -150,10 +150,10 @@ static void ida_check_conv(struct ida *ida) IDA_BUG_ON(ida, !ida_is_empty(ida)); } +static DEFINE_IDA(ida); + static int ida_checks(void) { - DEFINE_IDA(ida); - IDA_BUG_ON(&ida, !ida_is_empty(&ida)); ida_check_alloc(&ida); ida_check_destroy(&ida); |