From: Greg Kroah-Hartman Date: Mon, 16 Jul 2018 10:46:06 +0000 (+0200) Subject: fix up a 4.9 mips patch X-Git-Tag: v4.4.141~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c7d98ecaa4797ed3e2f41decd28cc12cb247a254;p=thirdparty%2Fkernel%2Fstable-queue.git fix up a 4.9 mips patch --- diff --git a/queue-4.9/mips-use-async-ipis-for-arch_trigger_cpumask_backtrace.patch b/queue-4.9/mips-use-async-ipis-for-arch_trigger_cpumask_backtrace.patch index a3974de5a12..80661bd2d3c 100644 --- a/queue-4.9/mips-use-async-ipis-for-arch_trigger_cpumask_backtrace.patch +++ b/queue-4.9/mips-use-async-ipis-for-arch_trigger_cpumask_backtrace.patch @@ -127,7 +127,7 @@ Signed-off-by: Greg Kroah-Hartman -static void arch_dump_stack(void *info) -{ - struct pt_regs *regs; -+static DEFINE_PER_CPU(call_single_data_t, backtrace_csd); ++static DEFINE_PER_CPU(call_single_data, backtrace_csd); +static struct cpumask backtrace_csd_busy; - regs = get_irq_regs(); @@ -146,7 +146,7 @@ Signed-off-by: Greg Kroah-Hartman +static void raise_backtrace(cpumask_t *mask) { - long this_cpu = get_cpu(); -+ call_single_data_t *csd; ++ call_single_data *csd; + int cpu; - if (cpumask_test_cpu(this_cpu, mask) && !exclude_self) @@ -156,7 +156,7 @@ Signed-off-by: Greg Kroah-Hartman + * If we previously sent an IPI to the target CPU & it hasn't + * cleared its bit in the busy cpumask then it didn't handle + * our previous IPI & it's not safe for us to reuse the -+ * call_single_data_t. ++ * call_single_data. + */ + if (cpumask_test_and_set_cpu(cpu, &backtrace_csd_busy)) { + pr_warn("Unable to send backtrace IPI to CPU%u - perhaps it hung?\n",