Permalink
Switch branches/tags
Commits on Dec 31, 2009
  1. Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…

    torvalds committed Dec 31, 2009
    …it/lenb/linux-acpi-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
      ACPI: introduce kernel parameter acpi_sleep=sci_force_enable
      ACPI: WMI: Survive BIOS with duplicate GUIDs
      dell-wmi - fix condition to abort driver loading
      wmi: check find_guid() return value to prevent oops
      dell-wmi, hp-wmi, msi-wmi: check wmi_get_event_data() return value
      ACPI: hp-wmi, msi-wmi: clarify that wmi_install_notify_handler() returns an acpi_status
      dell-wmi: sys_init_module: 'dell_wmi'->init suspiciously returned 21, it should
      ACPI video: correct error-handling code
      ACPI video: no warning message if "acpi_backlight=vendor" is used
      ACPI: fix ACPI=n allmodconfig build
      thinkpad-acpi: improve Kconfig help text
      thinkpad-acpi: update volume subdriver documentation
      thinkpad-acpi: make volume subdriver optional
      thinkpad-acpi: don't fail to load the entire module due to ALSA problems
      thinkpad-acpi: don't take the first ALSA slot by default
Commits on Dec 30, 2009
  1. ACPI: introduce kernel parameter acpi_sleep=sci_force_enable

    zhang-rui committed with lenb Dec 30, 2009
    Introduce kernel parameter acpi_sleep=sci_force_enable
    
    some laptop requires SCI_EN being set directly on resume,
    or else they hung somewhere in the resume code path.
    
    We already have a blacklist for these laptops but we still need
    this option, especially when debugging some suspend/resume problems,
    in case there are systems that need this workaround and are not yet
    in the blacklist.
    
    Signed-off-by: Zhang Rui <rui.zhang@intel.com>
    Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
    Signed-off-by: Len Brown <len.brown@intel.com>
  2. Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git…

    torvalds committed Dec 30, 2009
    …/djbw/async_tx
    
    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
      drivers/dma: Correct use after free
      drivers/dma: drop unnecesary memset
      ioat2,3: put channel hardware in known state at init
      async_tx: expand async raid6 test to cover ioatdma corner case
      ioat3: fix p-disabled q-continuation
      sh: fix DMA driver's descriptor chaining and cookie assignment
      dma: at_hdmac: correct incompatible type for argument 1 of 'spin_lock_bh'
  3. Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Dec 30, 2009
    …/git/tytso/ext4
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
      ext4: Patch up how we claim metadata blocks for quota purposes
      ext4: Ensure zeroout blocks have no dirty metadata
      ext4: return correct wbc.nr_to_write in ext4_da_writepages
      ext4: Update documentation to correct the inode_readahead_blks option name
      jbd2: don't use __GFP_NOFAIL in journal_init_common()
      ext4: flush delalloc blocks when space is low
      fs-writeback: Add helper function to start writeback if idle
      ext4: Eliminate potential double free on error path
      ext4: fix unsigned long long printk warning in super.c
      ext4, jbd2: Add barriers for file systems with exernal journals
      ext4: replace BUG() with return -EIO in ext4_ext_get_blocks
      ext4: add module aliases for ext2 and ext3
      ext4: Don't ask about supporting ext2/3 in ext4 if ext4 is not configured
      ext4: remove unused #include <linux/version.h>
  4. Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kern…

    torvalds committed Dec 30, 2009
    …el/git/penberg/slab-2.6
    
    * 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
      SLAB: Fix lockdep annotation breakage
  5. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Dec 30, 2009
    …/git/jbarnes/pci-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
      PCI/cardbus: Add a fixup hook and fix powerpc
      PCI: change PCI nomenclature in drivers/pci/ (non-comment changes)
      PCI: change PCI nomenclature in drivers/pci/ (comment changes)
      PCI: fix section mismatch on update_res()
      PCI: add Intel 82599 Virtual Function specific reset method
      PCI: add Intel USB specific reset method
      PCI: support device-specific reset methods
      PCI: Handle case when no pci device can provide cache line size hint
      PCI/PM: Propagate wake-up enable for PCIe devices too
      vgaarbiter: fix a typo in the vgaarbiter Documentation
  6. Merge branch 'kvm-updates/2.6.33' of git://git.kernel.org/pub/scm/vir…

    torvalds committed Dec 30, 2009
    …t/kvm/kvm
    
    * 'kvm-updates/2.6.33' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
      KVM: get rid of kvm_create_vm() unused label warning on s390
      KVM: powerpc: Fix mtsrin in book3s_64 mmu
      KVM: ia64: fix build breakage due to host spinlock change
      KVM: x86: Extend KVM_SET_VCPU_EVENTS with selective updates
      KVM: LAPIC: make sure IRR bitmap is scanned after vm load
      KVM: Fix possible circular locking in kvm_vm_ioctl_assign_device()
      KVM: MMU: remove prefault from invlpg handler
  7. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Dec 30, 2009
    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: hda - Fix Oops at reloading beep devices
      ALSA: hda - Don't cache beep controls
      ALSA: Fix a typo in Procfile.txt
      ALSA: sound/arm: Fix build failure caused by missing struct aaci definition
      ALSA: hda - use snd_hda_jack_detect() again in patch_sigmatel.c
      ALSA: hda - Disable tigger at pin-sensing on AD codecs
      ALSA: hda - HDMI sticky stream tag support
      ALSA: Fix indentation in pcm_native.c
  8. kfifo: Fix typo in comment

    DerDakon committed with torvalds Dec 26, 2009
    It's DECLARE_KFIFO, not DECLARED_KFIFO.
    
    Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

    torvalds committed Dec 30, 2009
    * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
      block: blk_rq_err_sectors cleanup
      block: Honor the gfp_mask for alloc_page() in blkdev_issue_discard()
      block: Fix incorrect alignment offset reporting and update documentation
      cfq-iosched: don't regard requests with long distance as close
      aoe: switch to the new bio_flush_dcache_pages() interface
      drivers/block/mg_disk.c: use resource_size()
      drivers/block/DAC960.c: use DAC960_V2_Controller
      block: Fix topology stacking for data and discard alignment
      drbd: remove unused #include <linux/version.h>
      drbd: remove duplicated #include
      drbd: Fix test of unsigned in _drbd_fault_random()
      drbd: Constify struct file_operations
      cfq-iosched: Remove prio_change logic for workload selection
      cfq-iosched: Get rid of nr_groups
      cfq-iosched: Remove the check for same cfq group from allow_merge
      drbd: fix test of unsigned in _drbd_fault_random()
      block: remove Documentation/block/as-iosched.txt
  10. dell-wmi: sys_init_module: 'dell_wmi'->init suspiciously returned 21,…

    lenb committed with torvalds Dec 30, 2009
    … it should follow 0/-E convention
    
    wmi_install_notify_handler() returns an acpi_error,
    but dell_wmi_init() needs return a -errno style error.
    
    Signed-off-by: Len Brown <len.brown@intel.com>
    Tested-by: Paul Rolland <rol@as2917.net>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  11. wmi: check find_guid() return value to prevent oops

    as2917 committed with torvalds Dec 30, 2009
    Signed-off-by: rol@as2917.net <Paul Rolland>
    Signed-off-by: Len Brown <len.brown@intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  12. Merge branch 'for-linus' of git://neil.brown.name/md

    torvalds committed Dec 30, 2009
    * 'for-linus' of git://neil.brown.name/md:
      md: allow a resync that is waiting for other resync to complete, to be aborted.
      md: remove unnecessary code from do_md_run
      md: make recovery started by do_md_run() visible via sync_action
      md: fix small irregularity with start_ro module parameter
      md: Fix unfortunate interaction with evms
  13. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    torvalds committed Dec 30, 2009
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (74 commits)
      Revert "b43: Enforce DMA descriptor memory constraints"
      iwmc3200wifi: fix array out-of-boundary access
      wl1251: timeout one too soon in wl1251_boot_run_firmware()
      mac80211: fix propagation of failed hardware reconfigurations
      mac80211: fix race with suspend and dynamic_ps_disable_work
      ath9k: fix missed error codes in the tx status check
      ath9k: wake hardware during AMPDU TX actions
      ath9k: wake hardware for interface IBSS/AP/Mesh removal
      ath9k: fix suspend by waking device prior to stop
      cfg80211: fix error path in cfg80211_wext_siwscan
      wl1271_cmd.c: cleanup char => u8
      iwlwifi: Storage class should be before const qualifier
      ath9k: Storage class should be before const qualifier
      cfg80211: fix race between deauth and assoc response
      wireless: remove remaining qual code
      rt2x00: Add USB ID for Linksys WUSB 600N rev 2.
      ath5k: fix SWI calibration interrupt storm
      mac80211: fix ibss join with fixed-bssid
      libertas: Remove carrier signaling from the scan code
      orinoco: fix GFP_KERNEL in orinoco_set_key with interrupts disabled
      ...
  14. Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

    torvalds committed Dec 30, 2009
    * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
      hwrng: core - Fix double unlock in rng_dev_read
  15. generic_permission: MAY_OPEN is not write access

    Serge E. Hallyn committed with torvalds Dec 29, 2009
    generic_permission was refusing CAP_DAC_READ_SEARCH-enabled
    processes from opening DAC-protected files read-only, because
    do_filp_open adds MAY_OPEN to the open mask.
    
    Ignore MAY_OPEN.  After this patch, CAP_DAC_READ_SEARCH is
    again sufficient to open(fname, O_RDONLY) on a file to which
    DAC otherwise refuses us read permission.
    
    Reported-by: Mike Kazantsev <mk.fraggod@gmail.com>
    Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
    Tested-by: Mike Kazantsev <mk.fraggod@gmail.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  16. x86_64 SGI UV: Fix writes to led registers on remote uv hubs.

    Mike Travis committed with torvalds Dec 28, 2009
    The wrong address was being used to write the SCIR led regs on remote
    hubs.  Also, there was an inconsistency between how BIOS and the kernel
    indexed these regs.  Standardize on using the lower 6 bits of the APIC
    ID as the index.
    
    This patch fixes the problem of writing to an errant address to a
    cpu # >= 64.
    
    Signed-off-by: Mike Travis <travis@sgi.com>
    Reviewed-by: Jack Steiner <steiner@sgi.com>
    Cc: stable@kernel.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  17. mm: move sys_mmap_pgoff from util.c

    Hugh Dickins committed with torvalds Dec 30, 2009
    Move sys_mmap_pgoff() from mm/util.c to mm/mmap.c and mm/nommu.c,
    where we'd expect to find such code: especially now that it contains
    the MAP_HUGETLB handling.  Revert mm/util.c to how it was in 2.6.32.
    
    This patch just ignores MAP_HUGETLB in the nommu case, as in 2.6.32,
    whereas 2.6.33-rc2 reported -ENOSYS.  Perhaps validate_mmap_request()
    should reject it with -EINVAL?  Add that later if necessary.
    
    Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  18. libsrp: fix compile failure

    James Bottomley committed with torvalds Dec 30, 2009
    commit 4546548 ("kfifo: move struct
    kfifo in place") caused a compile failure in ibmvscsitgt.c because it
    changed a pointer to kfifo in the libsrp.h structure to a direct
    inclusion without including <linux/kfifo.h>.
    
    The fix is simple, just add the include, but how did this happen? This
    change, introduced at -rc2, hardly looks like a bug fix, and it clearly
    didn't go through linux-next, which would have picked up this compile
    failure (it only occurs on ppc because of the ibm virtual scsi target).
    
    [ Apparently all of -mm wasn't in linux-next.. ]
    
    Signed-off-by: James Bottomley <James.Bottomley@suse.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  19. ext4: Patch up how we claim metadata blocks for quota purposes

    tytso committed Dec 30, 2009
    As reported in Kernel Bugzilla #14936, commit d21cd8f triggered a BUG
    in the function ext4_da_update_reserve_space() found in
    fs/ext4/inode.c.  The root cause of this BUG() was caused by the fact
    that ext4_calc_metadata_amount() can severely over-estimate how many
    metadata blocks will be needed, especially when using direct
    block-mapped files.
    
    In addition, it can also badly *under* estimate how much space is
    needed, since ext4_calc_metadata_amount() assumes that the blocks are
    contiguous, and this is not always true.  If the application is
    writing blocks to a sparse file, the number of metadata blocks
    necessary can be severly underestimated by the functions
    ext4_da_reserve_space(), ext4_da_update_reserve_space() and
    ext4_da_release_space().  This was the cause of the dq_claim_space
    reports found on kerneloops.org.
    
    Unfortunately, doing this right means that we need to massively
    over-estimate the amount of free space needed.  So in some cases we
    may need to force the inode to be written to disk asynchronously in
    to avoid spurious quota failures.
    
    http://bugzilla.kernel.org/show_bug.cgi?id=14936
    
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
  20. Merge branch 'wmi' into release

    lenb committed Dec 30, 2009
  21. ACPI: WMI: Survive BIOS with duplicate GUIDs

    ccorbacho committed with lenb Dec 26, 2009
    It would appear that in BIOS's with nVidia hooks, the GUID
    05901221-D566-11D1-B2F0-00A0C9062910 is duplicated. For now, the simplest
    solution is to just ignore any duplicate GUIDs. These particular hooks are not
    currently supported/ used in the kernel, so whoever does that can figure out
    what the 'right' solution should be (if there's a better one).
    
    http://bugzilla.kernel.org/show_bug.cgi?id=14846
    
    Signed-off-by: Carlos Corbacho <carlos@strangeworlds.co.uk>
    Reported-by: Larry Finger <Larry.Finger@lwfinger.net>
    Reported-by: Oldřich Jedlička <oldium.pro@seznam.cz>
    Signed-off-by: Len Brown <len.brown@intel.com>
  22. dell-wmi - fix condition to abort driver loading

    dtor committed with lenb Dec 25, 2009
    From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    
    The commit 1fdd407 incorrectly made driver
    abort loading when known GUID is present when it should have done exactly
    the opposite.
    
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
    Signed-off-by: Len Brown <len.brown@intel.com>
  23. wmi: check find_guid() return value to prevent oops

    as2917 committed with lenb Dec 30, 2009
    Signed-off-by: Paul Rolland <rol@as2917.net>
    Signed-off-by: Len Brown <len.brown@intel.com>
  24. dell-wmi, hp-wmi, msi-wmi: check wmi_get_event_data() return value

    lenb committed Dec 27, 2009
    When acpi_evaluate_object() is passed ACPI_ALLOCATE_BUFFER,
    the caller must kfree the returned buffer if AE_OK is returned.
    
    The callers of wmi_get_event_data() pass ACPI_ALLOCATE_BUFFER,
    and thus must check its return value before accessing
    or kfree() on the buffer.
    
    Signed-off-by: Len Brown <len.brown@intel.com>
  25. ACPI: hp-wmi, msi-wmi: clarify that wmi_install_notify_handler() retu…

    lenb committed Dec 27, 2009
    …rns an acpi_status
    
    Emphasize that that wmi_install_notify_handler() returns an acpi_status
    rather than -errno by by testing ACPI_SUCCESS(), ACPI_FAILURE().
    
    No functional change in this patch, but this confusion caused a bug in dell-wmi.
    
    Signed-off-by: Len Brown <len.brown@intel.com>
  26. dell-wmi: sys_init_module: 'dell_wmi'->init suspiciously returned 21,…

    lenb committed Dec 27, 2009
    … it should
    
    follow 0/-E convention
    
    wmi_install_notify_handler() returns an acpi_error,
    but dell_wmi_init() needs return a -errno style error.
    
    Tested-by: Paul Rolland <rol@as2917.net>
    Signed-off-by: Len Brown <len.brown@intel.com>
  27. block: blk_rq_err_sectors cleanup

    guijianfeng committed with Jens Axboe Dec 30, 2009
    blk_rq_err_sectors() seems useless, get rid of it.
    
    Signed-off-by: Gui Jianfeng <guijianfeng@cn.fujitsu.com>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
  28. ACPI video: correct error-handling code

    zhang-rui committed with lenb Jul 29, 2009
    backlight_device_register may return an ERR_PTR
    value rather than a valid pointer.
    
    Problem found by Julia Lawall, properly fixed by Zhang Rui.
    
    Signed-off-by: Zhang Rui <rui.zhang@intel.com>
    Acked-by: Julia Lawall <julia@diku.dk>
    Signed-off-by: Len Brown <len.brown@intel.com>
  29. ACPI video: no warning message if "acpi_backlight=vendor" is used

    zhang-rui committed with lenb Jul 13, 2009
    AML code always sends notifications to ACPI video device,
    even if we disable the ACPI backlight control by using
    boot option "acpi_backlight=vendor".
    
    In this case we should not print any warning message.
    http://bugzilla.kernel.org/show_bug.cgi?id=13671#c14
    
    Sigend-off-by: Zhang Rui <rui.zhang@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  30. ACPI: fix ACPI=n allmodconfig build

    Ingo Molnar committed with lenb Dec 17, 2009
    Today's -tip failed to build because commit
    9e368fa ("ipmi: add PNP discovery (ACPI
    namespace via PNPACPI)") from today's upstream kernel causes the following
    build failure on x86, for CONFIG_ACPI=n && CONFIG_IPMI_SI=y:
    
     drivers/char/ipmi/ipmi_si_intf.c:3208: error: 'ipmi_pnp_driver' undeclared (first use in this function)
     drivers/char/ipmi/ipmi_si_intf.c:3208: error: (Each undeclared identifier is reported only once
     drivers/char/ipmi/ipmi_si_intf.c:3208: error: for each function it appears in.)
     drivers/char/ipmi/ipmi_si_intf.c:3334: error: 'ipmi_pnp_driver' undeclared (first use in this function)
    
    The reason is that the ipmi_pnp_driver depends on ACPI facilities and is only
    made available under ACPI - while the registration and unregistration is made
    dependent on CONFIG_PNP:
    
     #ifdef CONFIG_PNP
     	pnp_register_driver(&ipmi_pnp_driver);
     #endif
    
    The solution is to only register this driver under ACPI. (Also, the CONFIG_PNP
    dependency is not needed because pnp_register_driver() is stubbed out in the
    !CONFIG_PNP case.)
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Acked-by: Myron Stowe <myron.stowe@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>