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

Commit af37501c authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'core/percpu' into perfcounters/core 



Conflicts:
	arch/x86/include/asm/pda.h

We merge tip/core/percpu into tip/perfcounters/core because of a
semantic and contextual conflict: the former eliminates the PDA,
while the latter extends it with apic_perf_irqs field.

Resolve the conflict by moving the new field to the irq_cpustat
structure on 64-bit too.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents d859e29f 99937d64

Documentation/cputopology.txt

+3 −3
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ For an architecture to support this feature, it must define some of 
these macros in include/asm-XXX/topology.h:

#define topology_physical_package_id(cpu)

#define topology_core_id(cpu)

#define topology_thread_siblings(cpu)

#define topology_core_siblings(cpu)

#define topology_thread_cpumask(cpu)

#define topology_core_cpumask(cpu)



The type of **_id is int.

The type of siblings is cpumask_t.

The type of siblings is (const) struct cpumask *.



To be consistent on all architectures, include/linux/topology.h

provides default definitions for any of the above macros that are

arch/alpha/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ int irq_select_affinity(unsigned int irq) 
		cpu = (cpu < (NR_CPUS-1) ? cpu + 1 : 0);

	last_cpu = cpu;



	irq_desc[irq].affinity = cpumask_of_cpu(cpu);

	cpumask_copy(irq_desc[irq].affinity, cpumask_of(cpu));

	irq_desc[irq].chip->set_affinity(irq, cpumask_of(cpu));

	return 0;

}

arch/arm/kernel/irq.c

+12 −6
Original line number Diff line number Diff line
@@ -104,6 +104,11 @@ static struct irq_desc bad_irq_desc = { 
	.lock = SPIN_LOCK_UNLOCKED

};



#ifdef CONFIG_CPUMASK_OFFSTACK

/* We are not allocating bad_irq_desc.affinity or .pending_mask */

#error "ARM architecture does not support CONFIG_CPUMASK_OFFSTACK."

#endif



/*

 * do_IRQ handles all hardware IRQ's.  Decoded IRQs should not

 * come via this function.  Instead, they should provide their
@@ -161,7 +166,7 @@ void __init init_IRQ(void) 
		irq_desc[irq].status |= IRQ_NOREQUEST | IRQ_NOPROBE;



#ifdef CONFIG_SMP

	bad_irq_desc.affinity = CPU_MASK_ALL;

	cpumask_setall(bad_irq_desc.affinity);

	bad_irq_desc.cpu = smp_processor_id();

#endif

	init_arch_irq();
@@ -191,15 +196,16 @@ void migrate_irqs(void) 
		struct irq_desc *desc = irq_desc + i;



		if (desc->cpu == cpu) {

			unsigned int newcpu = any_online_cpu(desc->affinity);



			if (newcpu == NR_CPUS) {

			unsigned int newcpu = cpumask_any_and(desc->affinity,

							      cpu_online_mask);

			if (newcpu >= nr_cpu_ids) {

				if (printk_ratelimit())

					printk(KERN_INFO "IRQ%u no longer affine to CPU%u\n",

					       i, cpu);



				cpus_setall(desc->affinity);

				newcpu = any_online_cpu(desc->affinity);

				cpumask_setall(desc->affinity);

				newcpu = cpumask_any_and(desc->affinity,

							 cpu_online_mask);

			}



			route_irq(desc, i, newcpu);

arch/arm/kernel/vmlinux.lds.S

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ SECTIONS 
#endif

		. = ALIGN(4096);

		__per_cpu_start = .;

			*(.data.percpu.page_aligned)

			*(.data.percpu)

			*(.data.percpu.shared_aligned)

		__per_cpu_end = .;

arch/arm/mach-imx/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <linux/err.h>

#include <linux/io.h>



#include <mach/imx-regs.h>

#include <mach/hardware.h>



/*

 * Very simple approach: We can't disable clocks, so we do