1. 10 9月, 2014 1 次提交
  2. 01 9月, 2014 14 次提交
    • A
      ARM: i.MX: Remove i.MX1 ADS board support · 13758c52
      Alexander Shiyan 提交于
      mx1ads.c can be replaced with devicetree equivalent: imx1-ads.dts,
      so remove the board file.
      Signed-off-by: NAlexander Shiyan <shc_work@mail.ru>
      Signed-off-by: NShawn Guo <shawn.guo@freescale.com>
      13758c52
    • X
      ARM: dts: vf610-twr: remove useless property for sound card. · 2b10368a
      Xiubo Li 提交于
      This was added by:
      Commit 8128c4f3 ("ARM: dts: vf610-twr: Add simple-card support.")
      
      This useless property may cause some confusions for users.
      Signed-off-by: NXiubo Li <Li.Xiubo@freescale.com>
      Signed-off-by: NShawn Guo <shawn.guo@freescale.com>
      2b10368a
    • S
      ARM: imx: remove imx_scu_standby_enable() · ee295d7f
      Shawn Guo 提交于
      With commit c716483c ("ARM: 8122/1: smp_scu: enable SCU standby
      support"), the STANDBY bit of SCU is handled by core function
      scu_enable().  So imx_scu_standby_enable() can be removed now.
      Signed-off-by: NShawn Guo <shawn.guo@freescale.com>
      ee295d7f
    • A
      ARM: i.MX: Remove Phytec i.MX27 PCM038/PCM970 board files · 1ca7070d
      Alexander Shiyan 提交于
      pcm970-baseboard.c and mach-pcm038.c can be replaced with their
      devicetree equivalents: imx27-phytec-phycore-rdk.dts and
      imx27-phytec-phycore-som.dtsi respectively, so remove the board files.
      Signed-off-by: NAlexander Shiyan <shc_work@mail.ru>
      Signed-off-by: NShawn Guo <shawn.guo@freescale.com>
      1ca7070d
    • A
      ARM: i.MX: Remove mach-cpuimx27sd board file · 7c5deaf7
      Alexander Shiyan 提交于
      eukrea_mbimx27-baseboard.c and mach-cpuimx27.c can be replaced with their
      devicetree equivalents: imx27-eukrea-mbimxsd27-baseboard.dts and
      imx27-eukrea-cpuimx27.dtsi respectively, so remove the board files.
      Signed-off-by: NAlexander Shiyan <shc_work@mail.ru>
      Acked-by: NEric Bénard <eric@eukrea.com>
      Signed-off-by: NShawn Guo <shawn.guo@freescale.com>
      7c5deaf7
    • A
      ARM: imx: iomux: Do not export symbol without public declaration · 58b71c3e
      Alexander Stein 提交于
      The iomux function declarations are in headers only accessible in this
      directory. Thus those can't be used in any module. None of the
      objects in this directory is tristate. Neither can the header be included
      in out-of-tree modules.
      Signed-off-by: NAlexander Stein <alexander.stein@systec-electronic.com>
      Signed-off-by: NShawn Guo <shawn.guo@freescale.com>
      58b71c3e
    • L
      Linux 3.17-rc3 · 69e273c0
      Linus Torvalds 提交于
      69e273c0
    • L
      Merge tag 'xtensa-20140830' of git://github.com/czankel/xtensa-linux · 05bdb8c9
      Linus Torvalds 提交于
      Pull Xtensa updates from Chris Zankel:
       "Xtensa improvements for 3.17:
         - support highmem on cores with aliasing data cache.  Enable highmem
           on kc705 by default
         - simplify addition of new core variants (no need to modify Kconfig /
           Makefiles)
         - improve robustness of unaligned access handler and its interaction
           with window overflow/underflow exception handlers
         - deprecate atomic and spill registers syscalls
         - clean up Kconfig: remove orphan MATH_EMULATION, sort 'select'
           statements
         - wire up renameat2 syscall.
      
        Various fixes:
         - fix address checks in dma_{alloc,free}_coherent (runtime BUG)
         - fix access to THREAD_RA/THREAD_SP/THREAD_DS (debug build breakage)
         - fix TLBTEMP_BASE_2 region handling in fast_second_level_miss
           (runtime unrecoverable exception)
         - fix a6 and a7 handling in fast_syscall_xtensa (runtime userspace
           register clobbering)
         - fix kernel/user jump out of fast_unaligned (potential runtime
           unrecoverabl exception)
         - replace termios IOCTL code definitions with constants (userspace
           build breakage)"
      
      * tag 'xtensa-20140830' of git://github.com/czankel/xtensa-linux: (25 commits)
        xtensa: deprecate fast_xtensa and fast_spill_registers syscalls
        xtensa: don't allow overflow/underflow on unaligned stack
        xtensa: fix a6 and a7 handling in fast_syscall_xtensa
        xtensa: allow single-stepping through unaligned load/store
        xtensa: move invalid unaligned instruction handler closer to its users
        xtensa: make fast_unaligned store restartable
        xtensa: add double exception fixup handler for fast_unaligned
        xtensa: fix kernel/user jump out of fast_unaligned
        xtensa: configure kc705 for highmem
        xtensa: support highmem in aliasing cache flushing code
        xtensa: support aliasing cache in kmap
        xtensa: support aliasing cache in k[un]map_atomic
        xtensa: implement clear_user_highpage and copy_user_highpage
        xtensa: fix TLBTEMP_BASE_2 region handling in fast_second_level_miss
        xtensa: allow fixmap and kmap span more than one page table
        xtensa: make fixmap region addressing grow with index
        xtensa: fix access to THREAD_RA/THREAD_SP/THREAD_DS
        xtensa: add renameat2 syscall
        xtensa: fix address checks in dma_{alloc,free}_coherent
        xtensa: replace IOCTL code definitions with constants
        ...
      05bdb8c9
    • G
      unicore32: Fix build error · ca98565a
      Guenter Roeck 提交于
      unicore32 builds fail with
      
        arch/unicore32/kernel/signal.c: In function ‘setup_frame’:
        arch/unicore32/kernel/signal.c:257: error: ‘usig’ undeclared (first use in this function)
        arch/unicore32/kernel/signal.c:279: error: ‘usig’ undeclared (first use in this function)
        arch/unicore32/kernel/signal.c: In function ‘handle_signal’:
        arch/unicore32/kernel/signal.c:306: warning: unused variable ‘tsk’
        arch/unicore32/kernel/signal.c: In function ‘do_signal’:
        arch/unicore32/kernel/signal.c:376: error: implicit declaration of function ‘get_signsl’
        make[1]: *** [arch/unicore32/kernel/signal.o] Error 1
        make: *** [arch/unicore32/kernel/signal.o] Error 2
      
      Bisect points to commit 649671c9 ("unicore32: Use get_signal()
      signal_setup_done()").
      
      This code never even compiled.  Reverting the patch does not work, since
      previously used functions no longer exist, so try to fix it up.  Compile
      tested only.
      
      Fixes: 649671c9 ("unicore32: Use get_signal() signal_setup_done()")
      Cc: Richard Weinberger <richard@nod.at>
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ca98565a
    • L
      Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · 94559a4a
      Linus Torvalds 提交于
      Pull ARM fixes from Russell King:
       "Various assorted fixes:
      
         - a couple of patches from Mark Rutland to resolve an errata with
           Cortex-A15 CPUs.
         - fix cpuidle for the CPU part ID changes in the last merge window
         - add support for a relocation which ARM binutils is generating in
           some circumstances"
      
      * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
        ARM: 8130/1: cpuidle/cpuidle-big_little: fix reading cpu id part number
        ARM: 8129/1: errata: work around Cortex-A15 erratum 830321 using dummy strex
        ARM: 8128/1: abort: don't clear the exclusive monitors
        ARM: 8127/1: module: add support for R_ARM_TARGET1 relocations
      94559a4a
    • L
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 19ed3eb9
      Linus Torvalds 提交于
      Pull ARM SoC fixes from Olof Johansson:
       "Here's the weekly batch of fixes from arm-soc.
      
        The delta is a largeish negative delta, due to revert of SMP support
        for Broadcom's STB SoC -- it was accidentally merged before some
        issues had been addressed, so they will make a new attempt for 3.18.
        I didn't see a need for a full revert of the whole platform due to
        this, we're keeping the rest enabled.
      
        The rest is mostly:
      
         - a handful of DT fixes for i.MX (Hummingboard/Cubox-i in particular)
         - some MTD/NAND fixes for OMAP
         - minor DT fixes for shmobile
         - warning fix for UP builds on vexpress/spc
      
        There's also a couple of patches that wires up hwmod on TI's DRA7 SoC
        so it can boot.  Drivers and the rest had landed for 3.17, and it's
        small and isolated so it made sense to pick up now even if it's not a
        bugfix"
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits)
        vexpress/spc: fix a build warning on array bounds
        ARM: DRA7: hwmod: Add dra74x and dra72x specific ocp interface lists
        ARM: DRA7: Add support for soc_is_dra74x() and soc_is_dra72x() variants
        MAINTAINERS: catch special Rockchip code locations
        ARM: dts: microsom-ar8035: MDIO pad must be set open drain
        ARM: dts: omap54xx-clocks: Fix the l3 and l4 clock rates
        ARM: brcmstb: revert SMP support
        ARM: OMAP2+: hwmod: Rearm wake-up interrupts for DT when MUSB is idled
        ARM: dts: Enable UART wake-up events for beagleboard
        ARM: dts: Remove twl6030 clk32g "regulator"
        ARM: OMAP2+: omap_device: remove warning that clk alias already exists
        ARM: OMAP: fix %d confusingly prefixed with 0x in format string
        ARM: dts: DRA7: fix interrupt-cells for GPIO
        mtd: nand: omap: Fix 1-bit Hamming code scheme, omap_calculate_ecc()
        ARM: dts: omap3430-sdp: Revert to using software ECC for NAND
        ARM: OMAP2+: GPMC: Support Software ECC scheme via DT
        mtd: nand: omap: Revert to using software ECC by default
        ARM: dts: hummingboard/cubox-i: change SPDIF output to be more descriptive
        ARM: dts: hummingboard/cubox-i: add USB OC pinctrl configuration
        ARM: shmobile: r8a7791: add missing 0x0100 for SDCKCR
        ...
      19ed3eb9
    • A
      vexpress/spc: fix a build warning on array bounds · e160cc17
      Alex Shi 提交于
      With ARCH_VEXPRESS_SPC option, kernel build has the following
      warning:
      
      arch/arm/mach-vexpress/spc.c: In function ‘ve_spc_clk_init’:
      arch/arm/mach-vexpress/spc.c:431:38: warning: array subscript is below array bounds [-Warray-bounds]
        struct ve_spc_opp *opps = info->opps[cluster];
                                            ^
      since 'cluster' maybe '-1' in UP system. This patch does a active
      checking to fix this issue.
      Signed-off-by: NAlex Shi <alex.shi@linaro.org>
      Acked-by: NPawel Moll <pawel.moll@arm.com>
      Acked-by: NSudeep Holla <sudeep.holla@arm.com>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      e160cc17
    • O
      Merge tag 'for-v3.17-rc/omap-dra72x-d74x-support-a' of... · 98fd1508
      Olof Johansson 提交于
      Merge tag 'for-v3.17-rc/omap-dra72x-d74x-support-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into fixes
      
      Pull "ARM: OMAP2+: DRA72x/DRA74x basic support" from Tony Lindgren:
      
      Add basic subarchitecture support for the DRA72x and DRA74x.  These
      are OMAP2+ derivative SoCs.  This should be low-risk to existing OMAP
      platforms.
      
      Basic build, boot, and PM test logs are available here:
      
      http://www.pwsan.com/omap/testlogs/hwmod-a-early-v3.17-rc/20140827194314/
      
      * tag 'for-v3.17-rc/omap-dra72x-d74x-support-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending:
        ARM: DRA7: hwmod: Add dra74x and dra72x specific ocp interface lists
        ARM: DRA7: Add support for soc_is_dra74x() and soc_is_dra72x() variants
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      98fd1508
    • L
      Merge tag 'spi-v3.17-rc3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · 81bbadc6
      Linus Torvalds 提交于
      Pull spi bugfixes from Mark Brown:
       "A smattering of bug fixes for the SPI subsystem, all in driver code
        which has seen active work recently and none of them with any great
        global impact.
      
        There's also a new ACPI ID for the pxa2xx driver which required no
        code changes and the addition of kerneldoc for some structure fields
        that were missing it and generating warnings during documentation
        builds as a result"
      
      * tag 'spi-v3.17-rc3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
        spi: sh-msiof: Fix transmit-only DMA transfers
        spi/rockchip: Avoid accidentally turning off the clock
        spi: dw: fix kernel crash due to NULL pointer dereference
        spi: dw-pci: fix bug when regs left uninitialized
        spi: davinci: fix SPI_NO_CS functionality
        spi/rockchip: fixup incorrect dma direction setting
        spi/pxa2xx: Add ACPI ID for Intel Braswell
        spi: spi-au1550: fix build failure
        spi: rspi: Fix leaking of unused DMA descriptors
        spi: sh-msiof: Fix leaking of unused DMA descriptors
        spi: Add missing kerneldoc bits
        spi/omap-mcspi: Fix the spi task hangs waiting dma_rx
      81bbadc6
  3. 31 8月, 2014 6 次提交
  4. 30 8月, 2014 19 次提交
    • L
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · fd5984d7
      Linus Torvalds 提交于
      Pull x86 fixes from Peter Anvin:
       "One patch to avoid assigning interrupts we don't actually have on
        non-PC platforms, and two patches that addresses bugs in the new
        IOAPIC assignment code"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, irq, PCI: Keep IRQ assignment for runtime power management
        x86: irq: Fix bug in setting IOAPIC pin attributes
        x86: Fix non-PC platform kernel crash on boot due to NULL dereference
      fd5984d7
    • L
      Merge tag 'pm+acpi-3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · ad6ede80
      Linus Torvalds 提交于
      Pull ACPI and power management fixes from Rafael Wysocki:
      
       - Fix for an ACPI regression related to the handling of fixed events
         that caused netlink routines to be (incorrectly) run in interrupt
         context from Lan Tianyu
      
       - Fix for an ACPI EC driver regression on Acer Aspire V5-573G that
         caused AC/battery plug/unplug and video brightness change
         notifications to be delayed on that machine from Lv Zheng
      
       - Fix for an ACPI device enumeration regression that caused ACPI driver
         probe to fail for some devices where it succeeded before (Rafael J
         Wysocki)
      
       - intel_pstate driver fix to prevent it from printing an information
         message for every CPU in the system on every boot from Andi Kleen
      
       - s5pv210 cpufreq driver fix to remove an __init annotation from a
         routine that in fact can be called at any time after init too from
         Mark Brown
      
       - New Intel Braswell device ID for the ACPI LPSS (Low-Power Subsystem)
         driver from Alan Cox
      
       - New Intel Braswell CPU ID for intel_pstate from Mika Westerberg
      
      * tag 'pm+acpi-3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        cpufreq: s5pv210: Remove spurious __init annotation
        cpufreq: intel_pstate: Add CPU ID for Braswell processor
        intel_pstate: Turn per cpu printk into pr_debug
        ACPI / LPSS: Add ACPI IDs for Intel Braswell
        ACPI / EC: Add support to disallow QR_EC to be issued before completing previous QR_EC
        ACPI / EC: Add support to disallow QR_EC to be issued when SCI_EVT isn't set
        ACPI: Run fixed event device notifications in process context
        ACPI / scan: Allow ACPI drivers to bind to PNP device objects
      ad6ede80
    • L
      Merge branch 'akpm' (fixes from Andrew Morton) · 10f3291a
      Linus Torvalds 提交于
      Merge patches from Andrew Morton:
       "22 fixes"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (22 commits)
        kexec: purgatory: add clean-up for purgatory directory
        Documentation/kdump/kdump.txt: add ARM description
        flush_icache_range: export symbol to fix build errors
        tools: selftests: fix build issue with make kselftests target
        ocfs2: quorum: add a log for node not fenced
        ocfs2: o2net: set tcp user timeout to max value
        ocfs2: o2net: don't shutdown connection when idle timeout
        ocfs2: do not write error flag to user structure we cannot copy from/to
        x86/purgatory: use approprate -m64/-32 build flag for arch/x86/purgatory
        drivers/rtc/rtc-s5m.c: re-add support for devices without irq specified
        xattr: fix check for simultaneous glibc header inclusion
        kexec: remove CONFIG_KEXEC dependency on crypto
        kexec: create a new config option CONFIG_KEXEC_FILE for new syscall
        x86,mm: fix pte_special versus pte_numa
        hugetlb_cgroup: use lockdep_assert_held rather than spin_is_locked
        mm/zpool: use prefixed module loading
        zram: fix incorrect stat with failed_reads
        lib: turn CONFIG_STACKTRACE into an actual option.
        mm: actually clear pmd_numa before invalidating
        memblock, memhotplug: fix wrong type in memblock_find_in_range_node().
        ...
      10f3291a
    • M
      kexec: purgatory: add clean-up for purgatory directory · b0108f9e
      Michael Welling 提交于
      Without this patch the kexec-purgatory.c and purgatory.ro files are not
      removed after make mrproper.
      Signed-off-by: NMichael Welling <mwelling@ieee.org>
      Acked-by: NVivek Goyal <vgoyal@redhat.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: "H. Peter Anvin" <hpa@zytor.com>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      b0108f9e
    • H
      Documentation/kdump/kdump.txt: add ARM description · 16b0371a
      HuKeping 提交于
      Add arm specific parts to kdump kernel documentation.
      Signed-off-by: NHu Keping <hukeping@huawei.com>
      Acked-by: NVivek Goyal <vgoyal@redhat.com>
      Cc: Haren Myneni <hbabu@us.ibm.com>
      Cc: Rob Landley <rob@landley.net>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      16b0371a
    • P
      flush_icache_range: export symbol to fix build errors · e3560305
      Pranith Kumar 提交于
      Fix building errors occuring due to a missing export of
      flush_icache_range() in
      
      kisskb.ellerman.id.au/kisskb/buildresult/11677809/
      
      ERROR: "flush_icache_range" [drivers/misc/lkdtm.ko] undefined!
      Signed-off-by: NPranith Kumar <bobby.prani@gmail.com>
      Reported-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      Acked-by: Vineet Gupta <vgupta@synopsys.com>	[arc]
      Acked-by: Richard Kuo <rkuo@codeaurora.org>	[hexagon]
      Cc: Chris Metcalf <cmetcalf@tilera.com>
      Cc: Chris Zankel <chris@zankel.net>
      Acked-by: Max Filippov <jcmvbkbc@gmail.com>	[xtensa]
      Cc: Noam Camus <noamc@ezchip.com>
      Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
      Acked-by: Zhigang Lu <zlu@tilera.com>		[tile]
      Cc: Kirill Tkhai <tkhai@yandex.ru>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      e3560305
    • P
      tools: selftests: fix build issue with make kselftests target · 498b473a
      Phong Tran 提交于
      Fix the typo of ARCH when running 'make kselftests'.  Change the 'X86'
      to 'x86'.  Test by compilation.
      Signed-off-by: NPhong Tran <tranmanphong@gmail.com>
      Cc: David Herrmann <dh.herrmann@gmail.com>
      Cc: Hugh Dickins <hughd@google.com>
      Cc: Shuah Khan <shuah.kh@samsung.com>
      Cc: Sam Ravnborg <sam@ravnborg.org>
      Cc: Michal Marek <mmarek@suse.cz>
      Cc: Shuah Khan <shuahkh@osg.samsung.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      498b473a
    • J
      ocfs2: quorum: add a log for node not fenced · 8c7b638c
      Junxiao Bi 提交于
      For debug use, we can see from the log whether the fence decision is
      made and why it is not fenced.
      Signed-off-by: NJunxiao Bi <junxiao.bi@oracle.com>
      Reviewed-by: NSrinivas Eeda <srinivas.eeda@oracle.com>
      Reviewed-by: NMark Fasheh <mfasheh@suse.de>
      Cc: Joel Becker <jlbec@evilplan.org>
      Cc: Joseph Qi <joseph.qi@huawei.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      8c7b638c
    • J
      ocfs2: o2net: set tcp user timeout to max value · 8e9801df
      Junxiao Bi 提交于
      When tcp retransmit timeout(15mins), the connection will be closed.
      Pending messages may be lost during this time.  So we set tcp user
      timeout to override the retransmit timeout to the max value.  This is OK
      for ocfs2 since we have disk heartbeat, if peer crash, the disk
      heartbeat will timeout and it will be evicted, if disk heartbeat not
      timeout and connection idle for a long time, then this means the cluster
      enters split-brain state, since fence can't happen, we'd better keep the
      connection and wait network recover.
      Signed-off-by: NJunxiao Bi <junxiao.bi@oracle.com>
      Reviewed-by: NSrinivas Eeda <srinivas.eeda@oracle.com>
      Reviewed-by: NMark Fasheh <mfasheh@suse.de>
      Cc: Joel Becker <jlbec@evilplan.org>
      Cc: Joseph Qi <joseph.qi@huawei.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      8e9801df
    • J
      ocfs2: o2net: don't shutdown connection when idle timeout · c43c363d
      Junxiao Bi 提交于
      This patch series is to fix a possible message lost bug in ocfs2 when
      network go bad.  This bug will cause ocfs2 hung forever even network
      become good again.
      
      The messages may lost in this case.  After the tcp connection is
      established between two nodes, an idle timer will be set to check its
      state periodically, if no messages are received during this time, idle
      timer will timeout, it will shutdown the connection and try to
      reconnect, so pending messages in tcp queues will be lost.  This
      messages may be from dlm.  Dlm may get hung in this case.  This may
      cause the whole ocfs2 cluster hung.
      
      This is very possible to happen when network state goes bad.  Do the
      reconnect is useless, it will fail if network state is still bad.  Just
      waiting there for network recovering may be a good idea, it will not
      lost messages and some node will be fenced until cluster goes into
      split-brain state, for this case, Tcp user timeout is used to override
      the tcp retransmit timeout.  It will timeout after 25 days, user should
      have notice this through the provided log and fix the network, if they
      don't, ocfs2 will fall back to original reconnect way.
      
      This patch (of 3):
      
      Some messages in the tcp queue maybe lost if we shutdown the connection
      and reconnect when idle timeout.  If packets lost and reconnect success,
      then the ocfs2 cluster maybe hung.
      
      To fix this, we can leave the connection there and do the fence decision
      when idle timeout, if network recover before fence dicision is made, the
      connection survive without lost any messages.
      
      This bug can be saw when network state go bad.  It may cause ocfs2 hung
      forever if some packets lost.  With this fix, ocfs2 will recover from
      hung if network becomes good again.
      Signed-off-by: NJunxiao Bi <junxiao.bi@oracle.com>
      Reviewed-by: NSrinivas Eeda <srinivas.eeda@oracle.com>
      Reviewed-by: NMark Fasheh <mfasheh@suse.de>
      Cc: Joel Becker <jlbec@evilplan.org>
      Cc: Joseph Qi <joseph.qi@huawei.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      c43c363d
    • B
      ocfs2: do not write error flag to user structure we cannot copy from/to · 2b462638
      Ben Hutchings 提交于
      If we failed to copy from the structure, writing back the flags leaks 31
      bits of kernel memory (the rest of the ir_flags field).
      
      In any case, if we cannot copy from/to the structure, why should we
      expect putting just the flags to work?
      
      Also make sure ocfs2_info_handle_freeinode() returns the right error
      code if the copy_to_user() fails.
      
      Fixes: ddee5cdb ('Ocfs2: Add new OCFS2_IOC_INFO ioctl for ocfs2 v8.')
      Signed-off-by: NBen Hutchings <ben@decadent.org.uk>
      Cc: Joel Becker <jlbec@evilplan.org>
      Acked-by: NMark Fasheh <mfasheh@suse.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      2b462638
    • V
      x86/purgatory: use approprate -m64/-32 build flag for arch/x86/purgatory · 4df4185a
      Vivek Goyal 提交于
      Thomas reported that build of x86_64 kernel was failing for him.  He is
      using 32bit tool chain.
      
      Problem is that while compiling purgatory, I have not specified -m64
      flag.  And 32bit tool chain must be assuming -m32 by default.
      
      Following is error message.
      
      (mini) [~/work/linux-2.6] make
      scripts/kconfig/conf --silentoldconfig Kconfig
        CHK     include/config/kernel.release
        UPD     include/config/kernel.release
        CHK     include/generated/uapi/linux/version.h
        CHK     include/generated/utsrelease.h
        UPD     include/generated/utsrelease.h
        CC      arch/x86/purgatory/purgatory.o
      arch/x86/purgatory/purgatory.c:1:0: error: code model 'large' not supported in
      the 32 bit mode
      
      Fix it by explicitly passing appropriate -m64/-m32 build flag for
      purgatory.
      Reported-by: NThomas Glanzmann <thomas@glanzmann.de>
      Tested-by: NThomas Glanzmann <thomas@glanzmann.de>
      Suggested-by: NH. Peter Anvin <hpa@zytor.com>
      Signed-off-by: NVivek Goyal <vgoyal@redhat.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      4df4185a
    • B
      drivers/rtc/rtc-s5m.c: re-add support for devices without irq specified · b7d5b9a9
      Bartlomiej Zolnierkiewicz 提交于
      The rtc-s5m driver used to support devices without irq specified in the
      past.  Re-add this support.
      
      The patch fixes boot for Insignal's Exynos4412 based Origen board.
      
      Error messages before the patch:
      
        ...
        Unable to handle kernel NULL pointer dereference at virtual address 00000094
        pgd = c0004000
        [00000094] *pgd=00000000
        Internal error: Oops: 5 [#1] PREEMPT SMP ARM
        Modules linked in:
        CPU: 1 PID: 1 Comm: swapper/0 Not tainted 3.16.0-next-20140804-00008-ga59480f-dirty #701
        task: ea80f000 ti: ea882000 task.ti: ea882000
        PC is at regmap_irq_get_virq+0x0/0x28
        LR is at s5m_rtc_probe+0xdc/0x310
        pc : [<c02574fc>]    lr : [<c02de75c>]    psr: 80000153
        sp : ea883e48  ip : 00000000  fp : 00000000
        r10: 0000000c  r9 : c05de7ac  r8 : eaabc600
        r7 : eaa6b4d0  r6 : c0439e8c  r5 : eaabc610  r4 : eab30e50
        r3 : 00000000  r2 : 00000000  r1 : 0000000c  r0 : 00000000
        Flags: Nzcv  IRQs on  FIQs off  Mode SVC_32  ISA ARM  Segment kernel
        Control: 10c5387d  Table: 4000404a  DAC: 00000015
        Process swapper/0 (pid: 1, stack limit = 0xea882240)
        Backtrace:
          regmap_irq_get_virq
          s5m_rtc_probe
          platform_drv_probe
          driver_probe_device
          __driver_attach
          bus_for_each_dev
          bus_add_driver
          driver_register
          do_one_initcall
          kernel_init_freeable
          kernel_init
        ---[ end trace a954d7f019122700 ]---
        Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b
        ...
      Signed-off-by: NBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
      Reviewed-by: NKrzysztof Kozlowski <k.kozlowski@samsung.com>
      Tested-by: NKrzysztof Kozlowski <k.kozlowski@samsung.com>
      Acked-by: NKyungmin Park <kyungmin.park@samsung.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      b7d5b9a9
    • F
      xattr: fix check for simultaneous glibc header inclusion · bfcfd44c
      Filipe Brandenburger 提交于
      The guard was introduced in commit ea1a8217 ("xattr: guard against
      simultaneous glibc header inclusion") but it is using #ifdef to check
      for a define that is either set to 1 or 0.  Fix it to use #if instead.
      
      * Without this patch:
      
        $ { echo "#include <sys/xattr.h>"; echo "#include <linux/xattr.h>"; } | gcc -E -Iinclude/uapi - >/dev/null
        include/uapi/linux/xattr.h:19:0: warning: "XATTR_CREATE" redefined [enabled by default]
         #define XATTR_CREATE 0x1 /* set value, fail if attr already exists */
         ^
        /usr/include/x86_64-linux-gnu/sys/xattr.h:32:0: note: this is the location of the previous definition
         #define XATTR_CREATE XATTR_CREATE
         ^
      
      * With this patch:
      
        $ { echo "#include <sys/xattr.h>"; echo "#include <linux/xattr.h>"; } | gcc -E -Iinclude/uapi - >/dev/null
        (no warnings)
      Signed-off-by: NFilipe Brandenburger <filbranden@google.com>
      Acked-by: NSerge E. Hallyn <serge.hallyn@ubuntu.com>
      Cc: Allan McRae <allan@archlinux.org>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      bfcfd44c
    • V
      kexec: remove CONFIG_KEXEC dependency on crypto · b41d34b4
      Vivek Goyal 提交于
      New system call depends on crypto.  As it did not have a separate config
      option, CONFIG_KEXEC was modified to select CRYPTO and CRYPTO_SHA256.
      
      But now previous patch introduced a new config option for new syscall.
      So CONFIG_KEXEC does not require crypto.  Remove that dependency.
      Signed-off-by: NVivek Goyal <vgoyal@redhat.com>
      Cc: Eric Biederman <ebiederm@xmission.com>
      Cc: H. Peter Anvin <hpa@zytor.com>
      Cc: Shaun Ruffell <sruffell@digium.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      b41d34b4
    • V
      kexec: create a new config option CONFIG_KEXEC_FILE for new syscall · 74ca317c
      Vivek Goyal 提交于
      Currently new system call kexec_file_load() and all the associated code
      compiles if CONFIG_KEXEC=y.  But new syscall also compiles purgatory
      code which currently uses gcc option -mcmodel=large.  This option seems
      to be available only gcc 4.4 onwards.
      
      Hiding new functionality behind a new config option will not break
      existing users of old gcc.  Those who wish to enable new functionality
      will require new gcc.  Having said that, I am trying to figure out how
      can I move away from using -mcmodel=large but that can take a while.
      
      I think there are other advantages of introducing this new config
      option.  As this option will be enabled only on x86_64, other arches
      don't have to compile generic kexec code which will never be used.  This
      new code selects CRYPTO=y and CRYPTO_SHA256=y.  And all other arches had
      to do this for CONFIG_KEXEC.  Now with introduction of new config
      option, we can remove crypto dependency from other arches.
      
      Now CONFIG_KEXEC_FILE is available only on x86_64.  So whereever I had
      CONFIG_X86_64 defined, I got rid of that.
      
      For CONFIG_KEXEC_FILE, instead of doing select CRYPTO=y, I changed it to
      "depends on CRYPTO=y".  This should be safer as "select" is not
      recursive.
      Signed-off-by: NVivek Goyal <vgoyal@redhat.com>
      Cc: Eric Biederman <ebiederm@xmission.com>
      Cc: H. Peter Anvin <hpa@zytor.com>
      Tested-by: NShaun Ruffell <sruffell@digium.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      74ca317c
    • H
      x86,mm: fix pte_special versus pte_numa · b38af472
      Hugh Dickins 提交于
      Sasha Levin has shown oopses on ffffea0003480048 and ffffea0003480008 at
      mm/memory.c:1132, running Trinity on different 3.16-rc-next kernels:
      where zap_pte_range() checks page->mapping to see if PageAnon(page).
      
      Those addresses fit struct pages for pfns d2001 and d2000, and in each
      dump a register or a stack slot showed d2001730 or d2000730: pte flags
      0x730 are PCD ACCESSED PROTNONE SPECIAL IOMAP; and Sasha's e820 map has
      a hole between cfffffff and 100000000, which would need special access.
      
      Commit c46a7c81 ("x86: define _PAGE_NUMA by reusing software bits on
      the PMD and PTE levels") has broken vm_normal_page(): a PROTNONE SPECIAL
      pte no longer passes the pte_special() test, so zap_pte_range() goes on
      to try to access a non-existent struct page.
      
      Fix this by refining pte_special() (SPECIAL with PRESENT or PROTNONE) to
      complement pte_numa() (SPECIAL with neither PRESENT nor PROTNONE).  A
      hint that this was a problem was that c46a7c81 added pte_numa() test
      to vm_normal_page(), and moved its is_zero_pfn() test from slow to fast
      path: This was papering over a pte_special() snag when the zero page was
      encountered during zap.  This patch reverts vm_normal_page() to how it
      was before, relying on pte_special().
      
      It still appears that this patch may be incomplete: aren't there other
      places which need to be handling PROTNONE along with PRESENT?  For
      example, pte_mknuma() clears _PAGE_PRESENT and sets _PAGE_NUMA, but on a
      PROT_NONE area, that would make it pte_special().  This is side-stepped
      by the fact that NUMA hinting faults skipped PROT_NONE VMAs and there
      are no grounds where a NUMA hinting fault on a PROT_NONE VMA would be
      interesting.
      
      Fixes: c46a7c81 ("x86: define _PAGE_NUMA by reusing software bits on the PMD and PTE levels")
      Reported-by: NSasha Levin <sasha.levin@oracle.com>
      Tested-by: NSasha Levin <sasha.levin@oracle.com>
      Signed-off-by: NHugh Dickins <hughd@google.com>
      Signed-off-by: NMel Gorman <mgorman@suse.de>
      Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Rik van Riel <riel@redhat.com>
      Cc: Johannes Weiner <hannes@cmpxchg.org>
      Cc: Cyrill Gorcunov <gorcunov@gmail.com>
      Cc: Matthew Wilcox <matthew.r.wilcox@intel.com>
      Cc: <stable@vger.kernel.org>	[3.16]
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      b38af472
    • M
      hugetlb_cgroup: use lockdep_assert_held rather than spin_is_locked · 7ea8574e
      Michal Hocko 提交于
      spin_lock may be an empty struct for !SMP configurations and so
      arch_spin_is_locked may return unconditional 0 and trigger the VM_BUG_ON
      even when the lock is held.
      
      Replace spin_is_locked by lockdep_assert_held.  We will not BUG anymore
      but it is questionable whether crashing makes a lot of sense in the
      uncharge path.  Uncharge happens after the last page reference was
      released so nobody should touch the page and the function doesn't update
      any shared state except for res counter which uses synchronization of
      its own.
      Signed-off-by: NMichal Hocko <mhocko@suse.cz>
      Reviewed-by: NAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      7ea8574e
    • K
      mm/zpool: use prefixed module loading · 137f8cff
      Kees Cook 提交于
      To avoid potential format string expansion via module parameters, do not
      use the zpool type directly in request_module() without a format string.
      Additionally, to avoid arbitrary modules being loaded via zpool API
      (e.g.  via the zswap_zpool_type module parameter) add a "zpool-" prefix
      to the requested module, as well as module aliases for the existing
      zpool types (zbud and zsmalloc).
      Signed-off-by: NKees Cook <keescook@chromium.org>
      Cc: Seth Jennings <sjennings@variantweb.net>
      Cc: Minchan Kim <minchan@kernel.org>
      Cc: Nitin Gupta <ngupta@vflare.org>
      Acked-by: NDan Streetman <ddstreet@ieee.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      137f8cff