Home Home > GIT Browse > openSUSE-15.0
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.com>2019-01-15 13:18:23 +0100
committerPetr Mladek <pmladek@suse.com>2019-01-15 13:18:23 +0100
commit9d51899d1a29efea8279eebaced20687d24a4599 (patch)
tree4acee62ad47bb23f534b4b8692d0be5d7a5e2a40
parent33387273048feeef1ec76574de5b5da27bd14295 (diff)
tools/lib/lockdep: Rename "trywlock" into "trywrlock"
(bsc#1121973).
-rw-r--r--patches.fixes/tools-lib-lockdep-Rename-trywlock-into-trywrlock.patch66
-rw-r--r--series.conf1
2 files changed, 67 insertions, 0 deletions
diff --git a/patches.fixes/tools-lib-lockdep-Rename-trywlock-into-trywrlock.patch b/patches.fixes/tools-lib-lockdep-Rename-trywlock-into-trywrlock.patch
new file mode 100644
index 0000000000..27ee980353
--- /dev/null
+++ b/patches.fixes/tools-lib-lockdep-Rename-trywlock-into-trywrlock.patch
@@ -0,0 +1,66 @@
+From 7f3c7952d111ac93573fb86f4d5aeff527a07fcc Mon Sep 17 00:00:00 2001
+From: Bart Van Assche <bvanassche@acm.org>
+Date: Thu, 6 Dec 2018 17:11:29 -0800
+Subject: [PATCH] tools/lib/lockdep: Rename "trywlock" into "trywrlock"
+Git-commit: 7f3c7952d111ac93573fb86f4d5aeff527a07fcc
+Patch-mainline: v5.0-rc1
+References: bsc#1121973
+
+This patch avoids that the following compiler warning is reported while
+compiling the lockdep unit tests:
+
+Include/liblockdep/rwlock.h: In function 'liblockdep_pthread_rwlock_trywlock':
+include/liblockdep/rwlock.h:66:9: warning: implicit declaration of function 'pthread_rwlock_trywlock'; did you mean 'pthread_rwlock_trywrlock'? [-Wimplicit-function-declaration]
+ return pthread_rwlock_trywlock(&lock->rwlock) == 0 ? 1 : 0;
+ ^~~~~~~~~~~~~~~~~~~~~~~
+ pthread_rwlock_trywrlock
+
+Signed-off-by: Bart Van Assche <bvanassche@acm.org>
+Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
+Cc: Johannes Berg <johannes@sipsolutions.net>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Sasha Levin <sasha.levin@oracle.com>
+Cc: Sasha Levin <sashal@kernel.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: Waiman Long <longman@redhat.com>
+Cc: johannes.berg@intel.com
+Cc: tj@kernel.org
+Fixes: 5a52c9b480e0 ("liblockdep: Add public headers for pthread_rwlock_t implementation")
+Link: https://lkml.kernel.org/r/20181207011148.251812-6-bvanassche@acm.org
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Acked-by: Petr Mladek <pmladek@suse.com>
+
+---
+ tools/lib/lockdep/include/liblockdep/rwlock.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tools/lib/lockdep/include/liblockdep/rwlock.h b/tools/lib/lockdep/include/liblockdep/rwlock.h
+index a96c3bf0fef1..365762e3a1ea 100644
+--- a/tools/lib/lockdep/include/liblockdep/rwlock.h
++++ b/tools/lib/lockdep/include/liblockdep/rwlock.h
+@@ -60,10 +60,10 @@ static inline int liblockdep_pthread_rwlock_tryrdlock(liblockdep_pthread_rwlock_
+ return pthread_rwlock_tryrdlock(&lock->rwlock) == 0 ? 1 : 0;
+ }
+
+-static inline int liblockdep_pthread_rwlock_trywlock(liblockdep_pthread_rwlock_t *lock)
++static inline int liblockdep_pthread_rwlock_trywrlock(liblockdep_pthread_rwlock_t *lock)
+ {
+ lock_acquire(&lock->dep_map, 0, 1, 0, 1, NULL, (unsigned long)_RET_IP_);
+- return pthread_rwlock_trywlock(&lock->rwlock) == 0 ? 1 : 0;
++ return pthread_rwlock_trywrlock(&lock->rwlock) == 0 ? 1 : 0;
+ }
+
+ static inline int liblockdep_rwlock_destroy(liblockdep_pthread_rwlock_t *lock)
+@@ -79,7 +79,7 @@ static inline int liblockdep_rwlock_destroy(liblockdep_pthread_rwlock_t *lock)
+ #define pthread_rwlock_unlock liblockdep_pthread_rwlock_unlock
+ #define pthread_rwlock_wrlock liblockdep_pthread_rwlock_wrlock
+ #define pthread_rwlock_tryrdlock liblockdep_pthread_rwlock_tryrdlock
+-#define pthread_rwlock_trywlock liblockdep_pthread_rwlock_trywlock
++#define pthread_rwlock_trywrlock liblockdep_pthread_rwlock_trywrlock
+ #define pthread_rwlock_destroy liblockdep_rwlock_destroy
+
+ #endif
+--
+2.13.7
+
diff --git a/series.conf b/series.conf
index caff84ab2f..1d429c8b0a 100644
--- a/series.conf
+++ b/series.conf
@@ -19590,6 +19590,7 @@
patches.drivers/device-property-fix-fwnode_graph_get_next_endpoint-d.patch
patches.drivers/platform-msi-Free-descriptors-in-platform_msi_domain.patch
patches.fixes/0001-x86-speculation-l1tf-Drop-the-swap-storage-limit-res.patch
+ patches.fixes/tools-lib-lockdep-Rename-trywlock-into-trywrlock.patch
patches.arch/powerpc-pkeys-Fix-handling-of-pkey-state-across-fork.patch
patches.drivers/can-flexcan-flexcan_irq-fix-indention.patch
patches.drivers/wlcore-Fix-the-return-value-in-case-of-error-in-wlco.patch