x86 fixes
Subsystems (2)
Linus,
Please pull the latest x86-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-for-linus
# HEAD: 5b2bdbc84556774afbe11bcfd24c2f6411cfa92b x86: Init per-cpu shadow copy of CR4 on 32-bit CPUs too
A CR4-shadow 32-bit init fix, plus two typo fixes.
Thanks,
Ingo
------------------>
Steven Rostedt (1):
x86: Init per-cpu shadow copy of CR4 on 32-bit CPUs too
Yannick Guerrini (2):
x86/cpu/intel: Fix trivial typo in intel_tlb_table[] x86/platform/intel-mid: Fix trivial printk message typo in intel_mid_arch_setup()
arch/x86/kernel/cpu/common.c | 6 ++++++ arch/x86/kernel/cpu/intel.c | 4 ++-- arch/x86/platform/intel-mid/intel-mid.c | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/common.c +6 -0
@@ -1396,6 +1396,12 @@ void cpu_init(void)wait_for_master_cpu (cpu); +/* +* Initialize the CR4 shadow before doing anything that could +* try to read it. +*/ +cr4_init_shadow (); +show_ucode_info_early ();printk (KERN_INFO "Initializing CPU#%d\n" , cpu);
arch/x86/kernel/cpu/intel.c +2 -2
@@ -565,8 +565,8 @@ static const struct _tlb_table intel_tlb_table[] = { { 0xb2, TLB_INST_4K, 64, " TLB_INST 4KByte pages, 4-way set associative" }, { 0xb3, TLB_DATA_4K, 128, " TLB_DATA 4 KByte pages, 4-way set associative" }, { 0xb4, TLB_DATA_4K, 256, " TLB_DATA 4 KByte pages, 4-way associative" }, - { 0xb5, TLB_INST_4K, 64, " TLB_INST 4 KByte pages, 8-way set ssociative" }, - { 0xb6, TLB_INST_4K, 128, " TLB_INST 4 KByte pages, 8-way set ssociative" }, + { 0xb5, TLB_INST_4K, 64, " TLB_INST 4 KByte pages, 8-way set associative" }, + { 0xb6, TLB_INST_4K, 128, " TLB_INST 4 KByte pages, 8-way set associative" }, { 0xba, TLB_DATA_4K, 64, " TLB_DATA 4 KByte pages, 4-way associative" }, { 0xc0, TLB_DATA_4K_4M, 8, " TLB_DATA 4 KByte and 4 MByte pages, 4-way associative" }, { 0xc1, STLB_4K_2M, 1024, " STLB 4 KByte and 2 MByte pages, 8-way associative" },
arch/x86/platform/intel-mid/intel-mid.c +1 -1
@@ -130,7 +130,7 @@ static void intel_mid_arch_setup(void) intel_mid_ops = get_intel_mid_ops[__intel_mid_cpu_chip](); else { intel_mid_ops = get_intel_mid_ops[INTEL_MID_CPU_CHIP_PENWELL ](); -pr_info ("ARCH: Uknown SoC, assuming PENWELL!\n" ); +pr_info ("ARCH: Unknown SoC, assuming PENWELL!\n" ); } out: