Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Several cases of overlapping changes, except the packet scheduler
conflicts which deal with the addition of the free list parameter
to qdisc_enqueue().

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 18 insertions, 0 deletions

diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index 678e0842cb3b..62ff3c0622e2 100644
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -909,3 +909,21 @@ int setup_profiling_timer(unsigned int multiplier)
 {
         return -EINVAL;
 }
+
+static bool have_cpu_die(void)
+{
+#ifdef CONFIG_HOTPLUG_CPU
+        int any_cpu = raw_smp_processor_id();
+
+        if (cpu_ops[any_cpu]->cpu_die)
+                return true;
+#endif
+        return false;
+}
+
+bool cpus_are_stuck_in_kernel(void)
+{
+        bool smp_spin_tables = (num_possible_cpus() > 1 && !have_cpu_die());
+
+        return !!cpus_stuck_in_kernel || smp_spin_tables;
+}