[PATCH 1/2] tools: Remove lockdep.h and its include from spinlock.h

From: Eugenio Pérez
Date: Tue Jul 06 2021 - 10:39:09 EST


Commit 58d6ea3085f2 ("xarray: Add XArray unconditional store
operations") adds this file at the same time that xarray and xarray
tests. However, xarray tests and other tools/ works with no problem
without this file.

The motivation for the deletion is that vhost tests/tools need to use
spinlock.h mock file, but at the moment it includes lockdep.h that is
only available under tools/testing/radix-tree.

Signed-off-by: Eugenio Pérez <eperezma@xxxxxxxxxx>
---
tools/include/linux/spinlock.h | 2 --
tools/testing/radix-tree/linux/lockdep.h | 11 -----------
2 files changed, 13 deletions(-)
delete mode 100644 tools/testing/radix-tree/linux/lockdep.h

diff --git a/tools/include/linux/spinlock.h b/tools/include/linux/spinlock.h
index c934572d935c..622266b197d0 100644
--- a/tools/include/linux/spinlock.h
+++ b/tools/include/linux/spinlock.h
@@ -37,6 +37,4 @@ static inline bool arch_spin_is_locked(arch_spinlock_t *mutex)
return true;
}

-#include <linux/lockdep.h>
-
#endif
diff --git a/tools/testing/radix-tree/linux/lockdep.h b/tools/testing/radix-tree/linux/lockdep.h
deleted file mode 100644
index 565fccdfe6e9..000000000000
--- a/tools/testing/radix-tree/linux/lockdep.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _LINUX_LOCKDEP_H
-#define _LINUX_LOCKDEP_H
-struct lock_class_key {
- unsigned int a;
-};
-
-static inline void lockdep_set_class(spinlock_t *lock,
- struct lock_class_key *key)
-{
-}
-#endif /* _LINUX_LOCKDEP_H */
--
2.27.0