1. 08 4月, 2017 23 次提交
  2. 07 4月, 2017 9 次提交
    • R
      Merge branch 'acpi-scan-fixes' · dc752d54
      Rafael J. Wysocki 提交于
      * acpi-scan-fixes:
        ACPI / scan: Prefer devices without _HID for _ADR matching
      dc752d54
    • W
      Revert "Revert "arm64: hugetlb: partial revert of 66b3923a"" · 6ae979ab
      Will Deacon 提交于
      The use of the contiguous bit by our hugetlb implementation violates
      the break-before-make requirements of the architecture and can lead to
      silent data corruption or TLB conflict aborts. Once again, disable these
      hugetlb sizes whilst it gets worked out.
      
      This reverts commit ab2e1b89.
      
      Conflicts:
      	arch/arm64/mm/hugetlbpage.c
      Signed-off-by: NWill Deacon <will.deacon@arm.com>
      6ae979ab
    • L
      Merge tag 'xfs-4.11-fixes-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux · 269c930e
      Linus Torvalds 提交于
      Pull XFS fixes from Darrick Wong:
       "Here are three more fixes for 4.11.
      
        The first one reworks the inline directory verifier to check the
        working copy of the directory metadata and to avoid triggering a
        periodic crash in xfs/348. The second patch fixes a regression in hole
        punching at EOF that corrupts files; and the third patch closes a
        kernel memory disclosure bug.
      
        Summary:
      
         - rework the inline directory verifier to avoid crashes on disk
           corruption
      
         - don't change file size when punching holes w/ KEEP_SIZE
      
         - close a kernel memory exposure bug"
      
      * tag 'xfs-4.11-fixes-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
        xfs: fix kernel memory exposure problems
        xfs: Honor FALLOC_FL_KEEP_SIZE when punching ends of files
        xfs: rework the inline directory verifiers
      269c930e
    • L
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 977674c0
      Linus Torvalds 提交于
      Pull MIPS fixes from Ralf Baechle:
       "Lantiq:
          - Fix adding xbar resoures causing a panic
      
        Loongson3:
          - Some Loongson 3A don't identify themselves as having an FTLB so
            hardwire that knowledge into CPU probing.
          - Handle Loongson 3 TLB peculiarities in the fast path of the RDHWR
            emulation.
          - Fix invalid FTLB entries with huge page on VTLB+FTLB platforms
          - Add missing calculation of S-cache and V-cache cache-way size
      
        Ralink:
          - Fix typos in rt3883 pinctrl data
      
        Generic:
          - Force o32 fp64 support on 32bit MIPS64r6 kernels
          - Yet another build fix after the linux/sched.h changes
          - Wire up statx system call
          - Fix stack unwinding after introduction of IRQ stack
          - Fix spinlock code to build even for microMIPS with recent binutils
      
        SMP-CPS:
          - Fix retrieval of VPE mask on big endian CPUs"
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: IRQ Stack: Unwind IRQ stack onto task stack
        MIPS: c-r4k: Fix Loongson-3's vcache/scache waysize calculation
        MIPS: Flush wrong invalid FTLB entry for huge page
        MIPS: Check TLB before handle_ri_rdhwr() for Loongson-3
        MIPS: Add MIPS_CPU_FTLB for Loongson-3A R2
        MIPS: Lantiq: fix missing xbar kernel panic
        MIPS: smp-cps: Fix retrieval of VPE mask on big endian CPUs
        MIPS: Wire up statx system call
        MIPS: Include asm/ptrace.h now linux/sched.h doesn't
        MIPS: ralink: Fix typos in rt3883 pinctrl
        MIPS: End spinlocks with .insn
        MIPS: Force o32 fp64 support on 32bit MIPS64r6 kernels
      977674c0
    • L
      Merge tag 'trace-v4.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 4691f4a6
      Linus Torvalds 提交于
      Pull tracing fix from Steven Rostedt:
       "Wei Yongjun fixed a long standing bug in the ring buffer startup test.
      
        If for some unknown reason, the kthread that is created fails to be
        created, the return from kthread_create() is an PTR_ERR and not a
        NULL. The test incorrectly checks for NULL instead of an error"
      
      * tag 'trace-v4.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        ring-buffer: Fix return value check in test_ringbuffer()
      4691f4a6
    • M
      sparc: remove unused wp_works_ok macro · 86e1066f
      Mathias Krause 提交于
      It's unused for ages, used to be required for ksyms.c back in the v1.1
      times.
      Signed-off-by: NMathias Krause <minipli@googlemail.com>
      Acked-by: NDavid S. Miller <davem@davemloft.net>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      86e1066f
    • G
      sparc32: Export vac_cache_size to fix build error · 9d262d95
      Guenter Roeck 提交于
      sparc32:allmodconfig fails to build with the following error.
      
      ERROR: "vac_cache_size" [drivers/infiniband/sw/rxe/rdma_rxe.ko] undefined!
      
      Fixes: cb886455 ("infiniband: Fix alignment of mmap cookies ...")
      Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
      Cc: Doug Ledford <dledford@redhat.com>
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      9d262d95
    • N
      sparc64: Fix memory corruption when THP is enabled · 76811263
      Nitin Gupta 提交于
      The memory corruption was happening due to incorrect
      TLB/TSB flushing of hugepages.
      Reported-by: NDavid S. Miller <davem@davemloft.net>
      Signed-off-by: NNitin Gupta <nitin.m.gupta@oracle.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      76811263
    • T
      sparc64: Fix kernel panic due to erroneous #ifdef surrounding pmd_write() · 9ae34dbd
      Tom Hromatka 提交于
      This commit moves sparc64's prototype of pmd_write() outside
      of the CONFIG_TRANSPARENT_HUGEPAGE ifdef.
      
      In 2013, commit a7b9403f ("sparc64: Encode huge PMDs using PTE
      encoding.") exposed a path where pmd_write() could be called without
      CONFIG_TRANSPARENT_HUGEPAGE defined.  This can result in the panic below.
      
      The diff is awkward to read, but the changes are straightforward.
      pmd_write() was moved outside of #ifdef CONFIG_TRANSPARENT_HUGEPAGE.
      Also, __HAVE_ARCH_PMD_WRITE was defined.
      
      kernel BUG at include/asm-generic/pgtable.h:576!
                    \|/ ____ \|/
                    "@'/ .. \`@"
                    /_| \__/ |_\
                       \__U_/
      oracle_8114_cdb(8114): Kernel bad sw trap 5 [#1]
      CPU: 120 PID: 8114 Comm: oracle_8114_cdb Not tainted
      4.1.12-61.7.1.el6uek.rc1.sparc64 #1
      task: fff8400700a24d60 ti: fff8400700bc4000 task.ti: fff8400700bc4000
      TSTATE: 0000004411e01607 TPC: 00000000004609f8 TNPC: 00000000004609fc Y:
      00000005    Not tainted
      TPC: <gup_huge_pmd+0x198/0x1e0>
      g0: 000000000001c000 g1: 0000000000ef3954 g2: 0000000000000000 g3: 0000000000000001
      g4: fff8400700a24d60 g5: fff8001fa5c10000 g6: fff8400700bc4000 g7: 0000000000000720
      o0: 0000000000bc5058 o1: 0000000000000240 o2: 0000000000006000 o3: 0000000000001c00
      o4: 0000000000000000 o5: 0000048000080000 sp: fff8400700bc6ab1 ret_pc: 00000000004609f0
      RPC: <gup_huge_pmd+0x190/0x1e0>
      l0: fff8400700bc74fc l1: 0000000000020000 l2: 0000000000002000 l3: 0000000000000000
      l4: fff8001f93250950 l5: 000000000113f800 l6: 0000000000000004 l7: 0000000000000000
      i0: fff8400700ca46a0 i1: bd0000085e800453 i2: 000000026a0c4000 i3: 000000026a0c6000
      i4: 0000000000000001 i5: fff800070c958de8 i6: fff8400700bc6b61 i7: 0000000000460dd0
      I7: <gup_pud_range+0x170/0x1a0>
      Call Trace:
       [0000000000460dd0] gup_pud_range+0x170/0x1a0
       [0000000000460e84] get_user_pages_fast+0x84/0x120
       [00000000006f5a18] iov_iter_get_pages+0x98/0x240
       [00000000005fa744] do_direct_IO+0xf64/0x1e00
       [00000000005fbbc0] __blockdev_direct_IO+0x360/0x15a0
       [00000000101f74fc] ext4_ind_direct_IO+0xdc/0x400 [ext4]
       [00000000101af690] ext4_ext_direct_IO+0x1d0/0x2c0 [ext4]
       [00000000101af86c] ext4_direct_IO+0xec/0x220 [ext4]
       [0000000000553bd4] generic_file_read_iter+0x114/0x140
       [00000000005bdc2c] __vfs_read+0xac/0x100
       [00000000005bf254] vfs_read+0x54/0x100
       [00000000005bf368] SyS_pread64+0x68/0x80
      Signed-off-by: NTom Hromatka <tom.hromatka@oracle.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      9ae34dbd
  3. 06 4月, 2017 7 次提交
  4. 05 4月, 2017 1 次提交