the first column '-/+' means contents was removed/added from file 5e9d274. the 2nd column '-/+' means contents was removed/added from file 9c93e12.
Yes, The notify_cpu_starting kept in final file later.
Just make sure it is in line with commit 7ade67b5984d0a (arm64: move enabling of GIC before CPUs are set online)
Give you the part of modified smp.c file here :) ====
printk("CPU%u: Booted secondary processor\n", cpu);
/* * All kernel threads share the same mm context; grab a * reference and switch to it. */ atomic_inc(&mm->mm_count); current->active_mm = mm; cpumask_set_cpu(cpu, mm_cpumask(mm));
/* * TTBR0 is only used for the identity mapping at this stage. Make it * point to zero page to avoid speculatively fetching new entries. */ cpu_set_reserved_ttbr0(); flush_tlb_all();
preempt_disable(); trace_hardirqs_off();
if (cpu_ops[cpu]->cpu_postboot) cpu_ops[cpu]->cpu_postboot();
smp_store_cpu_info(cpu);
/* * OK, now it's safe to let the boot CPU continue. Wait for * the CPU migration code to notice that the CPU is online * before we continue. */ set_cpu_online(cpu, true); complete(&cpu_running);
/* * Enable GIC and timers. */ notify_cpu_starting(cpu);
local_irq_enable(); local_fiq_enable();
/* * OK, it's off to the idle thread for us */ cpu_startup_entry(CPUHP_ONLINE); }