From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 1 Jun 2009 19:06:21 +0000 (+0200)
Subject: Merge branch 'linus' into irq/numa
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3d58f48ba05caed9118bce62b3047f8683438835;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'linus' into irq/numa

Conflicts:
	arch/mips/sibyte/bcm1480/irq.c
	arch/mips/sibyte/sb1250/irq.c

Merge reason: we gathered a few conflicts plus update to latest upstream fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

3d58f48ba05caed9118bce62b3047f8683438835
diff --cc arch/mips/sibyte/bcm1480/irq.c
index 4f256a131bf6,c147c4b35d3f..690de06bde90
--- a/arch/mips/sibyte/bcm1480/irq.c
+++ b/arch/mips/sibyte/bcm1480/irq.c
@@@ -153,10 -151,7 +151,9 @@@ static int bcm1480_set_affinity(unsigne
  			____raw_writeq(cur_ints, IOADDR(A_BCM1480_IMR_MAPPER(cpu) + R_BCM1480_IMR_INTERRUPT_MASK_H + (k*BCM1480_IMR_HL_SPACING)));
  		}
  	}
- 	spin_unlock(&bcm1480_imr_lock);
- 	spin_unlock_irqrestore(&desc->lock, flags);
+ 	spin_unlock_irqrestore(&bcm1480_imr_lock, flags);
 +
 +	return 0;
  }
  #endif
  
diff --cc arch/mips/sibyte/sb1250/irq.c
index e389507f1f96,38cb998ade22..409dec798863
--- a/arch/mips/sibyte/sb1250/irq.c
+++ b/arch/mips/sibyte/sb1250/irq.c
@@@ -144,10 -142,7 +142,9 @@@ static int sb1250_set_affinity(unsigne
  		____raw_writeq(cur_ints, IOADDR(A_IMR_MAPPER(cpu) +
  					R_IMR_INTERRUPT_MASK));
  	}
- 	spin_unlock(&sb1250_imr_lock);
- 	spin_unlock_irqrestore(&desc->lock, flags);
+ 	spin_unlock_irqrestore(&sb1250_imr_lock, flags);
 +
 +	return 0;
  }
  #endif