Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	drivers/firmware/iscsi_ibft.c

7 files changed, 30 insertions, 30 deletions

diff --git a/arch/powerpc/platforms/cell/beat_htab.c b/arch/powerpc/platforms/cell/beat_htab.c
index 35b1ec492715..2516c1cf8467 100644
--- a/arch/powerpc/platforms/cell/beat_htab.c
+++ b/arch/powerpc/platforms/cell/beat_htab.c
@@ -40,7 +40,7 @@
 #define DBG_LOW(fmt...) do { } while (0)
 #endif
 
-static DEFINE_SPINLOCK(beat_htab_lock);
+static DEFINE_RAW_SPINLOCK(beat_htab_lock);
 
 static inline unsigned int beat_read_mask(unsigned hpte_group)
 {
@@ -114,18 +114,18 @@ static long beat_lpar_hpte_insert(unsigned long hpte_group,
         if (rflags & _PAGE_NO_CACHE)
                 hpte_r &= ~_PAGE_COHERENT;
 
-        spin_lock(&beat_htab_lock);
+        raw_spin_lock(&beat_htab_lock);
         lpar_rc = beat_read_mask(hpte_group);
         if (lpar_rc == 0) {
                 if (!(vflags & HPTE_V_BOLTED))
                         DBG_LOW(" full\n");
-                spin_unlock(&beat_htab_lock);
+                raw_spin_unlock(&beat_htab_lock);
                 return -1;
         }
 
         lpar_rc = beat_insert_htab_entry(0, hpte_group, lpar_rc << 48,
                 hpte_v, hpte_r, &slot);
-        spin_unlock(&beat_htab_lock);
+        raw_spin_unlock(&beat_htab_lock);
 
         /*
          * Since we try and ioremap PHBs we don't own, the pte insert
@@ -198,17 +198,17 @@ static long beat_lpar_hpte_updatepp(unsigned long slot,
                 "avpnv=%016lx, slot=%016lx, psize: %d, newpp %016lx ... ",
                 want_v & HPTE_V_AVPN, slot, psize, newpp);
 
-        spin_lock(&beat_htab_lock);
+        raw_spin_lock(&beat_htab_lock);
         dummy0 = beat_lpar_hpte_getword0(slot);
         if ((dummy0 & ~0x7FUL) != (want_v & ~0x7FUL)) {
                 DBG_LOW("not found !\n");
-                spin_unlock(&beat_htab_lock);
+                raw_spin_unlock(&beat_htab_lock);
                 return -1;
         }
 
         lpar_rc = beat_write_htab_entry(0, slot, 0, newpp, 0, 7, &dummy0,
                                         &dummy1);
-        spin_unlock(&beat_htab_lock);
+        raw_spin_unlock(&beat_htab_lock);
         if (lpar_rc != 0 || dummy0 == 0) {
                 DBG_LOW("not found !\n");
                 return -1;
@@ -262,13 +262,13 @@ static void beat_lpar_hpte_updateboltedpp(unsigned long newpp,
         vsid = get_kernel_vsid(ea, MMU_SEGSIZE_256M);
         va = (vsid << 28) | (ea & 0x0fffffff);
 
-        spin_lock(&beat_htab_lock);
+        raw_spin_lock(&beat_htab_lock);
         slot = beat_lpar_hpte_find(va, psize);
         BUG_ON(slot == -1);
 
         lpar_rc = beat_write_htab_entry(0, slot, 0, newpp, 0, 7,
                 &dummy0, &dummy1);
-        spin_unlock(&beat_htab_lock);
+        raw_spin_unlock(&beat_htab_lock);
 
         BUG_ON(lpar_rc != 0);
 }
@@ -285,18 +285,18 @@ static void beat_lpar_hpte_invalidate(unsigned long slot, unsigned long va,
                 slot, va, psize, local);
         want_v = hpte_encode_v(va, psize, MMU_SEGSIZE_256M);
 
-        spin_lock_irqsave(&beat_htab_lock, flags);
+        raw_spin_lock_irqsave(&beat_htab_lock, flags);
         dummy1 = beat_lpar_hpte_getword0(slot);
 
         if ((dummy1 & ~0x7FUL) != (want_v & ~0x7FUL)) {
                 DBG_LOW("not found !\n");
-                spin_unlock_irqrestore(&beat_htab_lock, flags);
+                raw_spin_unlock_irqrestore(&beat_htab_lock, flags);
                 return;
         }
 
         lpar_rc = beat_write_htab_entry(0, slot, 0, 0, HPTE_V_VALID, 0,
                 &dummy1, &dummy2);
-        spin_unlock_irqrestore(&beat_htab_lock, flags);
+        raw_spin_unlock_irqrestore(&beat_htab_lock, flags);
 
         BUG_ON(lpar_rc != 0);
 }
diff --git a/arch/powerpc/platforms/cell/beat_interrupt.c b/arch/powerpc/platforms/cell/beat_interrupt.c
index 36052a9ebcda..682af97321a8 100644
--- a/arch/powerpc/platforms/cell/beat_interrupt.c
+++ b/arch/powerpc/platforms/cell/beat_interrupt.c
@@ -30,7 +30,7 @@
 #include "beat_wrapper.h"
 
 #define MAX_IRQS        NR_IRQS
-static DEFINE_SPINLOCK(beatic_irq_mask_lock);
+static DEFINE_RAW_SPINLOCK(beatic_irq_mask_lock);
 static uint64_t beatic_irq_mask_enable[(MAX_IRQS+255)/64];
 static uint64_t beatic_irq_mask_ack[(MAX_IRQS+255)/64];
 
@@ -65,30 +65,30 @@ static void beatic_mask_irq(unsigned int irq_plug)
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&beatic_irq_mask_lock, flags);
+        raw_spin_lock_irqsave(&beatic_irq_mask_lock, flags);
         beatic_irq_mask_enable[irq_plug/64] &= ~(1UL << (63 - (irq_plug%64)));
         beatic_update_irq_mask(irq_plug);
-        spin_unlock_irqrestore(&beatic_irq_mask_lock, flags);
+        raw_spin_unlock_irqrestore(&beatic_irq_mask_lock, flags);
 }
 
 static void beatic_unmask_irq(unsigned int irq_plug)
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&beatic_irq_mask_lock, flags);
+        raw_spin_lock_irqsave(&beatic_irq_mask_lock, flags);
         beatic_irq_mask_enable[irq_plug/64] |= 1UL << (63 - (irq_plug%64));
         beatic_update_irq_mask(irq_plug);
-        spin_unlock_irqrestore(&beatic_irq_mask_lock, flags);
+        raw_spin_unlock_irqrestore(&beatic_irq_mask_lock, flags);
 }
 
 static void beatic_ack_irq(unsigned int irq_plug)
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&beatic_irq_mask_lock, flags);
+        raw_spin_lock_irqsave(&beatic_irq_mask_lock, flags);
         beatic_irq_mask_ack[irq_plug/64] &= ~(1UL << (63 - (irq_plug%64)));
         beatic_update_irq_mask(irq_plug);
-        spin_unlock_irqrestore(&beatic_irq_mask_lock, flags);
+        raw_spin_unlock_irqrestore(&beatic_irq_mask_lock, flags);
 }
 
 static void beatic_end_irq(unsigned int irq_plug)
@@ -103,14 +103,14 @@ static void beatic_end_irq(unsigned int irq_plug)
 
                 printk(KERN_ERR "IRQ over-downcounted, plug %d\n", irq_plug);
         }
-        spin_lock_irqsave(&beatic_irq_mask_lock, flags);
+        raw_spin_lock_irqsave(&beatic_irq_mask_lock, flags);
         beatic_irq_mask_ack[irq_plug/64] |= 1UL << (63 - (irq_plug%64));
         beatic_update_irq_mask(irq_plug);
-        spin_unlock_irqrestore(&beatic_irq_mask_lock, flags);
+        raw_spin_unlock_irqrestore(&beatic_irq_mask_lock, flags);
 }
 
 static struct irq_chip beatic_pic = {
-        .name = " CELL-BEAT ",
+        .name = "CELL-BEAT",
         .unmask = beatic_unmask_irq,
         .mask = beatic_mask_irq,
         .eoi = beatic_end_irq,
diff --git a/arch/powerpc/platforms/cell/cbe_powerbutton.c b/arch/powerpc/platforms/cell/cbe_powerbutton.c
index dcddaa5fcb66..f75a4daa4ca2 100644
--- a/arch/powerpc/platforms/cell/cbe_powerbutton.c
+++ b/arch/powerpc/platforms/cell/cbe_powerbutton.c
@@ -48,7 +48,7 @@ static int __init cbe_powerbutton_init(void)
         int ret = 0;
         struct input_dev *dev;
 
-        if (!machine_is_compatible("IBM,CBPLUS-1.0")) {
+        if (!of_machine_is_compatible("IBM,CBPLUS-1.0")) {
                 printk(KERN_ERR "%s: Not a cell blade.\n", __func__);
                 ret = -ENODEV;
                 goto out;
diff --git a/arch/powerpc/platforms/cell/interrupt.c b/arch/powerpc/platforms/cell/interrupt.c
index 6829cf7e2bda..10eb1a443626 100644
--- a/arch/powerpc/platforms/cell/interrupt.c
+++ b/arch/powerpc/platforms/cell/interrupt.c
@@ -88,7 +88,7 @@ static void iic_eoi(unsigned int irq)
 }
 
 static struct irq_chip iic_chip = {
-        .name = " CELL-IIC ",
+        .name = "CELL-IIC",
         .mask = iic_mask,
         .unmask = iic_unmask,
         .eoi = iic_eoi,
@@ -133,7 +133,7 @@ static void iic_ioexc_cascade(unsigned int irq, struct irq_desc *desc)
 
 
 static struct irq_chip iic_ioexc_chip = {
-        .name = " CELL-IOEX",
+        .name = "CELL-IOEX",
         .mask = iic_mask,
         .unmask = iic_unmask,
         .eoi = iic_ioexc_eoi,
diff --git a/arch/powerpc/platforms/cell/ras.c b/arch/powerpc/platforms/cell/ras.c
index 5e0a191764fc..608fd2b584c9 100644
--- a/arch/powerpc/platforms/cell/ras.c
+++ b/arch/powerpc/platforms/cell/ras.c
@@ -255,7 +255,7 @@ static int __init cbe_sysreset_init(void)
 {
         struct cbe_pmd_regs __iomem *regs;
 
-        sysreset_hack = machine_is_compatible("IBM,CBPLUS-1.0");
+        sysreset_hack = of_machine_is_compatible("IBM,CBPLUS-1.0");
         if (!sysreset_hack)
                 return 0;
 
diff --git a/arch/powerpc/platforms/cell/spider-pic.c b/arch/powerpc/platforms/cell/spider-pic.c
index 01244f254a11..5876e888e412 100644
--- a/arch/powerpc/platforms/cell/spider-pic.c
+++ b/arch/powerpc/platforms/cell/spider-pic.c
@@ -168,7 +168,7 @@ static int spider_set_irq_type(unsigned int virq, unsigned int type)
 }
 
 static struct irq_chip spider_pic = {
-        .name = " SPIDER   ",
+        .name = "SPIDER",
         .unmask = spider_unmask_irq,
         .mask = spider_mask_irq,
         .ack = spider_ack_irq,
diff --git a/arch/powerpc/platforms/cell/spu_manage.c b/arch/powerpc/platforms/cell/spu_manage.c
index 4c506c1463cd..891f18e337a2 100644
--- a/arch/powerpc/platforms/cell/spu_manage.c
+++ b/arch/powerpc/platforms/cell/spu_manage.c
@@ -457,7 +457,7 @@ neighbour_spu(int cbe, struct device_node *target, struct device_node *avoid)
                         continue;
                 vic_handles = of_get_property(spu_dn, "vicinity", &lenp);
                 for (i=0; i < (lenp / sizeof(phandle)); i++) {
-                        if (vic_handles[i] == target->linux_phandle)
+                        if (vic_handles[i] == target->phandle)
                                 return spu;
                 }
         }
@@ -499,7 +499,7 @@ static void init_affinity_node(int cbe)
 
                         if (strcmp(name, "spe") == 0) {
                                 spu = devnode_spu(cbe, vic_dn);
-                                avoid_ph = last_spu_dn->linux_phandle;
+                                avoid_ph = last_spu_dn->phandle;
                         } else {
                                 /*
                                  * "mic-tm" and "bif0" nodes do not have
@@ -514,7 +514,7 @@ static void init_affinity_node(int cbe)
                                         last_spu->has_mem_affinity = 1;
                                         spu->has_mem_affinity = 1;
                                 }
-                                avoid_ph = vic_dn->linux_phandle;
+                                avoid_ph = vic_dn->phandle;
                         }
 
                         list_add_tail(&spu->aff_list, &last_spu->aff_list);