Signed-off-by: Daniel Walker <[email protected]>
---
include/linux/rt_lock.h | 6 ++++--
include/linux/spinlock.h | 5 +++--
2 files changed, 7 insertions(+), 4 deletions(-)
Index: linux-2.6.22/include/linux/rt_lock.h
===================================================================
--- linux-2.6.22.orig/include/linux/rt_lock.h
+++ linux-2.6.22/include/linux/rt_lock.h
@@ -128,12 +128,14 @@ struct semaphore name = \
*/
#define DECLARE_MUTEX_LOCKED COMPAT_DECLARE_MUTEX_LOCKED
-extern void fastcall __sema_init(struct semaphore *sem, int val, char *name, char *file, int line);
+extern void fastcall
+__sema_init(struct semaphore *sem, int val, char *name, char *file, int line);
#define rt_sema_init(sem, val) \
__sema_init(sem, val, #sem, __FILE__, __LINE__)
-extern void fastcall __init_MUTEX(struct semaphore *sem, char *name, char *file, int line);
+extern void fastcall
+__init_MUTEX(struct semaphore *sem, char *name, char *file, int line);
#define rt_init_MUTEX(sem) \
__init_MUTEX(sem, #sem, __FILE__, __LINE__)
Index: linux-2.6.22/include/linux/spinlock.h
===================================================================
--- linux-2.6.22.orig/include/linux/spinlock.h
+++ linux-2.6.22/include/linux/spinlock.h
@@ -126,7 +126,7 @@ extern int __lockfunc generic__raw_read_
#ifdef CONFIG_DEBUG_SPINLOCK
extern __lockfunc void _raw_spin_lock(raw_spinlock_t *lock);
-#define _raw_spin_lock_flags(lock, flags) _raw_spin_lock(lock)
+# define _raw_spin_lock_flags(lock, flags) _raw_spin_lock(lock)
extern __lockfunc int _raw_spin_trylock(raw_spinlock_t *lock);
extern __lockfunc void _raw_spin_unlock(raw_spinlock_t *lock);
extern __lockfunc void _raw_read_lock(raw_rwlock_t *lock);
@@ -325,7 +325,8 @@ do { \
# define _read_trylock(rwl) rt_read_trylock(rwl)
# define _write_trylock(rwl) rt_write_trylock(rwl)
-#define _write_trylock_irqsave(rwl, flags) rt_write_trylock_irqsave(rwl, flags)
+# define _write_trylock_irqsave(rwl, flags) \
+ rt_write_trylock_irqsave(rwl, flags)
# define _read_lock(rwl) rt_read_lock(rwl)
# define _write_lock(rwl) rt_write_lock(rwl)
--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]