Commit 181f977d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (93 commits)
  x86, tlb, UV: Do small micro-optimization for native_flush_tlb_others()
  x86-64, NUMA: Don't call numa_set_distanc() for all possible node combinations during emulation
  x86-64, NUMA: Don't assume phys node 0 is always online in numa_emulation()
  x86-64, NUMA: Clean up initmem_init()
  x86-64, NUMA: Fix numa_emulation code with node0 without RAM
  x86-64, NUMA: Revert NUMA affine page table allocation
  x86: Work around old gas bug
  x86-64, NUMA: Better explain numa_distance handling
  x86-64, NUMA: Fix distance table handling
  mm: Move early_node_map[] reverse scan helpers under HAVE_MEMBLOCK
  x86-64, NUMA: Fix size of numa_distance array
  x86: Rename e820_table_* to pgt_buf_*
  bootmem: Move __alloc_memory_core_early() to nobootmem.c
  bootmem: Move contig_page_data definition to bootmem.c/nobootmem.c
  bootmem: Separate out CONFIG_NO_BOOTMEM code into nobootmem.c
  x86-64, NUMA: Seperate out numa_alloc_distance() from numa_set_distance()
  x86-64, NUMA: Add proper function comments to global functions
  x86-64, NUMA: Move NUMA emulation into numa_emulation.c
  x86-64, NUMA: Prepare numa_emulation() for moving NUMA emulation into a separate file
  x86-64, NUMA: Do not scan two times for setup_node_bootmem()
  ...

Fix up conflicts in arch/x86/kernel/smpboot.c
parents d5d42399 25542c64

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1709,7 +1709,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID 
	depends on NUMA



config USE_PERCPU_NUMA_NODE_ID

	def_bool X86_64

	def_bool y

	depends on NUMA



menu "Power management and ACPI options"

arch/x86/include/asm/acpi.h

+1 −9
Original line number Diff line number Diff line
@@ -186,15 +186,7 @@ struct bootnode; 


#ifdef CONFIG_ACPI_NUMA

extern int acpi_numa;

extern void acpi_get_nodes(struct bootnode *physnodes, unsigned long start,

				unsigned long end);

extern int acpi_scan_nodes(unsigned long start, unsigned long end);

#define NR_NODE_MEMBLKS (MAX_NUMNODES*2)



#ifdef CONFIG_NUMA_EMU

extern void acpi_fake_nodes(const struct bootnode *fake_nodes,

				   int num_nodes);

#endif

extern int x86_acpi_numa_init(void);

#endif /* CONFIG_ACPI_NUMA */



#define acpi_unlazy_tlb(x)	leave_mm(x)

arch/x86/include/asm/amd_nb.h

+6 −8
Original line number Diff line number Diff line
@@ -9,23 +9,20 @@ struct amd_nb_bus_dev_range { 
	u8 dev_limit;

};



extern struct pci_device_id amd_nb_misc_ids[];

extern const struct pci_device_id amd_nb_misc_ids[];

extern const struct amd_nb_bus_dev_range amd_nb_bus_dev_ranges[];

struct bootnode;



extern int early_is_amd_nb(u32 value);

extern int amd_cache_northbridges(void);

extern void amd_flush_garts(void);

extern int amd_numa_init(unsigned long start_pfn, unsigned long end_pfn);

extern int amd_scan_nodes(void);



#ifdef CONFIG_NUMA_EMU

extern void amd_fake_nodes(const struct bootnode *nodes, int nr_nodes);

extern void amd_get_nodes(struct bootnode *nodes);

#endif

extern int amd_numa_init(void);

extern int amd_get_subcaches(int);

extern int amd_set_subcaches(int, int);



struct amd_northbridge {

	struct pci_dev *misc;

	struct pci_dev *link;

};



