Merge tag 'tty-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[sfrench/cifs-2.6.git] / arch / sparc / kernel / process_64.c

diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
index 4dee88af403f3fea8718c37e98f7d929412bee4d..529adfecd58ca1ee98199c64e30ea00e232b439f 100644 (file)
--- a/arch/sparc/kernel/process_64.c
+++ b/arch/sparc/kernel/process_64.c
@@ -236,7 +236,7 @@ static void __global_reg_poll(struct global_reg_snapshot *gp)
        }
 }
 
-void arch_trigger_cpumask_backtrace(const cpumask_t *mask, bool exclude_self)
+void arch_trigger_cpumask_backtrace(const cpumask_t *mask, int exclude_cpu)
 {
        struct thread_info *tp = current_thread_info();
        struct pt_regs *regs = get_irq_regs();
@@ -252,7 +252,7 @@ void arch_trigger_cpumask_backtrace(const cpumask_t *mask, bool exclude_self)
 
        memset(global_cpu_snapshot, 0, sizeof(global_cpu_snapshot));
 
-       if (cpumask_test_cpu(this_cpu, mask) && !exclude_self)
+       if (cpumask_test_cpu(this_cpu, mask) && this_cpu != exclude_cpu)
                __global_reg_self(tp, regs, this_cpu);
 
        smp_fetch_global_regs();
@@ -260,7 +260,7 @@ void arch_trigger_cpumask_backtrace(const cpumask_t *mask, bool exclude_self)
        for_each_cpu(cpu, mask) {
                struct global_reg_snapshot *gp;
 
-               if (exclude_self && cpu == this_cpu)
+               if (cpu == exclude_cpu)
                        continue;
 
                gp = &global_cpu_snapshot[cpu].reg;