From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 28 Mar 2009 20:40:20 +0000 (-0700)
Subject: Merge branch 'percpu-cpumask-x86-for-linus-2' of git://git.kernel.org/pub/scm/linux... 
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7c730ccdc1188b97f5c8cb690906242c7ed75c22;p=linux-2.6-omap-h63xx.git

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

* 'percpu-cpumask-x86-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (682 commits)
  percpu: fix spurious alignment WARN in legacy SMP percpu allocator
  percpu: generalize embedding first chunk setup helper
  percpu: more flexibility for @dyn_size of pcpu_setup_first_chunk()
  percpu: make x86 addr <-> pcpu ptr conversion macros generic
  linker script: define __per_cpu_load on all SMP capable archs
  x86: UV: remove uv_flush_tlb_others() WARN_ON
  percpu: finer grained locking to break deadlock and allow atomic free
  percpu: move fully free chunk reclamation into a work
  percpu: move chunk area map extension out of area allocation
  percpu: replace pcpu_realloc() with pcpu_mem_alloc() and pcpu_mem_free()
  x86, percpu: setup reserved percpu area for x86_64
  percpu, module: implement reserved allocation and use it for module percpu variables
  percpu: add an indirection ptr for chunk page map access
  x86: make embedding percpu allocator return excessive free space
  percpu: use negative for auto for pcpu_setup_first_chunk() arguments
  percpu: improve first chunk initial area map handling
  percpu: cosmetic renames in pcpu_setup_first_chunk()
  percpu: clean up percpu constants
  x86: un-__init fill_pud/pmd/pte
  x86: remove vestigial fix_ioremap prototypes
  ...

Manually merge conflicts in arch/ia64/kernel/irq_ia64.c
---

7c730ccdc1188b97f5c8cb690906242c7ed75c22
diff --cc arch/ia64/kernel/irq_ia64.c
index 977a6ef1332,927ad027820..acc4d19ae62
--- a/arch/ia64/kernel/irq_ia64.c
+++ b/arch/ia64/kernel/irq_ia64.c
@@@ -493,16 -493,16 +493,15 @@@ ia64_handle_irq (ia64_vector vector, st
  	saved_tpr = ia64_getreg(_IA64_REG_CR_TPR);
  	ia64_srlz_d();
  	while (vector != IA64_SPURIOUS_INT_VECTOR) {
- 		struct irq_desc *desc;
 -		struct irq_desc *desc = irq_to_desc(vector);
 +		int irq = local_vector_to_irq(vector);
++		struct irq_desc *desc = irq_to_desc(irq);
  
- 		desc = irq_desc + irq;
  		if (unlikely(IS_LOCAL_TLB_FLUSH(vector))) {
  			smp_local_flush_tlb();
 -			kstat_incr_irqs_this_cpu(vector, desc);
 -		} else if (unlikely(IS_RESCHEDULE(vector)))
 -			kstat_incr_irqs_this_cpu(vector, desc);
 -		else {
 -			int irq = local_vector_to_irq(vector);
 -
 +			kstat_incr_irqs_this_cpu(irq, desc);
- 		} else if (unlikely(IS_RESCHEDULE(vector)))
++		} else if (unlikely(IS_RESCHEDULE(vector))) {
 +			kstat_incr_irqs_this_cpu(irq, desc);
- 		else {
++		} else {
  			ia64_setreg(_IA64_REG_CR_TPR, vector);
  			ia64_srlz_d();
  
@@@ -553,17 -553,16 +552,16 @@@ void ia64_process_pending_intr(void
  	  * Perform normal interrupt style processing
  	  */
  	while (vector != IA64_SPURIOUS_INT_VECTOR) {
- 		struct irq_desc *desc;
 -		struct irq_desc *desc = irq_to_desc(vector);
 +		int irq = local_vector_to_irq(vector);
- 		desc = irq_desc + irq;
++		struct irq_desc *desc = irq_to_desc(irq);
  
  		if (unlikely(IS_LOCAL_TLB_FLUSH(vector))) {
  			smp_local_flush_tlb();
 -			kstat_incr_irqs_this_cpu(vector, desc);
 -		} else if (unlikely(IS_RESCHEDULE(vector)))
 -			kstat_incr_irqs_this_cpu(vector, desc);
 -		else {
 +			kstat_incr_irqs_this_cpu(irq, desc);
- 		} else if (unlikely(IS_RESCHEDULE(vector)))
++		} else if (unlikely(IS_RESCHEDULE(vector))) {
 +			kstat_incr_irqs_this_cpu(irq, desc);
- 		else {
++		} else {
  			struct pt_regs *old_regs = set_irq_regs(NULL);
 -			int irq = local_vector_to_irq(vector);
  
  			ia64_setreg(_IA64_REG_CR_TPR, vector);
  			ia64_srlz_d();