|
@@ -2393,12 +2393,15 @@ static inline void task_unlock(struct task_struct *p)
|
|
|
extern struct sighand_struct *__lock_task_sighand(struct task_struct *tsk,
|
|
|
unsigned long *flags);
|
|
|
|
|
|
-#define lock_task_sighand(tsk, flags) \
|
|
|
-({ struct sighand_struct *__ss; \
|
|
|
- __cond_lock(&(tsk)->sighand->siglock, \
|
|
|
- (__ss = __lock_task_sighand(tsk, flags))); \
|
|
|
- __ss; \
|
|
|
-}) \
|
|
|
+static inline struct sighand_struct *lock_task_sighand(struct task_struct *tsk,
|
|
|
+ unsigned long *flags)
|
|
|
+{
|
|
|
+ struct sighand_struct *ret;
|
|
|
+
|
|
|
+ ret = __lock_task_sighand(tsk, flags);
|
|
|
+ (void)__cond_lock(&tsk->sighand->siglock, ret);
|
|
|
+ return ret;
|
|
|
+}
|
|
|
|
|
|
static inline void unlock_task_sighand(struct task_struct *tsk,
|
|
|
unsigned long *flags)
|