1. 11 Jan, 2012 32 commits
  2. 10 Jan, 2012 3 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · e4e11180
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        vfs: new helper - d_make_root()
        dcache: use a dispose list in select_parent
        ceph: d_alloc_root() may fail
        ext4: fix failure exits
        isofs: inode leak on mount failure
      e4e11180
    • Al Viro's avatar
      vfs: new helper - d_make_root() · adc0e91a
      Al Viro authored
      d_alloc_root() with iput() in case of allocation failure...
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      adc0e91a
    • Dave Chinner's avatar
      dcache: use a dispose list in select_parent · b48f03b3
      Dave Chinner authored
      select_parent currently abuses the dentry cache LRU to provide
      cleanup features for child dentries that need to be freed. It moves
      them to the tail of the LRU, then tells shrink_dcache_parent() to
      calls __shrink_dcache_sb to unconditionally move them to a dispose
      list (as DCACHE_REFERENCED is ignored). __shrink_dcache_sb() has to
      relock the dentries to move them off the LRU onto the dispose list,
      but otherwise does not touch the dentries that select_parent() moved
      to the tail of the LRU. It then passses the dispose list to
      shrink_dentry_list() which tries to free the dentries.
      
      IOWs, the use of __shrink_dcache_sb() is superfluous - we can build
      exactly the same list of dentries for disposal directly in
      select_parent() and call shrink_dentry_list() instead of calling
      __shrink_dcache_sb() to do that. This means that we avoid long holds
      on the lru lock walking the LRU moving dentries to the dispose list
      We also avoid the need to relock each dentry just to move it off the
      LRU, reducing the numebr of times we lock each dentry to dispose of
      them in shrink_dcache_parent() from 3 to 2 times.
      
      Further, we remove one of the two callers of __shrink_dcache_sb().
      This also means that __shrink_dcache_sb can be moved into back into
      prune_dcache_sb() and we no longer have to handle referenced
      dentries conditionally, simplifying the code.
      Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      b48f03b3
  3. 09 Jan, 2012 5 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next · 37cfc3f6
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next:
        sparc32: remove unused file: include/asm/pgtsun4.h
        sparc32: fix PAGE_SIZE definition
        sparc32: enable different preemptions models
        sparc32: support atomic64_t
        apbuart: fix section mismatch warning
        sparc32: drop useless preprocessor conditional in atomic_32.h
        sparc32: drop unused atomic24 support
      37cfc3f6
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 38e5781b
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        igmp: Avoid zero delay when receiving odd mixture of IGMP queries
        netdev: make net_device_ops const
        bcm63xx: make ethtool_ops const
        usbnet: make ethtool_ops const
        net: Fix build with INET disabled.
        net: introduce netif_addr_lock_nested() and call if when appropriate
        net: correct lock name in dev_[uc/mc]_sync documentations.
        net: sk_update_clone is only used in net/core/sock.c
        8139cp: fix missing napi_gro_flush.
        pktgen: set correct max and min in pktgen_setup_inject()
        smsc911x: Unconditionally include linux/smscphy.h in smsc911x.h
        asix: fix infinite loop in rx_fixup()
        net: Default UDP and UNIX diag to 'n'.
        r6040: fix typo in use of MCR0 register bits
        net: fix sock_clone reference mismatch with tcp memcontrol
      38e5781b
    • Linus Torvalds's avatar
      Merge tag 'clk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 979ecef5
      Linus Torvalds authored
      clock management changes for i.MX
      
      Another simple series related to clock management, this time only for
      imx.
      
      * tag 'clk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: mxs: select HAVE_CLK_PREPARE for clock
        clk: add config option HAVE_CLK_PREPARE into Kconfig
        ASoC: mxs-saif: convert to clk_prepare/clk_unprepare
        video: mxsfb: convert to clk_prepare/clk_unprepare
        serial: mxs-auart: convert to clk_prepare/clk_unprepare
        net: flexcan: convert to clk_prepare/clk_unprepare
        mtd: gpmi-lib: convert to clk_prepare/clk_unprepare
        mmc: mxs-mmc: convert to clk_prepare/clk_unprepare
        dma: mxs-dma: convert to clk_prepare/clk_unprepare
        net: fec: add clk_prepare/clk_unprepare
        ARM: mxs: convert platform code to clk_prepare/clk_unprepare
        clk: add helper functions clk_prepare_enable and clk_disable_unprepare
      
      Fix up trivial conflicts in drivers/net/ethernet/freescale/fec.c due to
      commit 0ebafefc ("net: fec: add clk_prepare/clk_unprepare") clashing
      trivially with commit e163cc97 ("net/fec: fix the .remove code").
      979ecef5
    • Linus Torvalds's avatar
      Merge tag 'timer' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · e8cbce97
      Linus Torvalds authored
      timer changes for msm
      
      A very simple series. We used to have more churn in the timer
      area, so this is kept separate. Will probably put this into the
      drivers series next time.
      
      * tag 'timer' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        msm: timer: Use clockevents_config_and_register()
        msm: timer: Setup interrupt after registering clockevent
        msm: timer: Remove SoC specific #ifdefs
        msm: timer: Remove msm_clocks[] and simplify code
        msm: timer: Fix ONESHOT mode interrupts
        msm: timer: Use GPT for clockevents and DGT for clocksource
        msm: timer: Cleanup #includes and #defines
        msm: timer: Tighten #ifdef for local timer support
      e8cbce97
    • Linus Torvalds's avatar
      Merge tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · b3c37522
      Linus Torvalds authored
      power management changes for omap and imx
      
      A significant part of the changes for these two platforms went into
      power management, so they are split out into a separate branch.
      
      * tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (65 commits)
        ARM: imx6: remove __CPUINIT annotation from v7_invalidate_l1
        ARM: imx6: fix v7_invalidate_l1 by adding I-Cache invalidation
        ARM: imx6q: resume PL310 only when CACHE_L2X0 defined
        ARM: imx6q: build pm code only when CONFIG_PM selected
        ARM: mx5: use generic irq chip pm interface for pm functions on
        ARM: omap: pass minimal SoC/board data for UART from dt
        arm/dts: Add minimal device tree support for omap2420 and omap2430
        omap-serial: Add minimal device tree support
        omap-serial: Use default clock speed (48Mhz) if not specified
        omap-serial: Get rid of all pdev->id usage
        ARM: OMAP2+: hwmod: Add a new flag to handle hwmods left enabled at init
        ARM: OMAP4: PRM: use PRCM interrupt handler
        ARM: OMAP3: pm: use prcm chain handler
        ARM: OMAP: hwmod: add support for selecting mpu_irq for each wakeup pad
        ARM: OMAP2+: mux: add support for PAD wakeup interrupts
        ARM: OMAP: PRCM: add suspend prepare / finish support
        ARM: OMAP: PRCM: add support for chain interrupt handler
        ARM: OMAP3/4: PRM: add functions to read pending IRQs, PRM barrier
        ARM: OMAP2+: hwmod: Add API to enable IO ring wakeup
        ARM: OMAP2+: mux: add wakeup-capable hwmod mux entries to dynamic list
        ...
      b3c37522