Skip to content

Commit a6df45b

Browse files
committed
arch/x86: Unbreak df21bf3 ("arch/x86: Provide the CPU number in the wakeup AP callback")
The commit df21bf3 ("arch/x86: Provide the CPU number in the wakeup AP callback") changed the signature of struct apic::wakeup_secondary_cpu(). It forgot to update numachip_wakeup_secondary(). update it to unbreak compile error. arch/x86/kernel/apic/apic_numachip.c:228:43: error: initialization of 'int (*)(u32, long unsigned int, unsigned int)' {aka 'int (*)(unsigned int, long unsigned int, unsigned int)'} from incompatible pointer type 'int (*)(u32, long unsigned int)' {aka 'int (*)(unsigned int, long unsigned int)'} [-Wincompatible-pointer-types] 228 | .wakeup_secondary_cpu = numachip_wakeup_secondary, | ^~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: df21bf3 ("arch/x86: Provide the CPU number in the wakeup AP callback") Signed-off-by: Isaku Yamahata <[email protected]>
1 parent a3585b2 commit a6df45b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/x86/kernel/apic/apic_numachip.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ static void numachip2_apic_icr_write(int apicid, unsigned int val)
5656
numachip2_write32_lcsr(NUMACHIP2_APIC_ICR, (apicid << 12) | val);
5757
}
5858

59-
static int numachip_wakeup_secondary(u32 phys_apicid, unsigned long start_rip)
59+
static int numachip_wakeup_secondary(u32 phys_apicid, unsigned long start_rip, unsigned int cpu)
6060
{
6161
numachip_apic_icr_write(phys_apicid, APIC_DM_INIT);
6262
numachip_apic_icr_write(phys_apicid, APIC_DM_STARTUP |

0 commit comments

Comments
 (0)