[tip:locking/core] tools/lib/lockdep: Fix compilation for 4.11

From: tip-bot for Levin, Alexander (Sasha Levin)
Date: Mon Jun 05 2017 - 05:11:09 EST


Commit-ID: 6c8e6483850e7a7e44fd584790969c308887c468
Gitweb: http://git.kernel.org/tip/6c8e6483850e7a7e44fd584790969c308887c468
Author: Levin, Alexander (Sasha Levin) <alexander.levin@xxxxxxxxxxx>
AuthorDate: Thu, 25 May 2017 12:58:47 +0000
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitDate: Mon, 5 Jun 2017 09:28:09 +0200

tools/lib/lockdep: Fix compilation for 4.11

- More rcu stubs
- New dummy headers due to sched header split
- jhash2 included in due to kernel lockdep inclusion and usage

Signed-off-by: Sasha Levin <alexander.levin@xxxxxxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: a.p.zijlstra@xxxxxxxxx
Cc: ben@xxxxxxxxxxxxxxx
Link: http://lkml.kernel.org/r/20170525130005.5947-13-alexander.levin@xxxxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
tools/include/linux/bitops.h | 10 ++++++++++
{include => tools/include}/linux/jhash.h | 0
{include => tools/include}/linux/unaligned/packed_struct.h | 0
tools/lib/lockdep/uinclude/linux/bitops.h | 3 ---
tools/lib/lockdep/uinclude/linux/compiler.h | 2 ++
tools/lib/lockdep/uinclude/linux/kernel.h | 2 ++
tools/lib/lockdep/uinclude/linux/rcu.h | 2 ++
7 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/tools/include/linux/bitops.h b/tools/include/linux/bitops.h
index 1aecad3..969db19 100644
--- a/tools/include/linux/bitops.h
+++ b/tools/include/linux/bitops.h
@@ -61,4 +61,14 @@ static inline unsigned fls_long(unsigned long l)
return fls64(l);
}

+/**
+ * rol32 - rotate a 32-bit value left
+ * @word: value to rotate
+ * @shift: bits to roll
+ */
+static inline __u32 rol32(__u32 word, unsigned int shift)
+{
+ return (word << shift) | (word >> ((-shift) & 31));
+}
+
#endif
diff --git a/include/linux/jhash.h b/tools/include/linux/jhash.h
similarity index 100%
copy from include/linux/jhash.h
copy to tools/include/linux/jhash.h
diff --git a/include/linux/unaligned/packed_struct.h b/tools/include/linux/unaligned/packed_struct.h
similarity index 100%
copy from include/linux/unaligned/packed_struct.h
copy to tools/include/linux/unaligned/packed_struct.h
diff --git a/tools/lib/lockdep/uinclude/linux/bitops.h b/tools/lib/lockdep/uinclude/linux/bitops.h
deleted file mode 100644
index fab00ff..0000000
--- a/tools/lib/lockdep/uinclude/linux/bitops.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-/* empty file */
-
diff --git a/tools/lib/lockdep/uinclude/linux/compiler.h b/tools/lib/lockdep/uinclude/linux/compiler.h
index fd3e56a..fba5e02 100644
--- a/tools/lib/lockdep/uinclude/linux/compiler.h
+++ b/tools/lib/lockdep/uinclude/linux/compiler.h
@@ -7,4 +7,6 @@
#define WRITE_ONCE(x, val) x=(val)
#define RCU_INIT_POINTER(p, v) p=(v)

+#define __packed __attribute__((packed))
+
#endif
diff --git a/tools/lib/lockdep/uinclude/linux/kernel.h b/tools/lib/lockdep/uinclude/linux/kernel.h
index 021cff4..faa98cc 100644
--- a/tools/lib/lockdep/uinclude/linux/kernel.h
+++ b/tools/lib/lockdep/uinclude/linux/kernel.h
@@ -52,4 +52,6 @@ static inline int lockdep_warn(int condition)
#define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; })
#endif

+#define pr_err(format, ...) fprintf (stderr, format, ## __VA_ARGS__)
+
#endif
diff --git a/tools/lib/lockdep/uinclude/linux/rcu.h b/tools/lib/lockdep/uinclude/linux/rcu.h
index 042ee8e..6f03323 100644
--- a/tools/lib/lockdep/uinclude/linux/rcu.h
+++ b/tools/lib/lockdep/uinclude/linux/rcu.h
@@ -18,4 +18,6 @@ static inline bool rcu_is_watching(void)
return false;
}

+#define rcu_assign_pointer(p, v) ((p) = (v))
+
#endif