Commit 1ca94929 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:
  [MIPS] Cobalt: Fix UART I/O type
  [MIPS] Fixup copy_from_user_inatomic
  [MIPS] Fix struct sigcontext for N32 userland
  [MIPS] Make some __setup functions static
  [MIPS] Declare highstart_pfn, highend_pfn only if CONFIG_HIGHMEM=y
  [MIPS] Allow selection of KGDB only on platforms where it's supported.
parents c9ce2283 0cfd5267

arch/mips/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ config BASLER_EXCITE 
	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_KGDB

	help

	  The eXcite is a smart camera platform manufactured by

	  Basler Vision Technologies AG
@@ -210,6 +211,7 @@ config MIPS_EV64120 
	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_KGDB

	help

	  This is an evaluation board based on the Galileo GT-64120

	  single-chip system controller that contains a MIPS R5000 compatible
@@ -374,6 +376,7 @@ config MOMENCO_JAGUAR_ATX 
	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_KGDB

	help

	  The Jaguar ATX is a MIPS-based Single Board Computer (SBC) made by

	  Momentum Computer <http://www.momenco.com/>.
@@ -391,6 +394,7 @@ config MOMENCO_OCELOT 
	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_KGDB

	help

	  The Ocelot is a MIPS-based Single Board Computer (SBC) made by

	  Momentum Computer <http://www.momenco.com/>.
@@ -480,6 +484,8 @@ config DDB5477 
	select SYS_HAS_CPU_R5432

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL

	select SYS_SUPPORTS_KGDB

	select SYS_SUPPORTS_KGDB

	select SYS_SUPPORTS_LITTLE_ENDIAN

	help

	  This enables support for the R5432-based NEC DDB Vrc-5477,
@@ -508,6 +514,7 @@ config PMC_YOSEMITE 
	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_HIGHMEM

	select SYS_SUPPORTS_KGDB

	select SYS_SUPPORTS_SMP

	help

	  Yosemite is an evaluation board for the RM9000x2 processor
@@ -584,6 +591,7 @@ config SGI_IP27 
	select SYS_HAS_CPU_R10000

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_KGDB

	select SYS_SUPPORTS_NUMA

	select SYS_SUPPORTS_SMP

	select GENERIC_HARDIRQS_NO__DO_IRQ
@@ -633,6 +641,7 @@ config SIBYTE_SWARM 
	select SYS_HAS_CPU_SB1

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_HIGHMEM

	select SYS_SUPPORTS_KGDB

	select SYS_SUPPORTS_LITTLE_ENDIAN



config SIBYTE_SENTOSA
@@ -773,6 +782,7 @@ config TOSHIBA_RBTX4927 
	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_KGDB

	select TOSHIBA_BOARDS

	select GENERIC_HARDIRQS_NO__DO_IRQ

	help
@@ -793,6 +803,7 @@ config TOSHIBA_RBTX4938 
	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_KGDB

	select TOSHIBA_BOARDS

	select GENERIC_HARDIRQS_NO__DO_IRQ

	help
@@ -959,6 +970,7 @@ config IRQ_MV64340 


config DDB5XXX_COMMON

	bool

	select SYS_SUPPORTS_KGDB



config MIPS_BOARDS_GEN

	bool
@@ -1007,6 +1019,7 @@ config SOC_AU1X00 
	select SYS_HAS_CPU_MIPS32_R1

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_APM_EMULATION

	select SYS_SUPPORTS_KGDB



config PNX8550

	bool
@@ -1019,6 +1032,7 @@ config SOC_PNX8550 
	select SYS_HAS_CPU_MIPS32_R1

	select SYS_SUPPORTS_32BIT_KERNEL

	select GENERIC_HARDIRQS_NO__DO_IRQ

	select SYS_SUPPORTS_KGDB



config SWAP_IO_SPACE

	bool

arch/mips/Kconfig.debug

+4 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ config DEBUG_STACK_USAGE 


config KGDB

	bool "Remote GDB kernel debugging"

	depends on DEBUG_KERNEL

	depends on DEBUG_KERNEL && SYS_SUPPORTS_KGDB

	select DEBUG_INFO

	help

	  If you say Y here, it will be possible to remotely debug the MIPS
@@ -48,6 +48,9 @@ config KGDB 
	  better 32 MB RAM to avoid excessive linking time. This is only

	  useful for kernel hackers. If unsure, say N.



config SYS_SUPPORTS_KGDB

	bool



config GDB_CONSOLE

	bool "Console output to GDB"

	depends on KGDB

arch/mips/cobalt/setup.c

+7 −7
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ void __init plat_mem_setup(void) 


	set_io_port_base(CKSEG1ADDR(GT_DEF_PCI0_IO_BASE));



	/* I/O port resource must include UART and LCD/buttons */

	/* I/O port resource must include LCD/buttons */

	ioport_resource.end = 0x0fffffff;



	/* request I/O space for devices used on all i[345]86 PCs */
@@ -149,25 +149,25 @@ void __init plat_mem_setup(void) 
	register_pci_controller(&cobalt_pci_controller);

#endif



#ifdef CONFIG_SERIAL_8250

	if (cobalt_board_id > COBALT_BRD_ID_RAQ1) {



#ifdef CONFIG_EARLY_PRINTK

		cobalt_early_console();

#endif



#ifdef CONFIG_SERIAL_8250

		uart.line	= 0;

		uart.type	= PORT_UNKNOWN;

		uart.uartclk	= 18432000;

		uart.irq	= COBALT_SERIAL_IRQ;

		uart.flags	= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;

		uart.iobase	= 0xc800000;

		uart.iotype	= UPIO_PORT;

		uart.flags	= UPF_IOREMAP | UPF_BOOT_AUTOCONF |

				  UPF_SKIP_TEST;

		uart.iotype	= UPIO_MEM;

		uart.mapbase	= 0x1c800000;



		early_serial_setup(&uart);

	}

#endif

	}

}



/*

 * Prom init. We read our one and only communication with the firmware.

arch/mips/kernel/cpu-probe.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static void au1k_wait(void) 


static int __initdata nowait = 0;



int __init wait_disable(char *s)

static int __init wait_disable(char *s)

{

	nowait = 1;

arch/mips/kernel/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -543,7 +543,7 @@ void __init setup_arch(char **cmdline_p) 
#endif

}



int __init fpu_disable(char *s)

static int __init fpu_disable(char *s)

{

	int i;
@@ -555,7 +555,7 @@ int __init fpu_disable(char *s) 


__setup("nofpu", fpu_disable);



int __init dsp_disable(char *s)

static int __init dsp_disable(char *s)

{

	cpu_data[0].ases &= ~MIPS_ASE_DSP;

CRA Git | Maintained and supported by SUSTech CRA and CCSE