diff --git a/[refs] b/[refs] index f3dffe6fb038..aff7e074399e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 90936cfe6c8f7e90a6f8b0c5cb44d3a012dfd313 +refs/heads/master: 85a14437ed24244c78f9a70d58b8299753b03c92 diff --git a/trunk/arch/x86/kernel/mpparse.c b/trunk/arch/x86/kernel/mpparse.c index 6ae005ccaed8..78509ee8cc74 100644 --- a/trunk/arch/x86/kernel/mpparse.c +++ b/trunk/arch/x86/kernel/mpparse.c @@ -49,7 +49,7 @@ static int __init mpf_checksum(unsigned char *mp, int len) return sum & 0xFF; } -static void __cpuinit MP_processor_info(struct mpc_config_processor *m) +static void __init MP_processor_info(struct mpc_config_processor *m) { int apicid; char *bootup_cpu = "";