summaryrefslogtreecommitdiff
path: root/arch/x86/mm/init.c
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2016-03-29 17:42:03 +0200
committerIngo Molnar <mingo@kernel.org>2016-03-31 13:35:10 +0200
commit16bf92261b1b6cb1a1c0671b445a2fcb5a1ecc96 (patch)
tree3893658bb15c550e88bfb01615939f6c964bb78d /arch/x86/mm/init.c
parentc109bf95992b391bb40bc37c5d309d13fead99b5 (diff)
downloadlinux-16bf92261b1b6cb1a1c0671b445a2fcb5a1ecc96.tar.gz
linux-16bf92261b1b6cb1a1c0671b445a2fcb5a1ecc96.tar.bz2
linux-16bf92261b1b6cb1a1c0671b445a2fcb5a1ecc96.zip
x86/cpufeature: Remove cpu_has_pse
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-11-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/mm/init.c')
-rw-r--r--arch/x86/mm/init.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 05ff46a9c261..372aad2b3291 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -157,12 +157,12 @@ static void __init probe_page_size_mask(void)
* This will simplify cpa(), which otherwise needs to support splitting
* large pages into small in interrupt context, etc.
*/
- if (cpu_has_pse && !debug_pagealloc_enabled())
+ if (boot_cpu_has(X86_FEATURE_PSE) && !debug_pagealloc_enabled())
page_size_mask |= 1 << PG_LEVEL_2M;
#endif
/* Enable PSE if available */
- if (cpu_has_pse)
+ if (boot_cpu_has(X86_FEATURE_PSE))
cr4_set_bits_and_update_boot(X86_CR4_PSE);
/* Enable PGE if available */