Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v2.6.32-git15
Commits on Dec 17, 2009
  1. @torvalds

    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    torvalds authored
    …t/viro/vfs-2.6
    
    * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
      kill I_LOCK
      fold do_sync_file_range into sys_sync_file_range
      fix up O_SYNC comments
      VFS/fsstack: handle 32-bit smp + preempt + large files in fsstack_copy_inode_size
      fsstack/ecryptfs: remove unused get_nlinks param to fsstack_copy_attr_all
      vfs: remove extraneous NULL d_inode check from do_filp_open
      fs: no games with DCACHE_UNHASHED
      fs: anon_inodes implement dname
      dio: fix use-after-free
  2. @torvalds

    Merge branch 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-s…

    torvalds authored
    …core
    
    * 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score:
      score: include asm-generic/param.h in asm/delay.h.
      score: fixed pfn_valid define.
      score: add flush_dcahce_page and PG_dcache_dirty define
  3. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/lrg/voltage-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: (27 commits)
      regulator: wm831x_reg_read() failure unnoticed in wm831x_aldo_get_mode()
      twl-regulator: Fix reg_disable functionality for 4030 and 6030
      twl-regulator: Add turnon delay to reg_enable
      twl-regulator: Restore REMAP configuration in regulator probe
      twl-regulator: Add turnon-delay and REMAP config to twlreg_info struct
      twl-regulator: Define critical regulators as always_on
      twl-regulator: Add all twl4030 regulators to twlreg_info
      regulator: mc13783-regulator: correct the probing time.
      regulator: Fix unbalanced disables/enables in regulator_bulk_{enable,disable} error path
      regulator: core.c: Small coding style cleanup (indentation fixup)
      drivers/regulator: use PTR_ERR to get error code
      regulator: consumer.h - fix build when consumer.h is #included first.
      regulator/mc13783: various cleanups
      regulator/mc13783: rename source file to match other drivers
      Fix some AB3100 regulator issues
      regulator: keep index within bounds in da9034_get_ldo12_voltage()
      regulator: Ensure val is initialised in 88pm8607 choose_voltage()
      regulator: Remove duplicate consts from ab3100
      regulator: Handle regulators without suspend mode configuration
      regulator: Factor out regulator name pretty printing
      ...
  4. kill I_LOCK

    Christoph Hellwig authored Al Viro committed
    After I_SYNC was split from I_LOCK the leftover is always used together with
    I_NEW and thus superflous.
    
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  5. fold do_sync_file_range into sys_sync_file_range

    Christoph Hellwig authored Al Viro committed
    We recently go rid of all callers of do_sync_file_range as they're better
    served with vfs_fsync or the filemap_write_and_wait.  Now that
    do_sync_file_range is down to a single caller fold it into it so that people
    don't start using it again accidentally.  While at it also switch it from
    using __filemap_fdatawrite_range(..., WB_SYNC_ALL) to the more clear
    filemap_fdatawrite_range().
    
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  6. fix up O_SYNC comments

    Christoph Hellwig authored Al Viro committed
    Proper Posix O_SYNC handling only made it into 2.6.33, not 2.6.32.
    
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  7. VFS/fsstack: handle 32-bit smp + preempt + large files in fsstack_cop…

    Erez Zadok authored Al Viro committed
    …y_inode_size
    
    Copy the inode size and blocks from one inode to another correctly on 32-bit
    systems with CONFIG_SMP, CONFIG_PREEMPT, or CONFIG_LBDAF.  Use proper inode
    spinlocks only when i_size/i_blocks cannot fit in one 32-bit word.
    
    Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
    Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  8. fsstack/ecryptfs: remove unused get_nlinks param to fsstack_copy_attr…

    Erez Zadok authored Al Viro committed
    …_all
    
    This get_nlinks parameter was never used by the only mainline user,
    ecryptfs; and it has never been used by unionfs or wrapfs either.
    
    Acked-by: Dustin Kirkland <kirkland@canonical.com>
    Acked-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
    Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  9. vfs: remove extraneous NULL d_inode check from do_filp_open

    Jeff Layton authored Al Viro committed
    We can't get to this point unless it's a valid pointer.
    
    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Cc: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  10. fs: no games with DCACHE_UNHASHED

    Nick Piggin authored Al Viro committed
    Filesystems outside the regular namespace do not have to clear DCACHE_UNHASHED
    in order to have a working /proc/$pid/fd/XXX. Nothing in proc prevents the
    fd link from being used if its dentry is not in the hash.
    
    Also, it does not get put into the dcache hash if DCACHE_UNHASHED is clear;
    that depends on the filesystem calling d_add or d_rehash.
    
    So delete the misleading comments and needless code.
    
    Acked-by: Miklos Szeredi <mszeredi@suse.cz>
    Signed-off-by: Nick Piggin <npiggin@suse.de>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  11. fs: anon_inodes implement dname

    Nick Piggin authored Al Viro committed
    Add a d_dname method for anon_inodes filesystem, the same way pipefs and
    sockfs pseudo filesystems.  This allows us to remove the DCACHE_UNHASHED
    hack from anon_inodes.c (see next patch).
    
    [AV: inumber is useless here, dropped from anon_inodefs_dname()]
    
    Signed-off-by: Nick Piggin <npiggin@suse.de>
    Cc: Miklos Szeredi <mszeredi@suse.cz>
    Cc: Davide Libenzi <davidel@xmailserver.org>
    Cc: "David S. Miller" <davem@davemloft.net>
    Cc: Jens Axboe <jens.axboe@oracle.com>
    Cc: Christoph Hellwig <hch@lst.de>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  12. @torvalds

    Merge branch 'for-33' of git://repo.or.cz/linux-kbuild

    torvalds authored
    * 'for-33' of git://repo.or.cz/linux-kbuild: (29 commits)
      net: fix for utsrelease.h moving to generated
      gen_init_cpio: fixed fwrite warning
      kbuild: fix make clean after mismerge
      kbuild: generate modules.builtin
      genksyms: properly consider  EXPORT_UNUSED_SYMBOL{,_GPL}()
      score: add asm/asm-offsets.h wrapper
      unifdef: update to upstream revision 1.190
      kbuild: specify absolute paths for cscope
      kbuild: create include/generated in silentoldconfig
      scripts/package: deb-pkg: use fakeroot if available
      scripts/package: add KBUILD_PKG_ROOTCMD variable
      scripts/package: tar-pkg: use tar --owner=root
      Kbuild: clean up marker
      net: add net_tstamp.h to headers_install
      kbuild: move utsrelease.h to include/generated
      kbuild: move autoconf.h to include/generated
      drop explicit include of autoconf.h
      kbuild: move compile.h to include/generated
      kbuild: drop include/asm
      kbuild: do not check for include/asm-$ARCH
      ...
    
    Fixed non-conflicting clean merge of modpost.c as per comments from
    Stephen Rothwell (modpost.c had grown an include of linux/autoconf.h
    that needed to be changed to generated/autoconf.h)
  13. @geertu @torvalds

    Revert "fbdev: atafb - add palette register check"

    geertu authored torvalds committed
    This reverts commit 8546e3c, as it's a
    partial duplicate of commit 2f39038
    ("fbdev: add palette register check to several drivers").
    
    The former went in first through the m68k tree, the latter through Andrew
    Morton.
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  14. @torvalds

    x86/ptrace: make genregs[32]_get/set more robust

    torvalds authored
    The loop condition is fragile: we compare an unsigned value to zero, and
    then decrement it by something larger than one in the loop.  All the
    callers should be passing in appropriately aligned buffer lengths, but
    it's better to just not rely on it, and have some appropriate defensive
    loop limits.
    
    Acked-by: Roland McGrath <roland@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  15. score: include asm-generic/param.h in asm/delay.h.

    Chen Liqin authored
    Signed-off-by: Cui Bixiong <bixiong@sunnorth.com.cn>
    Signed-off-by: Chen Liqin <liqin.chen@sunplusct.com>
  16. score: fixed pfn_valid define.

    Chen Liqin authored
    Signed-off-by: Cui Bixiong <bixiong@sunnorth.com.cn>
    Signed-off-by: Chen Liqin <liqin.chen@sunplusct.com>
    
    	modified:   arch/score/include/asm/page.h
    	modified:   arch/score/kernel/setup.c
    	modified:   arch/score/mm/init.c
  17. score: add flush_dcahce_page and PG_dcache_dirty define

    Chen Liqin authored
    Signed-off-by: Cui Bixiong <bixiong@sunnorth.com.cn>
    Signed-off-by: Chen Liqin <liqin.chen@sunplusct.com>
    
    	modified:   arch/score/include/asm/cacheflush.h
    	modified:   arch/score/mm/cache.c
  18. @RoelKluin

    regulator: wm831x_reg_read() failure unnoticed in wm831x_aldo_get_mode()

    RoelKluin authored Liam Girdwood committed
    ret should be signed to notice a failure in wm831x_reg_read().
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  19. twl-regulator: Fix reg_disable functionality for 4030 and 6030

    Juha Keski-Saari authored Liam Girdwood committed
    This change makes sure all regulator group assignments are cleared on
    disable call
    
    Signed-off-by: Juha Keski-Saari <ext-juha.1.keski-saari@nokia.com>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  20. twl-regulator: Add turnon delay to reg_enable

    Juha Keski-Saari authored Liam Girdwood committed
    This change implements a basic turnon delay in the regulator enable function
    to make it less probable that reg_enable returns before the regulator
    output is at target level
    
    Signed-off-by: Juha Keski-Saari <ext-juha.1.keski-saari@nokia.com>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  21. twl-regulator: Restore REMAP configuration in regulator probe

    Juha Keski-Saari authored Liam Girdwood committed
    This change ensures the regulator REMAP register configuration is in a known
    state so state transitions will function as intended regardless of
    possible bootloader effects on it
    
    Signed-off-by: Juha Keski-Saari <ext-juha.1.keski-saari@nokia.com>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  22. twl-regulator: Add turnon-delay and REMAP config to twlreg_info struct

    Juha Keski-Saari authored Liam Girdwood committed
    This change includes regulator turnon delay values and the REMAP reset
    configuration to the twlreg_info struct, since they are basic attributes
    of every TWL regulator
    
    Signed-off-by: Juha Keski-Saari <ext-juha.1.keski-saari@nokia.com>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  23. twl-regulator: Define critical regulators as always_on

    Juha Keski-Saari authored Liam Girdwood committed
    Defines VIO, VDD1, VDD2, VPLL1 and VINT* regulators as always_on by default
    since they are critical to TWL and its master's functionality and should
    be on in all cases where RegFW is used
    
    Signed-off-by: Juha Keski-Saari <ext-juha.1.keski-saari@nokia.com>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  24. twl-regulator: Add all twl4030 regulators to twlreg_info

    Juha Keski-Saari authored Liam Girdwood committed
    Define all twl4030 regulators in the twlreg_info table, along with
    appropriate VSEL tables for adjustable regulators
    
    Signed-off-by: Juha Keski-Saari <ext-juha.1.keski-saari@nokia.com>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  25. regulator: mc13783-regulator: correct the probing time.

    Alberto Panizzo authored Liam Girdwood committed
    When the mc13783-regulator driver is built in kernel, probing it during
    the regulator subsystem initialisation result in a fault.
    
    That is because regulator subsystem is planned to be initialised very early
    in the boot process, before the mfd subsystem initialisation.
    
    The mc12783-regulator probing process need to access to the mc13783-core
    functionality to read/write mc13783 registers and so must be called after
    the mc13783-core driver initialisation.
    
    The way to do this is to let the kernel probe the mc13783-regulator driver when
    mc13783-core register his regulator subdevice.
    
    Signed-off-by: Alberto Panizzo <maramaopercheseimorto@gmail.com>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  26. @larsclausen

    regulator: Fix unbalanced disables/enables in regulator_bulk_{enable,…

    larsclausen authored Liam Girdwood committed
    …disable} error path
    
    Currently it is possible for regulator_bulk_{enable,disable} operations to
    generate unbalanced regulator_{disable,enable} calls in its error path.
    In case of an error only those regulators of the bulk operation which actually
    had been enabled/disabled should get their original state restored.
    
    Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  27. @stroese

    regulator: core.c: Small coding style cleanup (indentation fixup)

    stroese authored Liam Girdwood committed
    Signed-off-by: Stefan Roese <sr@denx.de>
    Cc: Liam Girdwood <lrg@slimlogic.co.uk>
    Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  28. @JuliaLawall

    drivers/regulator: use PTR_ERR to get error code

    JuliaLawall authored Liam Girdwood committed
    IS_ERR returns only 1 or 0.  The callsite of setup_regulators expects a
    negative integer in an error case.  Thus, PTR_ERR has to be used to extract
    it.
    
    The semantic match that finds this problem is as follows:
    (http://coccinelle.lip6.fr/)
    
    // <smpl>
    @@
    expression E,E1;
    @@
    
    *E = IS_ERR(...)
     ... when != E = E1
    *return E;
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Acked-by: <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  29. regulator: consumer.h - fix build when consumer.h is #included first.

    Liam Girdwood authored
    consumer.h requires device.h for stand alone build.
    
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  30. regulator/mc13783: various cleanups

    Uwe Kleine-König authored Liam Girdwood committed
    - define needed registers and bits in the driver
    - properly namespace functions and structs
    - fix locking as required by patch
      "mfd/mc13783: near complete rewrite"
    - use platform_data as provided by "mfd/mc13783: near complete rewrite"
      instead of accessing struct mc13783
    - struct mc13783_regulator_priv.desc is (and was) unused and so can go
      away
    - use cpp magic to initialize mc13783_regulators
    - bring MODULE_LICENSE in sync with actual copyright
    - minor style fixes
    
    This allows not including mc13783-private.h which I intend to remove
    soon.
    
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Cc: Sascha Hauer <s.hauer@pengutronix.de>
    Cc: Liam Girdwood <lrg@slimlogic.co.uk>
    Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Cc: Samuel Ortiz <sameo@linux.intel.com>
    Acked-by: Mark Brown <broonie@opensoruce.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  31. regulator/mc13783: rename source file to match other drivers

    Uwe Kleine-König authored Liam Girdwood committed
    One annoying thing about the old name was that the module was just
    called mc13783 which caused wrong expectations (at least for me).
    
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Cc: Sascha Hauer <s.hauer@pengutronix.de>
    Cc: Liam Girdwood <lrg@slimlogic.co.uk>
    Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Cc: Samuel Ortiz <sameo@linux.intel.com>
    Acked-by: Mark Brown <broonie@opensoruce.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  32. Fix some AB3100 regulator issues

    Linus Walleij authored Liam Girdwood committed
    This patch will remove surplus register writes on shut down of
    LDO D (this magic was not needed), remove an unnecessary (!) error
    check and really unregister the regulators when the module is
    unloaded.
    
    Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  33. @RoelKluin

    regulator: keep index within bounds in da9034_get_ldo12_voltage()

    RoelKluin authored Liam Girdwood committed
    If selector equals ARRAY_SIZE(da9034_ldo12_data), that is one too
    large already.
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  34. @broonie

    regulator: Ensure val is initialised in 88pm8607 choose_voltage()

    broonie authored Liam Girdwood committed
    If we fall through it means that we hit an unknown regulator/chip
    combination so set -ENOENT as an explicit flag (the return code
    is only used internally).
    
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  35. @broonie

    regulator: Remove duplicate consts from ab3100

    broonie authored Liam Girdwood committed
    'static const int const' means the same thing as 'static const int'
    and sparse complains about this.
    
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Something went wrong with that request. Please try again.