21 files changed, 103 insertions, 49 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 455bd1f560aa..c6fc405a6c8e 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -714,6 +714,10 @@ config ARCH_HAS_ILOG2_U64
        bool
        default n
+config ARCH_SUPPORTS_OPROFILE
+        bool
+        default y if !MIPS_MT_SMTC
 config GENERIC_FIND_NEXT_BIT
        bool
        default y
diff --git a/arch/mips/au1000/common/dbdma.c b/arch/mips/au1000/common/dbdma.c
index 9d6ad43fded6..edf91f41a786 100644
--- a/arch/mips/au1000/common/dbdma.c
+++ b/arch/mips/au1000/common/dbdma.c
@@ -859,7 +859,7 @@ dbdma_interrupt(int irq, void *dev_id)
        intstat = dbdma_gptr->ddma_intstat;
        au_sync();
-        chan_index = ffs(intstat);
+        chan_index = __ffs(intstat);
        ctp = chan_tab_ptr[chan_index];
        cp = ctp->chan_ptr;
diff --git a/arch/mips/au1000/common/irq.c b/arch/mips/au1000/common/irq.c
index ddfb7f0a17a6..3c7714f057ac 100644
--- a/arch/mips/au1000/common/irq.c
+++ b/arch/mips/au1000/common/irq.c
@@ -462,9 +462,9 @@ static void intc0_req0_irqdispatch(void)
                return;
        }
 #endif
-        bit = ffs(intc0_req0);
+        bit = __ffs(intc0_req0);
        intc0_req0 &= ~(1 << bit);
-        do_IRQ(MIPS_CPU_IRQ_BASE + bit);
+        do_IRQ(AU1000_INTC0_INT_BASE + bit);
 }
@@ -478,9 +478,9 @@ static void intc0_req1_irqdispatch(void)
        if (!intc0_req1)
                return;
-        bit = ffs(intc0_req1);
+        bit = __ffs(intc0_req1);
        intc0_req1 &= ~(1 << bit);
-        do_IRQ(bit);
+        do_IRQ(AU1000_INTC0_INT_BASE + bit);
 }
@@ -498,9 +498,9 @@ static void intc1_req0_irqdispatch(void)
        if (!intc1_req0)
                return;
-        bit = ffs(intc1_req0);
+        bit = __ffs(intc1_req0);
        intc1_req0 &= ~(1 << bit);
-        do_IRQ(MIPS_CPU_IRQ_BASE + 32 + bit);
+        do_IRQ(AU1000_INTC1_INT_BASE + bit);
 }
@@ -514,9 +514,9 @@ static void intc1_req1_irqdispatch(void)
        if (!intc1_req1)
                return;
-        bit = ffs(intc1_req1);
+        bit = __ffs(intc1_req1);
        intc1_req1 &= ~(1 << bit);
-        do_IRQ(MIPS_CPU_IRQ_BASE + 32 + bit);
+        do_IRQ(AU1000_INTC1_INT_BASE + bit);
 }
 asmlinkage void plat_irq_dispatch(void)
diff --git a/arch/mips/au1000/pb1200/irqmap.c b/arch/mips/au1000/pb1200/irqmap.c
index c096be4ed4e7..8fcd0df86f93 100644
--- a/arch/mips/au1000/pb1200/irqmap.c
+++ b/arch/mips/au1000/pb1200/irqmap.c
@@ -74,7 +74,7 @@ irqreturn_t pb1200_cascade_handler( int irq, void *dev_id)
        bcsr->int_status = bisr;
        for( ; bisr; bisr &= (bisr-1) )
        {
-                extirq_nr = PB1200_INT_BEGIN + ffs(bisr);
+                extirq_nr = PB1200_INT_BEGIN + __ffs(bisr);
                /* Ack and dispatch IRQ */
                do_IRQ(extirq_nr);
        }
diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c
index 423bc2c473df..bdfa07aecd97 100644
--- a/arch/mips/oprofile/op_model_mipsxx.c
+++ b/arch/mips/oprofile/op_model_mipsxx.c
@@ -6,6 +6,7 @@
 * Copyright (C) 2004, 05, 06 by Ralf Baechle
 * Copyright (C) 2005 by MIPS Technologies, Inc.
 */
