summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/mtrr/cyrix.c
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2016-03-29 17:42:02 +0200
committerIngo Molnar <mingo@kernel.org>2016-03-31 13:35:09 +0200
commitc109bf95992b391bb40bc37c5d309d13fead99b5 (patch)
treec6a67c2c137ccb47ca806e914eeb5defb8a25363 /arch/x86/kernel/cpu/mtrr/cyrix.c
parent054efb6467f84490bdf92afab6d9dbd5102e620a (diff)
downloadblackbird-op-linux-c109bf95992b391bb40bc37c5d309d13fead99b5.tar.gz
blackbird-op-linux-c109bf95992b391bb40bc37c5d309d13fead99b5.zip
x86/cpufeature: Remove cpu_has_pge
Use static_cpu_has() in __flush_tlb_all() due to the time-sensitivity of this one. Signed-off-by: Borislav Petkov <bp@suse.de> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/1459266123-21878-10-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/mtrr/cyrix.c')
-rw-r--r--arch/x86/kernel/cpu/mtrr/cyrix.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/mtrr/cyrix.c b/arch/x86/kernel/cpu/mtrr/cyrix.c
index f8c81ba0b465..b1086f79e57e 100644
--- a/arch/x86/kernel/cpu/mtrr/cyrix.c
+++ b/arch/x86/kernel/cpu/mtrr/cyrix.c
@@ -137,7 +137,7 @@ static void prepare_set(void)
u32 cr0;
/* Save value of CR4 and clear Page Global Enable (bit 7) */
- if (cpu_has_pge) {
+ if (boot_cpu_has(X86_FEATURE_PGE)) {
cr4 = __read_cr4();
__write_cr4(cr4 & ~X86_CR4_PGE);
}
@@ -170,7 +170,7 @@ static void post_set(void)
write_cr0(read_cr0() & ~X86_CR0_CD);
/* Restore value of CR4 */
- if (cpu_has_pge)
+ if (boot_cpu_has(X86_FEATURE_PGE))
__write_cr4(cr4);
}
OpenPOWER on IntegriCloud