Commit 36423a5e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-fixes-for-linus' of... 

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, apic: Fix apic=debug boot crash
  x86, hotplug: Serialize CPU hotplug to avoid bringup concurrency issues
  x86-32: Fix dummy trampoline-related inline stubs
  x86-32: Separate 1:1 pagetables from swapper_pg_dir
  x86, cpu: Fix regression in AMD errata checking code
parents f6143a9b 05e40760

arch/x86/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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)) &&

CRA Git | Maintained and supported by SUSTech CRA and CCSE