5 files changed, 12 insertions, 39 deletions

diff --git a/kernel/Makefile b/kernel/Makefile
index 0f8f8b0bc1bf..60c302cfb4d3 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -197,9 +197,9 @@ x509.genkey:
         @echo >>x509.genkey "x509_extensions = myexts"
         @echo >>x509.genkey
         @echo >>x509.genkey "[ req_distinguished_name ]"
-        @echo >>x509.genkey "O = Magrathea"
-        @echo >>x509.genkey "CN = Glacier signing key"
-        @echo >>x509.genkey "emailAddress = slartibartfast@magrathea.h2g2"
+        @echo >>x509.genkey "#O = Unspecified company"
+        @echo >>x509.genkey "CN = Build time autogenerated kernel key"
+        @echo >>x509.genkey "#emailAddress = unspecified.user@unspecified.company"
         @echo >>x509.genkey
         @echo >>x509.genkey "[ myexts ]"
         @echo >>x509.genkey "basicConstraints=critical,CA:FALSE"
diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
index 4139a0f8b558..54f0e7fcd0e2 100644
--- a/kernel/bpf/core.c
+++ b/kernel/bpf/core.c
@@ -357,8 +357,8 @@ select_insn:
         ALU64_MOD_X:
                 if (unlikely(SRC == 0))
                         return 0;
-                tmp = DST;
-                DST = do_div(tmp, SRC);
+                div64_u64_rem(DST, SRC, &tmp);
+                DST = tmp;
                 CONT;
         ALU_MOD_X:
                 if (unlikely(SRC == 0))
@@ -367,8 +367,8 @@ select_insn:
                 DST = do_div(tmp, (u32) SRC);
                 CONT;
         ALU64_MOD_K:
-                tmp = DST;
-                DST = do_div(tmp, IMM);
+                div64_u64_rem(DST, IMM, &tmp);
+                DST = tmp;
                 CONT;
         ALU_MOD_K:
                 tmp = (u32) DST;
@@ -377,7 +377,7 @@ select_insn:
         ALU64_DIV_X:
                 if (unlikely(SRC == 0))
                         return 0;
-                do_div(DST, SRC);
+                DST = div64_u64(DST, SRC);
                 CONT;
         ALU_DIV_X:
                 if (unlikely(SRC == 0))
@@ -387,7 +387,7 @@ select_insn:
                 DST = (u32) tmp;
                 CONT;
         ALU64_DIV_K:
-                do_div(DST, IMM);
+                DST = div64_u64(DST, IMM);
                 CONT;
         ALU_DIV_K:
                 tmp = (u32) DST;
diff --git a/kernel/kexec.c b/kernel/kexec.c
index 38c25b1f2fd5..7a36fdcca5bf 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -707,7 +707,7 @@ static struct page *kimage_alloc_normal_control_pages(struct kimage *image,
         do {
                 unsigned long pfn, epfn, addr, eaddr;
 
-                pages = kimage_alloc_pages(GFP_KERNEL, order);
+                pages = kimage_alloc_pages(KEXEC_CONTROL_MEMORY_GFP, order);
                 if (!pages)
                         break;
                 pfn   = page_to_pfn(pages);
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index f9123a82cbb6..fe22f7510bce 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1016,13 +1016,6 @@ void check_preempt_curr(struct rq *rq, struct task_struct *p, int flags)
                 rq_clock_skip_update(rq, true);
 }
 
-static ATOMIC_NOTIFIER_HEAD(task_migration_notifier);
-
-void register_task_migration_notifier(struct notifier_block *n)
-{
-        atomic_notifier_chain_register(&task_migration_notifier, n);
-}
-
 #ifdef CONFIG_SMP
 void set_task_cpu(struct task_struct *p, unsigned int new_cpu)
 {
@@ -1053,18 +1046,10 @@ void set_task_cpu(struct task_struct *p, unsigned int new_cpu)
         trace_sched_migrate_task(p, new_cpu);
 
         if (task_cpu(p) != new_cpu) {
-                struct task_migration_notifier tmn;
-
                 if (p->sched_class->migrate_task_rq)
                         p->sched_class->migrate_task_rq(p, new_cpu);
                 p->se.nr_migrations++;
                 perf_sw_event_sched(PERF_COUNT_SW_CPU_MIGRATIONS, 1, 0);
-
-                tmn.task = p;
-                tmn.from_cpu = task_cpu(p);
-                tmn.to_cpu = new_cpu;
-
-                atomic_notifier_call_chain(&task_migration_notifier, 0, &tmn);
         }
 
         __set_task_cpu(p, new_cpu);
diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c
index deef1caa94c6..fefcb1fa5160 100644
--- a/kernel/sched/idle.c
+++ b/kernel/sched/idle.c
@@ -81,7 +81,6 @@ static void cpuidle_idle_call(void)
         struct cpuidle_device *dev = __this_cpu_read(cpuidle_devices);
         struct cpuidle_driver *drv = cpuidle_get_cpu_driver(dev);
         int next_state, entered_state;
-        unsigned int broadcast;
         bool reflect;
 
         /*
@@ -150,17 +149,6 @@ static void cpuidle_idle_call(void)
                 goto exit_idle;
         }
 
-        broadcast = drv->states[next_state].flags & CPUIDLE_FLAG_TIMER_STOP;
-
-        /*
-         * Tell the time framework to switch to a broadcast timer
-         * because our local timer will be shutdown. If a local timer
-         * is used from another cpu as a broadcast timer, this call may
-         * fail if it is not available
-         */
-        if (broadcast && tick_broadcast_enter())
-                goto use_default;
-
         /* Take note of the planned idle state. */
         idle_set_state(this_rq(), &drv->states[next_state]);
 
@@ -174,8 +162,8 @@ static void cpuidle_idle_call(void)
         /* The cpu is no longer idle or about to enter idle. */
         idle_set_state(this_rq(), NULL);
 
-        if (broadcast)
-                tick_broadcast_exit();
+        if (entered_state == -EBUSY)
+                goto use_default;
 
         /*
          * Give the governor an opportunity to reflect on the outcome