1. 01 Mar, 2017 10 commits
    • Arnd Bergmann's avatar
      x86/hyperv: Hide unused label · 73667e31
      Arnd Bergmann authored
      This new 32-bit warning just showed up:
      
      arch/x86/hyperv/hv_init.c: In function 'hyperv_init':
      arch/x86/hyperv/hv_init.c:167:1: error: label 'register_msr_cs' defined but not used [-Werror=unused-label]
      
      The easiest solution is to move the label up into the existing #ifdef that
      has the goto.
      
      Fixes: dee863b5 ("hv: export current Hyper-V clocksource")
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Acked-by: default avatarStephen Hemminger <sthemmin@microsoft.com>
      Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
      Cc: Haiyang Zhang <haiyangz@microsoft.com>
      Cc: devel@linuxdriverproject.org
      Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
      Cc: "K. Y. Srinivasan" <kys@microsoft.com>
      Link: http://lkml.kernel.org/r/20170214211736.2641241-1-arnd@arndb.deSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      73667e31
    • Matjaz Hegedic's avatar
      x86/reboot/quirks: Add ASUS EeeBook X205TA reboot quirk · 90b28ded
      Matjaz Hegedic authored
      Without the parameter reboot=a, ASUS EeeBook X205TA will hang when it should reboot.
      
      This adds the appropriate quirk, thus fixing the problem.
      Signed-off-by: default avatarMatjaz Hegedic <matjaz.hegedic@gmail.com>
      Cc: Andy Lutomirski <luto@kernel.org>
      Cc: Borislav Petkov <bp@alien8.de>
      Cc: Brian Gerst <brgerst@gmail.com>
      Cc: Denys Vlasenko <dvlasenk@redhat.com>
      Cc: H. Peter Anvin <hpa@zytor.com>
      Cc: Josh Poimboeuf <jpoimboe@redhat.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      90b28ded
    • Andrew Banman's avatar
      x86/platform/uv/BAU: Fix HUB errors by remove initial write to sw-ack register · 1b17c6df
      Andrew Banman authored
      Writing to the software acknowledge clear register when there are no
      pending messages causes a HUB error to assert. The original intent of this
      write was to clear the pending bits before start of operation, but this is
      an incorrect method and has been determined to be unnecessary.
      Signed-off-by: default avatarAndrew Banman <abanman@hpe.com>
      Acked-by: default avatarMike Travis <mike.travis@hpe.com>
      Cc: Andy Lutomirski <luto@kernel.org>
      Cc: Borislav Petkov <bp@alien8.de>
      Cc: Brian Gerst <brgerst@gmail.com>
      Cc: Denys Vlasenko <dvlasenk@redhat.com>
      Cc: H. Peter Anvin <hpa@zytor.com>
      Cc: Josh Poimboeuf <jpoimboe@redhat.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: akpm@linux-foundation.org
      Cc: rja@hpe.com
      Cc: sivanich@hpe.com
      Link: http://lkml.kernel.org/r/1487351269-181133-1-git-send-email-abanman@hpe.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
      1b17c6df
    • Dmitry Safonov's avatar
      x86/selftests: Add clobbers for int80 on x86_64 · 2a4d0c62
      Dmitry Safonov authored
      Kernel erases R8..R11 registers prior returning to userspace
      from int80:
      
        https://lkml.org/lkml/2009/10/1/164
      
      GCC can reuse these registers and doesn't expect them to change
      during syscall invocation. I met this kind of bug in CRIU once
      GCC 6.1 and CLANG stored local variables in those registers
      and the kernel zerofied them during syscall:
      
        https://github.com/xemul/criu/commit/990d33f1a1cdd17bca6c2eb059ab3be2564f7fa2
      
      By that reason I suggest to add those registers to clobbers
      in selftests.  Also, as noted by Andy - removed unneeded clobber
      for flags in INT $0x80 inline asm.
      Signed-off-by: default avatarDmitry Safonov <dsafonov@virtuozzo.com>
      Acked-by: default avatarAndy Lutomirski <luto@kernel.org>
      Cc: 0x7f454c46@gmail.com
      Cc: Borislav Petkov <bp@alien8.de>
      Cc: Borislav Petkov <bp@suse.de>
      Cc: Brian Gerst <brgerst@gmail.com>
      Cc: Denys Vlasenko <dvlasenk@redhat.com>
      Cc: H. Peter Anvin <hpa@zytor.com>
      Cc: Josh Poimboeuf <jpoimboe@redhat.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Shuah Khan <shuah@kernel.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: linux-kselftest@vger.kernel.org
      Link: http://lkml.kernel.org/r/20170213101336.20486-1-dsafonov@virtuozzo.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
      2a4d0c62
    • Dou Liyang's avatar
      x86/apic: Simplify enable_IR_x2apic(), remove try_to_enable_IR() · 11277aab
      Dou Liyang authored
      The following commit:
      
        2e63ad4b ("x86/apic: Do not init irq remapping if ioapic is disabled")
      
      ... added a check for skipped IO-APIC setup to enable_IR_x2apic(), but this
      check is also duplicated in try_to_enable_IR() - and it will never succeed in
      calling irq_remapping_enable().
      
      Remove the whole irq_remapping_enable() complication: if the IO-APIC is
      disabled we cannot enable IRQ remapping.
      Signed-off-by: default avatarDou Liyang <douly.fnst@cn.fujitsu.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: bp@alien8.de
      Cc: nicstange@gmail.com
      Cc: wanpeng.li@hotmail.com
      Link: http://lkml.kernel.org/r/1487841401-1543-1-git-send-email-douly.fnst@cn.fujitsu.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
      11277aab
    • Dou Liyang's avatar
      x86/apic: Fix a warning message in logical CPU IDs allocation · bb3f0a52
      Dou Liyang authored
      The current warning message in allocate_logical_cpuid() is somewhat confusing:
      
        Only 1 processors supported.Processor 2/0x2 and the rest are ignored.
      
      As it might imply that there's only one CPU in the system - while what we ran
      into here is a kernel limitation.
      
      Fix the warning message to clarify all that:
      
        APIC: NR_CPUS/possible_cpus limit of 2 reached. Processor 2/0x2 and the rest are ignored.
      
      ( Also update the error return from -1 to -EINVAL, which is the more
        canonical return value. )
      Signed-off-by: default avatarDou Liyang <douly.fnst@cn.fujitsu.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: bp@alien8.de
      Cc: nicstange@gmail.com
      Cc: wanpeng.li@hotmail.com
      Link: http://lkml.kernel.org/r/1488261052-25753-1-git-send-email-douly.fnst@cn.fujitsu.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
      bb3f0a52
    • Borislav Petkov's avatar
      x86/kdebugfs: Move boot params hierarchy under (debugfs)/x86/ · 10bce841
      Borislav Petkov authored
      ... since this is all x86-specific data and it makes sense to have it
      under x86/ logically instead in the toplevel debugfs dir.
      Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Link: http://lkml.kernel.org/r/20170227225058.27289-1-bp@alien8.deSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
      10bce841
    • Linus Torvalds's avatar
      Merge tag 'for-linus-4.11' of git://git.code.sf.net/p/openipmi/linux-ipmi · 2d6be4ab
      Linus Torvalds authored
      Pull IPMI updates from Corey Minyard:
       "This is a few small fixes to the main IPMI driver, make some things
        const, fix typos, etc.
      
        The last patch came in about a week ago, but IMHO it's best to go in
        now. It is not for the main driver, it's for the bt-bmc driver, which
        runs on the managment controller side, not on the host side, so the
        scope is limited and the change is necessary"
      
      * tag 'for-linus-4.11' of git://git.code.sf.net/p/openipmi/linux-ipmi:
        ipmi: bt-bmc: Use a regmap for register access
        char: ipmi: constify ipmi_smi_handlers structures
        acpi:ipmi: Make IPMI user handler const
        ipmi: make ipmi_usr_hndl const
        Documentation: Fix a typo in IPMI.txt.
      2d6be4ab
    • Linus Torvalds's avatar
      Merge branch 'idr-4.11' of git://git.infradead.org/users/willy/linux-dax · cf393195
      Linus Torvalds authored
      Pull IDR rewrite from Matthew Wilcox:
       "The most significant part of the following is the patch to rewrite the
        IDR & IDA to be clients of the radix tree. But there's much more,
        including an enhancement of the IDA to be significantly more space
        efficient, an IDR & IDA test suite, some improvements to the IDR API
        (and driver changes to take advantage of those improvements), several
        improvements to the radix tree test suite and RCU annotations.
      
        The IDR & IDA rewrite had a good spin in linux-next and Andrew's tree
        for most of the last cycle. Coupled with the IDR test suite, I feel
        pretty confident that any remaining bugs are quite hard to hit. 0-day
        did a great job of watching my git tree and pointing out problems; as
        it hit them, I added new test-cases to be sure not to be caught the
        same way twice"
      
      Willy goes on to expand a bit on the IDR rewrite rationale:
       "The radix tree and the IDR use very similar data structures.
      
        Merging the two codebases lets us share the memory allocation pools,
        and results in a net deletion of 500 lines of code. It also opens up
        the possibility of exposing more of the features of the radix tree to
        users of the IDR (and I have some interesting patches along those
        lines waiting for 4.12)
      
        It also shrinks the size of the 'struct idr' from 40 bytes to 24 which
        will shrink a fair few data structures that embed an IDR"
      
      * 'idr-4.11' of git://git.infradead.org/users/willy/linux-dax: (32 commits)
        radix tree test suite: Add config option for map shift
        idr: Add missing __rcu annotations
        radix-tree: Fix __rcu annotations
        radix-tree: Add rcu_dereference and rcu_assign_pointer calls
        radix tree test suite: Run iteration tests for longer
        radix tree test suite: Fix split/join memory leaks
        radix tree test suite: Fix leaks in regression2.c
        radix tree test suite: Fix leaky tests
        radix tree test suite: Enable address sanitizer
        radix_tree_iter_resume: Fix out of bounds error
        radix-tree: Store a pointer to the root in each node
        radix-tree: Chain preallocated nodes through ->parent
        radix tree test suite: Dial down verbosity with -v
        radix tree test suite: Introduce kmalloc_verbose
        idr: Return the deleted entry from idr_remove
        radix tree test suite: Build separate binaries for some tests
        ida: Use exceptional entries for small IDAs
        ida: Move ida_bitmap to a percpu variable
        Reimplement IDR and IDA using the radix tree
        radix-tree: Add radix_tree_iter_delete
        ...
      cf393195
    • Linus Torvalds's avatar
      Merge tag 'iommu-fix-v4.11-rc0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 5ecc5ac2
      Linus Torvalds authored
      Pull IOMMU fixes from Joerg Roedel:
       "Fix an issue introduced this merge window into the AMD and Intel IOMMU
        drivers that causes an oops when the vendor-specific sysfs-entries are
        accessed.
      
        The reason for this issue is that I forgot to update the sysfs code in
        the drivers when moving the iommu 'struct device' to the iommu-core"
      
      * tag 'iommu-fix-v4.11-rc0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
        iommu/amd: Fix crash when accessing AMD-Vi sysfs entries
        iommu/vt-d: Fix crash when accessing VT-d sysfs entries
      5ecc5ac2
  2. 28 Feb, 2017 30 commits
    • Linus Torvalds's avatar
      Merge tag 'nfsd-4.11' of git://linux-nfs.org/~bfields/linux · 8313064c
      Linus Torvalds authored
      Pull nfsd updates from Bruce Fields:
       "The nfsd update this round is mainly a lot of miscellaneous cleanups
        and bugfixes.
      
        A couple changes could theoretically break working setups on upgrade.
        I don't expect complaints in practice, but they seem worth calling out
        just in case:
      
         - NFS security labels are now off by default; a new security_label
           export flag reenables it per export. But, having them on by default
           is a disaster, as it generally only makes sense if all your clients
           and servers have similar enough selinux policies. Thanks to Jason
           Tibbitts for pointing this out.
      
         - NFSv4/UDP support is off. It was never really supported, and the
           spec explicitly forbids it. We only ever left it on out of
           laziness; thanks to Jeff Layton for finally fixing that"
      
      * tag 'nfsd-4.11' of git://linux-nfs.org/~bfields/linux: (34 commits)
        nfsd: Fix display of the version string
        nfsd: fix configuration of supported minor versions
        sunrpc: don't register UDP port with rpcbind when version needs congestion control
        nfs/nfsd/sunrpc: enforce transport requirements for NFSv4
        sunrpc: flag transports as having congestion control
        sunrpc: turn bitfield flags in svc_version into bools
        nfsd: remove superfluous KERN_INFO
        nfsd: special case truncates some more
        nfsd: minor nfsd_setattr cleanup
        NFSD: Reserve adequate space for LOCKT operation
        NFSD: Get response size before operation for all RPCs
        nfsd/callback: Drop a useless data copy when comparing sessionid
        nfsd/callback: skip the callback tag
        nfsd/callback: Cleanup callback cred on shutdown
        nfsd/idmap: return nfserr_inval for 0-length names
        SUNRPC/Cache: Always treat the invalid cache as unexpired
        SUNRPC: Drop all entries from cache_detail when cache_purge()
        svcrdma: Poll CQs in "workqueue" mode
        svcrdma: Combine list fields in struct svc_rdma_op_ctxt
        svcrdma: Remove unused sc_dto_q field
        ...
      8313064c
    • Linus Torvalds's avatar
      Merge tag 'ceph-for-4.11-rc1' of git://github.com/ceph/ceph-client · b2deee2d
      Linus Torvalds authored
      Pull ceph updates from Ilya Dryomov:
       "This time around we have:
      
         - support for rbd data-pool feature, which enables rbd images on
           erasure-coded pools (myself). CEPH_PG_MAX_SIZE has been bumped to
           allow erasure-coded profiles with k+m up to 32.
      
         - a patch for ceph_d_revalidate() performance regression introduced
           in 4.9, along with some cleanups in the area (Jeff Layton)
      
         - a set of fixes for unsafe ->d_parent accesses in CephFS (Jeff
           Layton)
      
         - buffered reads are now processed in rsize windows instead of rasize
           windows (Andreas Gerstmayr). The new default for rsize mount option
           is 64M.
      
         - ack vs commit distinction is gone, greatly simplifying ->fsync()
           and MOSDOpReply handling code (myself)
      
        ... also a few filesystem bug fixes from Zheng, a CRUSH sync up (CRUSH
        computations are still serialized though) and several minor fixes and
        cleanups all over"
      
      * tag 'ceph-for-4.11-rc1' of git://github.com/ceph/ceph-client: (52 commits)
        libceph, rbd, ceph: WRITE | ONDISK -> WRITE
        libceph: get rid of ack vs commit
        ceph: remove special ack vs commit behavior
        ceph: tidy some white space in get_nonsnap_parent()
        crush: fix dprintk compilation
        crush: do is_out test only if we do not collide
        ceph: remove req from unsafe list when unregistering it
        rbd: constify device_type structure
        rbd: kill obj_request->object_name and rbd_segment_name_cache
        rbd: store and use obj_request->object_no
        rbd: RBD_V{1,2}_DATA_FORMAT macros
        rbd: factor out __rbd_osd_req_create()
        rbd: set offset and length outside of rbd_obj_request_create()
        rbd: support for data-pool feature
        rbd: introduce rbd_init_layout()
        rbd: use rbd_obj_bytes() more
        rbd: remove now unused rbd_obj_request_wait() and helpers
        rbd: switch rbd_obj_method_sync() to ceph_osdc_call()
        libceph: pass reply buffer length through ceph_osdc_call()
        rbd: do away with obj_request in rbd_obj_read_sync()
        ...
      b2deee2d
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm · d4f4cf77
      Linus Torvalds authored
      Pull ARM updates from Russell King:
      
       - nommu updates from Afzal Mohammed cleaning up the vectors support
      
       - allow DMA memory "mapping" for nommu Benjamin Gaignard
      
       - fixing a correctness issue with R_ARM_PREL31 relocations in the
         module linker
      
       - add strlen() prototype for the decompressor
      
       - support for DEBUG_VIRTUAL from Florian Fainelli
      
       - adjusting memory bounds after memory reservations have been
         registered
      
       - unipher cache handling updates from Masahiro Yamada
      
       - initrd and Thumb Kconfig cleanups
      
      * 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm: (23 commits)
        ARM: mm: round the initrd reservation to page boundaries
        ARM: mm: clean up initrd initialisation
        ARM: mm: move initrd init code out of arm_memblock_init()
        ARM: 8655/1: improve NOMMU definition of pgprot_*()
        ARM: 8654/1: decompressor: add strlen prototype
        ARM: 8652/1: cache-uniphier: clean up active way setup code
        ARM: 8651/1: cache-uniphier: include <linux/errno.h> instead of <linux/types.h>
        ARM: 8650/1: module: handle negative R_ARM_PREL31 addends correctly
        ARM: 8649/2: nommu: remove Hivecs configuration is asm
        ARM: 8648/2: nommu: display vectors base
        ARM: 8647/2: nommu: dynamic exception base address setting
        ARM: 8646/1: mmu: decouple VECTORS_BASE from Kconfig
        ARM: 8644/1: Reduce "CPU: shutdown" message to debug level
        ARM: 8641/1: treewide: Replace uses of virt_to_phys with __pa_symbol
        ARM: 8640/1: Add support for CONFIG_DEBUG_VIRTUAL
        ARM: 8639/1: Define KERNEL_START and KERNEL_END
        ARM: 8638/1: mtd: lart: Rename partition defines to be prefixed with PART_
        ARM: 8637/1: Adjust memory boundaries after reservations
        ARM: 8636/1: Cleanup sanity_check_meminfo
        ARM: add CPU_THUMB_CAPABLE to indicate possible Thumb support
        ...
      d4f4cf77
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · f89db789
      Linus Torvalds authored
      Pull x86 fixes from Ingo Molnar:
       "Two documentation updates, plus a debugging annotation fix"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/crash: Update the stale comment in reserve_crashkernel()
        x86/irq, trace: Add __irq_entry annotation to x86's platform IRQ handlers
        Documentation, x86, resctrl: Recommend locking for resctrlfs
      f89db789
    • Linus Torvalds's avatar
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 65314ed0
      Linus Torvalds authored
      Pull scheduler fixes from Ingo Molnar:
       "Two rq-clock warnings related fixes, plus a cgroups related crash fix"
      
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched/cgroup: Move sched_online_group() back into css_online() to fix crash
        sched/fair: Update rq clock before changing a task's CPU affinity
        sched/core: Fix update_rq_clock() splat on hotplug (and suspend/resume)
      65314ed0
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 3f26b0c8
      Linus Torvalds authored
      Pull perf fixes from Ingo Molnar:
       "Misc fixes on the kernel and tooling side - nothing in particular
        stands out"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (21 commits)
        perf/core: Fix the perf_cpu_time_max_percent check
        perf/core: Fix perf_event_enable_on_exec() timekeeping (again)
        perf/core: Remove confusing comment and move put_ctx()
        perf record: Honor --quiet option properly
        perf annotate: Add -q/--quiet option
        perf diff: Add -q/--quiet option
        perf report: Add -q/--quiet option
        perf utils: Check verbose flag properly
        perf utils: Add perf_quiet_option()
        perf record: Add -a as default target
        perf stat: Add -a as default target
        perf tools: Fail on using multiple bits long terms without value
        perf tools: Move new_term arguments into struct parse_events_term template
        perf build: Add special fixdep cleaning rule
        perf tools: Replace _SC_NPROCESSORS_CONF with max_present_cpu in cpu_topology_map
        perf header: Make build_cpu_topology skip offline/absent CPUs
        perf cpumap: Add cpu__max_present_cpu()
        perf session: Fix DEBUG=1 build with clang
        tools lib traceevent: It's preempt not prempt
        perf python: Filter out -specs=/a/b/c from the python binding cc options
        ...
      3f26b0c8
    • Linus Torvalds's avatar
      Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 74efe07b
      Linus Torvalds authored
      Pull locking fixes from Ingo Molnar:
       "The main change is the uninlining of large refcount_t APIs, plus a
        header dependency fix.
      
        Note that the uninlining allowed us to enable the underflow/overflow
        warnings unconditionally and remove the debug Kconfig switch: this
        might trigger new warnings in buggy code and turn
        crashes/use-after-free bugs into less harmful memory leaks"
      
      * 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        locking/refcounts: Add missing kernel.h header to have UINT_MAX defined
        locking/refcounts: Out-of-line everything
      74efe07b
    • Linus Torvalds's avatar
      Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · e72e58fa
      Linus Torvalds authored
      Pull objtool fixes from Ingo Molnar:
       "A handful of objtool fixes related to unreachable code, plus a build
        fix for out of tree modules"
      
      * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        objtool: Enclose contents of unreachable() macro in a block
        objtool: Prevent GCC from merging annotate_unreachable()
        objtool: Improve detection of BUG() and other dead ends
        objtool: Fix CONFIG_STACK_VALIDATION=y warning for out-of-tree modules
      e72e58fa
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide · 74e3f63c
      Linus Torvalds authored
      Pull IDE updates from David Miller:
       "Just one actual change here this time around, adding some init data
        annotations. The other change was bogus and got reverted"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
        ide: palm_bk3710: add __initdata to palm_bk3710_port_info
        Revert "ide: Fix interface autodetection in legacy IDE driver (trial #2)"
        ide: Fix interface autodetection in legacy IDE driver (trial #2)
      74e3f63c
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · c2eca00f
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Don't save TIPC header values before the header has been validated,
          from Jon Paul Maloy.
      
       2) Fix memory leak in RDS, from Zhu Yanjun.
      
       3) We miss to initialize the UID in the flow key in some paths, from
          Julian Anastasov.
      
       4) Fix latent TOS masking bug in the routing cache removal from years
          ago, also from Julian.
      
       5) We forget to set the sockaddr port in sctp_copy_local_addr_list(),
          fix from Xin Long.
      
       6) Missing module ref count drop in packet scheduler actions, from
          Roman Mashak.
      
       7) Fix RCU annotations in rht_bucket_nested, from Herbert Xu.
      
       8) Fix use after free which happens because L2TP's ipv4 support returns
          non-zero values from it's backlog_rcv function which ipv4 interprets
          as protocol values. Fix from Paul Hüber.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (35 commits)
        qed: Don't use attention PTT for configuring BW
        qed: Fix race with multiple VFs
        l2tp: avoid use-after-free caused by l2tp_ip_backlog_recv
        xfrm: provide correct dst in xfrm_neigh_lookup
        rhashtable: Fix RCU dereference annotation in rht_bucket_nested
        rhashtable: Fix use before NULL check in bucket_table_free
        net sched actions: do not overwrite status of action creation.
        rxrpc: Kernel calls get stuck in recvmsg
        net sched actions: decrement module reference count after table flush.
        lib: Allow compile-testing of parman
        ipv6: check sk sk_type and protocol early in ip_mroute_set/getsockopt
        sctp: set sin_port for addr param when checking duplicate address
        net/mlx4_en: fix overflow in mlx4_en_init_timestamp()
        netfilter: nft_set_bitmap: incorrect bitmap size
        net: s2io: fix typo argumnet argument
        net: vxge: fix typo argumnet argument
        netfilter: nf_ct_expect: Change __nf_ct_expect_check() return value.
        ipv4: mask tos for input route
        ipv4: add missing initialization for flowi4_uid
        lib: fix spelling mistake: "actualy" -> "actually"
        ...
      c2eca00f
    • Joerg Roedel's avatar
      iommu/amd: Fix crash when accessing AMD-Vi sysfs entries · b7a42b9d
      Joerg Roedel authored
      The link between the iommu sysfs-device and the struct
      amd_iommu is no longer stored as driver-data. Update the
      code to the new correct way of getting from device to
      amd_iommu.
      Reported-by: default avatarDave Jones <davej@codemonkey.org.uk>
      Fixes: 39ab9555 ('iommu: Add sysfs bindings for struct iommu_device')
      Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
      b7a42b9d
    • Joerg Roedel's avatar
      iommu/vt-d: Fix crash when accessing VT-d sysfs entries · a7fdb6e6
      Joerg Roedel authored
      The link between the iommu sysfs-device and the struct
      intel_iommu is no longer stored as driver-data. Update the
      code to use the new access method.
      Reported-by: default avatarDave Jones <davej@codemonkey.org.uk>
      Fixes: 39ab9555 ('iommu: Add sysfs bindings for struct iommu_device')
      Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
      a7fdb6e6
    • Russell King's avatar
      Merge branches 'fixes' and 'misc'; commit 'kuser^{/add CPU_THUMB_CAPABLE to... · 17a870be
      Russell King authored
      Merge branches 'fixes' and 'misc'; commit 'kuser^{/add CPU_THUMB_CAPABLE to indicate}' into for-linus
      17a870be
    • Russell King's avatar
      ARM: mm: round the initrd reservation to page boundaries · cdcc5fa0
      Russell King authored
      Round the initrd memblock reservation to page boundaries to prevent
      other data sharing the initrd pages.  This prevents an allocation
      possibly overlapping with the initrd, which would later get trampled
      on in free_initrd_mem().
      Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      cdcc5fa0
    • Russell King's avatar
      ARM: mm: clean up initrd initialisation · 68b32f36
      Russell King authored
      Rather than repeatedly testing phys_initrd_size to see if the initrd
      is still enabled, return from the new function to avoid executing the
      remaining initialisation.
      Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      68b32f36
    • Russell King's avatar
      ARM: mm: move initrd init code out of arm_memblock_init() · 39286248
      Russell King authored
      Move the ARM initrd initialisation code out of arm_memblock_init() into
      its own function, so it can be cleaned up.
      Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      39286248
    • Arnd Bergmann's avatar
      ARM: 8655/1: improve NOMMU definition of pgprot_*() · e2fce0a2
      Arnd Bergmann authored
      The tegra DRM driver produces a harmless warning when built for NOMMU:
      
      drivers/gpu/drm/tegra/gem.c: In function 'tegra_drm_mmap':
      drivers/gpu/drm/tegra/gem.c:508:12: unused variable 'prot'
      
      This is because pgprot_writecombine() on ARM returns a constant and
      ignores its argument. The version in asm-generic doesn't have that
      problem, so let's use that one instead. We don't actually care
      about the value on NOMMU, and this is consistent with what some
      other architectures do.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Acked-by: default avatarThierry Reding <treding@nvidia.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      e2fce0a2
    • Arnd Bergmann's avatar
      ARM: 8654/1: decompressor: add strlen prototype · 7b96ddd0
      Arnd Bergmann authored
      The decompress.c file contains a declaration for strstr() so we can
      include some compression library code.
      
      With the updated LZ4 implementation, we run into the same problem again
      for strlen():
      
      In file included from ../include/linux/rcupdate.h:40:0,
                       from ../include/linux/srcu.h:33,
                       from ../include/linux/notifier.h:15,
                       from ../include/linux/memory_hotplug.h:6,
                       from ../include/linux/mmzone.h:749,
                       from ../include/linux/gfp.h:5,
                       from ../include/linux/kmod.h:22,
                       from ../include/linux/module.h:13,
                       from ../arch/arm/boot/compressed/../../../../lib/lz4/lz4_decompress.c:39,
                       from ../arch/arm/boot/compressed/../../../../lib/decompress_unlz4.c:13,
                       from ../arch/arm/boot/compressed/decompress.c:55:
      include/linux/cpumask.h: In function 'cpumask_parse':
      include/linux/cpumask.h:592:53: error: implicit declaration of function 'strlen';did you mean 'strstr'? [-Werror=implicit-function-declaration]
      
      This adds another declaration to work around the new problem.
      
      Fixes: ce83d9ab80d6 ("lib: update LZ4 compressor module")
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      7b96ddd0
    • Masahiro Yamada's avatar
      ARM: 8652/1: cache-uniphier: clean up active way setup code · 06369a1e
      Masahiro Yamada authored
      Now, the active way setup function is called with a fixed value zero
      for the second argument.  The code can be simpler.
      Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      06369a1e
    • Masahiro Yamada's avatar
      ARM: 8651/1: cache-uniphier: include <linux/errno.h> instead of <linux/types.h> · 1c63d4c5
      Masahiro Yamada authored
      Nothing in this header file depends on <linux/types.h>.
      Rather, <linux/errno.h> should be included for -ENODEV.
      Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      1c63d4c5
    • Ard Biesheuvel's avatar
      ARM: 8650/1: module: handle negative R_ARM_PREL31 addends correctly · 050d18d1
      Ard Biesheuvel authored
      According to the spec 'ELF for the ARM Architecture' (IHI 0044E),
      addends for R_ARM_PREL31 relocations are 31-bit signed quantities,
      so we need to sign extend the value to 32 bits before it can be used
      as an offset in the calculation of the relocated value.
      
      We have not been bitten by this because these relocations are usually
      emitted against the start of a section, which means the addends never
      assume negative values in practice. But it is a bug nonetheless, so fix
      it.
      Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
      Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      050d18d1
    • Afzal Mohammed's avatar
      ARM: 8649/2: nommu: remove Hivecs configuration is asm · ad475117
      Afzal Mohammed authored
      Now that exception based address is handled dynamically for
      processors with CP15, remove Hivecs configuration in assembly.
      Signed-off-by: default avatarafzal mohammed <afzal.mohd.ma@gmail.com>
      Tested-by: default avatarVladimir Murzin <vladimir.murzin@arm.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      ad475117
    • Afzal Mohammed's avatar
      ARM: 8648/2: nommu: display vectors base · 58c16709
      Afzal Mohammed authored
      VECTORS_BASE displays the exception base address. Now on no-MMU as
      the exception base address is dynamically estimated, define
      VECTORS_BASE to the variable holding it.
      
      As it is the case, limit VECTORS_BASE constant definition to MMU.
      Suggested-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      Signed-off-by: default avatarafzal mohammed <afzal.mohd.ma@gmail.com>
      Tested-by: default avatarVladimir Murzin <vladimir.murzin@arm.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      58c16709
    • Afzal Mohammed's avatar
      ARM: 8647/2: nommu: dynamic exception base address setting · f8300a0b
      Afzal Mohammed authored
      No-MMU dynamic exception base address configuration on CP15
      processors. In the case of low vectors, decision based on whether
      security extensions are enabled & whether remap vectors to RAM
      CONFIG option is selected.
      
      For no-MMU without CP15, current default value of 0x0 is retained.
      Signed-off-by: default avatarafzal mohammed <afzal.mohd.ma@gmail.com>
      Tested-by: default avatarVladimir Murzin <vladimir.murzin@arm.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      f8300a0b
    • Afzal Mohammed's avatar
      ARM: 8646/1: mmu: decouple VECTORS_BASE from Kconfig · d2ca5f24
      Afzal Mohammed authored
      For MMU configurations, VECTORS_BASE is always 0xffff0000, a macro
      definition will suffice.
      
      For no-MMU, exception base address is dynamically determined in
      subsequent patches. To preserve bisectability, now make the
      macro applicable for no-MMU scenario too.
      
      Thanks to 0-DAY kernel test infrastructure that found the
      bisectability issue. This macro will be restricted to MMU case upon
      dynamically determining exception base address for no-MMU.
      
      Once exception address is handled dynamically for no-MMU,
      VECTORS_BASE can be removed from Kconfig.
      Signed-off-by: default avatarafzal mohammed <afzal.mohd.ma@gmail.com>
      Tested-by: default avatarVladimir Murzin <vladimir.murzin@arm.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      d2ca5f24
    • Florian Fainelli's avatar
      ARM: 8644/1: Reduce "CPU: shutdown" message to debug level · 035e7875
      Florian Fainelli authored
      Similar to c68b0274 ("ARM: reduce "Booted secondary processor"
      message to debug level"), demote the "CPU: shutdown" pr_notice() into a
      pr_debug().
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      035e7875
    • Florian Fainelli's avatar
      ARM: 8641/1: treewide: Replace uses of virt_to_phys with __pa_symbol · 64fc2a94
      Florian Fainelli authored
      All low-level PM/SMP code using virt_to_phys() should actually use
      __pa_symbol() against kernel symbols. Update code where relevant to move
      away from virt_to_phys().
      Acked-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      Reviewed-by: default avatarLaura Abbott <labbott@redhat.com>
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      64fc2a94
    • Florian Fainelli's avatar
      ARM: 8640/1: Add support for CONFIG_DEBUG_VIRTUAL · e377cd82
      Florian Fainelli authored
      x86 has an option: CONFIG_DEBUG_VIRTUAL to do additional checks on
      virt_to_phys calls. The goal is to catch users who are calling
      virt_to_phys on non-linear addresses immediately. This includes caller
      using __virt_to_phys() on image addresses instead of __pa_symbol(). This
      is a generally useful debug feature to spot bad code (particulary in
      drivers).
      Acked-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      Acked-by: default avatarLaura Abbott <labbott@redhat.com>
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      e377cd82
    • Russell King's avatar
      Merge branch 'devel-stable' into misc · 399f157a
      Russell King authored
      399f157a
    • Florian Fainelli's avatar
      ARM: 8639/1: Define KERNEL_START and KERNEL_END · a09975bf
      Florian Fainelli authored
      In preparation for adding CONFIG_DEBUG_VIRTUAL support, define a set of
      common constants: KERNEL_START and KERNEL_END which abstract
      CONFIG_XIP_KERNEL vs. !CONFIG_XIP_KERNEL. Update the code where
      relevant.
      Acked-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      a09975bf