Skip to content
Commits on Jan 6, 2010
  1. @torvalds

    Linux 2.6.33-rc3

    torvalds committed Jan 5, 2010
  2. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

    * 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.
    torvalds committed Jan 5, 2010
  3. @rustyrussell @torvalds

    Revert "x86: Side-step lguest problem by only building cmpxchg8b_emu …

    …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>
    rustyrussell committed with torvalds Jan 5, 2010
  4. @torvalds

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

    …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.
    torvalds committed Jan 5, 2010
Commits on Jan 5, 2010
  1. @torvalds

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

    …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
    torvalds committed Jan 5, 2010
  2. @davem330

    sparc64: Fix Niagara2 perf event handling.

    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>
    davem330 committed Jan 4, 2010
Commits on Jan 4, 2010
  1. @davem330

    sparc64: Fix NMI programming when perf events are active.

    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>
    davem330 committed Jan 4, 2010
  2. @davem330
  3. @davem330

    bbc_envctrl: Clean up properly if kthread_run() fails.

    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>
    davem330 committed Jan 4, 2010
  4. @torvalds

    Merge branch 'limits_cleanup' of git://decibel.fi.muni.cz/~xslaby/linux

    * '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
    torvalds committed Jan 4, 2010
  5. @torvalds

    Merge branch 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux

    * '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
    torvalds committed Jan 4, 2010
  6. @ebiederm @torvalds

    sysfs: Add lockdep annotations for the sysfs active reference

    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>
    ebiederm committed with torvalds Jan 2, 2010
  7. @rustyrussell @torvalds

    lguest: fix bug in setting guest GDT entry

    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>
    rustyrussell committed with torvalds Jan 4, 2010
  8. @torvalds

    Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

    * '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
    torvalds committed Jan 4, 2010
  9. @torvalds

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

    …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.
    torvalds committed Jan 4, 2010
  10. @torvalds

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

    …/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
    torvalds committed Jan 4, 2010
  11. @torvalds

    tosh: Use non bkl ioctl

    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>
    Alan Cox committed with torvalds Jan 4, 2010
  12. @torvalds

    i2o: propogate the BKL down into the ioctl method

    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>
    Alan Cox committed with torvalds Jan 4, 2010
  13. @torvalds

    sony_pi: Remove the BKL from open and ioctl

    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>
    John Kacur committed with torvalds Oct 18, 2009
  14. @torvalds

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

    …/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
    torvalds committed Jan 4, 2010
  15. @broonie

    ASoC: fixup oops in generic AC97 codec glue

    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>
    Manuel Lauss committed with broonie Jan 4, 2010
  16. resource: add helpers for fetching rlimits

    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>
    Jiri Slaby committed Nov 19, 2009
  17. resource: move kernel function inside __KERNEL__

    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>
    Jiri Slaby committed Nov 20, 2009
  18. @jirislaby

    SECURITY: selinux, fix update_rlimit_cpu parameter

    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>
    jirislaby committed with Jiri Slaby Aug 28, 2009
  19. [S390] Update default configuration.

    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Martin Schwidefsky committed with Martin Schwidefsky Jan 4, 2010
  20. @rpjday

    [S390] Have param.h simply include <asm-generic/param.h>.

    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>
    rpjday committed with Martin Schwidefsky Jan 4, 2010
  21. [S390] qdio: convert global statistics to per-device stats

    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>
    Jan Glauber committed with Martin Schwidefsky Jan 4, 2010
  22. @d-hatayama

    binfmt_elf_fdpic: Fix build breakage introduced by coredump changes.

    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>
    d-hatayama committed with Paul Mundt Jan 4, 2010
  23. sh: update defconfigs.

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

    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>
    Paul Mundt committed Jan 4, 2010
  25. sh: Disable PMB for SH4AL-DSP CPUs.

    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>
    Paul Mundt committed Jan 4, 2010
  26. ARM: Merge s3c24xx-updates2

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

    Merge branch 'next-simtec' into for-linus/samsung
    Ben Dooks committed Jan 4, 2010
Commits on Jan 2, 2010
  1. @torvalds

    Merge branch 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linu…

    …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
    torvalds committed Jan 2, 2010
  2. @torvalds

    Documentation: Rename Documentation/DMA-mapping.txt

    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>
    Kusanagi Kouichi committed with torvalds Jan 1, 2010
Something went wrong with that request. Please try again.