1. 09 Jan, 2020 16 commits
    • Thomas Bogendoerfer's avatar
      MIPS: SGI-IP27: get rid of asm/sn/sn0/ip27.h · 5388b581
      Thomas Bogendoerfer authored
      The only piece needed in ip27.h is SEND_NMI. Move the define to the only
      place where it's used and remove ip27.h
      Signed-off-by: default avatarThomas Bogendoerfer <tbogendoerfer@suse.de>
      Signed-off-by: default avatarPaul Burton <paulburton@kernel.org>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Cc: James Hogan <jhogan@kernel.org>
      Cc: linux-mips@vger.kernel.org
      Cc: linux-kernel@vger.kernel.org
      5388b581
    • Thomas Bogendoerfer's avatar
      MIPS: SGI-IP27: use asm/sn/agent.h for including HUB related stuff · b78e9d63
      Thomas Bogendoerfer authored
      By including agent.h where hub related defines/structs are needed, we
      have only one place to select, which agent chip (HUB or BEDROCK) is used.
      Signed-off-by: default avatarThomas Bogendoerfer <tbogendoerfer@suse.de>
      Signed-off-by: default avatarPaul Burton <paulburton@kernel.org>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Cc: James Hogan <jhogan@kernel.org>
      Cc: linux-mips@vger.kernel.org
      Cc: linux-kernel@vger.kernel.org
      b78e9d63
    • Thomas Bogendoerfer's avatar
      MIPS: SGI-IP27: use cpu physid already present while scanning for CPUs · d6972bb4
      Thomas Bogendoerfer authored
      By using cpu physid already present when scanning for CPUs
      get_cpu_slice() is unsued and can be removed together with two
      other then used functions.
      Signed-off-by: default avatarThomas Bogendoerfer <tbogendoerfer@suse.de>
      Signed-off-by: default avatarPaul Burton <paulburton@kernel.org>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Cc: James Hogan <jhogan@kernel.org>
      Cc: linux-mips@vger.kernel.org
      Cc: linux-kernel@vger.kernel.org
      d6972bb4
    • Thomas Bogendoerfer's avatar
      MIPS: SGI-IP27: use nodemask instead of cpumask · 2d11e6a4
      Thomas Bogendoerfer authored
      Replication is done on a per node basis, so the use of cpumask
      was a misusage here.
      Signed-off-by: default avatarThomas Bogendoerfer <tbogendoerfer@suse.de>
      Signed-off-by: default avatarPaul Burton <paulburton@kernel.org>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Cc: James Hogan <jhogan@kernel.org>
      Cc: linux-mips@vger.kernel.org
      Cc: linux-kernel@vger.kernel.org
      2d11e6a4
    • Paul Burton's avatar
      MIPS: BPF: Restore MIPS32 cBPF JIT · 36366e36
      Paul Burton authored
      Commit 716850ab ("MIPS: eBPF: Initial eBPF support for MIPS32
      architecture.") enabled our eBPF JIT for MIPS32 kernels, whereas it has
      previously only been availailable for MIPS64. It was my understanding at
      the time that the BPF test suite was passing & JITing a comparable
      number of tests to our cBPF JIT [1], but it turns out that was not the
      case.
      
      The eBPF JIT has a number of problems on MIPS32:
      
      - Most notably various code paths still result in emission of MIPS64
        instructions which will cause reserved instruction exceptions & kernel
        panics when run on MIPS32 CPUs.
      
      - The eBPF JIT doesn't account for differences between the O32 ABI used
        by MIPS32 kernels versus the N64 ABI used by MIPS64 kernels. Notably
        arguments beyond the first 4 are passed on the stack in O32, and this
        is entirely unhandled when JITing a BPF_CALL instruction. Stack space
        must be reserved for arguments even if they all fit in registers, and
        the callee is free to assume that stack space has been reserved for
        its use - with the eBPF JIT this is not the case, so calling any
        function can result in clobbering values on the stack & unpredictable
        behaviour. Function arguments in eBPF are always 64-bit values which
        is also entirely unhandled - the JIT still uses a single (32-bit)
        register per argument. As a result all function arguments are always
        passed incorrectly when JITing a BPF_CALL instruction, leading to
        kernel crashes or strange behavior.
      
      - The JIT attempts to bail our on use of ALU64 instructions or 64-bit
        memory access instructions. The code doing this at the start of
        build_one_insn() incorrectly checks whether BPF_OP() equals BPF_DW,
        when it should really be checking BPF_SIZE() & only doing so when
        BPF_CLASS() is one of BPF_{LD,LDX,ST,STX}. This results in false
        positives that cause more bailouts than intended, and that in turns
        hides some of the problems described above.
      
      - The kernel's cBPF->eBPF translation makes heavy use of 64-bit eBPF
        instructions that the MIPS32 eBPF JIT bails out on, leading to most
        cBPF programs not being JITed at all.
      
      Until these problems are resolved, revert the removal of the cBPF JIT
      performed by commit 716850ab ("MIPS: eBPF: Initial eBPF support for
      MIPS32 architecture."). Together with commit f8fffebd ("MIPS: BPF:
      Disable MIPS32 eBPF JIT") this restores MIPS32 BPF JIT behavior back to
      the same state it was prior to the introduction of the broken eBPF JIT
      support.
      
      [1] https://lore.kernel.org/linux-mips/MWHPR2201MB13583388481F01A422CE7D66D4410@MWHPR2201MB1358.namprd22.prod.outlook.com/Signed-off-by: default avatarPaul Burton <paulburton@kernel.org>
      Fixes: 716850ab ("MIPS: eBPF: Initial eBPF support for MIPS32 architecture.")
      Cc: Daniel Borkmann <daniel@iogearbox.net>
      Cc: Hassan Naveed <hnaveed@wavecomp.com>
      Cc: Tony Ambardar <itugrok@yahoo.com>
      Cc: bpf@vger.kernel.org
      Cc: netdev@vger.kernel.org
      Cc: linux-mips@vger.kernel.org
      Cc: linux-kernel@vger.kernel.org
      36366e36
    • Mao Wenan's avatar
      MIPS: Loongson2ef: drop pointless static qualifier in loongson_suspend_enter() · 11d06df7
      Mao Wenan authored
      There is no need to have the 'T *v' variable static
      since new value always be assigned before use it.
      Reported-by: default avatarHulk Robot <hulkci@huawei.com>
      Signed-off-by: default avatarMao Wenan <maowenan@huawei.com>
      Signed-off-by: default avatarPaul Burton <paulburton@kernel.org>
      Cc: <jiaxun.yang@flygoat.com>
      Cc: <ralf@linux-mips.org>
      Cc: <jhogan@kernel.org>
      Cc: <gregkh@linuxfoundation.org>
      Cc: <tglx@linutronix.de>
      Cc: <linux-mips@vger.kernel.org>
      Cc: <linux-kernel@vger.kernel.org>
      Cc: <kernel-janitors@vger.kernel.org>
      11d06df7
    • Thomas Bogendoerfer's avatar
      MIPS: mm: Place per_cpu on different nodes, if NUMA is enabled · f3c560a6
      Thomas Bogendoerfer authored
      Implement placing of per_cpu into memory, which is local to the CPU.
      Signed-off-by: default avatarThomas Bogendoerfer <tbogendoerfer@suse.de>
      Signed-off-by: default avatarPaul Burton <paulburton@kernel.org>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Cc: James Hogan <jhogan@kernel.org>
      Cc: linux-mips@vger.kernel.org
      Cc: linux-kernel@vger.kernel.org
      f3c560a6
    • Thomas Bogendoerfer's avatar
      MIPS: Loongson64: Fix node_distance() · a14879e1
      Thomas Bogendoerfer authored
      Local node distance is defined as LOCAL_DISTANCE, which is 10. Use the
      define to give back correct local distance.
      Signed-off-by: default avatarThomas Bogendoerfer <tbogendoerfer@suse.de>
      Signed-off-by: default avatarPaul Burton <paulburton@kernel.org>
      Cc: Huacai Chen <chenhc@lemote.com>
      Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Cc: James Hogan <jhogan@kernel.org>
      Cc: linux-mips@vger.kernel.org
      Cc: linux-kernel@vger.kernel.org
      a14879e1
    • Thomas Bogendoerfer's avatar
      MIPS: SGI-IP27: Fix node_distance · a20ebc04
      Thomas Bogendoerfer authored
      node_distance must return values starting from 10 up to 255. 10 means
      local, 255 unreachable.
      Signed-off-by: default avatarThomas Bogendoerfer <tbogendoerfer@suse.de>
      Signed-off-by: default avatarPaul Burton <paulburton@kernel.org>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Cc: James Hogan <jhogan@kernel.org>
      Cc: linux-mips@vger.kernel.org
      Cc: linux-kernel@vger.kernel.org
      a20ebc04
    • 周琰杰 (Zhou Yanjie)'s avatar
      MIPS: X1830: Add X1830 system type. · b9bb868e
      周琰杰 (Zhou Yanjie) authored
      1.Add X1830 system type for cat /proc/cpuinfo to give out X1830.
      2.Change "PRID_IMP_XBURST" to "PRID_IMP_XBURST_REV1" and add a
        new "PRID_IMP_XBURST_REV2" for new Ingenic CPUs which has
        XBurst with MXU2 SIMD ISA.
      
      Notice:
      1."PRID_IMP_XBURST_REV2" is corresponds to the latest XBurst
        processor with 128bit MXU2 SIMD instruction set, not the upcoming
        XBurst2 processor. This version of the processors fixes issues
        such as BTB and HPTLB.
      2.In order to simplify and reuse the code, the "c->cputype" and
        the "c->writecombine" and the "__cpu_name[cpu]" in the original
        "PRID_IMP_XBURST" (now is "PRID_IMP_XBURST_REV1") are removed,
        and the corresponding settings are abtained through fall-through
        to "PRID_IMP_XBURST_REV2", which will cause the name that was
        previously mistakenly called "JZRISC" to become to the real name
        "XBurst".
      Signed-off-by: default avatar周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
      Signed-off-by: default avatarPaul Burton <paulburton@kernel.org>
      Cc: linux-mips@vger.kernel.org
      Cc: linux-kernel@vger.kernel.org
      Cc: yamada.masahiro@socionext.com
      Cc: tglx@linutronix.de
      Cc: chenhc@lemote.com
      Cc: tbogendoerfer@suse.de
      Cc: paul.burton@mips.com
      Cc: paul@crapouillou.net
      Cc: jhogan@kernel.org
      Cc: fancer.lancer@gmail.com
      Cc: ralf@linux-mips.org
      Cc: jiaxun.yang@flygoat.com
      b9bb868e
    • 周琰杰 (Zhou Yanjie)'s avatar
      MIPS: Ingenic: Add YSH & ATIL CU Neo board support. · 0cd2c6e5
      周琰杰 (Zhou Yanjie) authored
      Add a device tree for the Ingenic X1000 based YSH & ATIL CU Neo board.
      Signed-off-by: default avatar周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
      Acked-by: default avatarPaul Cercueil <paul@crapouillou.net>
      [paulburton@kernel.org:
        Drop stale mention of previously unselectable Kconfig entry.]
      Signed-off-by: default avatarPaul Burton <paulburton@kernel.org>
      Cc: linux-mips@vger.kernel.org
      Cc: linux-kernel@vger.kernel.org
      Cc: devicetree@vger.kernel.org
      Cc: robh+dt@kernel.org
      Cc: paul.burton@mips.com
      Cc: jhogan@kernel.org
      Cc: mripard@kernel.org
      Cc: shawnguo@kernel.org
      Cc: mark.rutland@arm.com
      Cc: alexandre.belloni@bootlin.com
      Cc: ralf@linux-mips.org
      Cc: heiko@sntech.de
      Cc: icenowy@aosc.io
      Cc: ak@linux.intel.com
      Cc: laurent.pinchart@ideasonboard.com
      Cc: krzk@kernel.org
      Cc: geert+renesas@glider.be
      Cc: prasannatsmkumar@gmail.com
      Cc: keescook@chromium.org
      Cc: ebiederm@xmission.com
      Cc: sernia.zhou@foxmail.com
      Cc: zhenwenjin@gmail.com
      Cc: 772753199@qq.com
      0cd2c6e5
    • 周琰杰 (Zhou Yanjie)'s avatar
      dt-bindings: MIPS: Add Ingenic XBurst based boards. · 4b396e56
      周琰杰 (Zhou Yanjie) authored
      Add Ingenic XBurst based boards, prepare for later dts.
      Signed-off-by: default avatar周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
      Reviewed-by: default avatarRob Herring <robh@kernel.org>
      Signed-off-by: default avatarPaul Burton <paulburton@kernel.org>
      Cc: linux-mips@vger.kernel.org
      Cc: linux-kernel@vger.kernel.org
      Cc: devicetree@vger.kernel.org
      Cc: robh+dt@kernel.org
      Cc: paul.burton@mips.com
      Cc: jhogan@kernel.org
      Cc: mripard@kernel.org
      Cc: shawnguo@kernel.org
      Cc: mark.rutland@arm.com
      Cc: alexandre.belloni@bootlin.com
      Cc: ralf@linux-mips.org
      Cc: heiko@sntech.de
      Cc: icenowy@aosc.io
      Cc: ak@linux.intel.com
      Cc: laurent.pinchart@ideasonboard.com
      Cc: krzk@kernel.org
      Cc: geert+renesas@glider.be
      Cc: paul@crapouillou.net
      Cc: prasannatsmkumar@gmail.com
      Cc: keescook@chromium.org
      Cc: ebiederm@xmission.com
      Cc: sernia.zhou@foxmail.com
      Cc: zhenwenjin@gmail.com
      Cc: 772753199@qq.com
      4b396e56
    • 周琰杰 (Zhou Yanjie)'s avatar
      dt-bindings: Document yna vendor-prefix. · 9d022be3
      周琰杰 (Zhou Yanjie) authored
      The "yna" is an acronym of the "YSH & ATIL".
      Signed-off-by: default avatar周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
      Acked-by: default avatarRob Herring <robh@kernel.org>
      Signed-off-by: default avatarPaul Burton <paulburton@kernel.org>
      Cc: linux-mips@vger.kernel.org
      Cc: linux-kernel@vger.kernel.org
      Cc: devicetree@vger.kernel.org
      Cc: robh+dt@kernel.org
      Cc: paul.burton@mips.com
      Cc: jhogan@kernel.org
      Cc: mripard@kernel.org
      Cc: shawnguo@kernel.org
      Cc: mark.rutland@arm.com
      Cc: alexandre.belloni@bootlin.com
      Cc: ralf@linux-mips.org
      Cc: heiko@sntech.de
      Cc: icenowy@aosc.io
      Cc: ak@linux.intel.com
      Cc: laurent.pinchart@ideasonboard.com
      Cc: krzk@kernel.org
      Cc: geert+renesas@glider.be
      Cc: paul@crapouillou.net
      Cc: prasannatsmkumar@gmail.com
      Cc: keescook@chromium.org
      Cc: ebiederm@xmission.com
      Cc: sernia.zhou@foxmail.com
      Cc: zhenwenjin@gmail.com
      Cc: 772753199@qq.com
      9d022be3
    • 周琰杰 (Zhou Yanjie)'s avatar
      MIPS: Ingenic: Add Ingenic X1000 support. · 7a16ccd3
      周琰杰 (Zhou Yanjie) authored
      Support the Ingenic X1000 SoC using the code under arch/mips/jz4740.
      This is left unselectable in Kconfig until a X1000 based board is
      added in a later commit.
      Signed-off-by: default avatar周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
      Signed-off-by: default avatarPaul Burton <paulburton@kernel.org>
      Cc: linux-mips@vger.kernel.org
      Cc: linux-kernel@vger.kernel.org
      Cc: devicetree@vger.kernel.org
      Cc: robh+dt@kernel.org
      Cc: paul.burton@mips.com
      Cc: jhogan@kernel.org
      Cc: mripard@kernel.org
      Cc: shawnguo@kernel.org
      Cc: mark.rutland@arm.com
      Cc: alexandre.belloni@bootlin.com
      Cc: ralf@linux-mips.org
      Cc: heiko@sntech.de
      Cc: icenowy@aosc.io
      Cc: ak@linux.intel.com
      Cc: laurent.pinchart@ideasonboard.com
      Cc: krzk@kernel.org
      Cc: geert+renesas@glider.be
      Cc: paul@crapouillou.net
      Cc: prasannatsmkumar@gmail.com
      Cc: keescook@chromium.org
      Cc: ebiederm@xmission.com
      Cc: sernia.zhou@foxmail.com
      Cc: zhenwenjin@gmail.com
      Cc: 772753199@qq.com
      7a16ccd3
    • yu kuai's avatar
      MIPS: ralink: add missing put_device in ill_acc_of_setup · defed0bb
      yu kuai authored
      If of_find_device_by_node return 0 and ill_acc_of_setup return error,
      pdev don't have a corresponding object release.
      
      Fix it by adding put_device.
      Signed-off-by: default avataryu kuai <yukuai3@huawei.com>
      Signed-off-by: default avatarPaul Burton <paulburton@kernel.org>
      Cc: <john@phrozen.org>
      Cc: <ralf@linux-mips.org>
      Cc: <jhogan@kernel.org>
      Cc: <linux-mips@vger.kernel.org>
      Cc: <linux-kernel@vger.kernel.org>
      Cc: <zhengbin13@huawei.com>
      Cc: <yi.zhang@huawei.com>
      defed0bb
    • James Hogan's avatar
      MAINTAINERS: Drop James Hogan as MIPS maintainer · 9c48c48c
      James Hogan authored
      I haven't been active for 18 months, and Paul seems to be doing a grand
      job, so drop me from MIPS maintainership.
      Signed-off-by: default avatarJames Hogan <jhogan@kernel.org>
      Cc: Paul Burton <paulburton@kernel.org>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Cc: linux-mips@vger.kernel.org
      Signed-off-by: default avatarPaul Burton <paulburton@kernel.org>
      9c48c48c
  2. 05 Jan, 2020 7 commits
    • Linus Torvalds's avatar
      Linux 5.5-rc5 · c79f46a2
      Linus Torvalds authored
      c79f46a2
    • Linus Torvalds's avatar
      Merge tag 'riscv/for-v5.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux · 768fc661
      Linus Torvalds authored
      Pull RISC-V fixes from Paul Walmsley:
       "Several fixes for RISC-V:
      
         - Fix function graph trace support
      
         - Prefix the CSR IRQ_* macro names with "RV_", to avoid collisions
           with macros elsewhere in the Linux kernel tree named "IRQ_TIMER"
      
         - Use __pa_symbol() when computing the physical address of a kernel
           symbol, rather than __pa()
      
         - Mark the RISC-V port as supporting GCOV
      
        One DT addition:
      
         - Describe the L2 cache controller in the FU540 DT file
      
        One documentation update:
      
         - Add patch acceptance guideline documentation"
      
      * tag 'riscv/for-v5.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
        Documentation: riscv: add patch acceptance guidelines
        riscv: prefix IRQ_ macro names with an RV_ namespace
        clocksource: riscv: add notrace to riscv_sched_clock
        riscv: ftrace: correct the condition logic in function graph tracer
        riscv: dts: Add DT support for SiFive L2 cache controller
        riscv: gcov: enable gcov for RISC-V
        riscv: mm: use __pa_symbol for kernel symbols
      768fc661
    • Paul Walmsley's avatar
      Documentation: riscv: add patch acceptance guidelines · 0e194d9d
      Paul Walmsley authored
      Formalize, in kernel documentation, the patch acceptance policy for
      arch/riscv.  In summary, it states that as maintainers, we plan to
      only accept patches for new modules or extensions that have been
      frozen or ratified by the RISC-V Foundation.
      
      We've been following these guidelines for the past few months.  In the
      meantime, we've received quite a bit of feedback that it would be
      helpful to have these guidelines formally documented.
      
      Based on a suggestion from Matthew Wilcox, we also add a link to this
      file to Documentation/process/index.rst, to make this document easier
      to find.  The format of this document has also been changed to align
      to the format outlined in the maintainer entry profiles, in accordance
      with comments from Jon Corbet and Dan Williams.
      Signed-off-by: default avatarPaul Walmsley <paul.walmsley@sifive.com>
      Reviewed-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
      Cc: Palmer Dabbelt <palmer@dabbelt.com>
      Cc: Albert Ou <aou@eecs.berkeley.edu>
      Cc: Krste Asanovic <krste@berkeley.edu>
      Cc: Andrew Waterman <waterman@eecs.berkeley.edu>
      Cc: Matthew Wilcox <willy@infradead.org>
      Cc: Dan Williams <dan.j.williams@intel.com>
      Cc: Jonathan Corbet <corbet@lwn.net>
      0e194d9d
    • Paul Walmsley's avatar
      riscv: prefix IRQ_ macro names with an RV_ namespace · 2f3035da
      Paul Walmsley authored
      "IRQ_TIMER", used in the arch/riscv CSR header file, is a sufficiently
      generic macro name that it's used by several source files across the
      Linux code base.  Some of these other files ultimately include the
      arch/riscv CSR include file, causing collisions.  Fix by prefixing the
      RISC-V csr.h IRQ_ macro names with an RV_ prefix.
      
      Fixes: a4c3733d ("riscv: abstract out CSR names for supervisor vs machine mode")
      Reported-by: default avatarOlof Johansson <olof@lixom.net>
      Acked-by: default avatarOlof Johansson <olof@lixom.net>
      Signed-off-by: default avatarPaul Walmsley <paul.walmsley@sifive.com>
      2f3035da
    • Zong Li's avatar
      clocksource: riscv: add notrace to riscv_sched_clock · 9d05c18e
      Zong Li authored
      When enabling ftrace graph tracer, it gets the tracing clock in
      ftrace_push_return_trace().  Eventually, it invokes riscv_sched_clock()
      to get the clock value.  If riscv_sched_clock() isn't marked with
      'notrace', it will call ftrace_push_return_trace() and cause infinite
      loop.
      
      The result of failure as follow:
      
      command: echo function_graph >current_tracer
      [   46.176787] Unable to handle kernel paging request at virtual address ffffffe04fb38c48
      [   46.177309] Oops [#1]
      [   46.177478] Modules linked in:
      [   46.177770] CPU: 0 PID: 256 Comm: $d Not tainted 5.5.0-rc1 #47
      [   46.177981] epc: ffffffe00035e59a ra : ffffffe00035e57e sp : ffffffe03a7569b0
      [   46.178216]  gp : ffffffe000d29b90 tp : ffffffe03a756180 t0 : ffffffe03a756968
      [   46.178430]  t1 : ffffffe00087f408 t2 : ffffffe03a7569a0 s0 : ffffffe03a7569f0
      [   46.178643]  s1 : ffffffe00087f408 a0 : 0000000ac054cda4 a1 : 000000000087f411
      [   46.178856]  a2 : 0000000ac054cda4 a3 : 0000000000373ca0 a4 : ffffffe04fb38c48
      [   46.179099]  a5 : 00000000153e22a8 a6 : 00000000005522ff a7 : 0000000000000005
      [   46.179338]  s2 : ffffffe03a756a90 s3 : ffffffe00032811c s4 : ffffffe03a756a58
      [   46.179570]  s5 : ffffffe000d29fe0 s6 : 0000000000000001 s7 : 0000000000000003
      [   46.179809]  s8 : 0000000000000003 s9 : 0000000000000002 s10: 0000000000000004
      [   46.180053]  s11: 0000000000000000 t3 : 0000003fc815749c t4 : 00000000000efc90
      [   46.180293]  t5 : ffffffe000d29658 t6 : 0000000000040000
      [   46.180482] status: 0000000000000100 badaddr: ffffffe04fb38c48 cause: 000000000000000f
      Signed-off-by: default avatarZong Li <zong.li@sifive.com>
      Reviewed-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
      [paul.walmsley@sifive.com: cleaned up patch description]
      Fixes: 92e0d143 ("clocksource/drivers/riscv_timer: Provide the sched_clock")
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarPaul Walmsley <paul.walmsley@sifive.com>
      9d05c18e
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew) · 36487907
      Linus Torvalds authored
      Merge misc fixes from Andrew Morton:
       "17 fixes"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>:
        hexagon: define ioremap_uc
        ocfs2: fix the crash due to call ocfs2_get_dlm_debug once less
        ocfs2: call journal flush to mark journal as empty after journal recovery when mount
        mm/hugetlb: defer freeing of huge pages if in non-task context
        mm/gup: fix memory leak in __gup_benchmark_ioctl
        mm/oom: fix pgtables units mismatch in Killed process message
        fs/posix_acl.c: fix kernel-doc warnings
        hexagon: work around compiler crash
        hexagon: parenthesize registers in asm predicates
        fs/namespace.c: make to_mnt_ns() static
        fs/nsfs.c: include headers for missing declarations
        fs/direct-io.c: include fs/internal.h for missing prototype
        mm: move_pages: return valid node id in status if the page is already on the target node
        memcg: account security cred as well to kmemcg
        kcov: fix struct layout for kcov_remote_arg
        mm/zsmalloc.c: fix the migrated zspage statistics.
        mm/memory_hotplug: shrink zones when offlining memory
      36487907
    • Linus Torvalds's avatar
      Merge tag 'apparmor-pr-2020-01-04' of... · a125bcda
      Linus Torvalds authored
      Merge tag 'apparmor-pr-2020-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor
      
      Pull apparmor fixes from John Johansen:
      
       - performance regression: only get a label reference if the fast path
         check fails
      
       - fix aa_xattrs_match() may sleep while holding a RCU lock
      
       - fix bind mounts aborting with -ENOMEM
      
      * tag 'apparmor-pr-2020-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor:
        apparmor: fix aa_xattrs_match() may sleep while holding a RCU lock
        apparmor: only get a label reference if the fast path check fails
        apparmor: fix bind mounts aborting with -ENOMEM
      a125bcda
  3. 04 Jan, 2020 17 commits