aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLeendert van Doorn <leendert@watson.ibm.com>2005-01-10 17:11:48 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-01-10 17:11:48 -0800
commitbff12f371c164b6530c3d911454102c655909fe2 (patch)
tree17522ad6660f68e485d9b89dfab7aba9a44a23a6 /arch
parenta664543754c04971285340031c8872ad4702b395 (diff)
downloadhistory-bff12f371c164b6530c3d911454102c655909fe2.tar.gz
[PATCH] arch/i386/kernel/cpu/mtrr: too many bits are masked off from CR4
The old code cuts off the higher bits in CR4 (such as X86_CR4_OSFXSR, X86_CR4_OSXMMEXCPT). Signed-off-by: leendert@watson.ibm.com Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/kernel/cpu/mtrr/generic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/cpu/mtrr/generic.c b/arch/i386/kernel/cpu/mtrr/generic.c
index 60a04638e39798..cf7fd685b34570 100644
--- a/arch/i386/kernel/cpu/mtrr/generic.c
+++ b/arch/i386/kernel/cpu/mtrr/generic.c
@@ -258,7 +258,7 @@ static void prepare_set(void)
/* Save value of CR4 and clear Page Global Enable (bit 7) */
if ( cpu_has_pge ) {
cr4 = read_cr4();
- write_cr4(cr4 & (unsigned char) ~(1 << 7));
+ write_cr4(cr4 & ~X86_CR4_PGE);
}
/* Flush all TLBs via a mov %cr3, %reg; mov %reg, %cr3 */