Commit 8a21d9f6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MIPS updates from Ralf Baechle:
 "A fair number of fixes all across arch/mips.  Nothing really stands
  out though APRP, the FPU code and syscall tracing code received
  multiple patches those all were small"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: mark O32+FP64 experimental for now
  MIPS: ftrace: Fix icache flush range error
  MIPS: Fix syscall tracing interface
  MIPS: asm: syscall: Fix copying system call arguments
  MIPS: Octeon: Fix fall through on bar type OCTEON_DMA_BAR_TYPE_SMALL
  MIPS: FPU: Fix conflict of register usage
  MIPS: Replace CONFIG_MIPS64 and CONFIG_MIPS32_R2
  MIPS: math-emu: Fix prefx detection and COP1X function field definition
  MIPS: APRP: Choose the correct VPE loader by fixing the linking
  MIPS: APRP: Unregister rtlx interrupt hook at module exit
  MIPS: APRP: Fix the linking of rtlx interrupt hook
  MIPS: bcm47xx: Include missing errno.h for ENXIO
  MIPS: Alchemy: Fix unchecked kstrtoul return value
  MIPS: Fix randconfig build error.
parents 9f8b483c 06e2e882

arch/mips/Kconfig

+9 −3
Original line number Diff line number Diff line
@@ -2353,9 +2353,8 @@ config SECCOMP 
	  If unsure, say Y. Only embedded should say N here.



config MIPS_O32_FP64_SUPPORT

	bool "Support for O32 binaries using 64-bit FP"

	bool "Support for O32 binaries using 64-bit FP (EXPERIMENTAL)"

	depends on 32BIT || MIPS32_O32

	default y

	help

	  When this is enabled, the kernel will support use of 64-bit floating

	  point registers with binaries using the O32 ABI along with the
@@ -2367,7 +2366,14 @@ config MIPS_O32_FP64_SUPPORT 
	  of your kernel & potentially improve FP emulation performance by

	  saying N here.



	  If unsure, say Y.

	  Although binutils currently supports use of this flag the details

	  concerning its effect upon the O32 ABI in userland are still being

	  worked on. In order to avoid userland becoming dependant upon current

	  behaviour before the details have been finalised, this option should

	  be considered experimental and only enabled by those working upon

	  said details.



	  If unsure, say N.



config USE_OF

	bool

arch/mips/alchemy/board-gpr.c

+1 −3
Original line number Diff line number Diff line
@@ -53,10 +53,8 @@ void __init prom_init(void) 
	prom_init_cmdline();



	memsize_str = prom_getenv("memsize");

	if (!memsize_str)

	if (!memsize_str || kstrtoul(memsize_str, 0, &memsize))

		memsize = 0x04000000;

	else

		strict_strtoul(memsize_str, 0, &memsize);

	add_memory_region(0, memsize, BOOT_MEM_RAM);

}

arch/mips/alchemy/board-mtx1.c

+1 −3
Original line number Diff line number Diff line
@@ -52,10 +52,8 @@ void __init prom_init(void) 
	prom_init_cmdline();



	memsize_str = prom_getenv("memsize");

	if (!memsize_str)

	if (!memsize_str || kstrtoul(memsize_str, 0, &memsize))

		memsize = 0x04000000;

	else

		strict_strtoul(memsize_str, 0, &memsize);

	add_memory_region(0, memsize, BOOT_MEM_RAM);

}

arch/mips/bcm47xx/board.c

+1 −0
Original line number Diff line number Diff line 
#include <linux/errno.h>

#include <linux/export.h>

#include <linux/string.h>

#include <bcm47xx_board.h>

arch/mips/include/asm/asmmacro.h

+2 −2
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ 
	.endm



	.macro	fpu_save_double thread status tmp

#if defined(CONFIG_MIPS64) || defined(CONFIG_CPU_MIPS32_R2)

#if defined(CONFIG_64BIT) || defined(CONFIG_CPU_MIPS32_R2)

	sll	\tmp, \status, 5

	bgez	\tmp, 10f

	fpu_save_16odd \thread
@@ -159,7 +159,7 @@ 
	.endm



	.macro	fpu_restore_double thread status tmp

#if defined(CONFIG_MIPS64) || defined(CONFIG_CPU_MIPS32_R2)

#if defined(CONFIG_64BIT) || defined(CONFIG_CPU_MIPS32_R2)

	sll	\tmp, \status, 5

	bgez	\tmp, 10f				# 16 register mode?

CRA Git | Maintained and supported by SUSTech CRA and CCSE