Permalink
Commits on Jan 6, 2010
  1. Linux 2.6.33-rc3

    torvalds committed Jan 6, 2010
  2. 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.
  3. Revert "x86: Side-step lguest problem by only building cmpxchg8b_emu …

    rustyrussell authored and torvalds committed 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>
  4. 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. 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>
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 authored and torvalds committed 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 authored and torvalds committed 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 authored and torvalds committed 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 authored and torvalds committed 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 authored and torvalds committed 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 authored and broonie committed 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. resource: add helpers for fetching rlimits

    Jiri Slaby
    Jiri Slaby committed Nov 19, 2009
    We want to be sure that compiler fetches the limit variable only
    once, so add helpers for fetching current and maximal resource
    limits which do that.
    
    Add them to sched.h (instead of resource.h) due to circular dependency
     sched.h->resource.h->task_struct
    Alternative would be to create a separate res_access.h or similar.
    
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    Cc: James Morris <jmorris@namei.org>
    Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Ingo Molnar <mingo@elte.hu>
  16. resource: move kernel function inside __KERNEL__

    Jiri Slaby
    Jiri Slaby committed Nov 20, 2009
    It is an internal function. Move it inside __KERNEL__ ifdef, along
    with task_struct declaration.
    
    Then we get:
    --- /usr/include/linux/resource.h       2009-09-14 15:09:29.000000000 +0200
    +++ usr/include/linux/resource.h       2010-01-04 11:30:54.000000000 +0100
    @@ -3,8 +3,6 @@
    
     #include <linux/time.h>
    
    -struct task_struct;
    -
     /*
      * Resource control/accounting header file for linux
      */
    @@ -70,6 +68,5 @@
      */
     #include <asm/resource.h>
    
    -int getrusage(struct task_struct *p, int who, struct rusage *ru);
    
     #endif
    
    ***********
    
    include/linux/Kbuild is untouched, since unifdef is run even on
    headers-y nowadays.
    
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
  17. SECURITY: selinux, fix update_rlimit_cpu parameter

    jirislaby authored and Jiri Slaby committed Aug 28, 2009
    Don't pass current RLIMIT_RTTIME to update_rlimit_cpu() in
    selinux_bprm_committing_creds, since update_rlimit_cpu expects
    RLIMIT_CPU limit.
    
    Use proper rlim[RLIMIT_CPU].rlim_cur instead to fix that.
    
    Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
    Acked-by: James Morris <jmorris@namei.org>
    Cc: Stephen Smalley <sds@tycho.nsa.gov>
    Cc: Eric Paris <eparis@parisplace.org>
    Cc: David Howells <dhowells@redhat.com>
  18. [S390] Update default configuration.

    Martin Schwidefsky Martin Schwidefsky
    Martin Schwidefsky authored and Martin Schwidefsky committed Jan 4, 2010
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  19. [S390] Have param.h simply include <asm-generic/param.h>.

    rpjday authored and Martin Schwidefsky committed Jan 4, 2010
    Since the files have identical content, might as well simplify.
    
    Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  20. [S390] qdio: convert global statistics to per-device stats

    Jan Glauber Martin Schwidefsky
    Jan Glauber authored and Martin Schwidefsky committed Jan 4, 2010
    Revamp the qdio performance statistics and move them from procfs to
    debugfs using the seq_file interface. Since the statistics are not
    intended for the general user the removal of /proc/qdio_perf should
    not surprise anyone.
    
    The per device statistics are disabled by default, writing 1 to
    /<debugfs mountpoint>/qdio/<device bus ID>/statistics enables the
    statistics for the given device.
    
    Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  21. binfmt_elf_fdpic: Fix build breakage introduced by coredump changes.

    d-hatayama authored and Paul Mundt committed Jan 4, 2010
    Commit f6151df introduces build
    breakage, so this patch fixes it together with some printk formatting
    cleanup.
    
    Signed-off-by: Daisuke HATAYAMA <d.hatayama@jp.fujitsu.com>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  22. sh: update defconfigs.

    Paul Mundt
    Paul Mundt committed Jan 4, 2010
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  23. sh: Don't default enable PMB support.

    Paul Mundt
    Paul Mundt committed Jan 4, 2010
    This has the adverse effect of converting many 29bit configs to 32bit
    mode, while this is a change that needs to be done manually for each
    platform. Turn it off by default in order to cut down on spurious bug
    reports.
    
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  24. sh: Disable PMB for SH4AL-DSP CPUs.

    Paul Mundt
    Paul Mundt committed Jan 4, 2010
    While the PMB is available on SH-4A parts, SH4AL-DSP parts exclude it
    altogether. As such, explicitly disable PMB support for these parts. If
    this changes in the future for newer subtypes, this will have to be made
    more fine-grained.
    
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  25. ARM: Merge s3c24xx-updates2

    Ben Dooks
    Ben Dooks committed Jan 4, 2010
    Merge branch 's3c24xx-updates2' into for-linus/samsung
  26. ARM: Merge next-simtec

    Ben Dooks
    Ben Dooks committed Jan 4, 2010
    Merge branch 'next-simtec' into for-linus/samsung
Commits on Jan 2, 2010
  1. Merge branch 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linu…

    torvalds committed Jan 2, 2010
    …x/kernel/git/frederic/random-tracing
    
    * 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
      reiserfs: Safely acquire i_mutex from xattr_rmdir
      reiserfs: Safely acquire i_mutex from reiserfs_for_each_xattr
      reiserfs: Fix journal mutex <-> inode mutex lock inversion
      reiserfs: Fix unwanted recursive reiserfs lock in reiserfs_unlink()
      reiserfs: Relax lock before open xattr dir in reiserfs_xattr_set_handle()
      reiserfs: Relax reiserfs lock while freeing the journal
      reiserfs: Fix reiserfs lock <-> i_mutex dependency inversion on xattr
      reiserfs: Warn on lock relax if taken recursively
      reiserfs: Fix reiserfs lock <-> i_xattr_sem dependency inversion
      reiserfs: Fix remaining in-reclaim-fs <-> reclaim-fs-on locking inversion
      reiserfs: Fix reiserfs lock <-> inode mutex dependency inversion
      reiserfs: Fix reiserfs lock and journal lock inversion dependency
      reiserfs: Fix possible recursive lock
  2. Documentation: Rename Documentation/DMA-mapping.txt

    k7k7 authored and torvalds committed Jan 2, 2010
    It seems that Documentation/DMA-mapping.txt was supposed to be renamed
    to Documentation/PCI/PCI-DMA-mapping.txt.
    
    Signed-off-by: Kusanagi Kouichi <slash@ac.auone-net.jp>
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>