Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc494d6c authored by Tony Luck's avatar Tony Luck
Browse files

Pull percpureserve into release branch

parents 78514c10 2c6e6db4

arch/ia64/kernel/acpi.c

+3 −1
Original line number Diff line number Diff line
@@ -423,6 +423,7 @@ static u32 __devinitdata pxm_flag[PXM_FLAG_LEN]; 
#define pxm_bit_set(bit)	(set_bit(bit,(void *)pxm_flag))

#define pxm_bit_test(bit)	(test_bit(bit,(void *)pxm_flag))

static struct acpi_table_slit __initdata *slit_table;

cpumask_t early_cpu_possible_map = CPU_MASK_NONE;



static int get_processor_proximity_domain(struct acpi_srat_cpu_affinity *pa)

{
@@ -482,6 +483,7 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa) 
	    (pa->apic_id << 8) | (pa->local_sapic_eid);

	/* nid should be overridden as logical node id later */

	node_cpuid[srat_num_cpus].nid = pxm;

	cpu_set(srat_num_cpus, early_cpu_possible_map);

	srat_num_cpus++;

}
@@ -559,7 +561,7 @@ void __init acpi_numa_arch_fixup(void) 
	}



	/* set logical node id in cpu structure */

	for (i = 0; i < srat_num_cpus; i++)

	for_each_possible_early_cpu(i)

		node_cpuid[i].nid = pxm_to_node(node_cpuid[i].nid);



	printk(KERN_INFO "Number of logical nodes in system = %d\n",

arch/ia64/kernel/numa.c

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ void __init build_cpu_to_node_map(void) 
	for(node=0; node < MAX_NUMNODES; node++)

		cpus_clear(node_to_cpu_mask[node]);



	for(cpu = 0; cpu < NR_CPUS; ++cpu) {

	for_each_possible_early_cpu(cpu) {

		node = -1;

		for (i = 0; i < NR_CPUS; ++i)

			if (cpu_physical_id(cpu) == node_cpuid[i].phys_id) {

arch/ia64/kernel/setup.c

+2 −0
Original line number Diff line number Diff line
@@ -493,6 +493,8 @@ setup_arch (char **cmdline_p) 
	acpi_table_init();

# ifdef CONFIG_ACPI_NUMA

	acpi_numa_init();

	per_cpu_scan_finalize((cpus_weight(early_cpu_possible_map) == 0 ?

		32 : cpus_weight(early_cpu_possible_map)), additional_cpus);

# endif

#else

# ifdef CONFIG_SMP

arch/ia64/mm/discontig.c

+5 −8
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static int __meminit early_nr_cpus_node(int node) 
{

	int cpu, n = 0;



	for (cpu = 0; cpu < NR_CPUS; cpu++)

	for_each_possible_early_cpu(cpu)

		if (node == node_cpuid[cpu].nid)

			n++;
@@ -124,6 +124,7 @@ static unsigned long __meminit compute_pernodesize(int node) 
	pernodesize += node * L1_CACHE_BYTES;

	pernodesize += L1_CACHE_ALIGN(sizeof(pg_data_t));

	pernodesize += L1_CACHE_ALIGN(sizeof(struct ia64_node_data));

	pernodesize += L1_CACHE_ALIGN(sizeof(pg_data_t));

	pernodesize = PAGE_ALIGN(pernodesize);

	return pernodesize;

}
@@ -142,7 +143,7 @@ static void *per_cpu_node_setup(void *cpu_data, int node) 
#ifdef CONFIG_SMP

	int cpu;



	for (cpu = 0; cpu < NR_CPUS; cpu++) {

	for_each_possible_early_cpu(cpu) {

		if (node == node_cpuid[cpu].nid) {

			memcpy(__va(cpu_data), __phys_per_cpu_start,

			       __per_cpu_end - __per_cpu_start);
@@ -345,7 +346,7 @@ static void __init initialize_pernode_data(void) 


#ifdef CONFIG_SMP

	/* Set the node_data pointer for each per-cpu struct */

	for (cpu = 0; cpu < NR_CPUS; cpu++) {

	for_each_possible_early_cpu(cpu) {

		node = node_cpuid[cpu].nid;

		per_cpu(cpu_info, cpu).node_data = mem_data[node].node_data;

	}
@@ -493,13 +494,9 @@ void __cpuinit *per_cpu_init(void) 
	int cpu;

	static int first_time = 1;





	if (smp_processor_id() != 0)

		return __per_cpu_start + __per_cpu_offset[smp_processor_id()];



	if (first_time) {

		first_time = 0;

		for (cpu = 0; cpu < NR_CPUS; cpu++)

		for_each_possible_early_cpu(cpu)

			per_cpu(local_per_cpu_offset, cpu) = __per_cpu_offset[cpu];

	}

arch/ia64/mm/numa.c

+3 −1
Original line number Diff line number Diff line
@@ -27,7 +27,9 @@ 
 */

int num_node_memblks;

struct node_memblk_s node_memblk[NR_NODE_MEMBLKS];

struct node_cpuid_s node_cpuid[NR_CPUS];

struct node_cpuid_s node_cpuid[NR_CPUS] =

	{ [0 ... NR_CPUS-1] = { .phys_id = 0, .nid = NUMA_NO_NODE } };



/*

 * This is a matrix with "distances" between nodes, they should be

 * proportional to the memory access latency ratios.