Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1657429

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

From "tip-bot for Levin, Alexander (Sasha Levin)" <tipbot@zytor.com>
Newsgroups linux.kernel
Subject [tip:locking/core] tools/lib/lockdep: Fix compilation for 4.11
Date 2017-06-05 11:20 +0200
Message-ID <tOWl3-12Q-5@gated-at.bofh.it> (permalink)
References <tL0GC-c1-19@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/21] liblockdep fixes for v4.12 "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-05-25 15:00 +0200
  [PATCH 10/21] tools: add install make target for liblockdep "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-05-25 15:00 +0200
    [tip:locking/core] tools: Add install make target for liblockdep tip-bot for Alexander Sverdlin <tipbot@zytor.com> - 2017-06-05 11:20 +0200
  [PATCH 06/21] liblockdep: Fix 'set but not used' warnings "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-05-25 15:00 +0200
    [tip:locking/core] tools/lib/lockdep: Fix 'set but not used'  warnings tip-bot for Ben Hutchings <tipbot@zytor.com> - 2017-06-05 11:10 +0200
  [PATCH 03/21] liblockdep: Define the ARRAY_SIZE() macro "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-05-25 15:00 +0200
    [tip:locking/core] tools/lib/lockdep: Define the ARRAY_SIZE() macro tip-bot for Ben Hutchings <tipbot@zytor.com> - 2017-06-05 11:10 +0200
  [PATCH 11/21] tools: liblockdep: Don't mix fd-based and stream IO "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-05-25 15:10 +0200
    [tip:locking/core] tools/lib/lockdep: Don't mix fd-based and stream  IO tip-bot for Alexander Sverdlin <tipbot@zytor.com> - 2017-06-05 11:20 +0200
  [PATCH 19/21] tools include: add IS_ERR_OR_NULL to err.h "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-05-25 15:10 +0200
    [tip:locking/core] tools/include: Add IS_ERR_OR_NULL to err.h "tip-bot for Levin, Alexander (Sasha Levin)" <tipbot@zytor.com> - 2017-06-05 11:20 +0200
  [PATCH 09/21] MAINTAINERS: update email for Sasha Levin "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-05-25 15:10 +0200
    [tip:locking/core] MAINTAINERS: Update email for Sasha Levin "tip-bot for Levin, Alexander (Sasha Levin)" <tipbot@zytor.com> - 2017-06-05 11:10 +0200
  [PATCH 04/21] liblockdep: Enable -Wall by default "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-05-25 15:10 +0200
    [tip:locking/core] tools/lib/lockdep: Enable -Wall by default tip-bot for Ben Hutchings <tipbot@zytor.com> - 2017-06-05 11:10 +0200
  [PATCH 12/21] tools: liblockdep: fix compilation for 4.11 "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-05-25 15:10 +0200
    [tip:locking/core] tools/lib/lockdep: Fix compilation for 4.11 "tip-bot for Levin, Alexander (Sasha Levin)" <tipbot@zytor.com> - 2017-06-05 11:20 +0200
  [PATCH 21/21] tools: liblockdep: hide liblockdep output from test  results "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-05-25 15:10 +0200
    [tip:locking/core] tools/lib/lockdep: Hide liblockdep output from  test results "tip-bot for Levin, Alexander (Sasha Levin)" <tipbot@zytor.com> - 2017-06-05 11:20 +0200
  [PATCH 14/21] tools: liblockdep: Remove double-quotes from soname "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-05-25 15:10 +0200
    [tip:locking/core] tools/lib/lockdep: Remove double-quotes from  soname tip-bot for Ben Hutchings <tipbot@zytor.com> - 2017-06-05 11:20 +0200
  [PATCH 17/21] tools: liblockdep: include err.h "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-05-25 15:10 +0200
    [tip:locking/core] tools/lib/lockdep: Include err.h "tip-bot for Levin, Alexander (Sasha Levin)" <tipbot@zytor.com> - 2017-06-05 11:20 +0200
  [PATCH 15/21] tools: liblockdep: Use LDFLAGS "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-05-25 15:10 +0200
    [tip:locking/core] tools/lib/lockdep: Use LDFLAGS tip-bot for Ben Hutchings <tipbot@zytor.com> - 2017-06-05 11:20 +0200
  [PATCH 20/21] tools: liblockdep: add dummy current_gfp_context() "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-05-25 15:10 +0200
    [tip:locking/core] tools/lib/lockdep: Add dummy  current_gfp_context() "tip-bot for Levin, Alexander (Sasha Levin)" <tipbot@zytor.com> - 2017-06-05 11:20 +0200
  [PATCH 18/21] tools: liblockdep: add empty  __is_[module,kernel]_percpu_address "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-05-25 15:10 +0200
    [tip:locking/core] tools/lib/lockdep: Add empty  __is_[module,kernel]_percpu_address "tip-bot for Levin, Alexander (Sasha Levin)" <tipbot@zytor.com> - 2017-06-05 11:20 +0200
  [PATCH 07/21] liblockdep: Fix 'defined but not used' warning for  init_utsname() "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-05-25 15:10 +0200
    [tip:locking/core] tools/lib/lockdep: Fix 'defined but not used'  warning for init_utsname() tip-bot for Ben Hutchings <tipbot@zytor.com> - 2017-06-05 11:10 +0200
  Re: [PATCH 00/21] liblockdep fixes for v4.12 Ingo Molnar <mingo@kernel.org> - 2017-05-26 09:00 +0200
    Re: [PATCH 00/21] liblockdep fixes for v4.12 "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-05-26 13:00 +0200
      Re: [PATCH 00/21] liblockdep fixes for v4.12 Ingo Molnar <mingo@kernel.org> - 2017-05-26 13:30 +0200
        Re: [PATCH 00/21] liblockdep fixes for v4.12 "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-05-26 13:50 +0200
          Re: [PATCH 00/21] liblockdep fixes for v4.12 Ingo Molnar <mingo@kernel.org> - 2017-05-28 11:20 +0200

csiph-web