The following commit has been merged into the locking/header branch of tip:
Commit-ID: e885d5d94793ef342e49d55672baabbc16e32bb1
Gitweb: https://git.kernel.org/tip/e885d5d94793ef342e49d55672baabbc16e32bb1
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
AuthorDate: Thu, 16 Jul 2020 16:36:50 +10:00
Committer: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
CommitterDate: Tue, 28 Jul 2020 10:45:46 +02:00
lockdep: Move list.h inclusion into lockdep.h
Currently lockdep_types.h includes list.h without actually using any
of its macros or functions. All it needs are the type definitions
which were moved into types.h long ago. This potentially causes
inclusion loops because both are included by many core header
files.
This patch moves the list.h inclusion into lockdep.h. Note that
we could probably remove it completely but that could potentially
result in compile failures should any end users not include list.h
directly and also be unlucky enough to not get list.h via some other
header file.
Reported-by: Petr Mladek <pmladek@xxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Tested-by: Petr Mladek <pmladek@xxxxxxxx>
Link: https://lkml.kernel.org/r/20200716063649.GA23065@xxxxxxxxxxxxxxxxxxx
---
include/linux/lockdep.h | 1 +
include/linux/lockdep_types.h | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 3b73cf8..b1ad5c0 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -21,6 +21,7 @@ extern int lock_stat;
#ifdef CONFIG_LOCKDEP
#include <linux/linkage.h>
+#include <linux/list.h>
#include <linux/debug_locks.h>
#include <linux/stacktrace.h>
diff --git a/include/linux/lockdep_types.h b/include/linux/lockdep_types.h
index 7b93506..bb35b44 100644
--- a/include/linux/lockdep_types.h
+++ b/include/linux/lockdep_types.h
@@ -32,8 +32,6 @@ enum lockdep_wait_type {
#ifdef CONFIG_LOCKDEP
-#include <linux/list.h>
-
/*
* We'd rather not expose kernel/lockdep_states.h this wide, but we do need
* the total number of states... :-(
|