[GIT PULL 0/2] tools/lib/lockdep: fixes for v4.15

[GIT PULL 0/2] tools/lib/lockdep: fixes for v4.15

[alexander.levin]

The following changes since commit dabe589657ad0f9a0d6f4101e2171574f74b00bf:

  Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (2017-12-06 15:20:51 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/sashal/linux.git liblockdep-fixes

for you to fetch changes up to d5fb0bd321788e5b516adbd1e544f11155182a4f:

  tools/lib/lockdep: add empty declaration for early_param (2017-12-12 13:02:13 -0500)

----------------------------------------------------------------
Mengting Zhang (1):
      tools/lib/lockdep: Add missing declaration of 'pr_cont()'

Sasha Levin (1):
      tools/lib/lockdep: add empty declaration for early_param

 tools/include/linux/kernel.h  | 2 ++
 tools/include/linux/lockdep.h | 1 +
 2 files changed, 3 insertions(+)

Mengting Zhang (1):
  tools/lib/lockdep: Add missing declaration of 'pr_cont()'

Sasha Levin (1):
  tools/lib/lockdep: add empty declaration for early_param

 tools/include/linux/kernel.h  | 2 ++
 tools/include/linux/lockdep.h | 1 +
 2 files changed, 3 insertions(+)

-- 
2.11.0

[PATCH 2/2] tools/lib/lockdep: add empty declaration for early_param

[alexander.levin]

Commit d141babe4244 ("locking/lockdep: Add a boot parameter allowing
unwind in cross-release and disable it by default") has added a boot
time param to allow recording full stack traces in cross-release.

However, the commit used early_param() which wasn't wrapped in the
userspace headers, causing the following compilation error:

	../../../kernel/locking/lockdep.c:89:13: error: expected declaration specifiers or ‘...’ before string constant

Fix it by creating a dummy declaration that uses the function pointer
to avoid declared but not used warnings.

Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
 tools/include/linux/kernel.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/include/linux/kernel.h b/tools/include/linux/kernel.h
index 0ad884452c5c..6d61a1a6c1d2 100644
--- a/tools/include/linux/kernel.h
+++ b/tools/include/linux/kernel.h
@@ -117,4 +117,6 @@ int scnprintf(char * buf, size_t size, const char * fmt, ...);
 #define current_gfp_context(k) 0
 #define synchronize_sched()
 
+#define early_param(str, fn) void __used *dummy##fn = fn;
+
 #endif
-- 
2.11.0

[PATCH 1/2] tools/lib/lockdep: Add missing declaration of 'pr_cont()'

[alexander.levin]

From: Mengting Zhang <zhangmengting@huawei.com>

Commit 681fbec881de ("lockdep: Use consistent printing primitives")
has moved lockdep away from using printk() for printing.

Unfourtenatly, the commit added usage of pr_cont() which wasn't
wrapped in the userspace headers, causing the following warning:

	../../../kernel/locking/lockdep.c:3544:2: warning: implicit declaration of function 'pr_cont' [-Wimplicit-function-declaration]

Adding an empty declaration of 'pr_cont' fixes the problem.

Reviewed-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>
Signed-off-by: Mengting Zhang <zhangmengting@huawei.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
 tools/include/linux/lockdep.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/include/linux/lockdep.h b/tools/include/linux/lockdep.h
index 940c1b075659..6b0c36a58fcb 100644
--- a/tools/include/linux/lockdep.h
+++ b/tools/include/linux/lockdep.h
@@ -48,6 +48,7 @@ static inline int debug_locks_off(void)
 #define printk(...) dprintf(STDOUT_FILENO, __VA_ARGS__)
 #define pr_err(format, ...) fprintf (stderr, format, ## __VA_ARGS__)
 #define pr_warn pr_err
+#define pr_cont pr_err
 
 #define list_del_rcu list_del
 
-- 
2.11.0

[tip:locking/urgent] tools/lib/lockdep: Add missing declaration of 'pr_cont()'

[tip-bot for Mengting Zhang]

Commit-ID:  92ccc262e485781ff4c0fb3b7c77a619282df49a
Gitweb:     https://git.kernel.org/tip/92ccc262e485781ff4c0fb3b7c77a619282df49a
Author:     Mengting Zhang <zhangmengting@huawei.com>
AuthorDate: Tue, 12 Dec 2017 18:16:57 +0000
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 13 Dec 2017 11:17:35 +0100

tools/lib/lockdep: Add missing declaration of 'pr_cont()'

Commit:

  681fbec881de ("lockdep: Use consistent printing primitives")

has moved lockdep away from using printk() for printing.

The commit added usage of pr_cont() which wasn't wrapped in the
userspace headers, causing the following warning for the
liblockdep build:

	../../../kernel/locking/lockdep.c:3544:2: warning: implicit declaration of function 'pr_cont' [-Wimplicit-function-declaration]

Adding an empty declaration of 'pr_cont' fixes the problem.

Signed-off-by: Mengting Zhang <zhangmengting@huawei.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Reviewed-by: Alexander Sverdlin <alexander.sverdlin@gmail.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
Link: http://lkml.kernel.org/r/20171212181644.11913-2-alexander.levin@verizon.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 tools/include/linux/lockdep.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/include/linux/lockdep.h b/tools/include/linux/lockdep.h
index 940c1b0..6b0c36a 100644
--- a/tools/include/linux/lockdep.h
+++ b/tools/include/linux/lockdep.h
@@ -48,6 +48,7 @@ static inline int debug_locks_off(void)
 #define printk(...) dprintf(STDOUT_FILENO, __VA_ARGS__)
 #define pr_err(format, ...) fprintf (stderr, format, ## __VA_ARGS__)
 #define pr_warn pr_err
+#define pr_cont pr_err
 
 #define list_del_rcu list_del