5 files changed, 8 insertions, 11 deletions

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index f7c51b869049..6537445dac0e 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -21,10 +21,6 @@ config GENERIC_ISA_DMA
         bool
         default y
 
-config GENERIC_IOMAP
-        bool
-        default y
-
 source "init/Kconfig"
 
 menu "General machine setup"
diff --git a/arch/sparc/defconfig b/arch/sparc/defconfig
index 8a3aef1e22f5..a69856263009 100644
--- a/arch/sparc/defconfig
+++ b/arch/sparc/defconfig
@@ -5,7 +5,6 @@ CONFIG_MMU=y
 CONFIG_UID16=y
 CONFIG_HIGHMEM=y
 CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_IOMAP=y
 
 #
 # Code maturity level options
diff --git a/arch/sparc64/kernel/head.S b/arch/sparc64/kernel/head.S
index f1dcdf8f7433..4c942f71184d 100644
--- a/arch/sparc64/kernel/head.S
+++ b/arch/sparc64/kernel/head.S
@@ -191,8 +191,9 @@ prom_boot_mapping_phys_low:
         stx     %l3, [%sp + 2047 + 128 + 0x10]  ! num_rets, 5
         stx     %l2, [%sp + 2047 + 128 + 0x18]  ! arg1: "translate"
         stx     %l5, [%sp + 2047 + 128 + 0x20]  ! arg2: prom_mmu_ihandle_cache
-        srlx    %l0, 22, %l3
-        sllx    %l3, 22, %l3
+        /* PAGE align */
+        srlx    %l0, 13, %l3
+        sllx    %l3, 13, %l3
         stx     %l3, [%sp + 2047 + 128 + 0x28]  ! arg3: vaddr, our PC
         stx     %g0, [%sp + 2047 + 128 + 0x30]  ! res1
         stx     %g0, [%sp + 2047 + 128 + 0x38]  ! res2
@@ -211,6 +212,9 @@ prom_boot_mapping_phys_low:
         ldx     [%sp + 2047 + 128 + 0x48], %l2  ! physaddr high
         stx     %l2, [%l4 + 0x0]
         ldx     [%sp + 2047 + 128 + 0x50], %l3  ! physaddr low
+        /* 4MB align */
+        srlx    %l3, 22, %l3
+        sllx    %l3, 22, %l3
         stx     %l3, [%l4 + 0x8]
 
         /* Leave service as-is, "call-method" */
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c
index e971156daa60..ba9381fd3f2d 100644
--- a/drivers/serial/sunsab.c
+++ b/drivers/serial/sunsab.c
@@ -274,7 +274,6 @@ static void transmit_chars(struct uart_sunsab_port *up,
         if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) {
                 up->interrupt_mask1 |= SAB82532_IMR1_XPR;
                 writeb(up->interrupt_mask1, &up->regs->w.imr1);
-                uart_write_wakeup(&up->port);
                 return;
         }
 
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index d75445738c88..7653d6cf05af 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -517,10 +517,9 @@ static void sunzilog_transmit_chars(struct uart_sunzilog_port *up,
         if (up->port.info == NULL)
                 goto ack_tx_int;
         xmit = &up->port.info->xmit;
-        if (uart_circ_empty(xmit)) {
-                uart_write_wakeup(&up->port);
+        if (uart_circ_empty(xmit))
                 goto ack_tx_int;
-        }
+
         if (uart_tx_stopped(&up->port))
                 goto ack_tx_int;