diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-05-16 10:04:48 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-05-16 10:04:48 +0300 |
| commit | 00f5764dbb040188e5dce2cd9e648360886b045c (patch) | |
| tree | 2dc969bb165a27a7cebdd1798b7a697243a790de /lib/plist.c | |
| parent | 409ca45526a428620d8efb362ccfd4b1e6b80642 (diff) | |
| parent | 5ac94332248ee017964ba368cdda4ce647e3aba7 (diff) | |
| download | linux-00f5764dbb040188e5dce2cd9e648360886b045c.tar.xz | |
Merge branch 'linus' into x86/urgent, to pick up dependent changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'lib/plist.c')
| -rw-r--r-- | lib/plist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/plist.c b/lib/plist.c index 199408f91057..d3bd8827186f 100644 --- a/lib/plist.c +++ b/lib/plist.c @@ -26,7 +26,7 @@ #include <linux/bug.h> #include <linux/plist.h> -#ifdef CONFIG_DEBUG_PI_LIST +#ifdef CONFIG_DEBUG_PLIST static struct plist_head test_head; @@ -173,7 +173,7 @@ void plist_requeue(struct plist_node *node, struct plist_head *head) plist_check_head(head); } -#ifdef CONFIG_DEBUG_PI_LIST +#ifdef CONFIG_DEBUG_PLIST #include <linux/sched.h> #include <linux/sched/clock.h> #include <linux/module.h> |