1. 10 Feb, 2014 4 commits
    • Philipp Zabel's avatar
      ARM: imx6: Initialize low-power mode early again · e7c57ecd
      Philipp Zabel authored
      Since commit 9e8147bb
      "ARM: imx6q: move low-power code out of clock driver"
      the kernel fails to boot on i.MX6Q/D if preemption is
      enabled (CONFIG_PREEMPT=y). The kernel just hangs
      before the console comes up.
      
      The above commit moved the initalization of the low-power
      mode setting (enabling clocked WAIT states), which was
      introduced in commit 83ae2098
      "ARM: imx: correct low-power mode setting", from
      imx6q_clks_init to imx6q_pm_init. Now it is called
      much later, after all cores are enabled.
      
      This patch moves the low-power mode initialization back
      to imx6q_clks_init again (and to imx6sl_clks_init).
      Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
      Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
      Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
      e7c57ecd
    • Linus Walleij's avatar
      ARM: pxa: fix various compilation problems · 9705e746
      Linus Walleij authored
      Due to commit 88f718e3
      "ARM: pxa: delete the custom GPIO header" some drivers fail
      compilation, for example like this:
      
      In file included from sound/soc/pxa/spitz.c:28:0:
      sound/soc/pxa/spitz.c: In function ‘spitz_ext_control’:
      arch/arm/mach-pxa/include/mach/spitz.h:111:30: error:
      ‘PXA_NR_BUILTIN_GPIO’ undeclared (first use in this function)
       #define SPITZ_SCP_GPIO_BASE (PXA_NR_BUILTIN_GPIO)
      (etc.)
      
      This is caused by implicit inclusion of <mach/irqs.h> from
      various board-specific headers under <mach/*> in the PXA
      platform. So we take a sweep over these, and for every such
      header that uses PXA_NR_BUILTIN_GPIO or PXA_GPIO_TO_IRQ()
      we explicitly #include "irqs.h" so that we satisfy the
      dependency in the board include file alone.
      Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      Cc: stable@vger.kernel.org # v3.13+
      Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
      9705e746
    • Linus Walleij's avatar
      ARM: pxa: fix compilation problem on AM300EPD board · 29ffa48f
      Linus Walleij authored
      This board fails compilation like this:
      arch/arm/mach-pxa/am300epd.c: In function ‘am300_cleanup’:
      arch/arm/mach-pxa/am300epd.c:179:2: error: implicit declaration
      of function ‘PXA_GPIO_TO_IRQ’ [-Werror=implicit-function-declaration]
        free_irq(PXA_GPIO_TO_IRQ(RDY_GPIO_PIN), par);
      
      This was caused by commit 88f718e3
      "ARM: pxa: delete the custom GPIO header"
      
      This is because it was previously getting the macro PXA_GPIO_TO_IRQ
      implicitly from <linux/gpio.h> which in turn implicitly included
      <mach/gpio.h> which in turn included <mach/irqs.h>.
      
      Add the missing include so that the board compiles again.
      Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
      29ffa48f
    • Kevin Hilman's avatar
      Merge tag 'mvebu-phy_ata-fixes-3.14' of git://git.infradead.org/linux-mvebu into fixes · 41a11e31
      Kevin Hilman authored
      From Jason Cooper:
      mvebu phy and ata fixes for v3.14
      
       - phy
          - add support for optional phys via NULL
      
       - ata
          - fix boot hang due to probe failure of optional phys
      
      NOTE:  Series has been Ack'd by both the phy maintainer and the ata maintainer
      for going through arm-soc
      
      * tag 'mvebu-phy_ata-fixes-3.14' of git://git.infradead.org/linux-mvebu:
        ata: sata_mv: Fix probe failures with optional phys
        drivers: phy: Add support for optional phys
        drivers: phy: Make NULL a valid phy reference
      Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
      41a11e31
  2. 05 Feb, 2014 3 commits
  3. 03 Feb, 2014 7 commits
    • Rob Herring's avatar
      ARM: fix HAVE_ARM_TWD selection for OMAP and shmobile · 8b7dfa7d
      Rob Herring authored
      The selection of HAVE_ARM_TWD for OMAP and shmobile depend on LOCAL_TIMER
      which no longer exists. They should depend on SMP instead.
      
      Cc: Tony Lindgren <tony@atomide.com>
      Cc: Simon Horman <horms@verge.net.au>
      Cc: Magnus Damm <magnus.damm@gmail.com>
      Signed-off-by: default avatarRob Herring <robh@kernel.org>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      8b7dfa7d
    • Rob Herring's avatar
      ARM: moxart: move DMA_OF selection to driver · e803d988
      Rob Herring authored
      Move the DMA_OF selection to the DMA driver to fix kconfig warning:
      
      warning: (ARCH_MOXART) selects DMA_OF which has unmet direct dependencies (DMADEVICES && OF)
      Signed-off-by: default avatarRob Herring <robh@kernel.org>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      e803d988
    • Rob Herring's avatar
      ARM: hisi: fix kconfig warning on HAVE_ARM_TWD · 57789d69
      Rob Herring authored
      Commit "ARM: hisi: don't select SMP" introduced a kconfig warning:
      warning: (ARCH_HI3xxx) selects HAVE_ARM_TWD which has unmet direct dependencies (SMP)
      
      Fix HAVE_ARM_TWD to depend on SMP.
      Signed-off-by: default avatarRob Herring <robh@kernel.org>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      57789d69
    • Linus Torvalds's avatar
      Linus 3.14-rc1 · 38dbfb59
      Linus Torvalds authored
      38dbfb59
    • Linus Torvalds's avatar
      Merge branch 'parisc-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · 69048e01
      Linus Torvalds authored
      Pull parisc updates from Helge Deller:
       "The three major changes in this patchset is a implementation for
        flexible userspace memory maps, cache-flushing fixes (again), and a
        long-discussed ABI change to make EWOULDBLOCK the same value as
        EAGAIN.
      
        parisc has been the only platform where we had EWOULDBLOCK != EAGAIN
        to keep HP-UX compatibility.  Since we will probably never implement
        full HP-UX support, we prefer to drop this compatibility to make it
        easier for us with Linux userspace programs which mostly never checked
        for both values.  We don't expect major fall-outs because of this
        change, and if we face some, we will simply rebuild the necessary
        applications in the debian archives"
      
      * 'parisc-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: add flexible mmap memory layout support
        parisc: Make EWOULDBLOCK be equal to EAGAIN on parisc
        parisc: convert uapi/asm/stat.h to use native types only
        parisc: wire up sched_setattr and sched_getattr
        parisc: fix cache-flushing
        parisc/sti_console: prefer Linux fonts over built-in ROM fonts
      69048e01
    • Mikulas Patocka's avatar
      hpfs: optimize quad buffer loading · 1c0b8a7a
      Mikulas Patocka authored
      HPFS needs to load 4 consecutive 512-byte sectors when accessing the
      directory nodes or bitmaps.  We can't switch to 2048-byte block size
      because files are allocated in the units of 512-byte sectors.
      
      Previously, the driver would allocate a 2048-byte area using kmalloc,
      copy the data from four buffers to this area and eventually copy them
      back if they were modified.
      
      In the current implementation of the buffer cache, buffers are allocated
      in the pagecache.  That means that 4 consecutive 512-byte buffers are
      stored in consecutive areas in the kernel address space.  So, we don't
      need to allocate extra memory and copy the content of the buffers there.
      
      This patch optimizes the code to avoid copying the buffers.  It checks
      if the four buffers are stored in contiguous memory - if they are not,
      it falls back to allocating a 2048-byte area and copying data there.
      Signed-off-by: default avatarMikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      1c0b8a7a
    • Mikulas Patocka's avatar
      hpfs: remember free space · 2cbe5c76
      Mikulas Patocka authored
      Previously, hpfs scanned all bitmaps each time the user asked for free
      space using statfs.  This patch changes it so that hpfs scans the
      bitmaps only once, remembes the free space and on next invocation of
      statfs it returns the value instantly.
      
      New versions of wine are hammering on the statfs syscall very heavily,
      making some games unplayable when they're stored on hpfs, with load
      times in minutes.
      
      This should be backported to the stable kernels because it fixes
      user-visible problem (excessive level load times in wine).
      Signed-off-by: default avatarMikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      2cbe5c76
  4. 02 Feb, 2014 12 commits
  5. 01 Feb, 2014 12 commits
  6. 31 Jan, 2014 2 commits
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-3.14-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 8a1f006a
      Linus Torvalds authored
      Pull NFS client bugfixes from Trond Myklebust:
       "Highlights:
      
         - Fix several races in nfs_revalidate_mapping
         - NFSv4.1 slot leakage in the pNFS files driver
         - Stable fix for a slot leak in nfs40_sequence_done
         - Don't reject NFSv4 servers that support ACLs with only ALLOW aces"
      
      * tag 'nfs-for-3.14-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        nfs: initialize the ACL support bits to zero.
        NFSv4.1: Cleanup
        NFSv4.1: Clean up nfs41_sequence_done
        NFSv4: Fix a slot leak in nfs40_sequence_done
        NFSv4.1 free slot before resending I/O to MDS
        nfs: add memory barriers around NFS_INO_INVALID_DATA and NFS_INO_INVALIDATING
        NFS: Fix races in nfs_revalidate_mapping
        sunrpc: turn warn_gssd() log message into a dprintk()
        NFS: fix the handling of NFS_INO_INVALID_DATA flag in nfs_revalidate_mapping
        nfs: handle servers that support only ALLOW ACE type.
      8a1f006a
    • Linus Torvalds's avatar
      Merge tag 'sound-fix-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 14864a52
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "The big chunks here are the updates for oxygen driver for Xonar DG
        devices, which were slipped from the previous pull request.  They are
        device-specific and thus not too dangerous.
      
        Other than that, all patches are small bug fixes, mainly for Samsung
        build fixes, a few HD-audio enhancements, and other misc ASoC fixes.
        (And this time ASoC merge is less than Octopus, lucky seven :)"
      
      * tag 'sound-fix-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (42 commits)
        ALSA: hda/hdmi - allow PIN_OUT to be dynamically enabled
        ALSA: hda - add headset mic detect quirks for another Dell laptop
        ALSA: oxygen: Xonar DG(X): cleanup and minor changes
        ALSA: oxygen: Xonar DG(X): modify high-pass filter control
        ALSA: oxygen: Xonar DG(X): modify input select functions
        ALSA: oxygen: Xonar DG(X): modify capture volume functions
        ALSA: oxygen: Xonar DG(X): use headphone volume control
        ALSA: oxygen: Xonar DG(X): modify playback output select
        ALSA: oxygen: Xonar DG(X): capture from I2S channel 1, not 2
        ALSA: oxygen: Xonar DG(X): move the mixer code into another file
        ALSA: oxygen: modify CS4245 register dumping function
        ALSA: oxygen: modify adjust_dg_dac_routing function
        ALSA: oxygen: Xonar DG(X): modify DAC/ADC parameters function
        ALSA: oxygen: Xonar DG(X): modify initialization functions
        ALSA: oxygen: Xonar DG(X): add new CS4245 SPI functions
        ALSA: oxygen: additional definitions for the Xonar DG/DGX card
        ALSA: oxygen: change description of the xonar_dg.c file
        ALSA: oxygen: export oxygen_update_dac_routing symbol
        ALSA: oxygen: add mute mask for the OXYGEN_PLAY_ROUTING register
        ALSA: oxygen: modify the SPI writing function
        ...
      14864a52