Commit d13ff055 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: (21 commits)
  [MIPS] Remove unused maltasmp.h.
  [MIPS] Remove unused saa9730_uart.h.
  [MIPS] Rename MIPS sys_pipe syscall entry point to something MIPS-specific.
  [MIPS] 32-bit compat: Delete unused sys_truncate64 and sys_ftruncate64.
  [MIPS] TXx9: Fix some sparse warnings
  [MIPS] TXx9: Add 64-bit support
  [MIPS] TXx9: Cleanups for 64-bit support
  [MIPS] Cobalt: Fix I/O port resource range
  [MIPS] don't leak setup_early_printk() in userspace header
  [MIPS] Remove include/asm-mips/mips-boards/sead{,int}.h
  [MIPS] Remove asm-mips/mips-boards/atlas{,int}.h
  [MIPS] mips/sgi-ip22/ip28-berr.c: fix the build
  [MIPS] TXx9: Miscellaneous build fixes
  [MIPS] Routerboard 532: Support for base system
  [MIPS] IP32: Use common SGI button driver
  [MIPS] IP22: Use common SGI button driver
  [MIPS] IP22, IP28: Fix merge bug
  [MIPS] Tinker with constraints in <asm/atomic.h> to fix build error.
  [MIPS] Add missing prototypes to asm/page.h
  [MIPS] Fix missing prototypes in asm/fpu.h
  ...
parents f076ab8d cb7f39d2

arch/mips/Kconfig

+20 −2
Original line number Diff line number Diff line
@@ -330,6 +330,7 @@ config SGI_IP22 
	select SGI_HAS_DS1286

	select SGI_HAS_I8042

	select SGI_HAS_INDYDOG

	select SGI_HAS_HAL2

	select SGI_HAS_SEEQ

	select SGI_HAS_WD93

	select SGI_HAS_ZILOG
@@ -386,7 +387,6 @@ config SGI_IP28 
	select SGI_HAS_I8042

	select SGI_HAS_INDYDOG

	select SGI_HAS_HAL2

	select SGI_HAS_HAL2

	select SGI_HAS_SEEQ

	select SGI_HAS_WD93

	select SGI_HAS_ZILOG
@@ -558,6 +558,24 @@ config MACH_TX39XX 
config MACH_TX49XX

	bool "Toshiba TX49 series based machines"



config MIKROTIK_RB532

	bool "Mikrotik RB532 boards"

	select CEVT_R4K

	select CSRC_R4K

	select DMA_NONCOHERENT

	select GENERIC_HARDIRQS_NO__DO_IRQ

	select HW_HAS_PCI

	select IRQ_CPU

	select SYS_HAS_CPU_MIPS32_R1

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SWAP_IO_SPACE

	select BOOT_RAW

	select GENERIC_GPIO

	help

	  Support the Mikrotik(tm) RouterBoard 532 series,

	  based on the IDT RC32434 SoC.



config WR_PPMC

	bool "Wind River PPMC board"

	select CEVT_R4K
@@ -899,7 +917,7 @@ config BOOT_ELF32 


config MIPS_L1_CACHE_SHIFT

	int

	default "4" if MACH_DECSTATION

	default "4" if MACH_DECSTATION || MIKROTIK_RB532

	default "7" if SGI_IP22 || SGI_IP27 || SGI_IP28 || SNI_RM

	default "4" if PMC_MSP4200_EVAL

	default "5"

arch/mips/Makefile

+7 −0
Original line number Diff line number Diff line
@@ -559,6 +559,13 @@ load-$(CONFIG_MACH_TX49XX) += 0xffffffff80100000 
#

core-$(CONFIG_TOSHIBA_JMR3927)	+= arch/mips/txx9/jmr3927/



#

# Routerboard 532 board

#

core-$(CONFIG_MIKROTIK_RB532)	+= arch/mips/rb532/

cflags-$(CONFIG_MIKROTIK_RB532) += -Iinclude/asm-mips/mach-rc32434

load-$(CONFIG_MIKROTIK_RB532)	+= 0xffffffff80101000



#

# Toshiba RBTX4927 board or

# Toshiba RBTX4937 board

arch/mips/cobalt/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -81,8 +81,8 @@ void __init plat_mem_setup(void) 


	set_io_port_base(CKSEG1ADDR(GT_DEF_PCI0_IO_BASE));



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

	ioport_resource.end = 0x0fffffff;

	/* I/O port resource */

	ioport_resource.end = 0x01ffffff;



	/* These resources have been reserved by VIA SuperI/O chip. */

	for (i = 0; i < ARRAY_SIZE(cobalt_reserved_resources); i++)

arch/mips/configs/rb532_defconfig

0 → 100644
+1314 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/mips/kernel/linux32.c

+0 −17
Original line number Diff line number Diff line
@@ -129,23 +129,6 @@ out: 
	return error;

}





asmlinkage int sys_truncate64(const char __user *path, unsigned int high,

			      unsigned int low)

{

	if ((int)high < 0)

		return -EINVAL;

	return sys_truncate(path, ((long) high << 32) | low);

}



asmlinkage int sys_ftruncate64(unsigned int fd, unsigned int high,

			       unsigned int low)

{

	if ((int)high < 0)

		return -EINVAL;

	return sys_ftruncate(fd, ((long) high << 32) | low);

}



/*

 * sys_execve() executes a new program.

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE