From 72343aa5fe48f06a98fdb45ac1086f8d9f9041ed Mon Sep 17 00:00:00 2001
From: Prarit Bhargava <prarit@redhat.com>
Date: Tue, 18 Oct 2011 13:24:10 -0400
Subject: [PATCH] --- yaml --- r: 276403 b: refs/heads/master c:
 644ddf588f5dba34df483a6ea8abe639cc102289 h: refs/heads/master i:   276401:
 9c3444790618afbc1213a83741ac7a2bc2b3af22   276399:
 ea58c32b3b6d34e3e81e60fdb1179a73bf26c698 v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/x86/kernel/cpu/mtrr/generic.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ad4f665d65c8..cb3a9d867690 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e6866686bdf2dcf3aeb0838076237ede532dcc8
+refs/heads/master: 644ddf588f5dba34df483a6ea8abe639cc102289
diff --git a/trunk/arch/x86/kernel/cpu/mtrr/generic.c b/trunk/arch/x86/kernel/cpu/mtrr/generic.c
index a71efcdbb092..e1fe7f42e0fb 100644
--- a/trunk/arch/x86/kernel/cpu/mtrr/generic.c
+++ b/trunk/arch/x86/kernel/cpu/mtrr/generic.c
@@ -547,6 +547,7 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base,
 
 		if (tmp != mask_lo) {
 			printk(KERN_WARNING "mtrr: your BIOS has configured an incorrect mask, fixing it.\n");
+			add_taint(TAINT_FIRMWARE_WORKAROUND);
 			mask_lo = tmp;
 		}
 	}