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

* 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (76 commits)
  PM / Hibernate: Implement compat_ioctl for /dev/snapshot
  PM / Freezer: fix return value of freezable_schedule_timeout_killable()
  PM / shmobile: Allow the A4R domain to be turned off at run time
  PM / input / touchscreen: Make st1232 use device PM QoS constraints
  PM / QoS: Introduce dev_pm_qos_add_ancestor_request()
  PM / shmobile: Remove the stay_on flag from SH7372's PM domains
  PM / shmobile: Don't include SH7372's INTCS in syscore suspend/resume
  PM / shmobile: Add support for the sh7372 A4S power domain / sleep mode
  PM: Drop generic_subsys_pm_ops
  PM / Sleep: Remove forward-only callbacks from AMBA bus type
  PM / Sleep: Remove forward-only callbacks from platform bus type
  PM: Run the driver callback directly if the subsystem one is not there
  PM / Sleep: Make pm_op() and pm_noirq_op() return callback pointers
  PM/Devfreq: Add Exynos4-bus device DVFS driver for Exynos4210/4212/4412.
  PM / Sleep: Merge internal functions in generic_ops.c
  PM / Sleep: Simplify generic system suspend callbacks
  PM / Hibernate: Remove deprecated hibernation snapshot ioctls
  PM / Sleep: Fix freezer failures due to racy usermodehelper_is_disabled()
  ARM: S3C64XX: Implement basic power domain support
  PM / shmobile: Use common always on power domain governor
  ...

Fix up trivial conflict in fs/xfs/xfs_buf.c due to removal of unused
XBT_FORCE_SLEEP bit

1 files changed, 27 insertions, 19 deletions

diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c
index eb1d8641cf5c..2b8661b54eaf 100644
--- a/drivers/dma/dmatest.c
+++ b/drivers/dma/dmatest.c
@@ -214,9 +214,18 @@ static unsigned int dmatest_verify(u8 **bufs, unsigned int start,
         return error_count;
 }
 
-static void dmatest_callback(void *completion)
+/* poor man's completion - we want to use wait_event_freezable() on it */
+struct dmatest_done {
+        bool                    done;
+        wait_queue_head_t       *wait;
+};
+
+static void dmatest_callback(void *arg)
 {
-        complete(completion);
+        struct dmatest_done *done = arg;
+
+        done->done = true;
+        wake_up_all(done->wait);
 }
 
 /*
@@ -235,7 +244,9 @@ static void dmatest_callback(void *completion)
  */
 static int dmatest_func(void *data)
 {
+        DECLARE_WAIT_QUEUE_HEAD_ONSTACK(done_wait);
         struct dmatest_thread   *thread = data;
+        struct dmatest_done     done = { .wait = &done_wait };
         struct dma_chan         *chan;
         const char              *thread_name;
         unsigned int            src_off, dst_off, len;
@@ -252,7 +263,7 @@ static int dmatest_func(void *data)
         int                     i;
 
         thread_name = current->comm;
-        set_freezable_with_signal();
+        set_freezable();
 
         ret = -ENOMEM;
 
@@ -306,9 +317,6 @@ static int dmatest_func(void *data)
                 struct dma_async_tx_descriptor *tx = NULL;
                 dma_addr_t dma_srcs[src_cnt];
                 dma_addr_t dma_dsts[dst_cnt];
-                struct completion cmp;
-                unsigned long start, tmo, end = 0 /* compiler... */;
-                bool reload = true;
                 u8 align = 0;
 
                 total_tests++;
@@ -391,9 +399,9 @@ static int dmatest_func(void *data)
                         continue;
                 }
 
-                init_completion(&cmp);
+                done.done = false;
                 tx->callback = dmatest_callback;
-                tx->callback_param = &cmp;
+                tx->callback_param = &done;
                 cookie = tx->tx_submit(tx);
 
                 if (dma_submit_error(cookie)) {
@@ -407,20 +415,20 @@ static int dmatest_func(void *data)
                 }
                 dma_async_issue_pending(chan);
 
-                do {
-                        start = jiffies;
-                        if (reload)
-                                end = start + msecs_to_jiffies(timeout);
-                        else if (end <= start)
-                                end = start + 1;
-                        tmo = wait_for_completion_interruptible_timeout(&cmp,
-                                                                end - start);
-                        reload = try_to_freeze();
-                } while (tmo == -ERESTARTSYS);
+                wait_event_freezable_timeout(done_wait, done.done,
+                                             msecs_to_jiffies(timeout));
 
                 status = dma_async_is_tx_complete(chan, cookie, NULL, NULL);
 
-                if (tmo == 0) {
+                if (!done.done) {
+                        /*
+                         * We're leaving the timed out dma operation with
+                         * dangling pointer to done_wait.  To make this
+                         * correct, we'll need to allocate wait_done for
+                         * each test iteration and perform "who's gonna
+                         * free it this time?" dancing.  For now, just
+                         * leave it dangling.
+                         */
                         pr_warning("%s: #%u: test timed out\n",
                                    thread_name, total_tests - 1);
                         failed_tests++;