[tip:x86/mtrr] x86, mtrr: Kill over the top warn

From: tip-bot for Alan Cox
Date: Tue Feb 16 2010 - 01:52:26 EST


Commit-ID: 942fa3b63eb525aa0512ba28c42e656d8efc6787
Gitweb: http://git.kernel.org/tip/942fa3b63eb525aa0512ba28c42e656d8efc6787
Author: Alan Cox <alan@xxxxxxxxxxxxxxx>
AuthorDate: Mon, 8 Feb 2010 10:03:17 +0000
Committer: H. Peter Anvin <hpa@xxxxxxxxx>
CommitDate: Mon, 15 Feb 2010 19:38:52 -0800

x86, mtrr: Kill over the top warn

Fixes bugzilla: http://bugzilla.kernel.org/show_bug.cgi?id=12558
Fixes bugzilla: http://bugzilla.kernel.org/show_bug.cgi?id=12317

(and if this really needed to be a warn you'd be responding to the bugs left
in bugzilla from it...)

Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
LKML-Reference: <20100208100239.2568.2940.stgit@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
---
arch/x86/kernel/cpu/mtrr/generic.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c
index 4d75584..163e59e 100644
--- a/arch/x86/kernel/cpu/mtrr/generic.c
+++ b/arch/x86/kernel/cpu/mtrr/generic.c
@@ -464,7 +464,7 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base,
tmp |= ~((1<<(hi - 1)) - 1);

if (tmp != mask_lo) {
- WARN_ONCE(1, KERN_INFO "mtrr: your BIOS has set up an incorrect mask, fixing it up.\n");
+ printk(KERN_WARNING "mtrr: your BIOS has configured an incorrect mask, fixing it.\n");
mask_lo = tmp;
}
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/