commit 040278e3c56e03afbb771f73aae6972c82688615 (patch)
parent e4ba7c70b3351f ai: add support for ptreadchecker
tree e6a408ad3d679dafb0eb837109e555334808c82b
author Jiri Slaby <jirislaby@gmail.com> 2012-09-04 14:33:25 +0200
committer Jiri Slaby <jirislaby@gmail.com> 2012-09-04 14:33:25 +0200
locks: remove calls to original code
It pollutes the code by assembler.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
---
include/linux/mutex.h | 4 ++--
include/linux/spinlock.h | 30 +++++++++++++++---------------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/include/linux/mutex.h b/include/linux/mutex.h
index 24affafdb2d7fc..99f1ee4ef75951 100644
--- a/include/linux/mutex.h
+++ b/include/linux/mutex.h
@@ -137,7 +137,7 @@ extern void mutex_lock(struct mutex *lock);
extern int __must_check mutex_lock_interruptible(struct mutex *lock);
extern int __must_check mutex_lock_killable(struct mutex *lock);
-#define mutex_lock(L) do { mutex_lock(L); __ai_lock(L); } while (0)
+#define mutex_lock(L) do { /*mutex_lock(L);*/ __ai_lock(L); } while (0)
#define mutex_lock_interruptible(L) (__ai_lock_cond(L) ? 0 : -EINTR)
#define mutex_lock_killable(L) (__ai_lock_cond(L) ? 0 : -EINTR)
@@ -154,6 +154,6 @@ extern int mutex_trylock(struct mutex *lock);
#define mutex_trylock(L) __ai_lock_cond(L)
extern void mutex_unlock(struct mutex *lock);
-#define mutex_unlock(L) do { mutex_unlock(L); __ai_unlock(L); } while (0)
+#define mutex_unlock(L) do { /*mutex_unlock(L);*/ __ai_unlock(L); } while (0)
#endif
diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h
index 64a8dc2270b4db..18317e7296cd9b 100644
--- a/include/linux/spinlock.h
+++ b/include/linux/spinlock.h
@@ -180,7 +180,7 @@ do { \
#define read_trylock(lock) __cond_lock(lock, _read_trylock(lock))
#define write_trylock(lock) __cond_lock(lock, _write_trylock(lock))
-#define spin_lock(lock) do { _spin_lock(lock); __ai_lock(lock); } while (0)
+#define spin_lock(lock) do { /*_spin_lock(lock);*/ __ai_lock(lock); } while (0)
#ifdef CONFIG_DEBUG_LOCK_ALLOC
# define spin_lock_nested(lock, subclass) _spin_lock_nested(lock, subclass)
@@ -190,8 +190,8 @@ do { \
_spin_lock_nest_lock(lock, &(nest_lock)->dep_map); \
} while (0)
#else
-# define spin_lock_nested(lock, subclass) do { _spin_lock(lock); __ai_lock(lock); } while (0)
-# define spin_lock_nest_lock(lock, nest_lock) do { _spin_lock(lock); __ai_lock(lock); } while (0)
+# define spin_lock_nested(lock, subclass) do { /*_spin_lock(lock);*/ __ai_lock(lock); } while (0)
+# define spin_lock_nest_lock(lock, nest_lock) do { /*_spin_lock(lock);*/ __ai_lock(lock); } while (0)
#endif
#define write_lock(lock) _write_lock(lock)
@@ -202,7 +202,7 @@ do { \
#define spin_lock_irqsave(lock, flags) \
do { \
typecheck(unsigned long, flags); \
- flags = _spin_lock_irqsave(lock); \
+ /*flags = _spin_lock_irqsave(lock);*/ \
__ai_lock(lock); \
} while (0)
#define read_lock_irqsave(lock, flags) \
@@ -226,7 +226,7 @@ do { \
#define spin_lock_irqsave_nested(lock, flags, subclass) \
do { \
typecheck(unsigned long, flags); \
- flags = _spin_lock_irqsave(lock); \
+ /*flags = _spin_lock_irqsave(lock); */ \
__ai_lock(lock); \
} while (0)
#endif
@@ -236,7 +236,7 @@ do { \
#define spin_lock_irqsave(lock, flags) \
do { \
typecheck(unsigned long, flags); \
- _spin_lock_irqsave(lock, flags); \
+/* _spin_lock_irqsave(lock, flags); */\
__ai_lock(lock); \
} while (0)
#define read_lock_irqsave(lock, flags) \
@@ -254,8 +254,8 @@ do { \
#endif
-#define spin_lock_irq(lock) do { _spin_lock_irq(lock); __ai_lock(lock); } while (0)
-#define spin_lock_bh(lock) do { _spin_lock_bh(lock); __ai_lock(lock); } while (0)
+#define spin_lock_irq(lock) do { /*_spin_lock_irq(lock); */__ai_lock(lock); } while (0)
+#define spin_lock_bh(lock) do { /*_spin_lock_bh(lock); */__ai_lock(lock); } while (0)
#define read_lock_irq(lock) _read_lock_irq(lock)
#define read_lock_bh(lock) _read_lock_bh(lock)
@@ -268,24 +268,24 @@ do { \
*/
#if defined(CONFIG_DEBUG_SPINLOCK) || defined(CONFIG_PREEMPT) || \
!defined(CONFIG_SMP)
-# define spin_unlock(lock) do { _spin_unlock(lock); __ai_unlock(lock); } while (0)
+# define spin_unlock(lock) do { /*_spin_unlock(lock); */__ai_unlock(lock); } while (0)
# define read_unlock(lock) _read_unlock(lock)
# define write_unlock(lock) _write_unlock(lock)
-# define spin_unlock_irq(lock) do { _spin_unlock_irq(lock); __ai_unlock(lock); } while (0)
+# define spin_unlock_irq(lock) do { /*_spin_unlock_irq(lock);*/ __ai_unlock(lock); } while (0)
# define read_unlock_irq(lock) _read_unlock_irq(lock)
# define write_unlock_irq(lock) _write_unlock_irq(lock)
#else
# define spin_unlock(lock) \
- do {__raw_spin_unlock(&(lock)->raw_lock); __release(lock); __ai_unlock(lock); } while (0)
+ do {/*__raw_spin_unlock(&(lock)->raw_lock); __release(lock);*/ __ai_unlock(lock); } while (0)
# define read_unlock(lock) \
do {__raw_read_unlock(&(lock)->raw_lock); __release(lock); } while (0)
# define write_unlock(lock) \
do {__raw_write_unlock(&(lock)->raw_lock); __release(lock); } while (0)
# define spin_unlock_irq(lock) \
do { \
- __raw_spin_unlock(&(lock)->raw_lock); \
+ /*__raw_spin_unlock(&(lock)->raw_lock);*/ \
__release(lock); \
- local_irq_enable(); \
+ /*local_irq_enable(); */\
__ai_unlock(lock); \
} while (0)
# define read_unlock_irq(lock) \
@@ -305,10 +305,10 @@ do { \
#define spin_unlock_irqrestore(lock, flags) \
do { \
typecheck(unsigned long, flags); \
- _spin_unlock_irqrestore(lock, flags); \
+ /*_spin_unlock_irqrestore(lock, flags); */\
__ai_unlock(lock); \
} while (0)
-#define spin_unlock_bh(lock) do { _spin_unlock_bh(lock); __ai_unlock(lock); } while (0)
+#define spin_unlock_bh(lock) do { /*_spin_unlock_bh(lock);*/ __ai_unlock(lock); } while (0)
#define read_unlock_irqrestore(lock, flags) \
do { \
glossary
--------
Commit objects reference one tree, and zero or more parents.
Single parent commits can typically generate a patch in
unified diff format via `git format-patch'.
Multiple parents means the commit is a merge.
Root commits have no ancestor. Note that it is
possible to have multiple root commits when merging independent histories.
Every commit references one top-level tree object.
git clone https://yhbt.net/lore/pub/scm/linux/kernel/git/jirislaby/linux.git