+#include <linux/cpumask.h>
 #include <linux/oprofile.h>
 #include <linux/interrupt.h>
 #include <linux/smp.h>
@@ -33,11 +34,45 @@
 #ifdef CONFIG_MIPS_MT_SMP
 #define WHAT            (M_TC_EN_VPE | M_PERFCTL_VPEID(smp_processor_id()))
 #define vpe_id()        smp_processor_id()
+/*
+ * The number of bits to shift to convert between counters per core and
+ * counters per VPE.  There is no reasonable interface atm to obtain the
+ * number of VPEs used by Linux and in the 34K this number is fixed to two
+ * anyways so we hardcore a few things here for the moment.  The way it's
+ * done here will ensure that oprofile VSMP kernel will run right on a lesser
+ * core like a 24K also or with maxcpus=1.
+ */
+static inline unsigned int vpe_shift(void)
+{
+        if (num_possible_cpus() > 1)
+                return 1;
+        return 0;
+}
 #else
 #define WHAT            0
 #define vpe_id()        0
+static inline unsigned int vpe_shift(void)
+{
+        return 0;
+}
 #endif
+static inline unsigned int counters_total_to_per_cpu(unsigned int counters)
+{
+        return counters >> vpe_shift();
+}
+static inline unsigned int counters_per_cpu_to_total(unsigned int counters)
+{
+        return counters << vpe_shift();
+}
 #define __define_perf_accessors(r, n, np)                               \
                                                                        \
 static inline unsigned int r_c0_ ## r ## n(void)                        \
@@ -269,9 +304,7 @@ static int __init mipsxx_init(void)
        reset_counters(counters);
