lkml.org 
[lkml]   [2013]   [Feb]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[tip:core/locking] liblockdep: Prevent multiple declarations of CALLER_ADDR0
Commit-ID:  8299c063bfa238da87fbdd15b1c3a31ca6e8ff74
Gitweb: http://git.kernel.org/tip/8299c063bfa238da87fbdd15b1c3a31ca6e8ff74
Author: Sasha Levin <sasha.levin@oracle.com>
AuthorDate: Sat, 9 Feb 2013 19:39:37 -0500
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 11 Feb 2013 10:12:39 +0100

liblockdep: Prevent multiple declarations of CALLER_ADDR0

They are declared once in the public and once in the private
headers, prevent declaring them twice if both headers are used.

Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: jamie.iles@oracle.com
Cc: penberg@kernel.org
Cc: acme@ghostprotocols.net
Cc: paulus@samba.org
Cc: namhyung@kernel.org
Cc: peterz@infradead.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1360456781-32462-7-git-send-email-sasha.levin@oracle.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
tools/lib/lockdep/include/liblockdep/common.h | 3 +++
tools/lib/lockdep/uinclude/linux/kernel.h | 2 ++
2 files changed, 5 insertions(+)

diff --git a/tools/lib/lockdep/include/liblockdep/common.h b/tools/lib/lockdep/include/liblockdep/common.h
index a675ef0..1bad66c 100644
--- a/tools/lib/lockdep/include/liblockdep/common.h
+++ b/tools/lib/lockdep/include/liblockdep/common.h
@@ -3,8 +3,11 @@

#include <pthread.h>

+#ifndef CALLER_ADDR0
#define CALLER_ADDR0 (__builtin_return_address(0))
#define _THIS_IP_ CALLER_ADDR0
+#endif
+
#define NR_LOCKDEP_CACHING_CLASSES 2
#define MAX_LOCKDEP_SUBCLASSES 8UL

diff --git a/tools/lib/lockdep/uinclude/linux/kernel.h b/tools/lib/lockdep/uinclude/linux/kernel.h
index da97ce8..af02ac1 100644
--- a/tools/lib/lockdep/uinclude/linux/kernel.h
+++ b/tools/lib/lockdep/uinclude/linux/kernel.h
@@ -28,7 +28,9 @@
#define noinline
#define list_add_tail_rcu list_add_tail

+#ifndef CALLER_ADDR0
#define _THIS_IP_ CALLER_ADDR0
#define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0))
+#endif

#endif

\
 
 \ /
  Last update: 2013-02-11 14:01    [W:0.197 / U:0.020 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site