Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'mips_fixes_4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips 

Pull MIPS fixes from James Hogan:
 "A selection of important MIPS fixes for 4.14, and some MAINTAINERS /
  email address updates:

  Maintainership updates:
   - imgtec.com -> mips.com email addresses (this trivially updates
     comments in quite a few files, as well as MAINTAINERS)
   - Pistachio SoC maintainership update

  Fixes:
   - NI 169445 build (new platform in 4.14)
   - EVA regression (4.14)
   - SMP-CPS build & preemption regressions (4.14)
   - SMP/hotplug deadlock & race (deadlock reintroduced 4.13)
   - ebpf_jit error return (4.13)
   - SMP-CMP build regressions (4.11 and 4.14)
   - bad UASM microMIPS encoding (3.16)
   - CM definitions (3.15)"

[ I had taken the email address updates separately, because I didn't
  expect James to send a pull request, so those got applied twice.   - Linus]

* tag 'mips_fixes_4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips:
  MIPS: Update email address for Marcin Nowakowski
  MIPS: smp-cmp: Fix vpe_id build error
  MAINTAINERS: Update Pistachio platform maintainers
  MIPS: smp-cmp: Use right include for task_struct
  MIPS: Update Goldfish RTC driver maintainer email address
  MIPS: Update RINT emulation maintainer email address
  MIPS: CPS: Fix use of current_cpu_data in preemptible code
  MIPS: SMP: Fix deadlock & online race
  MIPS: bpf: Fix a typo in build_one_insn()
  MIPS: microMIPS: Fix incorrect mask in insn_table_MM
  MIPS: Fix CM region target definitions
  MIPS: generic: Fix compilation error from include asm/mips-cpc.h
  MIPS: Fix exception entry when CONFIG_EVA enabled
  MIPS: generic: Fix NI 169445 its build
  Update MIPS email addresses
parents e50f82f8 ca208b5f

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com> 
Alan Cox <alan@lxorguk.ukuu.org.uk>

Alan Cox <root@hraefn.swansea.linux.org.uk>

Aleksey Gorelov <aleksey_gorelov@phoenix.com>

Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>

Al Viro <viro@ftp.linux.org.uk>

Al Viro <viro@zenIV.linux.org.uk>

Andreas Herrmann <aherrman@de.ibm.com>
@@ -101,6 +102,7 @@ Leonid I Ananiev <leonid.i.ananiev@intel.com> 
Linas Vepstas <linas@austin.ibm.com>

Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>

Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>

Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>

Mark Brown <broonie@sirena.org.uk>

Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>

Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
@@ -119,6 +121,7 @@ Matt Redfearn <matt.redfearn@mips.com> <matt.redfearn@imgtec.com> 
Mayuresh Janorkar <mayur@ti.com>

Michael Buesch <m@bues.ch>

Michel Dänzer <michel@tungstengraphics.com>

Miodrag Dinic <miodrag.dinic@mips.com> <miodrag.dinic@imgtec.com>

Mitesh shah <mshah@teja.com>

Mohit Kumar <mohit.kumar@st.com> <mohit.kumar.dhaka@gmail.com>

Morten Welinder <terra@gnome.org>

MAINTAINERS

+4 −5
Original line number Diff line number Diff line
@@ -873,7 +873,7 @@ F: drivers/android/ 
F:	drivers/staging/android/



ANDROID GOLDFISH RTC DRIVER

M:	Miodrag Dinic <miodrag.dinic@imgtec.com>

M:	Miodrag Dinic <miodrag.dinic@mips.com>

S:	Supported

F:	Documentation/devicetree/bindings/rtc/google,goldfish-rtc.txt

F:	drivers/rtc/rtc-goldfish.c
@@ -9019,7 +9019,7 @@ F: drivers/*/*loongson1* 
F:	drivers/*/*/*loongson1*



MIPS RINT INSTRUCTION EMULATION

M:	Aleksandar Markovic <aleksandar.markovic@imgtec.com>

M:	Aleksandar Markovic <aleksandar.markovic@mips.com>

L:	linux-mips@linux-mips.org

S:	Supported

F:	arch/mips/math-emu/sp_rint.c
@@ -10683,10 +10683,9 @@ S: Maintained 
F:	drivers/pinctrl/spear/



PISTACHIO SOC SUPPORT

M:	James Hartley <james.hartley@imgtec.com>

M:	Ionela Voinescu <ionela.voinescu@imgtec.com>

M:	James Hartley <james.hartley@sondrel.com>

L:	linux-mips@linux-mips.org

S:	Maintained

S:	Odd Fixes

F:	arch/mips/pistachio/

F:	arch/mips/include/asm/mach-pistachio/

F:	arch/mips/boot/dts/img/pistachio*

arch/mips/generic/board-ni169445.its.S

+1 −1
Original line number Diff line number Diff line 
{

/ {

	images {

		fdt@ni169445 {

			description = "NI 169445 device tree";

arch/mips/generic/init.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <asm/fw/fw.h>

#include <asm/irq_cpu.h>

#include <asm/machine.h>

#include <asm/mips-cpc.h>

#include <asm/mips-cps.h>

#include <asm/prom.h>

#include <asm/smp-ops.h>

#include <asm/time.h>

arch/mips/generic/kexec.c

+1 −1
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 Imagination Technologies

 * Author: Marcin Nowakowski <marcin.nowakowski@imgtec.com>

 * Author: Marcin Nowakowski <marcin.nowakowski@mips.com>

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License as published by the