-#ifdef CONFIG_MIPS_MT_SMP
+        counters = counters_total_to_per_cpu(counters);
-        counters >>= 1;
-#endif
        op_model_mipsxx_ops.num_counters = counters;
        switch (current_cpu_type()) {
@@ -330,9 +363,8 @@ static int __init mipsxx_init(void)
 static void mipsxx_exit(void)
 {
        int counters = op_model_mipsxx_ops.num_counters;
-#ifdef CONFIG_MIPS_MT_SMP
-        counters <<= 1;
+        counters = counters_per_cpu_to_total(counters);
-#endif
        reset_counters(counters);
        perf_irq = null_perf_irq;
diff --git a/arch/mips/pci/pci-bcm1480.c b/arch/mips/pci/pci-bcm1480.c
index bc647cb77298..47f316c86ab1 100644
--- a/arch/mips/pci/pci-bcm1480.c
+++ b/arch/mips/pci/pci-bcm1480.c
@@ -76,7 +76,10 @@ static inline void WRITECFG32(u32 addr, u32 data)
 int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
-        return K_BCM1480_INT_PCI_INTA + pin;
+        if (pin == 0)
+                return -1;
+        return K_BCM1480_INT_PCI_INTA - 1 + pin;
 }
 /* Do platform specific device initialization at pci_enable_device() time */
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S
index b2b2edc40eb1..1a6dac8df6fb 100644
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@ -1079,8 +1079,10 @@ cleanup_io_leave_insn:
 .Lexecve_tail:  .long   execve_tail
 .Ljump_table:   .long   pgm_check_table
 .Lschedule:     .long   schedule
+#ifdef CONFIG_PREEMPT
 .Lpreempt_schedule_irq:
                .long   preempt_schedule_irq
+#endif
 .Ltrace:        .long   syscall_trace
 .Lschedtail:    .long   schedule_tail
 .Lsysc_table:   .long   sys_call_table
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 50f8f1e3760e..577aa7dd660e 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -486,9 +486,7 @@ static void setup_addressing_mode(void)
        if (s390_noexec) {
                printk("S390 execute protection active, ");
                set_amode_and_uaccess(PSW_ASC_SECONDARY, PSW32_ASC_SECONDARY);
-                return;
+        } else if (switch_amode) {
-        }
-        if (switch_amode) {
                printk("S390 address spaces switched, ");
                set_amode_and_uaccess(PSW_ASC_PRIMARY, PSW32_ASC_PRIMARY);
        }
diff --git a/arch/sparc/kernel/devices.c b/arch/sparc/kernel/devices.c
index af90a5f9ab57..b240b8863fd0 100644
--- a/arch/sparc/kernel/devices.c
+++ b/arch/sparc/kernel/devices.c
@@ -62,8 +62,10 @@ static int __cpu_find_by(int (*compare)(int, int, void *), void *compare_arg,
                int err = check_cpu_node(dp->node, &cur_inst,
                                         compare, compare_arg,
                                         prom_node, mid);
-                if (!err)
+                if (!err) {
+                        of_node_put(dp);
                        return 0;
+                }
        }
        return -ENODEV;
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c
index f2d432edc92d..4cd5d7818dc6 100644
--- a/arch/sparc/kernel/pcic.c
+++ b/arch/sparc/kernel/pcic.c
@@ -329,7 +329,7 @@ int __init pcic_probe(void)
        pcic->pcic_res_cfg_addr.name = "pcic_cfg_addr";
        if ((pcic->pcic_config_space_addr =
            ioremap(regs[2].phys_addr, regs[2].reg_size * 2)) == 0) {
-                prom_printf("PCIC: Error, cannot map" 
+                prom_printf("PCIC: Error, cannot map "
                            "PCI Configuration Space Address.\n");
                prom_halt();
        }
@@ -341,7 +341,7 @@ int __init pcic_probe(void)
        pcic->pcic_res_cfg_data.name = "pcic_cfg_data";
        if ((pcic->pcic_config_space_data =
            ioremap(regs[3].phys_addr, regs[3].reg_size * 2)) == 0) {
-                prom_printf("PCIC: Error, cannot map" 
+                prom_printf("PCIC: Error, cannot map "
                            "PCI Configuration Space Data.\n");
                prom_halt();
        }
@@ -518,8 +518,8 @@ static void pcic_map_pci_device(struct linux_pcic *pcic,
                                 * board in a PCI slot. We must remap it
                                 * under 64K but it is not done yet. XXX
                                 */
-                                printk("PCIC: Skipping I/O space at 0x%lx,"
+                                printk("PCIC: Skipping I/O space at 0x%lx, "
-                                    "this will Oops if a driver attaches;"
+                                    "this will Oops if a driver attaches "
                                    "device '%s' at %02x:%02x)\n", address,
                                    namebuf, dev->bus->number, dev->devfn);
                        }
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index 22734ac08c8a..f62d9f6c5e2a 100644
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.24-rc1
+# Linux kernel version: 2.6.24-rc4
-# Wed Oct 31 15:36:47 2007
+# Tue Dec  4 00:37:59 2007
 #
 CONFIG_SPARC=y
 CONFIG_SPARC64=y
@@ -47,6 +47,7 @@ CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=18
@@ -154,6 +155,7 @@ CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_SYSCALL=y
 CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_PCI_MSI=y
+# CONFIG_PCI_LEGACY is not set
 # CONFIG_PCI_DEBUG is not set
 CONFIG_SUN_OPENPROMFS=m
 CONFIG_SPARC32_COMPAT=y
@@ -359,7 +361,6 @@ CONFIG_IDE_GENERIC=y
 CONFIG_BLK_DEV_IDEPCI=y
 # CONFIG_IDEPCI_SHARE_IRQ is not set
 CONFIG_IDEPCI_PCIBUS_ORDER=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
 # CONFIG_BLK_DEV_GENERIC is not set
 # CONFIG_BLK_DEV_OPTI621 is not set
 CONFIG_BLK_DEV_IDEDMA_PCI=y
@@ -584,7 +585,6 @@ CONFIG_NIU=m
 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET_MII is not set
 # CONFIG_USB_USBNET is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
@@ -780,6 +780,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_ADT7470 is not set
 # CONFIG_SENSORS_ATXP1 is not set
 # CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_I5K_AMB is not set
 # CONFIG_SENSORS_F71805F is not set
 # CONFIG_SENSORS_F71882FG is not set
 # CONFIG_SENSORS_F75375S is not set
diff --git a/arch/sparc64/kernel/isa.c b/arch/sparc64/kernel/isa.c
index 0f19dce1c905..b5f7b354084f 100644
--- a/arch/sparc64/kernel/isa.c
+++ b/arch/sparc64/kernel/isa.c
@@ -155,6 +155,7 @@ void __init isa_init(void)
                isa_br = kzalloc(sizeof(*isa_br), GFP_KERNEL);
                if (!isa_br) {
                        printk(KERN_DEBUG "isa: cannot allocate sparc_isa_bridge");
+                        pci_dev_put(pdev);
                        return;
                }
@@ -168,6 +169,7 @@ void __init isa_init(void)
                        printk(KERN_DEBUG "isa: device registration error for %s!\n",
                               dp->path_component_name);
                        kfree(isa_br);
+                        pci_dev_put(pdev);
                        return;
                }
diff --git a/arch/sparc64/kernel/ldc.c b/arch/sparc64/kernel/ldc.c
index 217478a94128..63969f610284 100644
--- a/arch/sparc64/kernel/ldc.c
+++ b/arch/sparc64/kernel/ldc.c
@@ -2338,6 +2338,7 @@ static int __init ldc_init(void)
        unsigned long major, minor;
        struct mdesc_handle *hp;
        const u64 *v;
+        int err;
        u64 mp;
        hp = mdesc_grab();
@@ -2345,29 +2346,33 @@ static int __init ldc_init(void)
                return -ENODEV;
        mp = mdesc_node_by_name(hp, MDESC_NODE_NULL, "platform");
+        err = -ENODEV;
        if (mp == MDESC_NODE_NULL)
-                return -ENODEV;
+                goto out;
        v = mdesc_get_property(hp, mp, "domaining-enabled", NULL);
        if (!v)
-                return -ENODEV;
+                goto out;
        major = 1;
        minor = 0;
        if (sun4v_hvapi_register(HV_GRP_LDOM, major, &minor)) {
                printk(KERN_INFO PFX "Could not register LDOM hvapi.\n");
-                return -ENODEV;
+                goto out;
        }
        printk(KERN_INFO "%s", version);
        if (!*v) {
                printk(KERN_INFO PFX "Domaining disabled.\n");
-                return -ENODEV;
+                goto out;
        }
        ldom_domaining_enabled = 1;
+        err = 0;
-        return 0;
+out:
+        mdesc_release(hp);
+        return err;
 }
 core_initcall(ldc_init);
diff --git a/arch/sparc64/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c
index 8c4875bdb4a8..e587a372f3fe 100644
--- a/arch/sparc64/kernel/pci_sun4v.c
+++ b/arch/sparc64/kernel/pci_sun4v.c
@@ -1022,6 +1022,10 @@ void __init sun4v_pci_init(struct device_node *dp, char *model_name)
        }
        prop = of_find_property(dp, "reg", NULL);
+        if (!prop) {
+                prom_printf("SUN4V_PCI: Could not find config registers\n");
+                prom_halt();
+        }
        regs = prop->value;
        devhandle = (regs->phys_addr >> 32UL) & 0x0fffffff;
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index 7cd8d94df0dc..894b506f9636 100644
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -236,8 +236,9 @@ void smp_synchronize_tick_client(void)
                       t[i].rt, t[i].master, t[i].diff, t[i].lat);
 #endif
