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

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus 

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (22 commits)
  MIPS: Ignore vmlinux.*
  MIPS: Move vmlinux.ecoff to arch/mips/boot
  MIPS: cpumask_of_node() should handle -1 as a node
  MIPS: Octeon: Use non-overflowing arithmetic in sched_clock
  MIPS: Malta, PowerTV: Remove unnecessary "Linux started"
  MIPS: BCM63xx: Remove duplicate CONFIG_CMDLINE.
  MIPS: AR7: Remove unused prom_getchar()
  MIPS: PowerTV: Remove extra r4k_clockevent_init() call
  MIPS: Cobalt use strlcat() for the command line arguments
  MIPS: Octeon: Add sched_clock() to csrc-octeon.c
  MIPS: TXx9: Cleanup builtin-cmdline processing
  MIPS: PowerTV: simplify prom_init_cmdline() and merge into prom_init()
  MIPS: PowerTV: Remove unused platform_die()
  MIPS: PowerTV: Remove mips_machine_halt()
  MIPS: PowerTV: Remove unused ptv_memsize
  MIPS: PowerTV: Remove unused prom_getcmdline()
  MIPS: AR7: Remove kgdb_enabled
  MIPS: Alchemy: Correct code taking the size of a pointer
  MIPS: BCM63xx: Fix whitespace damaged board_bcm963xx.c
  MIPS: VR41xx: Use strlcat() for the command line arguments
  ...
parents 7113578a 9a3065c9

arch/mips/alchemy/common/dbdma.c

+2 −2
Original line number Diff line number Diff line
@@ -613,7 +613,7 @@ u32 _au1xxx_dbdma_put_source(u32 chanid, void *buf, int nbytes, u32 flags) 
	dma_cache_wback_inv((unsigned long)buf, nbytes);

	dp->dscr_cmd0 |= DSCR_CMD0_V;	/* Let it rip */

	au_sync();

	dma_cache_wback_inv((unsigned long)dp, sizeof(dp));

	dma_cache_wback_inv((unsigned long)dp, sizeof(*dp));

	ctp->chan_ptr->ddma_dbell = 0;



	/* Get next descriptor pointer.	*/
@@ -676,7 +676,7 @@ _au1xxx_dbdma_put_dest(u32 chanid, void *buf, int nbytes, u32 flags) 
	dma_cache_inv((unsigned long)buf, nbytes);

	dp->dscr_cmd0 |= DSCR_CMD0_V;	/* Let it rip */

	au_sync();

	dma_cache_wback_inv((unsigned long)dp, sizeof(dp));

	dma_cache_wback_inv((unsigned long)dp, sizeof(*dp));

	ctp->chan_ptr->ddma_dbell = 0;



	/* Get next descriptor pointer.	*/

arch/mips/ar7/prom.c

+0 −15
Original line number Diff line number Diff line
@@ -219,14 +219,6 @@ static void __init console_config(void) 
	if (strstr(prom_getcmdline(), "console="))

		return;



#ifdef CONFIG_KGDB

	if (!strstr(prom_getcmdline(), "nokgdb")) {

		strcat(prom_getcmdline(), " console=kgdb");

		kgdb_enabled = 1;

		return;

	}

#endif



	s = prom_getenv("modetty0");

	if (s) {

		baud = simple_strtoul(s, &p, 10);
@@ -280,13 +272,6 @@ static inline void serial_out(int offset, int value) 
	writel(value, (void *)PORT(offset));

}



char prom_getchar(void)

{

	while (!(serial_in(UART_LSR) & UART_LSR_DR))

		;

	return serial_in(UART_RX);

}



int prom_putchar(char c)

{

	while ((serial_in(UART_LSR) & UART_LSR_TEMT) == 0)

arch/mips/bcm63xx/boards/board_bcm963xx.c

+16 −17
Original line number Diff line number Diff line
@@ -363,7 +363,6 @@ static struct board_info __initdata board_FAST2404 = { 
		.force_duplex_full	= 1,

	},





	.has_ohci0			= 1,

	.has_pccard			= 1,

	.has_ehci0			= 1,

arch/mips/bcm63xx/prom.c

+0 −3
Original line number Diff line number Diff line
@@ -40,9 +40,6 @@ void __init prom_init(void) 
	reg &= ~mask;

	bcm_perf_writel(reg, PERF_CKCTL_REG);



	/* assign command line from kernel config */

	strcpy(arcs_cmdline, CONFIG_CMDLINE);



	/* register gpiochip */

	bcm63xx_gpio_init();

arch/mips/boot/.gitignore

+1 −0
Original line number Diff line number Diff line 
mkboot

elf2ecoff

vmlinux.*

zImage

zImage.tmp

CRA Git | Maintained and supported by SUSTech CRA and CCSE