diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-30 06:38:28 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-30 06:38:28 -0400 |
| commit | d7e25c66c9bf882450060fd9464e784bd229d3ae (patch) | |
| tree | 0fb9525f91b11226a5a4b861cefd9fc5679f5c9b /arch/x86/kernel | |
| parent | 907241dccb4ce5d9413cf3c030b32b0cfc184914 (diff) | |
| parent | e4aad64597d7a2455a541f904365b48d607916db (diff) | |
Merge branch 'x86/urgent' into x86/asm
Get the cr4 fixes so we can apply the final cleanup
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/setup.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 44c868ebc314..87f2330cc805 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
| @@ -1137,9 +1137,7 @@ void __init setup_arch(char **cmdline_p) | |||
| 1137 | * auditing all the early-boot CR4 manipulation would be needed to | 1137 | * auditing all the early-boot CR4 manipulation would be needed to |
| 1138 | * rule it out. | 1138 | * rule it out. |
| 1139 | */ | 1139 | */ |
| 1140 | if (boot_cpu_data.cpuid_level >= 0) | 1140 | mmu_cr4_features = __read_cr4_safe(); |
| 1141 | /* A CPU has %cr4 if and only if it has CPUID. */ | ||
| 1142 | mmu_cr4_features = __read_cr4(); | ||
| 1143 | 1141 | ||
| 1144 | memblock_set_current_limit(get_max_mapped()); | 1142 | memblock_set_current_limit(get_max_mapped()); |
| 1145 | 1143 | ||