Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[mirror_ubuntu-bionic-kernel.git] / kernel / semaphore.c

diff --git a/kernel/semaphore.c b/kernel/semaphore.c
index 9c7017d1d99695b7767b2471843f6e63c7fa0e75..6815171a4fff4166450ac831729112b75ec64881 100644 (file)
--- a/kernel/semaphore.c
+++ b/kernel/semaphore.c
@@ -193,7 +193,7 @@ EXPORT_SYMBOL(up);
 struct semaphore_waiter {
        struct list_head list;
        struct task_struct *task;
-       int up;
+       bool up;
 };
 
 /*
@@ -209,7 +209,7 @@ static inline int __sched __down_common(struct semaphore *sem, long state,
 
        list_add_tail(&waiter.list, &sem->wait_list);
        waiter.task = task;
-       waiter.up = 0;
+       waiter.up = false;
 
        for (;;) {
                if (signal_pending_state(state, task))
@@ -258,6 +258,6 @@ static noinline void __sched __up(struct semaphore *sem)
        struct semaphore_waiter *waiter = list_first_entry(&sem->wait_list,
                                                struct semaphore_waiter, list);
        list_del(&waiter->list);
-       waiter->up = 1;
+       waiter->up = true;
        wake_up_process(waiter->task);
 }