From 47e23cae81d3431c1c83afc9fc1fa756abf68310 Mon Sep 17 00:00:00 2001 From: Roland Dreier Date: Wed, 23 Sep 2009 15:35:35 -0700 Subject: [PATCH] --- yaml --- r: 166415 b: refs/heads/master c: e23a8b6a8f319c0f08b6ccef2dccbb37e7603dc2 h: refs/heads/master i: 166413: 4d929a2cd6703a1e2f347a5436f6e300f468c836 166411: e59ead8454f231940053fa5533497ab4072ba644 166407: aae6cd4dca6c0e1cbd14ba472c41fd93fb47d0ab 166399: 6aa0b1adb4da5c3e51f6be105672e26a2a1e5b3e v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/pat.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fa7750aad38d..005493075a82 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea01c0d7315d6e3218fd22a6947c5b09305fcf65 +refs/heads/master: e23a8b6a8f319c0f08b6ccef2dccbb37e7603dc2 diff --git a/trunk/arch/x86/mm/pat.c b/trunk/arch/x86/mm/pat.c index 7257cf3decf9..e78cd0ec2bcf 100644 --- a/trunk/arch/x86/mm/pat.c +++ b/trunk/arch/x86/mm/pat.c @@ -81,6 +81,7 @@ enum { void pat_init(void) { u64 pat; + bool boot_cpu = !boot_pat_state; if (!pat_enabled) return; @@ -122,8 +123,10 @@ void pat_init(void) rdmsrl(MSR_IA32_CR_PAT, boot_pat_state); wrmsrl(MSR_IA32_CR_PAT, pat); - printk(KERN_INFO "x86 PAT enabled: cpu %d, old 0x%Lx, new 0x%Lx\n", - smp_processor_id(), boot_pat_state, pat); + + if (boot_cpu) + printk(KERN_INFO "x86 PAT enabled: cpu %d, old 0x%Lx, new 0x%Lx\n", + smp_processor_id(), boot_pat_state, pat); } #undef PAT