Commit d0316554 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (34 commits)
  m68k: rename global variable vmalloc_end to m68k_vmalloc_end
  percpu: add missing per_cpu_ptr_to_phys() definition for UP
  percpu: Fix kdump failure if booted with percpu_alloc=page
  percpu: make misc percpu symbols unique
  percpu: make percpu symbols in ia64 unique
  percpu: make percpu symbols in powerpc unique
  percpu: make percpu symbols in x86 unique
  percpu: make percpu symbols in xen unique
  percpu: make percpu symbols in cpufreq unique
  percpu: make percpu symbols in oprofile unique
  percpu: make percpu symbols in tracer unique
  percpu: make percpu symbols under kernel/ and mm/ unique
  percpu: remove some sparse warnings
  percpu: make alloc_percpu() handle array types
  vmalloc: fix use of non-existent percpu variable in put_cpu_var()
  this_cpu: Use this_cpu_xx in trace_functions_graph.c
  this_cpu: Use this_cpu_xx for ftrace
  this_cpu: Use this_cpu_xx in nmi handling
  this_cpu: Use this_cpu operations in RCU
  this_cpu: Use this_cpu ops for VM statistics
  ...

Fix up trivial (famous last words) global per-cpu naming conflicts in
	arch/x86/kvm/svm.c
	mm/slab.c
parents fb0bbb92 51e99be0

arch/ia64/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -87,9 +87,6 @@ config GENERIC_TIME_VSYSCALL 
	bool

	default y



config HAVE_LEGACY_PER_CPU_AREA

	def_bool y



config HAVE_SETUP_PER_CPU_AREA

	def_bool y

arch/ia64/include/asm/meminit.h

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ extern int register_active_ranges(u64 start, u64 len, int nid); 


#ifdef CONFIG_VIRTUAL_MEM_MAP

# define LARGE_GAP	0x40000000 /* Use virtual mem map if hole is > than this */

  extern unsigned long vmalloc_end;

  extern unsigned long VMALLOC_END;

  extern struct page *vmem_map;

  extern int find_largest_hole(u64 start, u64 end, void *arg);

  extern int create_mem_map_page_table(u64 start, u64 end, void *arg);

arch/ia64/include/asm/pgtable.h

+1 −2
Original line number Diff line number Diff line
@@ -228,8 +228,7 @@ ia64_phys_addr_valid (unsigned long addr) 
#define VMALLOC_START		(RGN_BASE(RGN_GATE) + 0x200000000UL)

#ifdef CONFIG_VIRTUAL_MEM_MAP

# define VMALLOC_END_INIT	(RGN_BASE(RGN_GATE) + (1UL << (4*PAGE_SHIFT - 9)))

# define VMALLOC_END		vmalloc_end

  extern unsigned long vmalloc_end;

extern unsigned long VMALLOC_END;

#else

#if defined(CONFIG_SPARSEMEM) && defined(CONFIG_SPARSEMEM_VMEMMAP)

/* SPARSEMEM_VMEMMAP uses half of vmalloc... */

arch/ia64/include/asm/processor.h

+3 −3
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ struct cpuinfo_ia64 { 
#endif

};



DECLARE_PER_CPU(struct cpuinfo_ia64, cpu_info);

DECLARE_PER_CPU(struct cpuinfo_ia64, ia64_cpu_info);



/*

 * The "local" data variable.  It refers to the per-CPU data of the currently executing
@@ -237,8 +237,8 @@ DECLARE_PER_CPU(struct cpuinfo_ia64, cpu_info); 
 * Do not use the address of local_cpu_data, since it will be different from

 * cpu_data(smp_processor_id())!

 */

#define local_cpu_data		(&__ia64_per_cpu_var(cpu_info))

#define cpu_data(cpu)		(&per_cpu(cpu_info, cpu))

#define local_cpu_data		(&__ia64_per_cpu_var(ia64_cpu_info))

#define cpu_data(cpu)		(&per_cpu(ia64_cpu_info, cpu))



extern void print_cpu_info (struct cpuinfo_ia64 *);

arch/ia64/kernel/acpi.c

+15 −18
Original line number Diff line number Diff line
@@ -702,10 +702,22 @@ int __init early_acpi_boot_init(void) 
		printk(KERN_ERR PREFIX

		       "Error parsing MADT - no LAPIC entries\n");



	return 0;

#ifdef CONFIG_SMP

	if (available_cpus == 0) {

		printk(KERN_INFO "ACPI: Found 0 CPUS; assuming 1\n");

		printk(KERN_INFO "CPU 0 (0x%04x)", hard_smp_processor_id());

		smp_boot_data.cpu_phys_id[available_cpus] =

		    hard_smp_processor_id();

		available_cpus = 1;	/* We've got at least one of these, no? */

	}

	smp_boot_data.cpu_count = available_cpus;

#endif

	/* Make boot-up look pretty */

	printk(KERN_INFO "%d CPUs available, %d CPUs total\n", available_cpus,

	       total_cpus);





	return 0;

}



int __init acpi_boot_init(void)

{
@@ -769,18 +781,8 @@ int __init acpi_boot_init(void) 
	if (acpi_table_parse(ACPI_SIG_FADT, acpi_parse_fadt))

		printk(KERN_ERR PREFIX "Can't find FADT\n");



#ifdef CONFIG_SMP

	if (available_cpus == 0) {

		printk(KERN_INFO "ACPI: Found 0 CPUS; assuming 1\n");

		printk(KERN_INFO "CPU 0 (0x%04x)", hard_smp_processor_id());

		smp_boot_data.cpu_phys_id[available_cpus] =

		    hard_smp_processor_id();

		available_cpus = 1;	/* We've got at least one of these, no? */

	}

	smp_boot_data.cpu_count = available_cpus;



	smp_build_cpu_map();

#ifdef CONFIG_ACPI_NUMA

#ifdef CONFIG_SMP

	if (srat_num_cpus == 0) {

		int cpu, i = 1;

		for (cpu = 0; cpu < smp_boot_data.cpu_count; cpu++)
@@ -790,13 +792,8 @@ int __init acpi_boot_init(void) 
				    smp_boot_data.cpu_phys_id[cpu];

	}

#endif

#endif

#ifdef CONFIG_ACPI_NUMA

	build_cpu_to_node_map();

#endif

	/* Make boot-up look pretty */

	printk(KERN_INFO "%d CPUs available, %d CPUs total\n", available_cpus,

	       total_cpus);

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE