x86 fixes for 2.6.36-rc2
Hi Linus,
The following changes since commit 763008c4357b73c8d18396dfd8d79dc58fa3f99d:
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 (2010-08-18 15:45:23 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-fixes-for-linus
Borislav Petkov (1):
x86, hotplug: Serialize CPU hotplug to avoid bringup concurrency issues
Daniel Kiper (1):
x86, apic: Fix apic=debug boot crash
H. Peter Anvin (1):
x86-32: Fix dummy trampoline-related inline stubs
Hans Rosenfeld (1):
x86, cpu: Fix regression in AMD errata checking code
Joerg Roedel (1):
x86-32: Separate 1:1 pagetables from swapper_pg_dir
arch/x86/Kconfig | 5 +++ arch/x86/include/asm/pgtable_32.h | 1 + arch/x86/include/asm/trampoline.h | 5 +++- arch/x86/kernel/apic/io_apic.c | 2 + arch/x86/kernel/cpu/amd.c | 2 +- arch/x86/kernel/head_32.S | 8 +++++- arch/x86/kernel/setup.c | 2 + arch/x86/kernel/smpboot.c | 51 +++++++++++++++++++++++------------- arch/x86/kernel/trampoline.c | 18 +++++++++++++ 9 files changed, 72 insertions(+), 22 deletions(-)
arch/x86/Kconfig +5 -0
@@ -245,6 +245,11 @@ config ARCH_HWEIGHT_CFLAGS config KTIME_SCALAR def_bool X86_32 + +config ARCH_CPU_PROBE_RELEASE + def_bool y + depends on HOTPLUG_CPU + source "init/Kconfig" source "kernel/Kconfig.freezer"
arch/x86/include/asm/pgtable_32.h +1 -0
@@ -26,6 +26,7 @@ struct mm_struct;struct vm_area_struct ;extern pgd_t swapper_pg_dir[1024 ]; +extern pgd_t trampoline_pg_dir[1024 ];static inline void pgtable_cache_init (void ) { }static inline void check_pgt_cache (void ) { }
arch/x86/include/asm/trampoline.h +4 -1
@@ -13,14 +13,17 @@ extern unsigned char *trampoline_base;extern unsigned long init_rsp;extern unsigned long initial_code; +extern unsigned long initial_page_table;extern unsigned long initial_gs;#define TRAMPOLINE_SIZE roundup(trampoline_end - trampoline_data, PAGE_SIZE)extern unsigned long setup_trampoline (void ); +extern void __init setup_trampoline_page_table (void );extern void __init reserve_trampoline_memory (void );#else -static inline void reserve_trampoline_memory (void ) {}; +static inline void setup_trampoline_page_table (void ) {} +static inline void reserve_trampoline_memory (void ) {}#endif /* CONFIG_X86_TRAMPOLINE */ #endif /* __ASSEMBLY__ */
arch/x86/kernel/apic/io_apic.c +2 -0
@@ -1728,6 +1728,8 @@ __apicdebuginit(void) print_IO_APIC(void)struct irq_pin_list *entry; cfg = desc->chip_data; +if (!cfg) +continue ; entry = cfg->irq_2_pin;if (!entry)continue ;
arch/x86/kernel/cpu/amd.c +1 -1
@@ -669,7 +669,7 @@ bool cpu_has_amd_erratum(const int *erratum) }/* OSVW unavailable or ID unknown, match family-model-stepping range */ - ms = (cpu->x86_model <<8 ) | cpu->x86_mask; + ms = (cpu->x86_model <<4 ) | cpu->x86_mask;while ((range = *erratum++)) if ((cpu->x86 == AMD_MODEL_RANGE_FAMILY(range)) && (ms >= AMD_MODEL_RANGE_START(range)) &&
arch/x86/kernel/head_32.S +7 -1
@@ -334,7 +334,7 @@ ENTRY(startup_32_smp) /* * Enable paging */ - movl $pa(swapper_pg_dir),%eax + movl pa(initial_page_table), %eax movl %eax,%cr3 /* set the page table pointer.. */ movl %cr0,%eax orl $X86_CR0_PG,%eax
@@ -614,6 +614,8 @@ ignore_int: .align 4 ENTRY(initial_code) .long i386_start_kernel +ENTRY(initial_page_table) + .long pa(swapper_pg_dir) /* * BSS section
@@ -629,6 +631,10 @@ ENTRY(swapper_pg_dir) #endif swapper_pg_fixmap: .fill 1024,4,0 +#ifdef CONFIG_X86_TRAMPOLINE +ENTRY(trampoline_pg_dir) + .fill 1024,4,0 +#endif ENTRY(empty_zero_page) .fill 4096,1,0
arch/x86/kernel/setup.c +2 -0
@@ -1014,6 +1014,8 @@ void __init setup_arch(char **cmdline_p)paging_init (); x86_init.paging.pagetable_setup_done (swapper_pg_dir); +setup_trampoline_page_table (); +tboot_probe ();#ifdef CONFIG_X86_64
arch/x86/kernel/smpboot.c +32 -19
89 lines not on this page · raw message
arch/x86/kernel/trampoline.c +18 -0
@@ -1,6 +1,7 @@#include <linux/io.h> #include <asm/trampoline.h> +#include <asm/pgtable.h> #include <asm/e820.h> #if defined(CONFIG_X86_64 ) && defined(CONFIG_ACPI_SLEEP )
@@ -37,3 +38,20 @@ unsigned long __trampinit setup_trampoline(void)memcpy (trampoline_base, trampoline_data,TRAMPOLINE_SIZE );return virt_to_phys (trampoline_base); } + +void __init setup_trampoline_page_table (void ) +{ +#ifdef CONFIG_X86_32 +/* Copy kernel address range */ +clone_pgd_range (trampoline_pg_dir +KERNEL_PGD_BOUNDARY , + swapper_pg_dir +KERNEL_PGD_BOUNDARY , + min_t(unsigned long, KERNEL_PGD_PTRS, +KERNEL_PGD_BOUNDARY )); + +/* Initialize low mappings */ +clone_pgd_range (trampoline_pg_dir, + swapper_pg_dir +KERNEL_PGD_BOUNDARY , + min_t(unsigned long, KERNEL_PGD_PTRS, +KERNEL_PGD_BOUNDARY )); +#endif +}