3 files changed, 12 insertions, 28 deletions

diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c
index e60d283f60bc..6b6165d36fd8 100644
--- a/arch/sparc64/kernel/irq.c
+++ b/arch/sparc64/kernel/irq.c
@@ -329,6 +329,10 @@ static void sun4v_irq_enable(unsigned int virt_irq)
                 if (err != HV_EOK)
                         printk("sun4v_intr_settarget(%x,%lu): err(%d)\n",
                                ino, cpuid, err);
+                err = sun4v_intr_setstate(ino, HV_INTR_STATE_IDLE);
+                if (err != HV_EOK)
+                        printk("sun4v_intr_setstate(%x): "
+                               "err(%d)\n", ino, err);
                 err = sun4v_intr_setenabled(ino, HV_INTR_ENABLED);
                 if (err != HV_EOK)
                         printk("sun4v_intr_setenabled(%x): err(%d)\n",
@@ -400,6 +404,12 @@ static void sun4v_virq_enable(unsigned int virt_irq)
                                "err(%d)\n",
                                dev_handle, dev_ino, cpuid, err);
                 err = sun4v_vintr_set_state(dev_handle, dev_ino,
+                                            HV_INTR_STATE_IDLE);
+                if (err != HV_EOK)
+                        printk("sun4v_vintr_set_state(%lx,%lx,"
+                                "HV_INTR_STATE_IDLE): err(%d)\n",
+                               dev_handle, dev_ino, err);
+                err = sun4v_vintr_set_valid(dev_handle, dev_ino,
                                             HV_INTR_ENABLED);
                 if (err != HV_EOK)
                         printk("sun4v_vintr_set_state(%lx,%lx,"
@@ -420,7 +430,7 @@ static void sun4v_virq_disable(unsigned int virt_irq)
                 dev_handle = ino & IMAP_IGN;
                 dev_ino = ino & IMAP_INO;
 
-                err = sun4v_vintr_set_state(dev_handle, dev_ino,
+                err = sun4v_vintr_set_valid(dev_handle, dev_ino,
                                             HV_INTR_DISABLED);
                 if (err != HV_EOK)
                         printk("sun4v_vintr_set_state(%lx,%lx,"
diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
index 81f4a5ea05f7..55ad1b899bb8 100644
--- a/arch/sparc64/kernel/pci.c
+++ b/arch/sparc64/kernel/pci.c
@@ -448,6 +448,7 @@ struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,
                  */
                 pci_read_config_dword(dev, PCI_CLASS_REVISION, &class);
                 dev->class = class >> 8;
+                dev->revision = class & 0xff;
 
                 sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(bus),
                         dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn));
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index 4dcd7d0b60f2..40e40f968d61 100644
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -1163,32 +1163,6 @@ int setup_profiling_timer(unsigned int multiplier)
         return -EINVAL;
 }
 
-static void __init smp_tune_scheduling(void)
-{
-        unsigned int smallest = ~0U;
-        int i;
-
-        for (i = 0; i < NR_CPUS; i++) {
-                unsigned int val = cpu_data(i).ecache_size;
-
-                if (val && val < smallest)
-                        smallest = val;
-        }
-
-        /* Any value less than 256K is nonsense.  */
-        if (smallest < (256U * 1024U))
-                smallest = 256 * 1024;
-
-        max_cache_size = smallest;
-
-        if (smallest < 1U * 1024U * 1024U)
-                printk(KERN_INFO "Using max_cache_size of %uKB\n",
-                       smallest / 1024U);
-        else
-                printk(KERN_INFO "Using max_cache_size of %uMB\n",
-                       smallest / 1024U / 1024U);
-}
-
 /* Constrain the number of cpus to max_cpus.  */
 void __init smp_prepare_cpus(unsigned int max_cpus)
 {
@@ -1206,7 +1180,6 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
         }
 
         cpu_data(boot_cpu_id).udelay_val = loops_per_jiffy;
-        smp_tune_scheduling();
 }
 
 void __devinit smp_prepare_boot_cpu(void)