8 files changed, 31 insertions, 21 deletions

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,"
-                                    "this will Oops if a driver attaches;"
+                                printk("PCIC: Skipping I/O space at 0x%lx, "
+                                    "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
-# Wed Oct 31 15:36:47 2007
+# Linux kernel version: 2.6.24-rc4
+# 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,"
-               "maxerr %lu cycles)\n", smp_processor_id(), delta, rt);
+        printk(KERN_INFO "CPU %d: synchronized TICK with master CPU "
+               "(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