mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 18:39:59 +00:00
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
This commit is contained in:
commit
da64c6ee6b
5 changed files with 8 additions and 11 deletions
|
@ -21,10 +21,6 @@ config GENERIC_ISA_DMA
|
||||||
bool
|
bool
|
||||||
default y
|
default y
|
||||||
|
|
||||||
config GENERIC_IOMAP
|
|
||||||
bool
|
|
||||||
default y
|
|
||||||
|
|
||||||
source "init/Kconfig"
|
source "init/Kconfig"
|
||||||
|
|
||||||
menu "General machine setup"
|
menu "General machine setup"
|
||||||
|
|
|
@ -5,7 +5,6 @@ CONFIG_MMU=y
|
||||||
CONFIG_UID16=y
|
CONFIG_UID16=y
|
||||||
CONFIG_HIGHMEM=y
|
CONFIG_HIGHMEM=y
|
||||||
CONFIG_GENERIC_ISA_DMA=y
|
CONFIG_GENERIC_ISA_DMA=y
|
||||||
CONFIG_GENERIC_IOMAP=y
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Code maturity level options
|
# Code maturity level options
|
||||||
|
|
|
@ -191,8 +191,9 @@ prom_boot_mapping_phys_low:
|
||||||
stx %l3, [%sp + 2047 + 128 + 0x10] ! num_rets, 5
|
stx %l3, [%sp + 2047 + 128 + 0x10] ! num_rets, 5
|
||||||
stx %l2, [%sp + 2047 + 128 + 0x18] ! arg1: "translate"
|
stx %l2, [%sp + 2047 + 128 + 0x18] ! arg1: "translate"
|
||||||
stx %l5, [%sp + 2047 + 128 + 0x20] ! arg2: prom_mmu_ihandle_cache
|
stx %l5, [%sp + 2047 + 128 + 0x20] ! arg2: prom_mmu_ihandle_cache
|
||||||
srlx %l0, 22, %l3
|
/* PAGE align */
|
||||||
sllx %l3, 22, %l3
|
srlx %l0, 13, %l3
|
||||||
|
sllx %l3, 13, %l3
|
||||||
stx %l3, [%sp + 2047 + 128 + 0x28] ! arg3: vaddr, our PC
|
stx %l3, [%sp + 2047 + 128 + 0x28] ! arg3: vaddr, our PC
|
||||||
stx %g0, [%sp + 2047 + 128 + 0x30] ! res1
|
stx %g0, [%sp + 2047 + 128 + 0x30] ! res1
|
||||||
stx %g0, [%sp + 2047 + 128 + 0x38] ! res2
|
stx %g0, [%sp + 2047 + 128 + 0x38] ! res2
|
||||||
|
@ -211,6 +212,9 @@ prom_boot_mapping_phys_low:
|
||||||
ldx [%sp + 2047 + 128 + 0x48], %l2 ! physaddr high
|
ldx [%sp + 2047 + 128 + 0x48], %l2 ! physaddr high
|
||||||
stx %l2, [%l4 + 0x0]
|
stx %l2, [%l4 + 0x0]
|
||||||
ldx [%sp + 2047 + 128 + 0x50], %l3 ! physaddr low
|
ldx [%sp + 2047 + 128 + 0x50], %l3 ! physaddr low
|
||||||
|
/* 4MB align */
|
||||||
|
srlx %l3, 22, %l3
|
||||||
|
sllx %l3, 22, %l3
|
||||||
stx %l3, [%l4 + 0x8]
|
stx %l3, [%l4 + 0x8]
|
||||||
|
|
||||||
/* Leave service as-is, "call-method" */
|
/* Leave service as-is, "call-method" */
|
||||||
|
|
|
@ -274,7 +274,6 @@ static void transmit_chars(struct uart_sunsab_port *up,
|
||||||
if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) {
|
if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) {
|
||||||
up->interrupt_mask1 |= SAB82532_IMR1_XPR;
|
up->interrupt_mask1 |= SAB82532_IMR1_XPR;
|
||||||
writeb(up->interrupt_mask1, &up->regs->w.imr1);
|
writeb(up->interrupt_mask1, &up->regs->w.imr1);
|
||||||
uart_write_wakeup(&up->port);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -517,10 +517,9 @@ static void sunzilog_transmit_chars(struct uart_sunzilog_port *up,
|
||||||
if (up->port.info == NULL)
|
if (up->port.info == NULL)
|
||||||
goto ack_tx_int;
|
goto ack_tx_int;
|
||||||
xmit = &up->port.info->xmit;
|
xmit = &up->port.info->xmit;
|
||||||
if (uart_circ_empty(xmit)) {
|
if (uart_circ_empty(xmit))
|
||||||
uart_write_wakeup(&up->port);
|
|
||||||
goto ack_tx_int;
|
goto ack_tx_int;
|
||||||
}
|
|
||||||
if (uart_tx_stopped(&up->port))
|
if (uart_tx_stopped(&up->port))
|
||||||
goto ack_tx_int;
|
goto ack_tx_int;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue