--- arch/x86/kernel/cpu/mtrr/main.c

+++ arch/x86/kernel/cpu/mtrr/main.c

@@ -762,13 +762,21 @@ void set_mtrr_aps_delayed_init(void)

}

/*

- * MTRR initialization for all AP's

+ * Delayed MTRR initialization for all AP's

*/

void mtrr_aps_init(void)

{

if (!use_intel())

return;

+ /*

+ * Check if someone has requested the delay of AP MTRR initialization,

+ * by doing set_mtrr_aps_delayed_init(), prior to this point. If not,

+ * then we are done.

+ */

+ if (!mtrr_aps_delayed_init)

+ return;

+

set_mtrr(~0U, 0, 0, 0);

mtrr_aps_delayed_init = false;

}