Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da64c6ee authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents f5154a98 b1b510aa

arch/sparc/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -21,10 +21,6 @@ config GENERIC_ISA_DMA 
	bool

	default y



config GENERIC_IOMAP

	bool

	default y



source "init/Kconfig"



menu "General machine setup"

arch/sparc/defconfig

+0 −1
Original line number Diff line number Diff line
@@ -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

arch/sparc64/kernel/head.S

+6 −2
Original line number Diff line number Diff line
@@ -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" */

drivers/serial/sunsab.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

	}

drivers/serial/sunzilog.c

+2 −3
Original line number Diff line number Diff line
@@ -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;