-        printk(KERN_INFO "CPU %d: synchronized TICK with master CPU (last diff %ld cycles,"
+        printk(KERN_INFO "CPU %d: synchronized TICK with master CPU "
-               "maxerr %lu cycles)\n", smp_processor_id(), delta, rt);
+               "(last diff %ld cycles, maxerr %lu cycles)\n",
+               smp_processor_id(), delta, rt);
 }
 static void smp_start_sync_tick_client(int cpu);
diff --git a/arch/um/Makefile-i386 b/arch/um/Makefile-i386
index 67290117d909..561e373bd850 100644
--- a/arch/um/Makefile-i386
+++ b/arch/um/Makefile-i386
@@ -22,11 +22,6 @@ export LDFLAGS HOSTCFLAGS HOSTLDFLAGS UML_OBJCOPYFLAGS
 endif
 endif
-KBUILD_CFLAGS           += -DCONFIG_X86_32
-KBUILD_AFLAGS           += -DCONFIG_X86_32
-CONFIG_X86_32           := y
-export CONFIG_X86_32
 # First of all, tune CFLAGS for the specific CPU. This actually sets cflags-y.
 include $(srctree)/arch/x86/Makefile_32.cpu
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 368864dfe6eb..80b7ba4056db 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -112,8 +112,9 @@ config GENERIC_TIME_VSYSCALL
        bool
        default X86_64
