Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  math-emu: correct test for downshifting fraction in _FP_FROM_INT()
  perf: Add DWARF register lookup for sparc
  MAINTAINERS: Add SBUS driver path to sparc entry.
  drivers/sbus: Remove unnecessary casts of private_data
  sparc: remove homegrown L1_CACHE_ALIGN macro
  sparc64: fix the build error due to smp_kgdb_capture_client()
  sparc64: Fix maybe_change_configuration() PCR setting.
  arch/sparc/kernel: Eliminate what looks like a NULL pointer dereference
  sparc64: Update defconfig.
  sunsu: Fix use after free in su_remove().
  sunserial: Don't call add_preferred_console() when console= is specified.
  sparc32: Kill none_mask, it's bogus.

2 files changed, 12 insertions, 5 deletions

diff --git a/drivers/serial/suncore.c b/drivers/serial/suncore.c
index ed7d958b0a01..544f2e25d0e5 100644
--- a/drivers/serial/suncore.c
+++ b/drivers/serial/suncore.c
@@ -71,7 +71,9 @@ int sunserial_console_match(struct console *con, struct device_node *dp,
 
         con->index = line;
         drv->cons = con;
-        add_preferred_console(con->name, line, NULL);
+
+        if (!console_set_on_cmdline)
+                add_preferred_console(con->name, line, NULL);
 
         return 1;
 }
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index 234459c2f012..ffbf4553f665 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -1500,20 +1500,25 @@ out_unmap:
 static int __devexit su_remove(struct of_device *op)
 {
         struct uart_sunsu_port *up = dev_get_drvdata(&op->dev);
+        bool kbdms = false;
 
         if (up->su_type == SU_PORT_MS ||
-            up->su_type == SU_PORT_KBD) {
+            up->su_type == SU_PORT_KBD)
+                kbdms = true;
+
+        if (kbdms) {
 #ifdef CONFIG_SERIO
                 serio_unregister_port(&up->serio);
 #endif
-                kfree(up);
-        } else if (up->port.type != PORT_UNKNOWN) {
+        } else if (up->port.type != PORT_UNKNOWN)
                 uart_remove_one_port(&sunsu_reg, &up->port);
-        }
 
         if (up->port.membase)
                 of_iounmap(&op->resource[0], up->port.membase, up->reg_size);
 
+        if (kbdms)
+                kfree(up);
+
         dev_set_drvdata(&op->dev, NULL);
 
         return 0;