diff --git a/[refs] b/[refs] index dd2f38d5f538..f3102f3c98d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08acb672624ece2d9234817570a0b3332cc8dae3 +refs/heads/master: 04d733bd3588fda8934591fdb0a3d719c5ec8fa0 diff --git a/trunk/arch/x86/kernel/setup_64.c b/trunk/arch/x86/kernel/setup_64.c index ff9029d34133..e1866172deb2 100644 --- a/trunk/arch/x86/kernel/setup_64.c +++ b/trunk/arch/x86/kernel/setup_64.c @@ -791,7 +791,7 @@ static int __cpuinit intel_num_cpu_cores(struct cpuinfo_x86 *c) return 1; } -static void srat_detect_node(void) +static void __cpuinit srat_detect_node(void) { #ifdef CONFIG_NUMA unsigned node;