+config ARCH_SUPPORTS_OPROFILE
+        bool
+        default y
 config ZONE_DMA32
@@ -148,7 +149,8 @@ config X86_SMP
 config X86_HT
        bool
-        depends on SMP && !(X86_VISWS || X86_VOYAGER || MK8)
+        depends on SMP
+        depends on (X86_32 && !(X86_VISWS || X86_VOYAGER)) || (X86_64 && !MK8)
        default y
 config X86_BIOS_REBOOT
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
index 9921b01fe199..606fe4d55a91 100644
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -497,7 +497,7 @@ static void __cpuinit cache_shared_cpu_map_setup(unsigned int cpu, int index) {}
 static void __cpuinit cache_remove_shared_cpu_map(unsigned int cpu, int index) {}
 #endif
-static void free_cache_attributes(unsigned int cpu)
+static void __cpuinit free_cache_attributes(unsigned int cpu)
 {
        int i;
diff --git a/arch/x86/kernel/nmi_32.c b/arch/x86/kernel/nmi_32.c
index f5cc47c60b13..80ca72e5ac29 100644
--- a/arch/x86/kernel/nmi_32.c
+++ b/arch/x86/kernel/nmi_32.c
@@ -106,7 +106,8 @@ static int __init check_nmi_watchdog(void)
                if (!per_cpu(wd_enabled, cpu))
                        continue;
                if (nmi_count(cpu) - prev_nmi_count[cpu] <= 5) {
-                        printk("CPU#%d: NMI appears to be stuck (%d->%d)!\n",
+                        printk(KERN_WARNING "WARNING: CPU#%d: NMI "
+                                "appears to be stuck (%d->%d)!\n",
                                cpu,
                                prev_nmi_count[cpu],
                                nmi_count(cpu));
diff --git a/arch/x86/kernel/nmi_64.c b/arch/x86/kernel/nmi_64.c
index a576fd740062..4253c4e8849c 100644
--- a/arch/x86/kernel/nmi_64.c
+++ b/arch/x86/kernel/nmi_64.c
@@ -109,7 +109,8 @@ int __init check_nmi_watchdog (void)
                if (!per_cpu(wd_enabled, cpu))
                        continue;
                if (cpu_pda(cpu)->__nmi_count - counts[cpu] <= 5) {
-                        printk("CPU#%d: NMI appears to be stuck (%d->%d)!\n",
+                        printk(KERN_WARNING "WARNING: CPU#%d: NMI "
+                               "appears to be stuck (%d->%d)!\n",
                               cpu,
                               counts[cpu],
                               cpu_pda(cpu)->__nmi_count);
diff --git a/arch/x86/kernel/topology.c b/arch/x86/kernel/topology.c
index 8caa0b777466..7e16d675eb85 100644
--- a/arch/x86/kernel/topology.c
+++ b/arch/x86/kernel/topology.c
@@ -33,7 +33,7 @@
 static struct i386_cpu cpu_devices[NR_CPUS];
-int arch_register_cpu(int num)
+int __cpuinit arch_register_cpu(int num)
 {
        /*
         * CPU0 cannot be offlined due to several
@@ -53,7 +53,8 @@ int arch_register_cpu(int num)
 }
 #ifdef CONFIG_HOTPLUG_CPU
-void arch_unregister_cpu(int num) {
+void arch_unregister_cpu(int num)
+{
        return unregister_cpu(&cpu_devices[num].cpu);
 }
 EXPORT_SYMBOL(arch_register_cpu);