Permalink
Commits on Feb 7, 2010
  1. @torvalds

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

    …/git/viro/vfs-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
      Take ima_file_free() to proper place.
      ima: rename PATH_CHECK to FILE_CHECK
      ima: rename ima_path_check to ima_file_check
      ima: initialize ima before inodes can be allocated
      fix ima breakage
      Take ima_path_check() in nfsd past dentry_open() in nfsd_open()
      freeze_bdev: don't deactivate successfully frozen MS_RDONLY sb
      befs: fix leak
    torvalds committed Feb 7, 2010
  2. @torvalds

    Fix race in tty_fasync() properly

    This reverts commit 7036251 ("tty: fix race in tty_fasync") and
    commit b04da8b ("fnctl: f_modown should call write_lock_irqsave/
    restore") that tried to fix up some of the fallout but was incomplete.
    
    It turns out that we really cannot hold 'tty->ctrl_lock' over calling
    __f_setown, because not only did that cause problems with interrupt
    disables (which the second commit fixed), it also causes a potential
    ABBA deadlock due to lock ordering.
    
    Thanks to Tetsuo Handa for following up on the issue, and running
    lockdep to show the problem.  It goes roughly like this:
    
     - f_getown gets filp->f_owner.lock for reading without interrupts
       disabled, so an interrupt that happens while that lock is held can
       cause a lockdep chain from f_owner.lock -> sighand->siglock.
    
     - at the same time, the tty->ctrl_lock -> f_owner.lock chain that
       commit 7036251 introduced, together with the pre-existing
       sighand->siglock -> tty->ctrl_lock chain means that we have a lock
       dependency the other way too.
    
    So instead of extending tty->ctrl_lock over the whole __f_setown() call,
    we now just take a reference to the 'pid' structure while holding the
    lock, and then release it after having done the __f_setown.  That still
    guarantees that 'struct pid' won't go away from under us, which is all
    we really ever needed.
    
    Reported-and-tested-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
    Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
    Acked-by: Américo Wang <xiyou.wangcong@gmail.com>
    Cc: stable@kernel.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    torvalds committed Feb 7, 2010
  3. Take ima_file_free() to proper place.

    Hooks: Just Say No.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed Feb 7, 2010
  4. ima: rename PATH_CHECK to FILE_CHECK

    With the movement of the ima hooks functions were renamed from *path* to
    *file* since they always deal with struct file.  This patch renames some of
    the ima internal flags to make them consistent with the rest of the code.
    
    Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
    Signed-off-by: Eric Paris <eparis@redhat.com>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Mimi Zohar committed with Al Viro Jan 26, 2010
  5. ima: rename ima_path_check to ima_file_check

    ima_path_check actually deals with files!  call it ima_file_check instead.
    
    Signed-off-by: Eric Paris <eparis@redhat.com>
    Acked-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Mimi Zohar committed with Al Viro Jan 26, 2010
  6. @eparis

    ima: initialize ima before inodes can be allocated

    ima wants to create an inode information struct (iint) when inodes are
    allocated.  This means that at least the part of ima which does this
    allocation (the allocation is filled with information later) should
    before any inodes are created.  To accomplish this we split the ima
    initialization routine placing the kmem cache allocator inside a
    security_initcall() function.  Since this makes use of radix trees we also
    need to make sure that is initialized before security_initcall().
    
    Signed-off-by: Eric Paris <eparis@redhat.com>
    Acked-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    eparis committed with Al Viro Dec 9, 2009
  7. fix ima breakage

    The "Untangling ima mess, part 2 with counters" patch messed
    up the counters.  Based on conversations with Al Viro, this patch
    streamlines ima_path_check() by removing the counter maintaince.
    The counters are now updated independently, from measuring the file,
    in __dentry_open() and alloc_file() by calling ima_counts_get().
    ima_path_check() is called from nfsd and do_filp_open().
    It also did not measure all files that should have been measured.
    Reason: ima_path_check() got bogus value passed as mask.
    [AV: mea culpa]
    [AV: add missing nfsd bits]
    
    Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Mimi Zohar committed with Al Viro Jan 20, 2010
  8. Take ima_path_check() in nfsd past dentry_open() in nfsd_open()

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed Jan 26, 2010
  9. freeze_bdev: don't deactivate successfully frozen MS_RDONLY sb

    Thanks Thomas and Christoph for testing and review.
    I removed 'smp_wmb()' before up_write from the previous patch,
    since up_write() should have necessary ordering constraints.
    (I.e. the change of s_frozen is visible to others after up_write)
    I'm quite sure the change is harmless but if you are uncomfortable
    with Tested-by/Reviewed-by on the modified patch, please remove them.
    
    If MS_RDONLY, freeze_bdev should just up_write(s_umount) instead of
    deactivate_locked_super().
    Also, keep sb->s_frozen consistent so that remount can check the frozen state.
    
    Otherwise a crash reported here can happen:
    http://lkml.org/lkml/2010/1/16/37
    http://lkml.org/lkml/2010/1/28/53
    
    This patch should be applied for 2.6.32 stable series, too.
    
    Reviewed-by: Christoph Hellwig <hch@lst.de>
    Tested-by: Thomas Backlund <tmb@mandriva.org>
    Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
    Cc: stable@kernel.org
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Jun'ichi Nomura committed with Al Viro Jan 29, 2010
  10. befs: fix leak

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed Jan 29, 2010
Commits on Feb 6, 2010
  1. @torvalds

    Linux 2.6.33-rc7

    torvalds committed Feb 6, 2010
  2. @torvalds

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

    …kernel/git/jdelvare/staging
    
    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
      hwmon: (w83781d) Request I/O ports individually for probing
      hwmon: (lm78) Request I/O ports individually for probing
      hwmon: (adt7462) Wrong ADT7462_VOLT_COUNT
    torvalds committed Feb 6, 2010
  3. @torvalds

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

    …/git/anholt/drm-intel
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
      drm/i915: Fix leak of relocs along do_execbuffer error path
      drm/i915: slow acpi_lid_open() causes flickering - V2
      drm/i915: Disable SR when more than one pipe is enabled
      drm/i915: page flip support for Ironlake
      drm/i915: Fix the incorrect DMI string for Samsung SX20S laptop
      drm/i915: Add support for SDVO composite TV
      drm/i915: don't trigger ironlake vblank interrupt at irq install
      drm/i915: handle non-flip pending case when unpinning the scanout buffer
      drm/i915: Fix the device info of Pineview
      drm/i915: enable vblank interrupt on ironlake
      drm/i915: Prevent use of uninitialized pointers along error path.
      drm/i915: disable hotplug detect before Ironlake CRT detect
    torvalds committed Feb 6, 2010
  4. @torvalds

    Fix potential crash with sys_move_pages

    We incorrectly depended on the 'node_state/node_isset()' functions
    testing the node range, rather than checking it explicitly.  That's not
    reliable, even if it might often happen to work.  So do the proper
    explicit test.
    
    Reported-by: Marcus Meissner <meissner@suse.de>
    Acked-and-tested-by: Brice Goglin <Brice.Goglin@inria.fr>
    Acked-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
    Cc: stable@kernel.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    torvalds committed Feb 6, 2010
Commits on Feb 5, 2010
  1. @torvalds

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

    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ASoC: pandora: Add APLL supply to fix audio output
      ALSA: ice1724 - aureon - fix wm8770 volume offset
      ALSA: cosmetic: make hda intel interrupt name consistent with others
      ALSA: hda - Delay switching to polling mode if an interrupt was missing
      ALSA: ctxfi - fix PTP address initialization
    torvalds committed Feb 5, 2010
  2. hwmon: (w83781d) Request I/O ports individually for probing

    Different motherboards have different PNP declarations for
    W83781D/W83782D chips. Some declare the whole range of I/O ports (8
    ports), some declare only the useful ports (2 ports at offset 5) and
    some declare fancy ranges, for example 4 ports at offset 4. To
    properly handle all cases, request all ports individually for probing.
    After we have determined that we really have a W83781D or W83782D
    chip, the useful port range will be requested again, as a single
    block.
    
    I did not see a board which needs this yet, but I know of one for lm78
    driver and I'd like to keep the logic of these two drivers in sync.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: stable@kernel.org
    Jean Delvare committed Feb 5, 2010
  3. hwmon: (lm78) Request I/O ports individually for probing

    Different motherboards have different PNP declarations for LM78/LM79
    chips. Some declare the whole range of I/O ports (8 ports), some
    declare only the useful ports (2 ports at offset 5) and some declare
    fancy ranges, for example 4 ports at offset 4. To properly handle all
    cases, request all ports individually for probing. After we have
    determined that we really have an LM78 or LM79 chip, the useful port
    range will be requested again, as a single block.
    
    This fixes the driver on the Olivetti M3000 DT 540, at least.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: stable@kernel.org
    Jean Delvare committed Feb 5, 2010
  4. hwmon: (adt7462) Wrong ADT7462_VOLT_COUNT

    The #define ADT7462_VOLT_COUNT is wrong, it should be 13 not 12. All the 
    for loops that use this as a limit count are of the typical form, "for 
    (n = 0; n < ADT7462_VOLT_COUNT; n++)", so to loop through all voltages 
    w/o missing the last one it is necessary for the count to be one greater 
    than it is.  (Specifically, you will miss the +1.5V 3GPIO input with count 
    = 12 vs. 13.)
    
    Signed-off-by: Ray Copeland <ray.copeland@aprius.com>
    Acked-by: "Darrick J. Wong" <djwong@us.ibm.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: stable@kernel.org
    Ray Copeland committed with Jean Delvare Feb 5, 2010
  5. @tiwai
  6. @tiwai
  7. @tiwai
  8. @torvalds

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

    …ernel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      [libata] Call flush_dcache_page after PIO data transfers in libata-sff.c
      ahci: add Acer G725 to broken suspend list
      libata: fix ata_id_logical_per_physical_sectors
      libata-scsi passthru: fix bug which truncated LBA48 return values
    torvalds committed Feb 5, 2010
  9. @torvalds

    CS5536: apply pci quirk for BIOS SMBUS bug

    The new cs5535-* drivers use PCI header config info rather than MSRs to
    determine the memory region to use for things like GPIOs and MFGPTs.  As
    anticipated, we've run into a buggy BIOS:
    
    [    0.081818] pci 0000:00:14.0: reg 10: [io  0x6000-0x7fff]
    [    0.081906] pci 0000:00:14.0: reg 14: [io  0x6100-0x61ff]
    [    0.082015] pci 0000:00:14.0: reg 18: [io  0x6200-0x63ff]
    [    0.082917] pci 0000:00:14.2: reg 20: [io  0xe000-0xe00f]
    [    0.083551] pci 0000:00:15.0: reg 10: [mem 0xa0010000-0xa0010fff]
    [    0.084436] pci 0000:00:15.1: reg 10: [mem 0xa0011000-0xa0011fff]
    [    0.088816] PCI: pci_cache_line_size set to 32 bytes
    [    0.088938] pci 0000:00:14.0: address space collision: [io 0x6100-0x61ff] already in use
    [    0.089052] pci 0000:00:14.0: can't reserve [io  0x6100-0x61ff]
    
    This is a Soekris board, and its BIOS sets the size of the PCI ISA bridge
    device's BAR0 to 8k.  In reality, it should be 8 bytes (BAR0 is used for
    SMBus stuff).  This quirk checks for an incorrect size, and resets it
    accordingly.
    
    Signed-off-by: Andres Salomon <dilinger@collabora.co.uk>
    Tested-by: Leigh Porter <leigh@leighporter.org>
    Tested-by: Jens Rottmann <JRottmann@LiPPERTEmbedded.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Andres Salomon committed with torvalds Feb 5, 2010
  10. @torvalds

    percpu: add __percpu for sparse

    This is to make the annotation of percpu variables during the next merge
    window less painfull.
    
    Extracted from a patch by Rusty Russell.
    
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Acked-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Stephen Rothwell committed with torvalds Feb 5, 2010
  11. @torvalds

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

    …/git/airlied/drm-2.6
    
    * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/radeon/kms: fix r300 vram width calculations
      drm/radeon/kms: rs400/480 MC setup is different than r300.
      drm/radeon/kms: make initial state of load detect property correct.
      drm/radeon/kms: disable HDMI audio for now on rv710/rv730
      drm/radeon/kms: don't call suspend path before cleaning up GPU
      drivers/gpu/drm/radeon/radeon_combios.c: fix warning
      ati_pcigart: fix printk format warning
      drm/r100/kms: Emit cache flush to the end of command buffer. (v2)
      drm/radeon/kms: fix regression rendering issue on R6XX/R7XX
      drm/radeon/kms: move blit initialization after we disabled VGA
    torvalds committed Feb 5, 2010
  12. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

    * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
      Btrfs: apply updated fallocate i_size fix
      Btrfs: do not try and lookup the file extent when finishing ordered io
      Btrfs: Fix oopsen when dropping empty tree.
      Btrfs: remove BUG_ON() due to mounting bad filesystem
      Btrfs: make error return negative in btrfs_sync_file()
      Btrfs: fix race between allocate and release extent buffer.
    torvalds committed Feb 5, 2010
  13. @notaz @broonie

    ASoC: pandora: Add APLL supply to fix audio output

    Pandora's external DAC is using 256*Fs output from the TWL4030
    codec, and TWL4030 needs to have APLL enabled for it's 256*Fs
    output to function.
    
    Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
    Acked-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
    Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    notaz committed with broonie Feb 4, 2010
  14. @perexg

    ALSA: ice1724 - aureon - fix wm8770 volume offset

    The volume register is from 0..0x7f and 0..0x1a range is mute.
    Also, fix mute combining in wm_vol_put(). The wrong behaviour was
    noticed by Peter Christensen.
    
    Signed-off-by: Jaroslav Kysela <perex@perex.cz>
    perexg committed Feb 5, 2010
  15. @maximlevitsky @tiwai

    ALSA: cosmetic: make hda intel interrupt name consistent with others

    This renames the interrupt name in /proc/interrupt.
    HDA Intel -> hda_intel
    
    This also eliminates space from the name, probably helping some
    parsers.
    Don't think anybody depends on this name in userspace
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    maximlevitsky committed with tiwai Feb 4, 2010
  16. @maximlevitsky @tiwai

    ALSA: hda - Delay switching to polling mode if an interrupt was missing

    My sound codec seems sometimes (very rarely) to omit interrupts (ALC268)
    However, interrupt mode still works.
    Thus if we get timeout, poll the codec once.
    
    If we get 3 such polls in a row, then switch to polling mode.
    
    This patch is maybe an bandaid, but this might be a workaround for hardware bug.
    
    Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    maximlevitsky committed with tiwai Feb 4, 2010
  17. drm/radeon/kms: fix r300 vram width calculations

    This was incorrect according to the docs and the UMS driver does
    it like this.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Dave Airlie committed Feb 5, 2010
  18. drm/radeon/kms: rs400/480 MC setup is different than r300.

    Boot testing on my rs480 laptop found the MC idle never happened
    on startup, a quick check with AMD found the idle bit is in a different
    place on the rs4xx than r300.
    
    Implement a new rs400 mc idle function to fix this.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Dave Airlie committed Feb 5, 2010
  19. drm/radeon/kms: make initial state of load detect property correct.

    this was incorrect on my rs480.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Dave Airlie committed with Dave Airlie Jan 27, 2010
  20. drm/radeon/kms: disable HDMI audio for now on rv710/rv730

    Support isn't correct yet and we are getting green tinges on the
    displays.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Dave Airlie committed Feb 5, 2010
  21. drm/radeon/kms: don't call suspend path before cleaning up GPU

    In suspend path we unmap the GART table while in cleaning up
    path we will unbind buffer and thus try to write to unmapped
    GART leading to oops. In order to avoid this we don't call the
    suspend path in cleanup path. Cleanup path is clever enough
    to desactive GPU like the suspend path is doing, thus this was
    redondant.
    
    Tested on: RV370, R420, RV515, RV570, RV610, RV770 (all PCIE)
    
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Jerome Glisse committed with Dave Airlie Feb 2, 2010