diff -Nurp -X linux-RT/Documentation/dontdiff linux-RT/include/linux/rt_lock.h linux-RT.mich/include/linux/rt_lock.h --- linux-RT/include/linux/rt_lock.h 2005-05-30 10:42:47.000000000 +0200 +++ linux-RT.mich/include/linux/rt_lock.h 2005-05-30 11:32:12.000000000 +0200 @@ -201,11 +201,13 @@ extern void FASTCALL(__sema_init(struct __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_LOCKED(struct semaphore *sem, char *name, char *file, int line)); #define rt_init_MUTEX(sem) \ __init_MUTEX(sem, #sem, __FILE__, __LINE__) +/* + * No locked initialization for RT semaphores + */ #define rt_init_MUTEX_LOCKED(sem) \ - __init_MUTEX_LOCKED(sem, #sem, __FILE__, __LINE__) + there_is_no_init_MUTEX_LOCKED_for_RT_semaphores extern void FASTCALL(rt_down(struct semaphore *sem)); extern int FASTCALL(rt_down_interruptible(struct semaphore *sem)); extern int FASTCALL(rt_down_trylock(struct semaphore *sem)); @@ -259,6 +261,10 @@ do { \ PICK_FUNC_1ARG(struct compat_semaphore, struct semaphore, \ compat_init_MUTEX, rt_init_MUTEX, sem) +#define init_MUTEX_LOCKED(sem) \ + PICK_FUNC_1ARG(struct compat_semaphore, struct semaphore, \ + compat_init_MUTEX_LOCKED, rt_init_MUTEX_LOCKED, sem) + #define down(sem) \ PICK_FUNC_1ARG(struct compat_semaphore, struct semaphore, \ compat_down, rt_down, sem) @@ -284,11 +290,6 @@ do { \ compat_sema_count, rt_sema_count, sem) /* - * No locked initialization for RT semaphores: - */ -#define init_MUTEX_LOCKED(sem) compat_init_MUTEX_LOCKED(sem) - -/* * rwsems: */