diff --git a/[refs] b/[refs] index f94d9a765842..4ebee9ab8de1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac629a98bf98bfe66bf0a674b22be3474ee6a9a4 +refs/heads/master: 3effef1f3bbc2a63cc79c9eda789642ac06067b3 diff --git a/trunk/arch/x86/kernel/setup_64.c b/trunk/arch/x86/kernel/setup_64.c index fe47807cac00..0d20ed7fb097 100644 --- a/trunk/arch/x86/kernel/setup_64.c +++ b/trunk/arch/x86/kernel/setup_64.c @@ -333,10 +333,10 @@ void __init setup_arch(char **cmdline_p) #ifdef CONFIG_SMP /* setup to use the early static init tables during kernel startup */ - x86_cpu_to_apicid_early_ptr = (void *)&x86_cpu_to_apicid_init; - x86_bios_cpu_apicid_early_ptr = (void *)&x86_bios_cpu_apicid_init; + x86_cpu_to_apicid_early_ptr = (void *)x86_cpu_to_apicid_init; + x86_bios_cpu_apicid_early_ptr = (void *)x86_bios_cpu_apicid_init; #ifdef CONFIG_NUMA - x86_cpu_to_node_map_early_ptr = (void *)&x86_cpu_to_node_map_init; + x86_cpu_to_node_map_early_ptr = (void *)x86_cpu_to_node_map_init; #endif #endif