From: "tip-bot for Levin, Alexander (Sasha Levin)" <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: torvalds@linux-foundation.org, peterz@infradead.org,
alexander.levin@verizon.com, hpa@zytor.com, tglx@linutronix.de,
mingo@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip:locking/core] tools/lib/lockdep: Fix compilation for 4.11
Date: Mon, 5 Jun 2017 02:07:25 -0700 [thread overview]
Message-ID: <tip-6c8e6483850e7a7e44fd584790969c308887c468@git.kernel.org> (raw)
In-Reply-To: <20170525130005.5947-13-alexander.levin@verizon.com>
Commit-ID: 6c8e6483850e7a7e44fd584790969c308887c468
Gitweb: http://git.kernel.org/tip/6c8e6483850e7a7e44fd584790969c308887c468
Author: Levin, Alexander (Sasha Levin) <alexander.levin@verizon.com>
AuthorDate: Thu, 25 May 2017 12:58:47 +0000
Committer: Ingo Molnar <mingo@kernel.org>
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@verizon.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: a.p.zijlstra@chello.nl
Cc: ben@decadent.org.uk
Link: http://lkml.kernel.org/r/20170525130005.5947-13-alexander.levin@verizon.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
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
next prev parent reply other threads:[~2017-06-05 9:10 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-25 12:58 [PATCH 00/21] liblockdep fixes for v4.12 Levin, Alexander (Sasha Levin)
2017-05-25 12:58 ` [PATCH 01/21] liblockdep: Fix undefined symbol prandom_u32 Levin, Alexander (Sasha Levin)
2017-06-05 9:01 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Ben Hutchings
2017-05-25 12:58 ` [PATCH 02/21] liblockdep: Reduce MAX_LOCK_DEPTH to avoid overflowing lock_chain::depth Levin, Alexander (Sasha Levin)
2017-06-05 9:01 ` [tip:locking/core] tools/lib/lockdep: Reduce MAX_LOCK_DEPTH to avoid overflowing lock_chain/: Depth tip-bot for Ben Hutchings
2017-05-25 12:58 ` [PATCH 03/21] liblockdep: Define the ARRAY_SIZE() macro Levin, Alexander (Sasha Levin)
2017-06-05 9:02 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Ben Hutchings
2017-05-25 12:58 ` [PATCH 04/21] liblockdep: Enable -Wall by default Levin, Alexander (Sasha Levin)
2017-06-05 9:02 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Ben Hutchings
2017-05-25 12:58 ` [PATCH 05/21] liblockdep: Fix 'unused value' warnings Levin, Alexander (Sasha Levin)
2017-06-05 9:03 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Ben Hutchings
2017-05-25 12:58 ` [PATCH 06/21] liblockdep: Fix 'set but not used' warnings Levin, Alexander (Sasha Levin)
2017-06-05 9:04 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Ben Hutchings
2017-05-25 12:58 ` [PATCH 07/21] liblockdep: Fix 'defined but not used' warning for init_utsname() Levin, Alexander (Sasha Levin)
2017-06-05 9:04 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Ben Hutchings
2017-05-25 12:58 ` [PATCH 08/21] liblockdep: Remove -lpthread compiler option Levin, Alexander (Sasha Levin)
2017-06-05 9:05 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Vishal Thanki
2017-05-25 12:58 ` [PATCH 09/21] MAINTAINERS: update email for Sasha Levin Levin, Alexander (Sasha Levin)
2017-06-05 9:05 ` [tip:locking/core] MAINTAINERS: Update " tip-bot for Levin, Alexander (Sasha Levin)
2017-05-25 12:58 ` [PATCH 10/21] tools: add install make target for liblockdep Levin, Alexander (Sasha Levin)
2017-06-05 9:06 ` [tip:locking/core] tools: Add " tip-bot for Alexander Sverdlin
2017-05-25 12:58 ` [PATCH 11/21] tools: liblockdep: Don't mix fd-based and stream IO Levin, Alexander (Sasha Levin)
2017-06-05 9:06 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Alexander Sverdlin
2017-05-25 12:58 ` [PATCH 12/21] tools: liblockdep: fix compilation for 4.11 Levin, Alexander (Sasha Levin)
2017-06-05 9:07 ` tip-bot for Levin, Alexander (Sasha Levin) [this message]
2017-05-25 12:58 ` [PATCH 13/21] tools: liblockdep: Fix object file paths used in an out-of-tree build Levin, Alexander (Sasha Levin)
2017-06-05 9:07 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Ben Hutchings
2017-05-25 12:58 ` [PATCH 14/21] tools: liblockdep: Remove double-quotes from soname Levin, Alexander (Sasha Levin)
2017-06-05 9:08 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Ben Hutchings
2017-05-25 12:58 ` [PATCH 15/21] tools: liblockdep: Use LDFLAGS Levin, Alexander (Sasha Levin)
2017-06-05 9:09 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Ben Hutchings
2017-05-25 12:58 ` [PATCH 16/21] tools include: add empty include/linux/sched/mm.h Levin, Alexander (Sasha Levin)
2017-06-05 9:09 ` [tip:locking/core] tools/include: Add (mostly) " tip-bot for Levin, Alexander (Sasha Levin)
2017-05-25 12:58 ` [PATCH 17/21] tools: liblockdep: include err.h Levin, Alexander (Sasha Levin)
2017-06-05 9:10 ` [tip:locking/core] tools/lib/lockdep: Include err.h tip-bot for Levin, Alexander (Sasha Levin)
2017-05-25 12:58 ` [PATCH 18/21] tools: liblockdep: add empty __is_[module,kernel]_percpu_address Levin, Alexander (Sasha Levin)
2017-06-05 9:10 ` [tip:locking/core] tools/lib/lockdep: Add " tip-bot for Levin, Alexander (Sasha Levin)
2017-05-25 12:58 ` [PATCH 19/21] tools include: add IS_ERR_OR_NULL to err.h Levin, Alexander (Sasha Levin)
2017-06-05 9:11 ` [tip:locking/core] tools/include: Add " tip-bot for Levin, Alexander (Sasha Levin)
2017-05-25 12:58 ` [PATCH 20/21] tools: liblockdep: add dummy current_gfp_context() Levin, Alexander (Sasha Levin)
2017-06-05 9:11 ` [tip:locking/core] tools/lib/lockdep: Add " tip-bot for Levin, Alexander (Sasha Levin)
2017-05-25 12:58 ` [PATCH 21/21] tools: liblockdep: hide liblockdep output from test results Levin, Alexander (Sasha Levin)
2017-06-05 9:12 ` [tip:locking/core] tools/lib/lockdep: Hide " tip-bot for Levin, Alexander (Sasha Levin)
2017-05-26 6:52 ` [PATCH 00/21] liblockdep fixes for v4.12 Ingo Molnar
2017-05-26 10:57 ` Levin, Alexander (Sasha Levin)
2017-05-26 11:21 ` Ingo Molnar
2017-05-26 11:41 ` Levin, Alexander (Sasha Levin)
2017-05-28 9:11 ` Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-6c8e6483850e7a7e44fd584790969c308887c468@git.kernel.org \
--to=tipbot@zytor.com \
--cc=alexander.levin@verizon.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).