rt-patches/0189-powerpc-ps3-device-init.c-adapt-to-completions-using.patch

   1 From d9b835a2819032b85af97388eabb1947f1628437 Mon Sep 17 00:00:00 2001
   2 From: Paul Gortmaker <paul.gortmaker@windriver.com>
   3 Date: Sun, 31 May 2015 14:44:42 -0400
   4 Subject: [PATCH 189/366] powerpc: ps3/device-init.c - adapt to completions
   5  using swait vs wait
   6
   7 To fix:
   8
   9   cc1: warnings being treated as errors
  10   arch/powerpc/platforms/ps3/device-init.c: In function 'ps3_notification_read_write':
  11   arch/powerpc/platforms/ps3/device-init.c:755:2: error: passing argument 1 of 'prepare_to_wait_event' from incompatible pointer type
  12   arch/powerpc/platforms/ps3/device-init.c:755:2: error: passing argument 1 of 'abort_exclusive_wait' from incompatible pointer type
  13   arch/powerpc/platforms/ps3/device-init.c:755:2: error: passing argument 1 of 'finish_wait' from incompatible pointer type
  14   arch/powerpc/platforms/ps3/device-init.o] Error 1
  15   make[3]: *** Waiting for unfinished jobs....
  16
  17 Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
  18 Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  19 ---
  20  arch/powerpc/platforms/ps3/device-init.c | 2 +-
  21  1 file changed, 1 insertion(+), 1 deletion(-)
  22
  23 diff --git a/arch/powerpc/platforms/ps3/device-init.c b/arch/powerpc/platforms/ps3/device-init.c
  24 index 3f175e8..c4c02f9 100644
  25 --- a/arch/powerpc/platforms/ps3/device-init.c
  26 +++ b/arch/powerpc/platforms/ps3/device-init.c
  27 @@ -752,7 +752,7 @@ static int ps3_notification_read_write(struct ps3_notification_device *dev,
  28         }
  29         pr_debug("%s:%u: notification %s issued\n", __func__, __LINE__, op);
  30
  31 -       res = wait_event_interruptible(dev->done.wait,
  32 +       res = swait_event_interruptible(dev->done.wait,
  33                                        dev->done.done || kthread_should_stop());
  34         if (kthread_should_stop())
  35                 res = -EINTR;
  36 --
  37 1.9.1
  38