Permalink
Switch branches/tags
Commits on Jan 6, 2010
  1. Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

    torvalds committed Jan 6, 2010
    * 'for-linus' of git://git.open-osd.org/linux-open-osd:
      exofs: simple_write_end does not mark_inode_dirty
      exofs: fix pnfs_osd re-definitions in pre-pnfs trees
  2. Merge master.kernel.org:/home/rmk/linux-2.6-arm

    torvalds committed Jan 6, 2010
    * master.kernel.org:/home/rmk/linux-2.6-arm: (22 commits)
      ARM: 5865/1: nuc900 ethernet driver needs mii
      ARM: 5864/1: Implement arch_reset() in NUC900
      ARM: 5863/1: fix bugs of clock source of NUC900
      ARM: 5858/1: Remove unused vma_vm_flags macro from v7wbi_flush_user_tlb_range
      imx/mx3: depend on USB_ULPI for otg_ulpi_create
      ARM: MX3: make CPU revision number detection work on all boards
      mx25: pdk: add platform code for FEC support
      mx25: add support for FEC on i.MX25
      mx25: s/NO_PAD_CTL/NO_PAD_CTRL/
      mx31moboard: fix usbh device names
      mx3: add support for the mt9v022 camera sensor to pcm037 platform
      mx27: mxt_td60: Remove not used UART pins
      [ARM] pxa/poodle: fix incorrect 'gpio_card_detect' of MMC
      [ARM] pxa/zylonite: simplify reduntant gpio settings on mmc slot
      [ARM] pxa/ttc_dkb: remove duplicate macro definition
      [ARM] pxa/zeus: provide power-source information when APM is enabled
      [ARM] pxa/zeus: relax memory timings on Zeus ethernet ports
      [ARM] pxa/zeus: make internal zeus_get_pcb_info static
      [ARM] pxa/littleton: select CPU_PXA300 and CPU_PXA310
      [ARM] pxa/littleton: add UART3 GPIO config
      ...
  3. modules: Skip empty sections when exporting section notes

    bwhacks committed with torvalds Dec 19, 2009
    Commit 35dead4 "modules: don't export section names of empty sections
    via sysfs" changed the set of sections that have attributes, but did
    not change the iteration over these attributes in add_notes_attrs().
    This can lead to add_notes_attrs() creating attributes with the wrong
    names or with null name pointers.
    
    Introduce a sect_empty() function and use it in both add_sect_attrs()
    and add_notes_attrs().
    
    Reported-by: Martin Michlmayr <tbm@cyrius.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Tested-by: Martin Michlmayr <tbm@cyrius.com>
    Cc: stable@kernel.org
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. Linux 2.6.33-rc3

    torvalds committed Jan 6, 2010
  5. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

    torvalds committed Jan 6, 2010
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc64: Fix Niagara2 perf event handling.
      sparc64: Fix NMI programming when perf events are active.
      bbc_envctrl: Clean up properly if kthread_run() fails.
  6. Revert "x86: Side-step lguest problem by only building cmpxchg8b_emu …

    rustyrussell committed with torvalds Jan 5, 2010
    …for pre-Pentium"
    
    This reverts commit ae1b22f.
    
    As Linus said in 982d007: "There was something really messy about
    cmpxchg8b and clone CPU's, so if you enable it on other CPUs later, do it
    carefully."
    
    This breaks lguest for those configs, but we can fix that by emulating
    if we have to.
    
    Fixes: http://bugzilla.kernel.org/show_bug.cgi?id=14884
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Cc: stable@kernel.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/k…

    torvalds committed Jan 6, 2010
    …ernel/git/jlbec/ocfs2
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
      ocfs2: Handle O_DIRECT when writing to a refcounted cluster.
