ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Greg Kroah-Hartman
2018-10-18 11:24:32 +02:00
parent 9bd871df56 a309d5db58
commit ca9f672f7c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/core-api/idr.rst
View File

@@ -1,4 +1,4 @@
.. SPDX-License-Identifier: CC-BY-SA-4.0 .. SPDX-License-Identifier: GPL-2.0+
============= =============
ID Allocation ID Allocation

4
lib/test_ida.c
View File

@@ -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);