From 2ac2b1ba08966d148ccec2f06196c1cb2d87429b Mon Sep 17 00:00:00 2001 From: Fenghua Yu Date: Tue, 13 Nov 2012 11:32:48 -0800 Subject: [PATCH] --- yaml --- r: 339131 b: refs/heads/master c: 30242aa6023b71325c6b8addac06faf544a85fd0 h: refs/heads/master i: 339129: 37d79bd586cd159b0c0e4cb6b8eabc0279a033bf 339127: 7db12a6da3d59154a4b74e4b5da71a654f1a958e v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/mtrr/main.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1ab55b74b7f8..dcc170753124 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 27fd185f3d9e83c64b7a596881d7751a638c9683 +refs/heads/master: 30242aa6023b71325c6b8addac06faf544a85fd0 diff --git a/trunk/arch/x86/kernel/cpu/mtrr/main.c b/trunk/arch/x86/kernel/cpu/mtrr/main.c index 6b96110bb0c3..e4c1a4184531 100644 --- a/trunk/arch/x86/kernel/cpu/mtrr/main.c +++ b/trunk/arch/x86/kernel/cpu/mtrr/main.c @@ -695,11 +695,16 @@ void mtrr_ap_init(void) } /** - * Save current fixed-range MTRR state of the BSP + * Save current fixed-range MTRR state of the first cpu in cpu_online_mask. */ void mtrr_save_state(void) { - smp_call_function_single(0, mtrr_save_fixed_ranges, NULL, 1); + int first_cpu; + + get_online_cpus(); + first_cpu = cpumask_first(cpu_online_mask); + smp_call_function_single(first_cpu, mtrr_save_fixed_ranges, NULL, 1); + put_online_cpus(); } void set_mtrr_aps_delayed_init(void)