git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "x86/PAT: Fix Xorg regression on CPUs that don't support PAT"
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
mm
/
pat.c
diff --git
a/arch/x86/mm/pat.c
b/arch/x86/mm/pat.c
index 83a59a67757a77b46f7b7788074294a3a3c8a10c..9b78685b66e663c80ec3a68986a39024fd372b3c 100644
(file)
--- a/
arch/x86/mm/pat.c
+++ b/
arch/x86/mm/pat.c
@@
-65,11
+65,9
@@
static int __init nopat(char *str)
}
early_param("nopat", nopat);
}
early_param("nopat", nopat);
-static bool __read_mostly __pat_initialized = false;
-
bool pat_enabled(void)
{
bool pat_enabled(void)
{
- return
__pat_initializ
ed;
+ return
!!__pat_enabl
ed;
}
EXPORT_SYMBOL_GPL(pat_enabled);
}
EXPORT_SYMBOL_GPL(pat_enabled);
@@
-227,14
+225,13
@@
static void pat_bsp_init(u64 pat)
}
wrmsrl(MSR_IA32_CR_PAT, pat);
}
wrmsrl(MSR_IA32_CR_PAT, pat);
- __pat_initialized = true;
__init_cache_modes(pat);
}
static void pat_ap_init(u64 pat)
{
__init_cache_modes(pat);
}
static void pat_ap_init(u64 pat)
{
- if (!
this
_cpu_has(X86_FEATURE_PAT)) {
+ if (!
boot
_cpu_has(X86_FEATURE_PAT)) {
/*
* If this happens we are on a secondary CPU, but switched to
* PAT on the boot CPU. We have no way to undo PAT.
/*
* If this happens we are on a secondary CPU, but switched to
* PAT on the boot CPU. We have no way to undo PAT.
@@
-309,7
+306,7
@@
void pat_init(void)
u64 pat;
struct cpuinfo_x86 *c = &boot_cpu_data;
u64 pat;
struct cpuinfo_x86 *c = &boot_cpu_data;
- if (!
__pat_enabled
) {
+ if (!
pat_enabled()
) {
init_cache_modes();
return;
}
init_cache_modes();
return;
}