Merge branch 'linus' into sched/core, to resolve conflict

Conflicts:
	arch/sparc/include/asm/topology_64.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>

4 files changed, 13 insertions, 11 deletions

diff --git a/kernel/module.c b/kernel/module.c
index 42a1d2afb217..cfc9e843a924 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -3370,6 +3370,9 @@ static int load_module(struct load_info *info, const char __user *uargs,
         module_bug_cleanup(mod);
         mutex_unlock(&module_mutex);
 
+        blocking_notifier_call_chain(&module_notify_list,
+                                     MODULE_STATE_GOING, mod);
+
         /* we can't deallocate the module until we clear memory protection */
         unset_module_init_ro_nx(mod);
         unset_module_core_ro_nx(mod);
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 5140db62c621..20b858f2db22 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -4425,10 +4425,7 @@ long __sched io_schedule_timeout(long timeout)
         long ret;
 
         current->in_iowait = 1;
-        if (old_iowait)
-                blk_schedule_flush_plug(current);
-        else
-                blk_flush_plug(current);
+        blk_schedule_flush_plug(current);
 
         delayacct_blkio_start();
         rq = raw_rq();
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index 76d4bd962b19..93ef7190bdea 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -266,21 +266,23 @@ lock_hrtimer_base(const struct hrtimer *timer, unsigned long *flags)
 /*
  * Divide a ktime value by a nanosecond value
  */
-u64 __ktime_divns(const ktime_t kt, s64 div)
+s64 __ktime_divns(const ktime_t kt, s64 div)
 {
-        u64 dclc;
         int sft = 0;
+        s64 dclc;
+        u64 tmp;
 
         dclc = ktime_to_ns(kt);
+        tmp = dclc < 0 ? -dclc : dclc;
+
         /* Make sure the divisor is less than 2^32: */
         while (div >> 32) {
                 sft++;
                 div >>= 1;
         }
-        dclc >>= sft;
-        do_div(dclc, (unsigned long) div);
-
-        return dclc;
+        tmp >>= sft;
+        do_div(tmp, (unsigned long) div);
+        return dclc < 0 ? -tmp : tmp;
 }
 EXPORT_SYMBOL_GPL(__ktime_divns);
 #endif /* BITS_PER_LONG >= 64 */
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 506edcc500c4..581a68a04c64 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -621,7 +621,7 @@ void watchdog_nmi_enable_all(void)
         put_online_cpus();
 
 unlock:
-        mutex_lock(&watchdog_proc_mutex);
+        mutex_unlock(&watchdog_proc_mutex);
 }
 
 void watchdog_nmi_disable_all(void)