Commit 9049a11d authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge
Browse files

Merge commit 'remotes/tip/x86/paravirt' into x86/untangle2 

* commit 'remotes/tip/x86/paravirt': (175 commits)
  xen: use direct ops on 64-bit
  xen: make direct versions of irq_enable/disable/save/restore to common code
  xen: setup percpu data pointers
  xen: fix 32-bit build resulting from mmu move
  x86/paravirt: return full 64-bit result
  x86, percpu: fix kexec with vmlinux
  x86/vmi: fix interrupt enable/disable/save/restore calling convention.
  x86/paravirt: don't restore second return reg
  xen: setup percpu data pointers
  x86: split loading percpu segments from loading gdt
  x86: pass in cpu number to switch_to_new_gdt()
  x86: UV fix uv_flush_send_and_wait()
  x86/paravirt: fix missing callee-save call on pud_val
  x86/paravirt: use callee-saved convention for pte_val/make_pte/etc
  x86/paravirt: implement PVOP_CALL macros for callee-save functions
  x86/paravirt: add register-saving thunks to reduce caller register pressure
  x86/paravirt: selectively save/restore regs around pvops calls
  x86: fix paravirt clobber in entry_64.S
  x86/pvops: add a paravirt_ident functions to allow special patching
  xen: move remaining mmu-related stuff into mmu.c
  ...

Conflicts:
	arch/x86/mach-voyager/voyager_smp.c
	arch/x86/mm/fault.c
parents c47c1b1f e4d04071

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(bad_irq_desc.lock),

};



#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/oprofile/op_model_mpcore.c

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ static void em_route_irq(int irq, unsigned int cpu) 
	const struct cpumask *mask = cpumask_of(cpu);



	spin_lock_irq(&desc->lock);

	desc->affinity = *mask;

	cpumask_copy(desc->affinity, mask);

	desc->chip->set_affinity(irq, mask);

	spin_unlock_irq(&desc->lock);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE