Commit 7869e588 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

Merge remote-tracking branch 'tip/perf/urgent' into perf/core 



To pick up fixes.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents 9aae1780 4e9ae0d3

Documentation/devicetree/bindings/net/dsa/b53.txt

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Required properties: 
      "brcm,bcm53128"

      "brcm,bcm5365"

      "brcm,bcm5395"

      "brcm,bcm5389"

      "brcm,bcm5397"

      "brcm,bcm5398"

Documentation/i2c/busses/i2c-ocores

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ Kernel driver i2c-ocores 


Supported adapters:

  * OpenCores.org I2C controller by Richard Herveille (see datasheet link)

    Datasheet: http://www.opencores.org/projects.cgi/web/i2c/overview

    https://opencores.org/project/i2c/overview



Author: Peter Korsgaard <jacmet@sunsite.dk>

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -15513,6 +15513,14 @@ L: linux-kernel@vger.kernel.org 
S:	Supported

F:	drivers/char/xillybus/



XLP9XX I2C DRIVER

M:	George Cherian <george.cherian@cavium.com>

M:	Jan Glauber <jglauber@cavium.com>

L:	linux-i2c@vger.kernel.org

W:	http://www.cavium.com

S:	Supported

F:	drivers/i2c/busses/i2c-xlp9xx.c



XRA1403 GPIO EXPANDER

M:	Nandor Han <nandor.han@ge.com>

M:	Semi Malinen <semi.malinen@ge.com>

arch/mips/kernel/process.c

+4 −0
Original line number Diff line number Diff line
@@ -721,6 +721,10 @@ int mips_set_process_fp_mode(struct task_struct *task, unsigned int value) 
	if (value & ~known_bits)

		return -EOPNOTSUPP;



	/* Setting FRE without FR is not supported.  */

	if ((value & (PR_FP_MODE_FR | PR_FP_MODE_FRE)) == PR_FP_MODE_FRE)

		return -EOPNOTSUPP;



	/* Avoid inadvertently triggering emulation */

	if ((value & PR_FP_MODE_FR) && raw_cpu_has_fpu &&

	    !(raw_current_cpu_data.fpu_id & MIPS_FPIR_F64))

arch/mips/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -818,7 +818,7 @@ long arch_ptrace(struct task_struct *child, long request, 
				break;

			}

#endif

			tmp = get_fpr32(&fregs[addr - FPR_BASE], 0);

			tmp = get_fpr64(&fregs[addr - FPR_BASE], 0);

			break;

		case PC:

			tmp = regs->cp0_epc;

CRA Git | Maintained and supported by SUSTech CRA and CCSE