Skip to content


Subversion checkout URL

You can clone with
Download ZIP
tag: v2.6.33-rc2-gi…
Commits on Dec 31, 2009
  1. @torvalds

    Merge git://

    torvalds authored
    * git://
      [CIFS] Enable mmap on forcedirectio mounts
      cifs: NULL out tcon, pSesInfo, and srvTcp pointers when chasing DFS referrals
  2. @torvalds

    Merge branch 'for-linus' of git://…

    torvalds authored
    * 'for-linus' of git://
      firewire, ieee1394: update Kconfig help
      firewire, ieee1394: update MAINTAINERS entries
      firewire: ohci: always use packet-per-buffer mode for isochronous reception
      firewire: cdev: fix another memory leak in an error path
      firewire: fix use of multiple AV/C devices, allow multiple FCP listeners
    Comments from Stefan:
       Distributors who still ship the old stack (ieee1394, ohci1394,
       raw1394, sbp2, eth1394 and more) should now switch to the new one
       (firewire-core, firewire-ohci, firewire-sbp2, firewire-net).  In the
       first iteration, those distributors might want to ship the old stack
       also (but blacklisted) as a fallback for their users if unforeseen
       problems with the newer replacement drivers are encountered.
       The older FireWire stack contains several known problems which are
       not going to be fixed; instead, those issues are addressed by the new
       stack.  An incomplete list of these issues is kept in bugzilla:

       We have a guide on migration from the older to the newer stack:

  3. @rjwysocki @torvalds

    PCI: Fix build if quirks are not enabled

    rjwysocki authored torvalds committed
    After commit b9c3b26 ("PCI: support
    device-specific reset methods") the kernel build is broken if
    CONFIG_PCI_QUIRKS is unset.
    Fix this by moving pci_dev_specific_reset() to drivers/pci/quirks.c and
    providing an empty replacement for !CONFIG_PCI_QUIRKS builds.
    Signed-off-by: Rafael J. Wysocki <>
    Reported-by: Ingo Molnar <>
    Signed-off-by: Linus Torvalds <>
  4. @torvalds

    Merge branch 'x86-fixes-for-linus-2' of git://…

    torvalds authored
    * 'x86-fixes-for-linus-2' of git://
      dma-debug: Fix bug causing build warning
  5. @torvalds

    Merge branch 'perf-fixes-for-linus-2' of git://…

    torvalds authored
    * 'perf-fixes-for-linus-2' of git://
      perf: Fix NULL deref in inheritance code
      perf: Pass appropriate frame pointer to dump_trace()
  6. @torvalds

    Merge branch 'x86-fixes-for-linus' of git://…

    torvalds authored
    * 'x86-fixes-for-linus' of git://
      x86/agp: Fix agp_amd64_init() initialization with CONFIG_GART_IOMMU enabled
      x86: SGI UV: Fix writes to led registers on remote uv hubs
      x86, kmemcheck: Use KERN_WARNING for error reporting
      x86: Use KERN_DEFAULT log-level in __show_regs()
      x86, compress: Force i386 instructions for the decompressor
      x86/amd-iommu: Fix initialization failure panic
      dma-debug: Do not add notifier when dma debugging is disabled.
      x86: Fix objdump version check in chkobjdump.awk for different formats.
    Trivial conflicts in arch/x86/include/asm/uv/uv_hub.h due to me having
    applied an earlier version of an SGI UV fix.
  7. @torvalds

    Merge branch 'perf-fixes-for-linus' of git://…

    torvalds authored
    * 'perf-fixes-for-linus' of git://
      perf kmem: Fix statistics typo
      kprobes: Fix distinct type warning
      perf: Rename perf_event_hw_event in design document
      perf tools: Add missing header files to LIB_H Makefile variable
      perf record: We should fork only if a program was specified to run
      perf diff: Fix usage array, it must end with a NULL entry
  8. @torvalds

    Merge branch 'tracing-fixes-for-linus' of git://…

    torvalds authored
    * 'tracing-fixes-for-linus' of git://
      tracing: Fix sign fields in ftrace_define_fields_##call()
      tracing/syscalls: Fix typo in SYSCALL_DEFINE0
      tracing/kprobe: Show sign of fields in trace_kprobe format files
      ksym_tracer: Remove trace_stat
      ksym_tracer: Fix race when incrementing count
      ksym_tracer: Fix to allow writing newline to ksym_trace_filter
      ksym_tracer: Fix to make the tracer work
      tracing: Kconfig spelling fixes and cleanups
      tracing: Fix setting tracer specific options
      Documentation: Update ftrace-design.txt
      Documentation: Update tracepoint-analysis.txt
      Documentation: Update mmiotrace.txt
  9. @torvalds

    Merge branch 'for-linus' of git://…

    torvalds authored
    * 'for-linus' of git://
      Input: iforce - wait for command completion when closing the device
      Input: twl4030-pwrbutton - switch to using threaded IRQ
      Input: twl4030_keypad - switch to using threaded IRQ
      Input: lifebook - add CONFIG_DMI dependency
      Input: wistron - fix test for CONFIG_PM
      Input: psmouse - fix compile warning in hgpk module
      Input: matrix-keypad - handle cases when GPIOs can't be wakeup sources
      Input: iforce - fix oops on device disconnect
      Input: ff-memless - add notion of direction to for rumble effects
      Input: ff-memless - another fix for signed to unsigned overflow
      Input: ff-memless - start playing FF effects immediately
      Input: serio - do not mark kseriod freezable anymore
      Input: speed up suspend/shutdown for PS/2 mice and keyboards
  10. dma-debug: Fix bug causing build warning

    Ingo Molnar authored
    Stephen Rothwell reported the following build warning:
     lib/dma-debug.c: In function 'dma_debug_device_change':
     lib/dma-debug.c:680: warning: 'return' with no value, in function returning non-void
    Introduced by commit f797d98
    ("dma-debug: Do not add notifier when dma debugging is disabled").
    Return 0 [notify-done] when disabled. (this is standard bus notifier behavior.)
    Signed-off-by: Shaun Ruffell <>
    Signed-off-by: Joerg Roedel <>
    Cc: Linus Torvalds <>
    Cc: <>
    LKML-Reference: <20091231125624.GA14666@liondog.tnic>
    Signed-off-by: Ingo Molnar <>
  11. perf: Fix NULL deref in inheritance code

    Peter Zijlstra authored Ingo Molnar committed
    Liming found a NULL deref when a task has a perf context but no
    counters  when it forks.
    This can occur in two cases, a race during construction where
    the fork hits after installing the context but before the first
    counter gets inserted, or more reproducably, a fork after the
    last counter is closed (which leaves the context around).
    Reported-by: Wang Liming <>
    Signed-off-by: Peter Zijlstra <>
    Cc: Frederic Weisbecker <>
    Cc: Paul Mackerras <>
    CC: <>
    LKML-Reference: <1262185684.7135.222.camel@laptop>
    Signed-off-by: Ingo Molnar <>
  12. @fweisbec

    perf: Pass appropriate frame pointer to dump_trace()

    fweisbec authored Ingo Molnar committed
    Pass the frame pointer from the regs of the interrupted path
    to dump_trace() while processing the stack trace.
    Currently, dump_trace() takes the current bp and starts the
    callchain from dump_trace() itself. This is wasteful because
    we need to walk through the entire NMI/DEBUG stack before
    retrieving the interrupted point.
    We can fix that by just using the frame pointer from the
    captured regs. It points exactly where we want to start.
    Signed-off-by: Frederic Weisbecker <>
    Cc: Peter Zijlstra <>
    Cc: Arnaldo Carvalho de Melo <>
    Cc: Paul Mackerras <>
    LKML-Reference: <>
    Signed-off-by: Ingo Molnar <>
    Cc: Peter Zijlstra <>
    Cc: Arnaldo Carvalho de Melo <>
    Cc: Paul Mackerras <>
  13. @torvalds

    Merge branch 'release' of git://…

    torvalds authored
    * 'release' of git://
      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. @lenb
  2. @zhang-rui @lenb

    ACPI: introduce kernel parameter acpi_sleep=sci_force_enable

    zhang-rui authored lenb committed
    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 <>
    Acked-by: Rafael J. Wysocki <>
    Signed-off-by: Len Brown <>
  3. @torvalds

    Merge branch 'fixes' of git://…

    torvalds authored
    * 'fixes' of git://
      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'
  4. @torvalds

    Merge branch 'for_linus' of git://…

    torvalds authored
    * 'for_linus' of git://
      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>
  5. @torvalds

    Merge branch 'slab/urgent' of git://…

    torvalds authored
    * 'slab/urgent' of git://
      SLAB: Fix lockdep annotation breakage
  6. @torvalds

    Merge branch 'for-linus' of git://…

    torvalds authored
    * 'for-linus' of git://
      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
  7. @torvalds

    Merge branch 'kvm-updates/2.6.33' of git://…

    torvalds authored
    * 'kvm-updates/2.6.33' of git://
      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
  8. @torvalds

    Merge branch 'for-linus' of git://…

    torvalds authored
    * 'for-linus' of git://
      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
  9. @torvalds

    kfifo: Fix typo in comment

    Rolf Eike Beer authored torvalds committed
    Signed-off-by: Rolf Eike Beer <>
    Signed-off-by: Linus Torvalds <>
  10. @torvalds

    Merge branch 'for-linus' of git://

    torvalds authored
    * 'for-linus' of git://
      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
  11. @lenb @torvalds

    dell-wmi: sys_init_module: 'dell_wmi'->init suspiciously returned 21,…

    lenb authored torvalds committed
    … 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 <>
    Tested-by: Paul Rolland <>
    Signed-off-by: Linus Torvalds <>
  12. @torvalds

    wmi: check find_guid() return value to prevent oops

    Paul Rolland authored torvalds committed
    Signed-off-by: <Paul Rolland>
    Signed-off-by: Len Brown <>
    Signed-off-by: Linus Torvalds <>
  13. @torvalds

    Merge branch 'for-linus' of git://

    torvalds authored
    * 'for-linus' of git://
      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
  14. @torvalds

    Merge git://

    torvalds authored
    * git:// (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
  15. @torvalds

    Merge git://

    torvalds authored
    * git://
      hwrng: core - Fix double unlock in rng_dev_read
  16. @torvalds

    generic_permission: MAY_OPEN is not write access

    Serge E. Hallyn authored torvalds committed
    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 <>
    Signed-off-by: Serge E. Hallyn <>
    Tested-by: Mike Kazantsev <>
    Signed-off-by: Linus Torvalds <>
  17. @torvalds

    x86_64 SGI UV: Fix writes to led registers on remote uv hubs.

    Mike Travis authored torvalds committed
    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 <>
    Reviewed-by: Jack Steiner <>
    Signed-off-by: Linus Torvalds <>
  18. @torvalds

    mm: move sys_mmap_pgoff from util.c

    Hugh Dickins authored torvalds committed
    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 <>
    Signed-off-by: Linus Torvalds <>
  19. @torvalds

    libsrp: fix compile failure

    James Bottomley authored torvalds committed
    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 <>
    Signed-off-by: Linus Torvalds <>
  20. @dtor

    Input: iforce - wait for command completion when closing the device

    dtor authored
    We need to wait for the command to disable FF effects to complete before
    continuing with closing the device.
    Tested-by: Johannes Ebke <>
    Signed-off-by: Dmitry Torokhov <>
  21. @tytso

    ext4: Patch up how we claim metadata blocks for quota purposes

    tytso authored
    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
    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.
    Signed-off-by: "Theodore Ts'o" <>
  22. @laijs @rostedt

    tracing: Fix sign fields in ftrace_define_fields_##call()

    laijs authored rostedt committed
    Add is_signed_type() call to trace_define_field() in ftrace macros.
    The code previously just passed in 0 (false), disregarding whether
    or not the field was actually a signed type.
    Signed-off-by: Lai Jiangshan <>
    LKML-Reference: <>
    Signed-off-by: Steven Rostedt <>
Something went wrong with that request. Please try again.