struct amd_northbridge_info {
@@ -37,6 +34,7 @@ extern struct amd_northbridge_info amd_northbridges; 


#define AMD_NB_GART			0x1

#define AMD_NB_L3_INDEX_DISABLE		0x2

#define AMD_NB_L3_PARTITIONING		0x4



#ifdef CONFIG_AMD_NB

arch/x86/include/asm/apic.h

+23 −13
Original line number Diff line number Diff line
@@ -307,8 +307,6 @@ struct apic { 


	void (*setup_apic_routing)(void);

	int (*multi_timer_check)(int apic, int irq);

	int (*apicid_to_node)(int logical_apicid);

	int (*cpu_to_logical_apicid)(int cpu);

	int (*cpu_present_to_apicid)(int mps_cpu);

	void (*apicid_to_cpu_present)(int phys_apicid, physid_mask_t *retmap);

	void (*setup_portio_remap)(void);
@@ -356,6 +354,23 @@ struct apic { 
	void (*icr_write)(u32 low, u32 high);

	void (*wait_icr_idle)(void);

	u32 (*safe_wait_icr_idle)(void);



#ifdef CONFIG_X86_32

	/*

	 * Called very early during boot from get_smp_config().  It should

	 * return the logical apicid.  x86_[bios]_cpu_to_apicid is

	 * initialized before this function is called.

	 *

	 * If logical apicid can't be determined that early, the function

	 * may return BAD_APICID.  Logical apicid will be configured after

	 * init_apic_ldr() while bringing up CPUs.  Note that NUMA affinity

	 * won't be applied properly during early boot in this case.

	 */

	int (*x86_32_early_logical_apicid)(int cpu);



	/* determine CPU -> NUMA node mapping */

	int (*x86_32_numa_cpu_node)(int cpu);

#endif

};



/*
@@ -503,6 +518,11 @@ extern struct apic apic_noop; 


extern struct apic apic_default;



static inline int noop_x86_32_early_logical_apicid(int cpu)

{

	return BAD_APICID;

}



/*

 * Set up the logical destination ID.

 *
@@ -522,7 +542,7 @@ static inline int default_phys_pkg_id(int cpuid_apic, int index_msb) 
	return cpuid_apic >> index_msb;

}



extern int default_apicid_to_node(int logical_apicid);

extern int default_x86_32_numa_cpu_node(int cpu);



#endif
@@ -558,12 +578,6 @@ static inline void default_ioapic_phys_id_map(physid_mask_t *phys_map, physid_ma 
	*retmap = *phys_map;

}



/* Mapping from cpu number to logical apicid */

static inline int default_cpu_to_logical_apicid(int cpu)

{

	return 1 << cpu;

}



static inline int __default_cpu_present_to_apicid(int mps_cpu)

{

	if (mps_cpu < nr_cpu_ids && cpu_present(mps_cpu))
@@ -596,8 +610,4 @@ extern int default_check_phys_apicid_present(int phys_apicid); 


#endif /* CONFIG_X86_LOCAL_APIC */



#ifdef CONFIG_X86_32

extern u8 cpu_2_logical_apicid[NR_CPUS];

#endif



#endif /* _ASM_X86_APIC_H */

arch/x86/include/asm/entry_arch.h

+4 −1
Original line number Diff line number Diff line
@@ -16,10 +16,13 @@ BUILD_INTERRUPT(call_function_single_interrupt,CALL_FUNCTION_SINGLE_VECTOR) 
BUILD_INTERRUPT(irq_move_cleanup_interrupt,IRQ_MOVE_CLEANUP_VECTOR)

BUILD_INTERRUPT(reboot_interrupt,REBOOT_VECTOR)



.irpc idx, "01234567"

.irp idx,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15, \

	16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31

.if NUM_INVALIDATE_TLB_VECTORS > \idx

BUILD_INTERRUPT3(invalidate_interrupt\idx,

		 (INVALIDATE_TLB_VECTOR_START)+\idx,

		 smp_invalidate_interrupt)

.endif

.endr

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE