Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

16 files changed, 118 insertions, 37 deletions

diff --git a/arch/ia64/hp/sim/hpsim_console.c b/arch/ia64/hp/sim/hpsim_console.c
index 6e149c8ab83..01663bc42b1 100644
--- a/arch/ia64/hp/sim/hpsim_console.c
+++ b/arch/ia64/hp/sim/hpsim_console.c
@@ -21,6 +21,7 @@
 #include <asm/machvec.h>
 #include <asm/pgtable.h>
 #include <asm/sal.h>
+#include <asm/hpsim.h>
 
 #include "hpsim_ssc.h"
 
@@ -28,7 +29,7 @@ static int simcons_init (struct console *, char *);
 static void simcons_write (struct console *, const char *, unsigned);
 static struct tty_driver *simcons_console_device (struct console *, int *);
 
-struct console hpsim_cons = {
+static struct console hpsim_cons = {
         .name =         "simcons",
         .write =        simcons_write,
         .device =       simcons_console_device,
@@ -58,7 +59,18 @@ simcons_write (struct console *cons, const char *buf, unsigned count)
 
 static struct tty_driver *simcons_console_device (struct console *c, int *index)
 {
-        extern struct tty_driver *hp_simserial_driver;
         *index = c->index;
         return hp_simserial_driver;
 }
+
+int simcons_register(void)
+{
+        if (!ia64_platform_is("hpsim"))
+                return 1;
+
+        if (hpsim_cons.flags & CON_ENABLED)
+                return 1;
+
+        register_console(&hpsim_cons);
+        return 0;
+}
diff --git a/arch/ia64/hp/sim/hpsim_setup.c b/arch/ia64/hp/sim/hpsim_setup.c
index f2297192a58..f629e903ebc 100644
--- a/arch/ia64/hp/sim/hpsim_setup.c
+++ b/arch/ia64/hp/sim/hpsim_setup.c
@@ -21,6 +21,7 @@
 #include <asm/machvec.h>
 #include <asm/pgtable.h>
 #include <asm/sal.h>
+#include <asm/hpsim.h>
 
 #include "hpsim_ssc.h"
 
@@ -41,11 +42,5 @@ hpsim_setup (char **cmdline_p)
 {
         ROOT_DEV = Root_SDA1;           /* default to first SCSI drive */
 
-#ifdef CONFIG_HP_SIMSERIAL_CONSOLE
-        {
-                extern struct console hpsim_cons;
-                if (ia64_platform_is("hpsim"))
-                        register_console(&hpsim_cons);
-        }
-#endif
+        simcons_register();
 }
diff --git a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c
index f26077a773d..4017696ada6 100644
--- a/arch/ia64/hp/sim/simeth.c
+++ b/arch/ia64/hp/sim/simeth.c
@@ -22,6 +22,9 @@
 #include <linux/bitops.h>
 #include <asm/system.h>
 #include <asm/irq.h>
+#include <asm/hpsim.h>
+
+#include "hpsim_ssc.h"
 
 #define SIMETH_RECV_MAX 10
 
@@ -35,12 +38,6 @@
 #define SIMETH_FRAME_SIZE       ETH_FRAME_LEN
 
 
-#define SSC_NETDEV_PROBE                100
-#define SSC_NETDEV_SEND                 101
-#define SSC_NETDEV_RECV                 102
-#define SSC_NETDEV_ATTACH               103
-#define SSC_NETDEV_DETACH               104
-
 #define NETWORK_INTR                    8
 
 struct simeth_local {
@@ -124,9 +121,6 @@ simeth_probe (void)
         return r;
 }
 
-extern long ia64_ssc (long, long, long, long, int);
-extern void ia64_ssc_connect_irq (long intr, long irq);
-
 static inline int
 netdev_probe(char *name, unsigned char *ether)
 {
diff --git a/arch/ia64/hp/sim/simscsi.c b/arch/ia64/hp/sim/simscsi.c
index e62694f8ef7..4552a1cf5b3 100644
--- a/arch/ia64/hp/sim/simscsi.c
+++ b/arch/ia64/hp/sim/simscsi.c
@@ -14,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/timer.h>
 #include <asm/irq.h>
+#include "hpsim_ssc.h"
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
@@ -59,8 +60,6 @@ struct disk_stat {
         unsigned count;
 };
 
-extern long ia64_ssc (long arg0, long arg1, long arg2, long arg3, int nr);
-
 static int desc[16] = {
         -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
 };
diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c
index c47c8acc96e..00a4599e5f4 100644
--- a/arch/ia64/kernel/irq_ia64.c
+++ b/arch/ia64/kernel/irq_ia64.c
@@ -82,7 +82,7 @@ struct irq_cfg irq_cfg[NR_IRQS] __read_mostly = {
 };
 
 DEFINE_PER_CPU(int[IA64_NUM_VECTORS], vector_irq) = {
-        [0 ... IA64_NUM_VECTORS - 1] = IA64_SPURIOUS_INT_VECTOR
+        [0 ... IA64_NUM_VECTORS - 1] = -1
 };
 
 static cpumask_t vector_table[IA64_NUM_VECTORS] = {
@@ -179,7 +179,7 @@ static void __clear_irq_vector(int irq)
         domain = cfg->domain;
         cpus_and(mask, cfg->domain, cpu_online_map);
         for_each_cpu_mask(cpu, mask)
-                per_cpu(vector_irq, cpu)[vector] = IA64_SPURIOUS_INT_VECTOR;
+                per_cpu(vector_irq, cpu)[vector] = -1;
         cfg->vector = IRQ_VECTOR_UNASSIGNED;
         cfg->domain = CPU_MASK_NONE;
         irq_status[irq] = IRQ_UNUSED;
@@ -249,7 +249,7 @@ void __setup_vector_irq(int cpu)
 
         /* Clear vector_irq */
         for (vector = 0; vector < IA64_NUM_VECTORS; ++vector)
-                per_cpu(vector_irq, cpu)[vector] = IA64_SPURIOUS_INT_VECTOR;
+                per_cpu(vector_irq, cpu)[vector] = -1;
         /* Mark the inuse vectors */
         for (irq = 0; irq < NR_IRQS; ++irq) {
                 if (!cpu_isset(cpu, irq_cfg[irq].domain))
@@ -432,10 +432,18 @@ ia64_handle_irq (ia64_vector vector, struct pt_regs *regs)
                 } else if (unlikely(IS_RESCHEDULE(vector)))
                         kstat_this_cpu.irqs[vector]++;
                 else {
+                        int irq = local_vector_to_irq(vector);
+
                         ia64_setreg(_IA64_REG_CR_TPR, vector);
                         ia64_srlz_d();
 
-                        generic_handle_irq(local_vector_to_irq(vector));
+                        if (unlikely(irq < 0)) {
+                                printk(KERN_ERR "%s: Unexpected interrupt "
+                                       "vector %d on CPU %d is not mapped "
+                                       "to any IRQ!\n", __FUNCTION__, vector,
+                                       smp_processor_id());
+                        } else
+                                generic_handle_irq(irq);
 
                         /*
                          * Disable interrupts and send EOI:
@@ -483,6 +491,7 @@ void ia64_process_pending_intr(void)
                         kstat_this_cpu.irqs[vector]++;
                 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();
@@ -493,8 +502,15 @@ void ia64_process_pending_intr(void)
                          * it will work. I hope it works!.
                          * Probably could shared code.
                          */
-                        vectors_in_migration[local_vector_to_irq(vector)]=0;
-                        generic_handle_irq(local_vector_to_irq(vector));
+                        if (unlikely(irq < 0)) {
+                                printk(KERN_ERR "%s: Unexpected interrupt "
+                                       "vector %d on CPU %d not being mapped "
+                                       "to any IRQ!!\n", __FUNCTION__, vector,
+                                       smp_processor_id());
+                        } else {
+                                vectors_in_migration[irq]=0;
+                                generic_handle_irq(irq);
+                        }
                         set_irq_regs(old_regs);
 
                         /*
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 407efea04bf..9e392a30d19 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -60,6 +60,7 @@
 #include <asm/smp.h>
 #include <asm/system.h>
 #include <asm/unistd.h>
+#include <asm/hpsim.h>
 
 #if defined(CONFIG_SMP) && (IA64_CPU_SIZE > PAGE_SIZE)
 # error "struct cpuinfo_ia64 too big!"
@@ -389,13 +390,8 @@ early_console_setup (char *cmdline)
         if (!efi_setup_pcdp_console(cmdline))
                 earlycons++;
 #endif
-#ifdef CONFIG_HP_SIMSERIAL_CONSOLE
-        {
-                extern struct console hpsim_cons;
-                register_console(&hpsim_cons);
+        if (!simcons_register())
                 earlycons++;
-        }
-#endif
 
         return (earlycons) ? 0 : -1;
 }
@@ -960,6 +956,11 @@ cpu_init (void)
 
         /* clear TPR & XTP to enable all interrupt classes: */
         ia64_setreg(_IA64_REG_CR_TPR, 0);
+
+        /* Clear any pending interrupts left by SAL/EFI */
+        while (ia64_get_ivr() != IA64_SPURIOUS_INT_VECTOR)
+                ia64_eoi();
+
 #ifdef CONFIG_SMP
         normal_xtp();
 #endif
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index 62209dcf06d..308772f7cdd 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -58,6 +58,7 @@
 #include <asm/system.h>
 #include <asm/tlbflush.h>
 #include <asm/unistd.h>
+#include <asm/sn/arch.h>
 
 #define SMP_DEBUG 0
 
@@ -730,6 +731,11 @@ int __cpu_disable(void)
                 return (-EBUSY);
         }
 
+        if (ia64_platform_is("sn2")) {
+                if (!sn_cpu_disable_allowed(cpu))
+                        return -EBUSY;
+        }
+
         cpu_clear(cpu, cpu_online_map);
 
         if (migrate_platform_irqs(cpu)) {
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index 7ac8592a35b..d3c538be466 100644
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -17,6 +17,7 @@
 #include <linux/bootmem.h>
 #include <linux/efi.h>
 #include <linux/mm.h>
+#include <linux/nmi.h>
 #include <linux/swap.h>
 
 #include <asm/meminit.h>
@@ -56,6 +57,8 @@ void show_mem(void)
                 present = pgdat->node_present_pages;
                 for(i = 0; i < pgdat->node_spanned_pages; i++) {
                         struct page *page;
+                        if (unlikely(i % MAX_ORDER_NR_PAGES == 0))
+                                touch_nmi_watchdog();
                         if (pfn_valid(pgdat->node_start_pfn + i))
                                 page = pfn_to_page(pgdat->node_start_pfn + i);
                         else {
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index 0dbf0e81f8c..0d34585058c 100644
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -16,6 +16,7 @@
 
 #include <linux/kernel.h>
 #include <linux/mm.h>
+#include <linux/nmi.h>
 #include <linux/swap.h>
 #include <linux/bootmem.h>
 #include <linux/acpi.h>
@@ -533,6 +534,8 @@ void show_mem(void)
                 present = pgdat->node_present_pages;
                 for(i = 0; i < pgdat->node_spanned_pages; i++) {
                         struct page *page;
+                        if (unlikely(i % MAX_ORDER_NR_PAGES == 0))
+                                touch_nmi_watchdog();
                         if (pfn_valid(pgdat->node_start_pfn + i))
                                 page = pfn_to_page(pgdat->node_start_pfn + i);
                         else {
diff --git a/arch/ia64/sn/kernel/huberror.c b/arch/ia64/sn/kernel/huberror.c
index 2c3f9dfca78..b663168da55 100644
--- a/arch/ia64/sn/kernel/huberror.c
+++ b/arch/ia64/sn/kernel/huberror.c
@@ -185,11 +185,14 @@ void hubiio_crb_error_handler(struct hubdev_info *hubdev_info)
  */
 void hub_error_init(struct hubdev_info *hubdev_info)
 {
+
         if (request_irq(SGI_II_ERROR, hub_eint_handler, IRQF_SHARED,
-                        "SN_hub_error", (void *)hubdev_info))
+                        "SN_hub_error", (void *)hubdev_info)) {
                 printk("hub_error_init: Failed to request_irq for 0x%p\n",
                     hubdev_info);
-        return;
+                return;
+        }
+        sn_set_err_irq_affinity(SGI_II_ERROR);
 }
 
 
@@ -202,11 +205,14 @@ void hub_error_init(struct hubdev_info *hubdev_info)
  */
 void ice_error_init(struct hubdev_info *hubdev_info)
 {
+
         if (request_irq
             (SGI_TIO_ERROR, (void *)hub_eint_handler, IRQF_SHARED, "SN_TIO_error",
-             (void *)hubdev_info))
+             (void *)hubdev_info)) {
                 printk("ice_error_init: request_irq() error hubdev_info 0x%p\n",
                        hubdev_info);
-        return;
+                return;
+        }
+        sn_set_err_irq_affinity(SGI_TIO_ERROR);
 }
 
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c
index 36004738944..0f9b12683bf 100644
--- a/arch/ia64/sn/kernel/irq.c
+++ b/arch/ia64/sn/kernel/irq.c
@@ -19,6 +19,7 @@
 #include <asm/sn/pcidev.h>
 #include <asm/sn/shub_mmr.h>
 #include <asm/sn/sn_sal.h>
+#include <asm/sn/sn_feature_sets.h>
 
 static void force_interrupt(int irq);
 static void register_intr_pda(struct sn_irq_info *sn_irq_info);
@@ -233,6 +234,20 @@ static void sn_set_affinity_irq(unsigned int irq, cpumask_t mask)
                 (void)sn_retarget_vector(sn_irq_info, nasid, slice);
 }
 
+#ifdef CONFIG_SMP
+void sn_set_err_irq_affinity(unsigned int irq)
+{
+        /*
+         * On systems which support CPU disabling (SHub2), all error interrupts
+         * are targetted at the boot CPU.
+         */
+        if (is_shub2() && sn_prom_feature_available(PRF_CPU_DISABLE_SUPPORT))
+                set_irq_affinity_info(irq, cpu_physical_id(0), 0);
+}
+#else
+void sn_set_err_irq_affinity(unsigned int irq) { }
+#endif
+
 static void
 sn_mask_irq(unsigned int irq)
 {
diff --git a/arch/ia64/sn/kernel/sn2/sn2_smp.c b/arch/ia64/sn/kernel/sn2/sn2_smp.c
index 033c8a9f000..f3c69329e14 100644
--- a/arch/ia64/sn/kernel/sn2/sn2_smp.c
+++ b/arch/ia64/sn/kernel/sn2/sn2_smp.c
@@ -40,6 +40,7 @@
 #include <asm/sn/shub_mmr.h>
 #include <asm/sn/nodepda.h>
 #include <asm/sn/rw_mmr.h>
+#include <asm/sn/sn_feature_sets.h>
 
 DEFINE_PER_CPU(struct ptc_stats, ptcstats);
 DECLARE_PER_CPU(struct ptc_stats, ptcstats);
@@ -429,6 +430,31 @@ void sn2_send_IPI(int cpuid, int vector, int delivery_mode, int redirect)
         sn_send_IPI_phys(nasid, physid, vector, delivery_mode);
 }
 
+#ifdef CONFIG_HOTPLUG_CPU
+/**
+ * sn_cpu_disable_allowed - Determine if a CPU can be disabled.
+ * @cpu - CPU that is requested to be disabled.
+ *
+ * CPU disable is only allowed on SHub2 systems running with a PROM
+ * that supports CPU disable. It is not permitted to disable the boot processor.
+ */
+bool sn_cpu_disable_allowed(int cpu)
+{
+        if (is_shub2() && sn_prom_feature_available(PRF_CPU_DISABLE_SUPPORT)) {
+                if (cpu != 0)
+                        return true;
+                else
+                        printk(KERN_WARNING
+                              "Disabling the boot processor is not allowed.\n");
+
+        } else
+                printk(KERN_WARNING
+                       "CPU disable is not supported on this system.\n");
+
+        return false;
+}
+#endif /* CONFIG_HOTPLUG_CPU */
+
 #ifdef CONFIG_PROC_FS
 
 #define PTC_BASENAME    "sgi_sn/ptc_statistics"
diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
index df8d5bed611..1a8e49607f1 100644
--- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c
+++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
@@ -66,7 +66,8 @@ static int sn_hwperf_enum_objects(int *nobj, struct sn_hwperf_object_info **ret)
         }
 
         sz = sn_hwperf_obj_cnt * sizeof(struct sn_hwperf_object_info);
-        if ((objbuf = (struct sn_hwperf_object_info *) vmalloc(sz)) == NULL) {
+        objbuf = vmalloc(sz);
+        if (objbuf == NULL) {
                 printk("sn_hwperf_enum_objects: vmalloc(%d) failed\n", (int)sz);
                 e = -ENOMEM;
                 goto out;
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_provider.c b/arch/ia64/sn/pci/pcibr/pcibr_provider.c
index 42485ad50ce..ab3eaf85fe4 100644
--- a/arch/ia64/sn/pci/pcibr/pcibr_provider.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_provider.c
@@ -145,6 +145,7 @@ pcibr_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
                 printk(KERN_WARNING
                        "pcibr cannot allocate interrupt for error handler\n");
         }
+        sn_set_err_irq_affinity(SGI_PCIASIC_ERROR);
 
         /* 
          * Update the Bridge with the "kernel" pagesize 
diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c
index d798dd4d0dc..ef048a67477 100644
--- a/arch/ia64/sn/pci/tioca_provider.c
+++ b/arch/ia64/sn/pci/tioca_provider.c
@@ -654,6 +654,8 @@ tioca_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
                        __FUNCTION__, SGI_TIOCA_ERROR,
                        (int)tioca_common->ca_common.bs_persist_busnum);
 
+        sn_set_err_irq_affinity(SGI_TIOCA_ERROR);
+
         /* Setup locality information */
         controller->node = tioca_kern->ca_closest_node;
         return tioca_common;
diff --git a/arch/ia64/sn/pci/tioce_provider.c b/arch/ia64/sn/pci/tioce_provider.c
index 84b72b27e27..cee9379d44e 100644
--- a/arch/ia64/sn/pci/tioce_provider.c
+++ b/arch/ia64/sn/pci/tioce_provider.c
@@ -1034,6 +1034,7 @@ tioce_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
                        tioce_common->ce_pcibus.bs_persist_segment,
                        tioce_common->ce_pcibus.bs_persist_busnum);
 
+        sn_set_err_irq_affinity(SGI_PCIASIC_ERROR);
         return tioce_common;
 }