Merge tag 'v4.9.176' into khadas-vim3-4.9.y

This is the 4.9.176 stable release

 Conflicts:
	kernel/cpu.c

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/x86/kernel/process.c
Simple merge

diff --cc arch/x86/kvm/vmx.c
Simple merge

diff --cc include/linux/cpu.h
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc include/uapi/linux/prctl.h
Simple merge

diff --cc kernel/cpu.c
index 0b1a62b,db1a0bc..20ee962
--- 1/kernel/cpu.c
--- 2/kernel/cpu.c
+++ b/kernel/cpu.c
@@@ -2230,22 -2235,17 +2242,36 @@@ void __init boot_cpu_hotplug_init(void
        this_cpu_write(cpuhp_state.state, CPUHP_ONLINE);
  }
  
 +static ATOMIC_NOTIFIER_HEAD(idle_notifier);
 +
 +void idle_notifier_register(struct notifier_block *n)
 +{
 +      atomic_notifier_chain_register(&idle_notifier, n);
 +}
 +EXPORT_SYMBOL_GPL(idle_notifier_register);
 +
 +void idle_notifier_unregister(struct notifier_block *n)
 +{
 +      atomic_notifier_chain_unregister(&idle_notifier, n);
 +}
 +EXPORT_SYMBOL_GPL(idle_notifier_unregister);
 +
 +void idle_notifier_call_chain(unsigned long val)
 +{
 +      atomic_notifier_call_chain(&idle_notifier, val, NULL);
 +}
 +EXPORT_SYMBOL_GPL(idle_notifier_call_chain);
+ enum cpu_mitigations cpu_mitigations __ro_after_init = CPU_MITIGATIONS_AUTO;
+ 
+ static int __init mitigations_parse_cmdline(char *arg)
+ {
+       if (!strcmp(arg, "off"))
+               cpu_mitigations = CPU_MITIGATIONS_OFF;
+       else if (!strcmp(arg, "auto"))
+               cpu_mitigations = CPU_MITIGATIONS_AUTO;
+       else if (!strcmp(arg, "auto,nosmt"))
+               cpu_mitigations = CPU_MITIGATIONS_AUTO_NOSMT;
+ 
+       return 0;
+ }
+ early_param("mitigations", mitigations_parse_cmdline);

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/sched/sched.h
Simple merge