summaryrefslogtreecommitdiffstats
path: root/arch/x86/power
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/power
parentc109bf95992b391bb40bc37c5d309d13fead99b5 (diff)
downloadblackbird-obmc-linux-16bf92261b1b6cb1a1c0671b445a2fcb5a1ecc96.tar.gz
blackbird-obmc-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/power')
-rw-r--r--arch/x86/power/hibernate_32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/power/hibernate_32.c b/arch/x86/power/hibernate_32.c
index 291226b952a9..9f14bd34581d 100644
--- a/arch/x86/power/hibernate_32.c
+++ b/arch/x86/power/hibernate_32.c
@@ -106,7 +106,7 @@ static int resume_physical_mapping_init(pgd_t *pgd_base)
* normal page tables.
* NOTE: We can mark everything as executable here
*/
- if (cpu_has_pse) {
+ if (boot_cpu_has(X86_FEATURE_PSE)) {
set_pmd(pmd, pfn_pmd(pfn, PAGE_KERNEL_LARGE_EXEC));
pfn += PTRS_PER_PTE;
} else {
OpenPOWER on IntegriCloud