1. 09 Dec, 2013 1 commit
  2. 06 Dec, 2013 16 commits
  3. 05 Dec, 2013 14 commits
  4. 04 Dec, 2013 9 commits
    • H. Peter Anvin's avatar
      x86, bitops: Correct the assembly constraints to testing bitops · e0f6dec3
      H. Peter Anvin authored
      In checkin:
      
      0c44c2d0 x86: Use asm goto to implement better modify_and_test() functions
      
      the various functions which do modify and test were unified and
      optimized using "asm goto".  However, this change missed the detail
      that the bitops require an "Ir" constraint rather than an "er"
      constraint ("I" = integer constant from 0-31, "e" = signed 32-bit
      integer constant).  This would cause code to miscompile if these
      functions were used on constant bit positions 32-255 and the build to
      fail if used on constant bit positions above 255.
      
      Add the constraints as a parameter to the GEN_BINARY_RMWcc() macro to
      avoid this problem.
      Reported-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
      Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Link: http://lkml.kernel.org/r/529E8719.4070202@zytor.com
      e0f6dec3
    • Helge Deller's avatar
      nfs: fix do_div() warning by instead using sector_div() · 3873d064
      Helge Deller authored
      When compiling a 32bit kernel with CONFIG_LBDAF=n the compiler complains like
      shown below.  Fix this warning by instead using sector_div() which is provided
      by the kernel.h header file.
      
      fs/nfs/blocklayout/extents.c: In function ‘normalize’:
      include/asm-generic/div64.h:43:28: warning: comparison of distinct pointer types lacks a cast [enabled by default]
      fs/nfs/blocklayout/extents.c:47:13: note: in expansion of macro ‘do_div’
      nfs/blocklayout/extents.c:47:2: warning: right shift count >= width of type [enabled by default]
      fs/nfs/blocklayout/extents.c:47:2: warning: passing argument 1 of ‘__div64_32’ from incompatible pointer type [enabled by default]
      include/asm-generic/div64.h:35:17: note: expected ‘uint64_t *’ but argument is of type ‘sector_t *’
       extern uint32_t __div64_32(uint64_t *dividend, uint32_t divisor);
      Signed-off-by: default avatarHelge Deller <deller@gmx.de>
      Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
      3873d064
    • Trond Myklebust's avatar
    • Trond Myklebust's avatar
      NFSv4.1: Prevent a 3-way deadlock between layoutreturn, open and state recovery · f22e5edd
      Trond Myklebust authored
      Andy Adamson reports:
      
      The state manager is recovering expired state and recovery OPENs are being
      processed. If kswapd is pruning inodes at the same time, a deadlock can occur
      when kswapd calls evict_inode on an NFSv4.1 inode with a layout, and the
      resultant layoutreturn gets an error that the state mangager is to handle,
      causing the layoutreturn to wait on the (NFS client) cl_rpcwaitq.
      
      At the same time an open is waiting for the inode deletion to complete in
      __wait_on_freeing_inode.
      
      If the open is either the open called by the state manager, or an open from
      the same open owner that is holding the NFSv4 sequence id which causes the
      OPEN from the state manager to wait for the sequence id on the Seqid_waitqueue,
      then the state is deadlocked with kswapd.
      
      The fix is simply to have layoutreturn ignore all errors except NFS4ERR_DELAY.
      We already know that layouts are dropped on all server reboots, and that
      it has to be coded to deal with the "forgetful client model" that doesn't
      send layoutreturns.
      Reported-by: default avatarAndy Adamson <andros@netapp.com>
      Link: http://lkml.kernel.org/r/1385402270-14284-1-git-send-email-andros@netapp.comSigned-off-by: default avatarTrond Myklebust <Trond.Myklebust@primarydata.com>
      f22e5edd
    • Linus Torvalds's avatar
      Merge tag 'gpio-v3.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · 8ecffd79
      Linus Torvalds authored
      Pull GPIO fixes from Linus Walleij:
       "Here are a few more GPIO patches, we're a bit noisy for being the GPIO
        subsystem, mostly due to the new descriptor API, but all is getting
        into shape.
      
         - Fix compile warnings
      
         - Fix overly talkative diagnostic messages from usual use cases wrt
           GPIO descriptors
      
         - Add a documentation 00-INDEX
      
         - Use platform GPIOs as fallback when ACPI or device tree is used as
           the primary means to get GPIO lines
      
         - A bug fix for the MPC8572/MPC8536 fixing erroneous input data"
      
      * tag 'gpio-v3.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
        gpiolib: change a warning to debug message when failing to get gpio
        powerpc/gpio: Fix the wrong GPIO input data on MPC8572/MPC8536
        gpiolib: use platform GPIO mappings as fallback
        Documentation: gpiolib: add 00-INDEX file
        gpiolib: fix lookup of platform-mapped GPIOs
        gpiolib: add missing declarations
      8ecffd79
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 36059ee2
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "Another batch of fixes for ARM SoCs for 3.13.  The diffstat is large,
        mostly because of:
      
         - Another set of fixes to fix regressions caused by moving OMAP from
           board files to DT.  Tony thinks this was the last major set of
           fixes, with maybe just a few small patches to follow.
         - More fixes for Marvell platforms, most dealing with misdescribed
           PCIe hardware, i.e.  incorrect number of busses on some SoCs, etc.
           The line delta adds up due to various ranges moving around when
           this is fixed.
      
        But there's also:
      
         - Some smaller tweaks to defconfigs to make more boards bootable in
           my test setup for better coverage.
         - There are also a few other smaller fixes, a short series for at91,
           a couple of reverts for ux500, etc"
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (39 commits)
        arm: dts: socfpga: Change some clocks of gate-clk type to perip-clk
        arm: socfpga: Enable ARM_TWD for socfpga
        ARM: multi_v7_defconfig: enable SDHCI_BCM_KONA and MMC_BLOCK_MINORS=16
        ARM: sunxi_defconfig: enable NFS, TMPFS, PRINTK_TIME and nfsroot support
        ARM: multi_v7_defconfig: enable network for BeagleBone Black
        ARM: dts: Fix the name of supplies for smsc911x shared by OMAP
        ARM: OMAP2+: Powerdomain: Fix unchecked dereference of arch_pwrdm
        ARM: dts: omap3-beagle: Add omap-twl4030 audio support
        ARM: dts: omap4-sdp: Fix pin muxing for wl12xx
        ARM: dts: omap4-panda-common: Fix pin muxing for wl12xx
        ARM: at91: fixed unresolved symbol "at91_pm_set_standby" when built without CONFIG_PM
        ARM: at91: add usart3 alias to dtsi
        ARM: at91: sama5d3: reduce TWI internal clock frequency
        mmc: omap: Fix I2C dependency and make driver usable with device tree
        mmc: omap: Fix DMA configuration to not rely on device id
        ARM: dts: omap3-beagle: Fix USB host on beagle boards (for 3.13)
        ARM: dts: omap3-igep0020: name twl4030 VPLL2 regulator as vdds_dsi
        ARM: dts: AM33XX IGEP0033: add USB support
        ARM: dts: AM33XX BASE0033: add 32KBit EEPROM support
        ARM: dts: AM33XX BASE0033: add pinmux and user led support
        ...
      36059ee2
    • Linus Torvalds's avatar
      Merge branch 'parisc-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · 8aa9c367
      Linus Torvalds authored
      Pull parsic updates from Helge Deller:
       - a fix for the mmap(MAP_FIXED|MAP_SHARED) syscall to the same address
         which was already given in a previous call (fixes locale-gen on
         debian)
       - change the memory layout of the kernel to avoid the need for the
         -mlong-calls compiler option (depends on commit 5ecbe3c3 -
         "kernel/extable: fix address-checks for core_kernel and init areas")
       - defconfig updates, e.g.  use the SIL680 driver instead of the SIIMAGE
         driver
       - add more parisc machine names to the machine database
      
      * 'parisc-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: update 64bit defconfigs and use SIL680 instead of SIIMAGE driver
        parisc: remove CONFIG_MLONGCALLS=y from defconfigs
        parisc: fix kernel memory layout in vmlinux.ld.S
        parisc: use kernel_text_address() in unwind functions
        parisc: remove empty SERIAL_PORT_DFNS in serial.h
        parisc: add some more machine names to hardware database
        parisc: fix mmap(MAP_FIXED|MAP_SHARED) to already mmapped address
      8aa9c367
    • Linus Torvalds's avatar
      Merge tag 'squashfs-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next · 27871790
      Linus Torvalds authored
      Pull squashfs bugfix from Phillip Lougher:
       "Just a single bug fix to the new "directly decompress into the page
        cache" code"
      
      * tag 'squashfs-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next:
        Squashfs: fix failure to unlock pages on decompress error
      27871790
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · d644c026
      Linus Torvalds authored
      Pull crypto fixes from Herbert Xu:
       "This push fixes a number of crashes triggered by a previous crypto
        self-test update.  It also fixes a build problem in the caam driver,
        as well as a concurrency issue in s390.
      
        Finally there is a pair of fixes to bugs in the crypto scatterwalk
        code and authenc that may lead to crashes"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: testmgr - fix sglen in test_aead for case 'dst != src'
        crypto: talitos - fix aead sglen for case 'dst != src'
        crypto: caam - fix aead sglen for case 'dst != src'
        crypto: ccm - Fix handling of zero plaintext when computing mac
        crypto: s390 - Fix aes-xts parameter corruption
        crypto: talitos - corrrectly handle zero-length assoc data
        crypto: scatterwalk - Set the chain pointer indication bit
        crypto: authenc - Find proper IV address in ablkcipher callback
        crypto: caam - Add missing Job Ring include
      d644c026