Commits on Jan 5, 2010
  1. Merge branch 'for-2.6.33' of git://git.kernel.org/pub/scm/linux/kerne…

    torvalds committed Jan 5, 2010
    …l/git/broonie/sound-2.6
    
    * 'for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6:
      ASoC: fixup oops in generic AC97 codec glue
      ASoC: fix params_rate() macro use in several codecs
      ASoC: fsi-ak4642: Remove ak4642_add_i2c_device
  2. ARM: 5865/1: nuc900 ethernet driver needs mii

    lijie committed with Russell King Dec 31, 2009
    nuc900 ethernet driver uses mii_xx_xx serials api, so mii module should be selected.
    
    Signed-off-by: lijie <eltshanli@gmail.com>
    Acked-by: Wan ZongShun <mcuos.com@gmail.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  3. ARM: 5864/1: Implement arch_reset() in NUC900

    lijie committed with Russell King Dec 31, 2009
    Implement arch_reset(), reboot from shell become possible.
    
    Signed-off-by: lijie <eltshanli@gmail.com>
    Acked-by: Wan ZongShun <mcuos.com@gmail.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  4. ARM: 5863/1: fix bugs of clock source of NUC900

    lijie committed with Russell King Dec 31, 2009
    This patch fix following bugs:
    
    1. typo error, CLOCK_EVT_MODE_PERIODIC -> CLOCK_EVT_FEAT_PERIODIC
    2. TCSR register of timer1 missed PRESCALE
    3. timer1 should be enabled before register it to clock source.
    
    Signed-off-by: lijie <eltshanli@gmail.com>
    Acked-by: Wan ZongShun <mcuos.com@gmail.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  5. ARM: 5858/1: Remove unused vma_vm_flags macro from v7wbi_flush_user_t…

    Bahadir Balban committed with Russell King Dec 25, 2009
    …lb_range
    
    Signed-off-by: Bahadir Balban <bbalban@b-labs.co.uk>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  6. sparc64: Fix Niagara2 perf event handling.

    davem330 committed Jan 5, 2010
    For chips like Niagara2 that have true overflow indications
    in the %pcr (which we don't actually need and don't use)
    the interrupt signal persists until the overflow bits are
    cleared by an explicit %pcr write.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
  7. exofs: simple_write_end does not mark_inode_dirty

    Boaz Harrosh committed Dec 27, 2009
    exofs uses simple_write_end() for it's .write_end handler. But
    it is not enough because simple_write_end() does not call
    mark_inode_dirty() when it extends i_size. So even if we do
    call mark_inode_dirty at beginning of write out, with a very
    long IO and a saturated system we might get the .write_inode()
    called while still extend-writing to file and miss out on the last
    i_size updates.
    
    So override .write_end, call simple_write_end(), and afterwords if
    i_size was changed call mark_inode_dirty().
    
    It stands to logic that since simple_write_end() was the one extending
    i_size it should also call mark_inode_dirty(). But it looks like all
    users of simple_write_end() are memory-bound pseudo filesystems, who
    could careless about mark_inode_dirty(). I might submit a
    warning-comment patch to simple_write_end() in future.
    
    CC: Stable <stable@kernel.org>
    Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
  8. exofs: fix pnfs_osd re-definitions in pre-pnfs trees

    Boaz Harrosh committed Dec 21, 2009
    Some on disk exofs constants and types are defined in the pnfs_osd_xdr.h
    file. Since we needed these types before the pnfs-objects code was
    accepted to mainline we duplicated the minimal needed definitions into
    an exofs local header. The definitions where conditionally included
    depending on !CONFIG_PNFS defined. So if PNFS was present in the tree
    definitions are taken from there and if not they are defined locally.
    
    That was all good but, the CONFIG_PNFS is planed to be included upstream
    before the pnfs-objects is also included. (The first pnfs batch might be
    pnfs-files only)
    
    So condition exofs local definitions on the absence of pnfs_osd_xdr.h
    inclusion (__PNFS_OSD_XDR_H__ not defined). User code must make sure
    that in future pnfs_osd_xdr.h will be included before fs/exofs/pnfs.h,
    which happens to be so in current code.
    
    Once pnfs-objects hits mainline, exofs's local header will be removed.
    
    Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Commits on Jan 4, 2010
  1. sparc64: Fix NMI programming when perf events are active.

    davem330 committed Jan 4, 2010
    If perf events are active, we should not reset the %pcr to
    PCR_PIC_PRIV.  That perf events code does the management.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
  2. bbc_envctrl: Clean up properly if kthread_run() fails.

    davem330 committed Jan 4, 2010
    In bbc_envctrl_init() we have to unlink the fan and temp instances
    from the lists because our caller is going to free up the 'bp' object
    if we return an error.
    
    We can't rely upon bbc_envctrl_cleanup() to do this work for us in
    this case.
    
    Reported-by: Patrick Finnegan <pat@computer-refuge.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  3. Merge branch 'limits_cleanup' of git://decibel.fi.muni.cz/~xslaby/linux

    torvalds committed Jan 4, 2010
    * 'limits_cleanup' of git://decibel.fi.muni.cz/~xslaby/linux:
      resource: add helpers for fetching rlimits
      resource: move kernel function inside __KERNEL__
      SECURITY: selinux, fix update_rlimit_cpu parameter
  4. Merge branch 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux

    torvalds committed Jan 4, 2010
    * 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux:
      ARM: S3C: Fix NAND device registration by s3c_nand_set_platdata().
      ARM: S3C24XX: touchscreen device definition
      ARM: mach-bast: add NAND_SCAN_SILENT_NODEV to optional devices
      ARM: mach-osiris: add NAND_SCAN_SILENT_NODEV to optional devices
      ARM: S3C24XX: touchscreen device definition
  5. sysfs: Add lockdep annotations for the sysfs active reference

    ebiederm committed with torvalds Jan 2, 2010
    Holding locks over device_del -> kobject_del -> sysfs_deactivate can
    cause deadlocks if those same locks are grabbed in sysfs show or store
    methods.
    
    The I model s_active count + completion as a sleeping read/write lock.
    I describe to lockdep sysfs_get_active as a read_trylock,
    sysfs_put_active as a read_unlock, and sysfs_deactivate as a
    write_lock and write_unlock pair.  This seems to capture the essence
    for purposes of finding deadlocks, and in my testing gives finds real
    issues and ignores non-issues.
    
    This brings us back to holding locks over kobject_del is a problem
    that ideally we should find a way of addressing, but at least lockdep
    can tell us about the problems instead of requiring developers to debug
    rare strange system deadlocks, that happen when sysfs files are removed
    while being written to.
    
    Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
    Acked-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. lguest: fix bug in setting guest GDT entry

    rustyrussell committed with torvalds Jan 4, 2010
    We kill the guest, but then we blatt random stuff.
    
    Reported-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Cc: stable@kernel.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

    torvalds committed Jan 4, 2010
    * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
      [S390] Update default configuration.
      [S390] Have param.h simply include <asm-generic/param.h>.
      [S390] qdio: convert global statistics to per-device stats
  8. Merge branch 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/ke…

    torvalds committed Jan 4, 2010
    …rnel/git/lethal/sh-2.6
    
    * 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
      binfmt_elf_fdpic: Fix build breakage introduced by coredump changes.
      sh: update defconfigs.
      sh: Don't default enable PMB support.
      sh: Disable PMB for SH4AL-DSP CPUs.
      sh: Only provide a PCLK definition for legacy CPG CPUs.
  9. Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Jan 4, 2010
    …/git/tytso/ext4
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
      ext4: Calculate metadata requirements more accurately
      ext4: Fix accounting of reserved metadata blocks
  10. tosh: Use non bkl ioctl

    Alan Cox committed with torvalds Jan 4, 2010
    We wrap the smm calls and other bits with the BKL push down as a
    precaution but they can probably go
    
    Signed-off-by: Alan Cox <alan@linux.intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  11. i2o: propogate the BKL down into the ioctl method

    Alan Cox committed with torvalds Jan 4, 2010
    Nobody seems to want to own I2O patches so sending this one directly.
    
    Signed-off-by: Alan Cox <alan@linux.intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  12. sony_pi: Remove the BKL from open and ioctl

    John Kacur committed with torvalds Oct 18, 2009
    The BKL is in this function because of the BKL pushdown (see commit
    f8f2c79)
    
    It is not needed here because the mutex_lock sonypi_device.lock provides
    the necessary locking.
    
    sonypi_misc_ioctl can be converted to unlocked ioctls since it relies on
    its own locking (the mutex sonypi_device.lock) and not the bkl
    
    Document that llseek is not needed by explictly setting it to no_llseek
    
    LKML-Reference: <alpine.LFD.2.00.0910192019420.3563@localhost.localdomain>
    Signed-off-by: John Kacur <jkacur@redhat.com>
    Acked-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  13. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Jan 4, 2010
    …/git/ryusuke/nilfs2
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
      nilfs2: update mailing list address
      nilfs2: Storage class should be before const qualifier
      nilfs2: trivial coding style fix
  14. ASoC: fixup oops in generic AC97 codec glue

    Manuel Lauss committed with broonie Jan 4, 2010
    Initialize the glue by calling snd_soc_new_ac97_codec() as is done
    in other ASoC AC97 codecs.  Fixes an oops caused by dereferencing
    uninitialized members in snd_soc_new_pcms().
    
    Run-tested on Au1250.
    
    Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
    Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  15. imx/mx3: depend on USB_ULPI for otg_ulpi_create

    Uwe Kleine-König committed with saschahauer Dec 22, 2009
    otg_ulpi_create is defined in drivers/usb/otg/ulpi.c which depends on
    CONFIG_USB_ULPI.  So protect its usage by the same symbol.  Moreover
    mxc_ulpi_access_ops needs CONFIG_MXC_ULPI.
    
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Cc: Sascha Hauer <s.hauer@pengutronix.de>
    Cc: Valentin Longchamp <valentin.longchamp@epfl.ch>
    Cc: Daniel Mack <daniel@caiaq.de>
    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
  16. ARM: MX3: make CPU revision number detection work on all boards

    wdenx committed with saschahauer Dec 14, 2009
    Commit 52939c0 (ARM: MX3: fix CPU revision number detection) started
    using the CPU's SREV register for revision number detection. This
    makes it mandatory to have a valid SPBA0 mapping. Add this to the
    global map_io code instead of adding multiple copies for each board.
    
    Signed-off-by: Wolfgang Denk <wd@denx.de>
    Cc: Daniel Mack <daniel@caiaq.de>
    Cc: Sascha Hauer <s.hauer@pengutronix.de>
    
    Tested on Qong (EVB-Lite)
    Tested-by: Wolfgang Denk <wd@denx.de>
    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
  17. mx25: pdk: add platform code for FEC support

    baruchsiach committed with saschahauer Dec 21, 2009
    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
  18. mx25: add support for FEC on i.MX25

    baruchsiach committed with saschahauer Dec 21, 2009
    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>