Purely a preparatory patch; it changes the control flow to match what
will soon be generated by generic code so that that patch can be a
unity transform.

Signed-off-by: Peter Zijlstra <pet...@infradead.org>
---
 include/linux/wait.h |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

--- a/include/linux/wait.h
+++ b/include/linux/wait.h
@@ -430,23 +430,24 @@ do {                                                      
                \
 
 #define __wait_event_interruptible_exclusive(wq, condition, ret)       \
 do {                                                                   \
+       __label__ __out;                                                \
        DEFINE_WAIT(__wait);                                            \
                                                                        \
        for (;;) {                                                      \
                prepare_to_wait_exclusive(&wq, &__wait,                 \
                                        TASK_INTERRUPTIBLE);            \
-               if (condition) {                                        \
-                       finish_wait(&wq, &__wait);                      \
+               if (condition)                                          \
                        break;                                          \
-               }                                                       \
                if (signal_pending(current)) {                          \
                        ret = -ERESTARTSYS;                             \
                        abort_exclusive_wait(&wq, &__wait,              \
                                TASK_INTERRUPTIBLE, NULL);              \
-                       break;                                          \
+                       goto __out;                                     \
                }                                                       \
                schedule();                                             \
        }                                                               \
+       finish_wait(&wq, &__wait);                                      \
+__out: ;                                                               \
 } while (0)
 
 #define wait_event_interruptible_exclusive(wq, condition)              \


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to