commit 3edac25f2e8ac8c2a84904c140e1aeb434e73e75 Merge: 504765f... c35a254... Author: Linus Torvalds Date: Wed Nov 12 10:56:31 2008 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: IPoIB: Fix crash in path_rec_completion() IPoIB: Fix hang in ipoib_flush_paths() IPoIB: Don't enable NAPI when it's already enabled RDMA/cxgb3: Fix deadlock in iw_cxgb3 (hang when configuring interface) IB/ehca: Remove reference to special QP in case of port activation failure IB/mlx4: Set umem field to NULL in mlx4_ib_alloc_fast_reg_mr() mlx4_core: Fix unused variable warning RDMA/nes: Mitigate compatibility issue regarding PCIe write credits RDMA/nes: Fix CQ allocation scheme for multicast receive queue apps RDMA/nes: Correct handling of PBL resources RDMA/nes: Reindent mis-indented spinlocks RDMA/cxgb3: Fix too-big reserved field zeroing in iwch_post_zb_read() IB/ipath: Fix RDMA write with immediate copy of last packet commit 504765f3b020f15e88bc1334d5b3e0a6e849b1cd Merge: 58a4748... 24924f8... Author: Linus Torvalds Date: Wed Nov 12 10:42:38 2008 -0800 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: ALSA: hda - Fix IDT/STAC multiple HP detection ALSA: hda - Fix input pin initialization for STAC/IDT codecs ALSA: hda - Add missing analog-mux mixer creation for STAC9200 commit 58a47481b6ecb6dd05ab4a788e1f2ae3c7c46f57 Author: David Howells Date: Wed Nov 12 15:35:55 2008 +0000 MN10300: Don't do misalignment handling for userspace Don't do misalignment handling for userspace misalignment faults: just generate an appropriate SIGBUS instead. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit bd9384a9fdd6c15da6b01b2844c3471d07a45d64 Author: David Howells Date: Wed Nov 12 15:35:50 2008 +0000 MN10300: Don't handle misaligned loading and storing of SP Don't handle the misaligned loading and storing of the SP register as in C code that's most certainly a compiler bug. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit d3bd462865421dd8be310fac2d2f6da6069f9679 Author: David Howells Date: Wed Nov 12 15:35:45 2008 +0000 MN10300: Handle misaligned SP-based operands Support misalignment handling for instructions that have kernel SP-based address operands, including fixing those that include IMM8 or IMM16 displacements. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 852c15b7362cf34e0d7949abefbfeeb0845d93b4 Author: David Howells Date: Wed Nov 12 15:35:40 2008 +0000 MN10300: Fix misaligned index-register addressing handling Fix misalignment handling for an address calculated from the sum of two registers. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 6d615c78fb92fbd80e52ba7acb2d4c4d503006c3 Author: David Howells Date: Wed Nov 12 15:35:35 2008 +0000 MN10300: Handle misaligned postinc-with-imm addressing mode correctly Correctly handle misalignment in MOV instructions with postinc-with-immediate addressing mode operands. In these, the immediate value is the increment to be applied the address register, not the displacement to the address. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit ddb6d05cbaea76eddbee52585152ab801a8aedc7 Author: David Howells Date: Wed Nov 12 15:35:30 2008 +0000 MN10300: Perform misalignment fixups of MOV_Lcc Perform misalignment fixups of the MOV_Lcc instructions (move postinc memory to register and conditionally loop). Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit aefefbbec1ad25bafa97a7a1db25313ce26563e2 Author: David Howells Date: Wed Nov 12 15:35:25 2008 +0000 MN10300: Allow misalignment fixup in interrupt handling Allow misalignment fixup in interrupt handling in the MN10300 arch. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit f911c685d65ea1855eb3f95b8eaf871e5d9342fa Author: David Howells Date: Wed Nov 12 15:35:20 2008 +0000 MN10300: Fix register-postinc addressing misalignment handling Fix misalignment handling of operands with register postincrement addressing. The flag to indicate that postincrement is required should not be interpreted as an specification of a value to be added to the address. Also add BUGs to catch unimplemented parameter markings in the opcodes table. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit b308bf3be1f75207c307eea9ada90e0b76194911 Author: David Howells Date: Wed Nov 12 15:35:14 2008 +0000 MN10300: Extract the displacement from an insn correctly in misalignment fixup Extract the displacement from an MN10300 instruction correctly in the misalignment fixup handler. The code should extract the displacement in LSB order, not MSB order. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit ee6e740cf7e5605b353af539eb9a6e17948747b6 Author: David Howells Date: Wed Nov 12 15:35:09 2008 +0000 MN10300: Add further misalignment fixups Add further misalignment fixup support to the MN10300 arch, notably for ABS32 and SP+disp addressing. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 9f55588968095306d52bd30564666d4fadce5e39 Author: David Howells Date: Wed Nov 12 15:35:04 2008 +0000 MN10300: Add built-in testing for misalignment handler Add configurable built-in testing for the MN10300 misalignment handler. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 31ea24bba77a16d3220b0822838785cbafb78175 Author: David Howells Date: Wed Nov 12 15:34:59 2008 +0000 MN10300: Clean up the misalignment handler a little Clean up the MN10300 misalignment handler a little by: (1) Use ilog2() rather than doing implementing log2() locally. (2) Make format_tbl[] const and static. (3) Making the debugging prints more consistent. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 5d2007ebc278525cbe8d2e3ef559a4b191ee4ded Merge: 1c12718... e17d1dc... Author: Linus Torvalds Date: Wed Nov 12 10:38:42 2008 -0800 Merge branch 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm * 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm: KVM: Fix pit memory leak if unable to allocate irq source id KVM: ia64: fix vmm_spin_{un}lock for !CONFIG_SMP KVM: VMX: Set IGMT bit in EPT entry KVM: Require the PCI subsystem x86: KVM guest: fix section mismatch warning in kvmclock.c KVM: ia64: Use guest signal mask when blocking KVM: MMU: increase per-vcpu rmap cache alloc size commit 1c1271850494f06b63ae6b485e2e1b9c27ffb2d1 Author: Denys Vlasenko Date: Wed Nov 12 01:24:41 2008 +0100 parisc: fix find_extend_vma() breakage The STACK_GROWSUP case of stack expansion was missing a test for 'prev', which got removed by commit cb8f488c33539f096580e202f5438a809195008f ("mmap.c: deinline a few functions") by mistake. I found my original email in "sent" folder. The patch in that mail does NOT remove !prev. That change had beed added by someone else. Ok, I think we are not much interested in who did it, let's fix it for good. [ "It looks like this was caused by me fixing rejects. That was the fancy include-lots-of-context-so-it-wont-apply patch." - akpm ] Reported-and-bisected-by: Helge Deller Signed-off-by: Denys Vlasenko Cc: Andrew Morton Cc: Jiri Kosina Signed-off-by: Linus Torvalds commit 08c1184fa2b785f23453b8cbb43f86b409cde3a6 Merge: f21f237... d1876ba... Author: Linus Torvalds Date: Wed Nov 12 10:24:46 2008 -0800 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (47 commits) ACPI: pci_link: remove acpi_irq_balance_set() interface fujitsu-laptop: Add DMI callback for Lifebook S6420 ACPI: EC: Don't do transaction from GPE handler in poll mode. ACPI: EC: lower interrupt storm treshold ACPICA: Use spinlock for acpi_{en|dis}able_gpe ACPI: EC: restart failed command ACPI: EC: wait for last write gpe ACPI: EC: make kernel messages more useful when GPE storm is detected ACPI: EC: revert msleep patch thinkpad_acpi: fingers off backlight if video.ko is serving this functionality sony-laptop: fingers off backlight if video.ko is serving this functionality msi-laptop: fingers off backlight if video.ko is serving this functionality fujitsu-laptop: fingers off backlight if video.ko is serving this functionality eeepc-laptop: fingers off backlight if video.ko is serving this functionality compal: fingers off backlight if video.ko is serving this functionality asus-acpi: fingers off backlight if video.ko is serving this functionality Acer-WMI: fingers off backlight if video.ko is serving this functionality ACPI video: if no ACPI backlight support, use vendor drivers ACPI: video: Ignore devices that aren't present in hardware Delete an unwanted return statement at evgpe.c ... commit c35a2549642c45ba9085d8b6db4dd68d2b0de230 Merge: b3e123c... fad96ab... a8b56f2... ff79ae8... 7f3abf5... 6336936... Author: Roland Dreier Date: Wed Nov 12 10:24:44 2008 -0800 Merge branches 'cxgb3', 'ehca', 'ipath', 'ipoib', 'mlx4' and 'nes' into for-next commit ff79ae80837cf45cb703b34824dd3862d2ddcb24 Author: Yossi Etigin Date: Wed Nov 12 10:24:39 2008 -0800 IPoIB: Fix crash in path_rec_completion() Fix a crash in path_rec_completion() during an SM up/down loop. If more than one path record request is issued, the first completion releases path->done, allowing ipoib_flush_paths() to free the path, and thus corrupting it for the second completion. Commit ee1e2c82 ("IPoIB: Refresh paths instead of flushing them on SM change events") added the field path->valid and changed the test "if (!path)" to "if (!path || !path->valid)". This change made it possible for a path with an outstanding query to pass the test and issue another query on the same path. Having two queries on the same path leads to a crash. This fixes . Signed-off-by: Yossi Etigin Signed-off-by: Roland Dreier commit 93a3ab939ba90e00e193f0bad98f43fbdfbd925d Author: Yossi Etigin Date: Wed Nov 12 10:24:38 2008 -0800 IPoIB: Fix hang in ipoib_flush_paths() ipoib_flush_paths() can hang during an SM up/down loop: if path_rec_start() fails (for instance, because there is no sm_ah), the path is still added to the path list by neigh_add_path(). Then, ipoib_flush_paths() will wait for path->done, but it will never complete because the request was not issued at all. Fix this by completing path->done if issuing the query fails. This fixes . Signed-off-by: Yossi Etigin Signed-off-by: Roland Dreier commit fe25c56190bbc0951d7c53b4ccd148e669d69938 Author: Yossi Etigin Date: Wed Nov 12 10:24:36 2008 -0800 IPoIB: Don't enable NAPI when it's already enabled If a P_Key is not present when an interface is created, ipoib_open() will return after doing napi_enable(). ipoib_open() will be called again from ipoib_pkey_poll() when the P_Key appears, after NAPI has already been enabled, and try to enable it again. This triggers a BUG_ON() in napi_enable(). Fix this by moving the call to napi_enable() to after the test for P_Key presence. Signed-off-by: Yossi Etigin Signed-off-by: Roland Dreier commit b3e123cf65baadc0cc30a843fd48cfd6a4b2e1ca Author: Steve Wise Date: Wed Nov 12 10:16:47 2008 -0800 RDMA/cxgb3: Fix deadlock in iw_cxgb3 (hang when configuring interface) When the iw_cxgb3 module's cxgb3_client "add" func gets called by the cxgb3 module, the iwarp driver ends up calling the ethtool ops get_drvinfo function in cxgb3 to get the fw version and other info. Currently the iwarp driver grabs the rtnl lock around this down call to serialize. As of 2.6.27 or so, things changed such that the rtnl lock is held around the call to the netdev driver open function. Also the cxgb3_client "add" function doesn't get called if the device is down. So, if you load cxgb3, then load iw_cxgb3, then ifconfig up the device, the iw_cxgb3 add func gets called with the rtnl_lock held. If you load cxgb3, ifconfig up the device, then load iw_cxgb3, the add func gets called without the rtnl_lock held. The former causes the deadlock, the latter does not. In addition, there are iw_cxgb3 sysfs handlers that also can call down into cxgb3 to gather the fw and hw versions. These can be called concurrently on different processors and at any time. Thus we need to push this serialization down in the cxgb3 driver get_drvinfo func. The fix is to remove rtnl lock usage, and use a per-device lock in cxgb3. Signed-off-by: Steve Wise Acked-by: Divy Le Ray Signed-off-by: Roland Dreier commit 24924f884cd36603615ea5496244e542b0b513c6 Merge: f21f237... d7a8943... Author: Takashi Iwai Date: Wed Nov 12 10:06:31 2008 +0100 Merge branch 'topic/fix/hda' into for-linus commit d7a8943635485597ae7c6d554a8ccf3ce5a42d2d Author: Takashi Iwai Date: Wed Nov 12 09:48:04 2008 +0100 ALSA: hda - Fix IDT/STAC multiple HP detection Due to the recent change for multiple HP as line-out switch, only one of the multiple headphons (usually a wrong one) is toggled and the other pins are still disabled. This causes the silent output problem on some Dell laptops. Also, the hp_switch check is screwed up when a line-in or a mic-in jack exists. This is added as an additional output, but hp_switch check doesn't take it into account. This patch fixes these issues: simplify hp_switch check by using the NID instead of bool, and clean up / fix the toggle of HP pins in unsol event handler code. Reference: Novell bnc#443267 https://bugzilla.novell.com/show_bug.cgi?id=443267 Signed-off-by: Takashi Iwai commit d1876ba4dead6ace7e9fbf16f83397e6486d0dfe Merge: 547f784... 8517934... Author: Len Brown Date: Tue Nov 11 21:17:26 2008 -0500 Merge branch 'ec' into release commit 547f7847472c097a54adf38e6576f95ab512e27c Merge: f398778... 5b53ed6... Author: Len Brown Date: Tue Nov 11 21:17:03 2008 -0500 Merge branch 'processor-256' into release commit f398778aa336a2919ee04ba45d915007230c6957 Merge: 9b5a56d... 2dba1b5... Author: Len Brown Date: Tue Nov 11 21:15:50 2008 -0500 Merge branch 'video' into release Conflicts: Documentation/kernel-parameters.txt Signed-off-by: Len Brown commit 9b5a56ddfd615a27e3a0856ceae1592a24021e42 Merge: a0017f4... 0794469... Author: Len Brown Date: Tue Nov 11 21:14:49 2008 -0500 Merge branch 'sysfs' into release commit a0017f471054a46379abbc4c96e269deaff5d9d9 Merge: f613984... bd2b064... Author: Len Brown Date: Tue Nov 11 21:14:25 2008 -0500 Merge branch 'sony' into release commit f613984902b64cfb05599f9ba52c0af39cb4db6b Merge: 3e0fe36... 676962d... Author: Len Brown Date: Tue Nov 11 21:14:15 2008 -0500 Merge branch 'power' into release commit 3e0fe364835cecc8560cf32bb9609f4c56c5d9fa Merge: e911d27... 3283625... Author: Len Brown Date: Tue Nov 11 21:14:11 2008 -0500 Merge branch 'misc' into release commit e911d27af43e7d28d59a96a4682e8942f0661469 Merge: 50f19e3... d21cf3c... Author: Len Brown Date: Tue Nov 11 21:14:01 2008 -0500 Merge branch 'bugzilla-11917' into release commit 50f19e37c38e82c4fd2aa50fedbfa3aac7903e5a Merge: 597e4fa... 4feba70... Author: Len Brown Date: Tue Nov 11 21:13:55 2008 -0500 Merge branch 'bugzilla-11539' into release commit 597e4fabb0b0c7fdfa7c2d551fd0a797aab7e53b Merge: 3ad4f59... ed206fa... Author: Len Brown Date: Tue Nov 11 21:13:50 2008 -0500 Merge branch 'bugzilla-11312' into release commit 32836259ff25ce97010569706cd33ba94de81d62 Author: Bjorn Helgaas Date: Wed Nov 5 16:17:52 2008 -0700 ACPI: pci_link: remove acpi_irq_balance_set() interface This removes the acpi_irq_balance_set() interface from the PCI interrupt link driver. x86 used acpi_irq_balance_set() to tell the PCI interrupt link driver to configure links to minimize IRQ sharing. But the link driver can easily figure out whether to turn on IRQ balancing based on the IRQ model (PIC/IOAPIC/etc), so we can get rid of that external interface. It's better for the driver to figure this out at init-time. If we set it externally via the x86 code, the interface reduces modularity, and we depend on the fact that acpi_process_madt() happens before we process the kernel command line. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit 56960b546a88844a6f5295a9f81aab9e6b81edc9 Author: Tony Vroon Date: Sun Nov 9 04:20:05 2008 +0000 fujitsu-laptop: Add DMI callback for Lifebook S6420 The Lifebook S6420 is the ICH9M-based follow-up to the S6410. The application panel contains the following keys: lock, mobility center, eco, info. Whilst key 4 might be more appropriate for help then key 2, I've done things the S6410 way. I can confirm that backlight control is functional, and that the lock key activates the Gnome screensaver as expected. Signed-off-by: Tony Vroon Acked-by: Jonathan Woithe Signed-off-by: Len Brown commit fad96ab62d38b94efbdb4c3c5fc55cb90d57937d Author: Stefan Roscher Date: Tue Nov 11 15:44:22 2008 -0800 IB/ehca: Remove reference to special QP in case of port activation failure If the initialization of a special QP (e.g. AQP1) fails due to a software timeout, we have to remove the reference to that special QP struct from the port struct to stop the driver from accessing the QP, since it will be/has been destroyed by the caller, eg in this case ib_mad. Signed-off-by: Stefan Roscher Signed-off-by: Roland Dreier commit 8517934ef6aaa28d6e055b98df65b31cedbd1372 Author: Alexey Starikovskiy Date: Tue Nov 11 12:54:11 2008 +0300 ACPI: EC: Don't do transaction from GPE handler in poll mode. Referencies: http://bugzilla.kernel.org/show_bug.cgi?id=12004 Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit 06cf7d3c7af902939cd1754abcafb2464060cba8 Author: Alexey Starikovskiy Date: Sun Nov 9 19:01:06 2008 +0300 ACPI: EC: lower interrupt storm treshold http://bugzilla.kernel.org/show_bug.cgi?id=11892 Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit 0b7084ac67fb84f0cf2f8bc02d7e0dea8521dd2d Author: Alexey Starikovskiy Date: Sat Oct 25 21:48:46 2008 +0400 ACPICA: Use spinlock for acpi_{en|dis}able_gpe Disabling gpe might interfere with gpe detection/handling, thus producing "interrupt not handled" errors. Ironically, disabling of GPE from interrupt context is already under spinlock, so only userspace needs to start using it. Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit a2f93aeadf97e870ff385030633a73e21146815d Author: Alexey Starikovskiy Date: Wed Nov 12 01:40:19 2008 +0300 ACPI: EC: restart failed command Restart current transaction if we recieved unexpected GPEs instead of needed ones. http://bugzilla.kernel.org/show_bug.cgi?id=11896 Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit dd15f8c42af09031e27da5b4d697ce925511f2e1 Author: Alexey Starikovskiy Date: Sat Nov 8 21:42:30 2008 +0300 ACPI: EC: wait for last write gpe There is a possibility that EC might break if next command is issued within 1 us after write or burst-disable command. Suggestd-by: Zhao Yakui Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit f8248434e6a11d7cd314281be3b39bbcf82fc243 Author: Alan Jenkins Date: Sat Nov 1 11:05:26 2008 +0000 ACPI: EC: make kernel messages more useful when GPE storm is detected Make sure we can tell if the GPE storm workaround gets activated, and avoid flooding the logs afterwards. http://bugzilla.kernel.org/show_bug.cgi?id=11841 "plenty of line "ACPI: EC: non-query interrupt received, switching to interrupt mode" in dmesg" Signed-off-by: Alan Jenkins Acked-by: Alexey Starikovskiy Signed-off-by: Len Brown commit 1cfe62c8010ac56e1bd3827e30386a87cc2f3594 Author: Alexey Starikovskiy Date: Tue Oct 28 00:35:30 2008 +0300 ACPI: EC: revert msleep patch With the better solution for EC interrupt storm issue, there is no need to use msleep over udelay. References: http://bugzilla.kernel.org/show_bug.cgi?id=11810 http://bugzilla.kernel.org/show_bug.cgi?id=10724 Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit e17d1dc0863767bab8fde4ba9be92c7f79e7fe50 Author: Avi Kivity Date: Tue Nov 11 13:09:36 2008 +0200 KVM: Fix pit memory leak if unable to allocate irq source id Reported-By: Daniel Marjamäki Signed-off-by: Avi Kivity commit c60ff51eb26dfcfb0bdc807b09a096aeadd01325 Author: Xiantao Zhang Date: Sat Nov 8 15:46:59 2008 +0800 KVM: ia64: fix vmm_spin_{un}lock for !CONFIG_SMP In the case of !CONFIG_SMP, raw_spinlock_t is empty and the spinlock functions don't build. Fix by defining spinlock functions for the uniprocessor case. Signed-off-by: Xiantao Zhang Signed-off-by: Avi Kivity commit 928d4bf747e9c290b690ff515d8f81e8ee226d97 Author: Sheng Yang Date: Thu Nov 6 14:55:45 2008 +0800 KVM: VMX: Set IGMT bit in EPT entry There is a potential issue that, when guest using pagetable without vmexit when EPT enabled, guest would use PAT/PCD/PWT bits to index PAT msr for it's memory, which would be inconsistent with host side and would cause host MCE due to inconsistent cache attribute. The patch set IGMT bit in EPT entry to ignore guest PAT and use WB as default memory type to protect host (notice that all memory mapped by KVM should be WB). Signed-off-by: Sheng Yang Signed-off-by: Avi Kivity commit ca93e992fdfdc6569ac2845d7560eeb5de4a4e0b Author: Avi Kivity Date: Tue Nov 4 11:25:17 2008 +0200 KVM: Require the PCI subsystem PCI device assignment makes calls to pci code, so require it to be built into the kernel. Signed-off-by: Avi Kivity commit a29a2af378f3f6362b68e126e2541c8bde885ead Author: Rakib Mullick Date: Wed Oct 29 14:13:39 2008 -0700 x86: KVM guest: fix section mismatch warning in kvmclock.c WARNING: arch/x86/kernel/built-in.o(.text+0x1722c): Section mismatch in reference from the function kvm_setup_secondary_clock() to the function .devinit.text:setup_secondary_APIC_clock() The function kvm_setup_secondary_clock() references the function __devinit setup_secondary_APIC_clock(). This is often because kvm_setup_secondary_clock lacks a __devinit annotation or the annotation of setup_secondary_APIC_clock is wrong. Signed-off-by: Md.Rakib H. Mullick Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Avi Kivity commit f21f237cf55494c3a4209de323281a3b0528da10 Merge: 2f96cb5... 5d5254f... Author: Linus Torvalds Date: Tue Nov 11 10:53:50 2008 -0800 Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: timers: handle HRTIMER_CB_IRQSAFE_UNLOCKED correctly from softirq context nohz: disable tick_nohz_kick_tick() for now irq: call __irq_enter() before calling the tick_idle_check x86: HPET: enter hpet_interrupt_handler with interrupts disabled x86: HPET: read from HPET_Tn_CMP() not HPET_T0_CMP x86: HPET: convert WARN_ON to WARN_ON_ONCE commit a2e4e28946c2c282a040ba4945c8f7288de69118 Author: Xiantao Zhang Date: Thu Oct 23 15:02:52 2008 +0800 KVM: ia64: Use guest signal mask when blocking Before a vcpu blocks, it should switch to the guest signal mask to allow signals to unblock it. Signed-off-by: Xiantao Zhang Signed-off-by: Avi Kivity commit c41ef344de212bd918f7765af21b5008628c03e0 Author: Marcelo Tosatti Date: Tue Oct 28 18:16:58 2008 -0200 KVM: MMU: increase per-vcpu rmap cache alloc size The page fault path can use two rmap_desc structures, if: - walk_addr's dirty pte update allocates one rmap_desc. - mmu_lock is dropped, sptes are zapped resulting in rmap_desc being freed. - fetch->mmu_set_spte allocates another rmap_desc. Increase to 4 for safety. Signed-off-by: Marcelo Tosatti Signed-off-by: Avi Kivity commit 2f96cb57cde9957bac0991c712068d29364b2ac9 Merge: 09eb3b5... 2002c69... Author: Linus Torvalds Date: Tue Nov 11 10:52:25 2008 -0800 Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: release buddies on yield fix for account_group_exec_runtime(), make sure ->signal can't be freed under rq->lock sched: clean up debug info commit 09eb3b5b1bcab7b25e9dd57e90ee9753adf7afe2 Merge: 04ca2c1... 45b86a9... Author: Linus Torvalds Date: Tue Nov 11 10:51:50 2008 -0800 Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: ring-buffer: prevent infinite looping on time stamping ftrace: disable tracing on resize ftrace: fix breakage in bin_fmt results ftrace: ftrace.txt version update ftrace: update txt document commit 04ca2c17e3fae2d3f73aa5ad533242d556cadf5a Merge: ad1164b... 220ca31... Author: Linus Torvalds Date: Tue Nov 11 09:32:58 2008 -0800 Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs * 'for-linus' of git://oss.sgi.com/xfs/xfs: [XFS] XFS: Check for valid transaction headers in recovery [XFS] handle memory allocation failures during log initialisation [XFS] Account for allocated blocks when expanding directories [XFS] Wait for all I/O on truncate to zero file size [XFS] Fix use-after-free with log and quotas commit ad1164b79f1905ec1611cdc2a44949618bced2a6 Merge: 0906dd9... 6c1e183... Author: Linus Torvalds Date: Tue Nov 11 09:31:32 2008 -0800 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: (21 commits) ocfs2: Check search result in ocfs2_xattr_block_get() ocfs2: fix printk related build warnings in xattr.c ocfs2: truncate outstanding block after direct io failure ocfs2/xattr: Proper hash collision handle in bucket division ocfs2: return 0 in page_mkwrite to let VFS retry. ocfs2: Set journal descriptor to NULL after journal shutdown ocfs2: Fix check of return value of ocfs2_start_trans() in xattr.c. ocfs2: Let inode be really deleted when ocfs2_mknod_locked() fails ocfs2: Fix checking of return value of new_inode() ocfs2: Fix check of return value of ocfs2_start_trans() ocfs2: Fix some typos in xattr annotations. ocfs2: Remove unused ocfs2_restore_xattr_block(). ocfs2: Don't repeat ocfs2_xattr_block_find() ocfs2: Specify appropriate journal access for new xattr buckets. ocfs2: Check errors from ocfs2_xattr_update_xattr_search() ocfs2: Don't return -EFAULT from a corrupt xattr entry. ocfs2: Check xattr block signatures properly. ocfs2: add handler_map array bounds checking ocfs2: remove duplicate definition in xattr ocfs2: fix function declaration and definition in xattr ... commit 0906dd9df2f79042cfa82d8388895be7cbe7a51b Author: Alan Cox Date: Tue Nov 11 14:51:23 2008 +0000 telephony: trivial: fix up email address Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 8eb04cf3402c59e84af9d2e86149edb4044f9a9e Author: Alan Cox Date: Tue Nov 11 14:48:44 2008 +0000 tty: trivial - fix up email addresses in tty related stuff Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 853041f0899177da7a47da3a09aa327a14ebd7bb Merge: e892873... 1d6782b... Author: Linus Torvalds Date: Tue Nov 11 09:25:21 2008 -0800 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (35 commits) V4L/DVB (9516): cx18: Move DVB buffer transfer handling from irq handler to work_queue V4L/DVB (9557): gspca: Small changes for the sensor HV7131B in zc3xx. V4L/DVB (9556): gspca: Bad init sequence for sensor HV7131B in zc3xx. V4L/DVB (9549): gspca: Fix a typo in one of gspca chips name. V4L/DVB (9515): cx18: Use correct Mailbox IRQ Ack values and misc IRQ handling cleanup V4L/DVB (9493): kconfig patch V4L/DVB (9527): af9015: fix compile warnings V4L/DVB (9524): af9013: fix bug in status reading V4L/DVB (9511): cx18: Mark CX18_CPU_DE_RELEASE_MDL as a slow API call V4L/DVB (9510): cx18: Fix write retries for registers that always change - part 2. V4L/DVB (9506): ivtv/cx18: fix test whether modules should be loaded or not. V4L/DVB (9499): cx88-mpeg: final fix for analogue only compilation + de-alloc fix V4L/DVB (9496): cx88-blackbird: bugfix: cx88-blackbird-mpeg-users V4L/DVB (9495): cx88-blackbird: bugfix: cx88-blackbird-poll-fix V4L/DVB (9494): anysee: initialize anysee_usb_mutex statically V4L/DVB (9492): unplug oops from dvb_frontend_init... V4L/DVB (9486): ivtv/ivtvfb: no longer experimental V4L/DVB (9485): ivtv: remove incorrect V4L1 & tvaudio dependency V4L/DVB (9482): Documentation, especially regarding audio and informational links V4L/DVB (9475): cx18: Disable write retries for registers that always change - part 1. ... commit e892873c5d7431324d98dfd3ed1572a2948046be Merge: eda1be6... cb8fdc6... Author: Linus Torvalds Date: Tue Nov 11 09:24:31 2008 -0800 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: powerpc: Update desktop/server defconfigs powerpc: Fix msr check in compat_sys_swapcontext powerpc: Repair device bindings documentation powerpc: Updated Freescale PPC related defconfigs powerpc: Update QE/CPM2 usb_ctlr structures for USB support powerpc/86xx: Correct SOC bus-frequency in GE Fanuc SBC610 DTS powerpc: Fix Book-E watchdog timer interval setting powerpc/fsl-booke: Fix synchronization bug w/local tlb invalidates commit eda1be631a1efa3985b408a231ba20e1ecf0a92b Merge: 5da38d3... 0baf823... Author: Linus Torvalds Date: Tue Nov 11 09:22:24 2008 -0800 Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/i915: Move legacy breadcrumb out of the reserved status page area drm/i915: Filter pci devices based on PCI_CLASS_DISPLAY_VGA drm/radeon: map registers at load time drm: Remove infrastructure for supporting i915's vblank swapping. i915: Remove racy delayed vblank swap ioctl. i915: Don't whine when pci_enable_msi() fails. i915: Don't attempt to short-circuit object_wait_rendering by checking domains. i915: Clean up sarea pointers on leavevt i915: Save/restore MCHBAR_RENDER_STANDBY on GM965/GM45 commit 5da38d32824eb27c325d296bf3a39b5946578789 Merge: 7e2cec8... 19b7232... Author: Linus Torvalds Date: Tue Nov 11 09:21:28 2008 -0800 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata: fix last_reset timestamp handling libata: Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127 [libata] pata_pcmcia: another memory card support [libata] pata_sch: notice attached slave devices [libata] pata_cs553*.c: cleanup kernel-doc commit 7e2cec8631b76e123787a57eb8334b95762b8741 Merge: 0a4cf2c... 12de512... Author: Linus Torvalds Date: Tue Nov 11 09:20:43 2008 -0800 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: Update defconfig. Revert "sparc: correct section of current_pc()" commit 0a4cf2c8786219b4871c37240ab9787a61d843ee Merge: 4694516... df02c6f... Author: Linus Torvalds Date: Tue Nov 11 09:20:29 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: dsa: fix master interface allmulti/promisc handling dsa: fix skb->pkt_type when mac address of slave interface differs net: fix setting of skb->tail in skb_recycle_check() net: fix /proc/net/snmp as memory corruptor mac80211: fix a buffer overrun in station debug code netfilter: payload_len is be16, add size of struct rather than size of pointer ipv6: fix ip6_mr_init error path [4/4] dca: fixup initialization dependency [3/4] I/OAT: fix async_tx.callback checking [2/4] I/OAT: fix dma_pin_iovec_pages() error handling [1/4] I/OAT: fix channel resources free for not allocated channels ssb: Fix DMA-API compilation for non-PCI systems SSB: hide empty sub menu vlan: Fix typos in proc output string [netdrvr] usb/hso: Cleanup rfkill error handling sfc: Correct address of gPXE boot configuration in EEPROM el3_common_init() should be __devinit, not __init hso: rfkill type should be WWAN mlx4_en: Start port error flow bug fix af_key: mark policy as dead before destroying commit 4f1e6bc3646ab50b8181555ab7e6eeab68b8632a Author: Takashi Iwai Date: Tue Nov 11 16:47:24 2008 +0100 ALSA: hda - Fix input pin initialization for STAC/IDT codecs The input pins are sometimes not initialized properly because of the optimization check of the current pinctl code. Force to initialize the mic input pins so that they can be set up properly even if they were in a weird state. But keep other input pins if already set up as input, since this could be an extra mic pin. Reference: Novell bnc#443738 https://bugzilla.novell.com/show_bug.cgi?id=443738 Signed-off-by: Takashi Iwai commit 355a0ec471377a8a907b79c8fba3f0f09b44656e Author: Takashi Iwai Date: Tue Nov 11 16:46:19 2008 +0100 ALSA: hda - Add missing analog-mux mixer creation for STAC9200 The creation of analog-mux mixer element is missing in patch_stac9200() due to the dynamic allocation patch. Signed-off-by: Takashi Iwai commit 2002c69595a092518107f7e3c1294c9710bc92ae Author: Peter Zijlstra Date: Tue Nov 11 11:52:33 2008 +0100 sched: release buddies on yield Clear buddies on yield, so that the buddy rules don't schedule them despite them being placed right-most. This fixed a performance regression with yield-happy binary JVMs. Signed-off-by: Peter Zijlstra Signed-off-by: Ingo Molnar Tested-by: Lin Ming commit 1d6782bda5c1fb2bca44af50647b45427d8ef4ec Author: Andy Walls Date: Wed Nov 5 00:49:14 2008 -0300 V4L/DVB (9516): cx18: Move DVB buffer transfer handling from irq handler to work_queue cx18: Move DVB buffer transfer handling from irq handler to work_queue thread. In order to properly lock the epu2cpu mailbox for driver to CX23418 commands, the DVB/TS buffer handling needs to be moved from the IRQ handler and IRQ context to a work queue. This work_queue implmentation is strikingly similar to the ivtv implementation - for better or worse. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit c9ff1b689a5d605640f098afc37d6102ecef9876 Author: Jean-Francois Moine Date: Thu Nov 6 15:29:47 2008 -0300 V4L/DVB (9557): gspca: Small changes for the sensor HV7131B in zc3xx. - touch only one register for brightness change - no quality control - don't probe again at streamon time. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 03bf75654cd31610ddd1ea66fab311b5b24700f0 Author: Jean-Francois Moine Date: Thu Nov 6 14:47:13 2008 -0300 V4L/DVB (9556): gspca: Bad init sequence for sensor HV7131B in zc3xx. This patch fixes the H flip and the R & B color inversion of mode 320x240. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 93d0f0385adafc331d070a4e874c8ae686e6179a Author: Krzysztof Helt Date: Sat Oct 25 05:06:58 2008 -0300 V4L/DVB (9549): gspca: Fix a typo in one of gspca chips name. Signed-off-by: Krzysztof Helt Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 465f8a805d3796fac2b2fb0c630217f6f76e667c Author: Andy Walls Date: Tue Nov 4 22:02:23 2008 -0300 V4L/DVB (9515): cx18: Use correct Mailbox IRQ Ack values and misc IRQ handling cleanup cx18: Use correct Mailbox IRQ Ack values and misc IRQ handling cleanup. The SCB field definitions for Ack IRQ's for mailboxes were inconsistent with the bitmasks being loaded into those SCB fields and the SW2 Ack IRQ handling logic. Renamed fields in SCB to make things consistent and did misc IRQ handling cleanups: removing legacy ivtv dma_reg_lock, HPU IRQ flags, etc. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 17ff61cb200e8ec0c8e456fbd426c1af63a6e28a Author: Frederic CAND Date: Wed Oct 29 14:37:49 2008 -0300 V4L/DVB (9493): kconfig patch Ok I made a patch that converts gspca kconfig file to a more standard= one, with tabs + 2 white spaces, so that if a warning is added it still compiles please find it attached Signed-off-by: Mauro Carvalho Chehab commit 349d042f34cc2a663f22cae2390b240934e61014 Author: Antti Palosaari Date: Wed Nov 5 16:31:24 2008 -0300 V4L/DVB (9527): af9015: fix compile warnings - use static to avoid compile warnings Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit 891bd1331eb378f4a474d2377451a97bb306a451 Author: roel kluin Date: Tue Nov 4 11:32:59 2008 -0300 V4L/DVB (9524): af9013: fix bug in status reading - ! has a higher precedence than & Signed-off-by: Roel Kluin Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit 4e6b61047db2a77a250b6510bdb3c20c41aee591 Author: Andy Walls Date: Sat Nov 1 01:07:36 2008 -0300 V4L/DVB (9511): cx18: Mark CX18_CPU_DE_RELEASE_MDL as a slow API call cx18: Mark CX18_CPU_DE_RELEASE_MDL as a slow API call. Give the encoder time to complete the MDL release before destroying the encoder internal task. This avoids an encoder lockup on the next digital capture and error messages about buffers being returned for an inactive encoder task handle. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit f056d29eebd2c8800cf42528ba0470c77a928821 Author: Andy Walls Date: Fri Oct 31 20:49:12 2008 -0300 V4L/DVB (9510): cx18: Fix write retries for registers that always change - part 2. cx18: Fix write retries for registers that always change - part 2. Some registers, especially interrupt related ones, will never read back the value just written. Modified interrupt register readback checks to make sure the intended effect was achieved. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 58ae1c23184772a7b2d02a4a82f5515a7820a155 Author: Hans Verkuil Date: Mon Nov 3 08:06:51 2008 -0300 V4L/DVB (9506): ivtv/cx18: fix test whether modules should be loaded or not. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 1a8dc86db1546f60a25f2b5cd071c0091db87146 Author: Darron Broad Date: Thu Oct 30 05:05:23 2008 -0300 V4L/DVB (9499): cx88-mpeg: final fix for analogue only compilation + de-alloc fix Final fix for when analogue only is selected for compilation (ie, !CX88_DVB) This tidies up previous fix and adds missing de-alloc memory leak on fault (eg, if fe1 fails to alloc where fe0 was allocated). Signed-off-by: Darron Broad Signed-off-by: Mauro Carvalho Chehab commit 9c8e0a260ed7c8935d7ee8dd51cd1971ef516385 Author: Frederic CAND Date: Thu Oct 30 04:50:05 2008 -0300 V4L/DVB (9496): cx88-blackbird: bugfix: cx88-blackbird-mpeg-users Allows multiple access to the mpeg device Signed-off-by: Frederic CAND Signed-off-by: Mauro Carvalho Chehab commit a2482377c9df89daa0cb94252bd1e8829c0e9c2f Author: Frederic CAND Date: Thu Oct 30 04:46:42 2008 -0300 V4L/DVB (9495): cx88-blackbird: bugfix: cx88-blackbird-poll-fix Starts encoder not only on a read call but also on a poll command. Signed-off-by: Frederic CAND Signed-off-by: Mauro Carvalho Chehab commit dec0c46ac2af9bbc4a2acd56e5bffbf02f20113e Author: Akinobu Mita Date: Wed Oct 29 21:16:04 2008 -0300 V4L/DVB (9494): anysee: initialize anysee_usb_mutex statically anysee_usb_mutex is initialized at every time the anysee device is probed. If the second anysee device is probed while anysee_usb_mutex is locked by the first anysee device, the mutex is broken. This patch fixes by initialize anysee_usb_mutex statically rather than initialize at probe time. Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 8268c8f54505e5b952d1705a7bf3b2a218ed26bf Author: Daniel J Blueman Date: Mon Jun 2 20:05:14 2008 -0300 V4L/DVB (9492): unplug oops from dvb_frontend_init... When inadvertently hot-unplugging a WT-220U USB DVB-T receiver with 2.6.24, I was met with an oops [1]. The problem is relevant to 2.6.25/26-rc also. dvb_frontend_init() was called either from re-creation of the kdvb-fe0 thread - seems unlikely, or someone called dvb_frontend_reinitialise(), causing this path in the thread - really unlikely, as I can't find any call-site for it. Either way, quite a number of drivers call dvb_usb_generic_rw() [2] without checking the validity of the relevant member in the dvb_usb_device struct - which had changed. Having dvb_usb_generic_rw() sanity-check and fail (rather than loading from 0x120) seems reasonable defensive programming [3], in light of it being called in this way. The problem with this, is that drivers don't check the return code of the init call [4]. Does it make sense to cook a patch which allows the failure to be propagated back up, or am I missing something else? Thanks, Daniel [83711.538485] dvb-usb: bulk message failed: -71 (1/0) [83711.538875] dvb-usb: bulk message failed: -71 (1/0) [83711.538899] usb 7-5: USB disconnect, address 3 [83711.538905] dvb-usb: bulk message failed: -22 (1/0) [83711.538924] dvb-usb: bulk message failed: -22 (1/0) [83711.538943] dvb-usb: bulk message failed: -22 (1/0) [83711.588979] dvb-usb: bulk message failed: -22 (1/0) [83711.589031] dvb-usb: bulk message failed: -22 (1/0) [83711.589078] dvb-usb: bulk message failed: -22 (1/0) [83711.589122] dvb-usb: bulk message failed: -22 (1/0) [83711.589167] dvb-usb: bulk message failed: -22 (1/0) [83711.639233] dvb-usb: bulk message failed: -22 (1/0) [83711.639282] dvb-usb: bulk message failed: -22 (1/0) [83711.639330] dvb-usb: bulk message failed: -22 (1/0) [83711.639374] dvb-usb: bulk message failed: -22 (1/0) [83711.639421] dvb-usb: bulk message failed: -22 (1/0) [83711.658391] dvb-usb: bulk message failed: -22 (1/0) [83768.174281] dvb-usb: bulk message failed: -22 (2/-32512) [83768.174350] Unable to handle kernel NULL pointer dereference<6>dvb-usb: WideView WT-220U PenType Receiver (Typhoon/Freecom) successfully deinitialized and disconnected. [83768.174459] at 0000000000000120 RIP: [83768.174459] [] :dvb_usb:dvb_usb_generic_rw+0x2f/0x1a0 [83768.174580] PGD 0 [83768.174643] Oops: 0000 [1] SMP [83768.174723] CPU 0 [83768.174782] Modules linked in: nfsd auth_rpcgss exportfs nfs lockd nfs_acl sunrpc af_packet xt_length ipt_tos ipt_TOS xt_CLASSIFY sch_sfq sch_htb ipt_MASQUERADE ipt_REDIRECT xt_limit xt_state xt_tcpudp iptable_nat nf_nat nf_conntrack_ipv4 nf_conntrack iptable_mangle iptable_filter ip_tables x_tables xfs sbp2 parport_pc lp parport loop ftdi_sio usbserial evdev dvb_usb_dtt200u dvb_usb dvb_core i2c_core sky2 iTCO_wdt iTCO_vendor_support snd_hda_intel shpchp snd_pcm snd_timer snd_page_alloc snd_hwdep snd pci_hotplug soundcore ipv6 button intel_agp ext3 jbd mbcache sg sd_mod ata_generic pata_acpi ahci ata_piix libata scsi_mod ohci1394 ieee1394 ehci_hcd uhci_hcd usbcore e1000 thermal processor fan fbcon tileblit font bitblit softcursor fuse [83768.176968] Pid: 5732, comm: kdvb-fe-0 Not tainted 2.6.24-16-server #1 [83768.177009] RIP: 0010:[] [] :dvb_usb:dvb_usb_generic_rw+0x2f/0x1a0 [83768.177096] RSP: 0018:ffff810021939df0 EFLAGS: 00010286 [83768.177138] RAX: ffff81003bc7cc00 RBX: 0000000000000001 RCX: 0000000000000000 [83768.177181] RDX: 0000000000000001 RSI: ffff810021939e67 RDI: 0000000000000000 [83768.177223] RBP: 0000000000000000 R08: 0000000000000000 R09: 0000000000000000 [83768.177267] R10: ffff810001009880 R11: 0000000000000001 R12: ffff81003c10b400 [83768.177311] R13: ffff81003c10b5b0 R14: ffff810021939ec0 R15: 0000000000000000 [83768.177354] FS: 0000000000000000(0000) GS:ffffffff805c3000(0000) knlGS:0000000000000000 [83768.177409] CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b [83768.177449] CR2: 0000000000000120 CR3: 0000000000201000 CR4: 00000000000006e0 [83768.177491] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [83768.177534] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [83768.177576] Process kdvb-fe-0 (pid: 5732, threadinfo ffff810021938000, task ffff81003bd1b7a0) [83768.177629] Stack: ffff81003e9b6828 0000000000000000 ffff8100378369f8 0000000000000000 [83768.177800] ffff81003bd1b7a0 ffff810037836d48 ffff81003bc7cc30 ffff81003c10b400 [83768.177943] ffff81003c10b5b0 ffff810021939ec0 ffff81003c10b5e0 ffffffff88342452 [83768.178054] Call Trace: [83768.178130] [] :dvb_usb_dtt200u:dtt200u_fe_init+0x22/0x30 [83768.178178] [] :dvb_usb:dvb_usb_fe_wakeup+0x3a/0x50 [83768.178229] [] :dvb_core:dvb_frontend_init+0x21/0x70 [83768.178278] [] :dvb_core:dvb_frontend_thread+0x8b/0x370 [83768.178329] [] :dvb_core:dvb_frontend_thread+0x0/0x370 [83768.178382] [] kthread+0x4b/0x80 [83768.178427] [] child_rip+0xa/0x12 [83768.178473] [] kthread+0x0/0x80 [83768.178514] [] child_rip+0x0/0x12 [83768.178557] [83768.178594] [83768.178594] Code: 44 8b 87 20 01 00 00 49 89 f4 45 89 ce 45 85 c0 0f 84 ad 00 [83768.179167] RIP [] :dvb_usb:dvb_usb_generic_rw+0x2f/0x1a0 [83768.179234] RSP [83768.179271] CR2: 0000000000000120 [83768.179419] ---[ end trace dba8483163cb1700 ]--- Signed-off-by: Mauro Carvalho Chehab commit 7c34158f206dca89c717e6818d04b8db187155a3 Author: Hans Verkuil Date: Tue Oct 28 10:45:46 2008 -0300 V4L/DVB (9486): ivtv/ivtvfb: no longer experimental Remove the EXPERIMENTAL tag. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 6a95ec590647989089b86a6d04c5f064240cb033 Author: Hans Verkuil Date: Tue Oct 28 10:44:12 2008 -0300 V4L/DVB (9485): ivtv: remove incorrect V4L1 & tvaudio dependency ivtv used tvaudio in the past and at the time tvaudio required V4L1. Since tvaudio is no longer dependent on V4L1 and since ivtv actually no longer uses tvaudio at all, this is no removed from Kconfig. Without this patch ivtv won't be build if V4L1 is disabled. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 6aadf82eb830cf2622f8803fd7f0414299e246d3 Author: Tobias Lorenz Date: Tue Oct 28 08:48:27 2008 -0300 V4L/DVB (9482): Documentation, especially regarding audio and informational links This patch adds a recommendation to select SND_USB_AUDIO for listing and adds a documentation file for si470x. Signed-off-by: Tobias Lorenz Signed-off-by: Mauro Carvalho Chehab commit f3a3e881b81ae33b786759c7042de974c1e0bbf7 Author: Andy Walls Date: Sat Oct 25 23:27:06 2008 -0300 V4L/DVB (9475): cx18: Disable write retries for registers that always change - part 1. cx18: Disable write retries for registers that always change - part 1. Interrupt related registers will likely not read back the value we just wrote. Disable retries for these registers for now to avoid accidently discarding interrupts. More intelligent read back verification criteria are needed for these and other registers (e.g. GPIO line registers), which will be addressed in subsequent changes. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 8182ff69f8675fc1847a399be4eea5e8118a8dd3 Author: Jean Delvare Date: Fri Oct 24 15:08:28 2008 -0300 V4L/DVB (9372): Minor fixes to the saa7110 driver * Apparently the author of the saa7110 driver was confused by the number of outputs returned by DECODER_GET_CAPABILITIES. Of course a decoder chip has no analog ouputs, but it must have at least one digital output. * Fix an off-by-one error when checking the input value of DECODER_SET_INPUT. Signed-off-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit 0d0f1e0a1d6ef2d0ea249930c5ea71d990fc0b6e Author: Rafael Diniz Date: Wed Oct 22 18:02:09 2008 -0300 V4L/DVB (9369): Documentation update for cx88 Attached is a patch that updates the cx88 documentation to add the fact the closed caption works for at least NTSC capture. ps: I also updated the wiki at: http://www.linuxtv.org/v4lwiki/index.php/Text_capture#cx88_devices Signed-off-by: Rafael Diniz Signed-off-by: Mauro Carvalho Chehab commit b058e3f39508a3876a4fbf4a92398c817cf82809 Author: Rafael Diniz Date: Fri Oct 24 23:07:57 2008 -0300 V4L/DVB (9368): VBI fix for cx88 cards The attached patch fix VBI support cx88 card. I'm running a capture for hours, getting the closed caption from it[1], and it's working perfect - the output is the same of a bttv card. Please apply this patch as soon as possible. [1] - using zvbi-ntsc-cc of zvbi project. Signed-off-by: Rafael Diniz Signed-off-by: Mauro Carvalho Chehab commit e8deeae24f8b55a7203bec9b056593d9c62fae68 Author: Jean-Francois Moine Date: Wed Oct 22 10:57:37 2008 -0300 V4L/DVB (9367a): Add gspca driver and subdrivers to MAINTAINERS Signed-off-by: Costantino Leandro Signed-off-by: Erik Andrén Signed-off-by: Frank Zago Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit bdb6ee32536b881085a99fabff7bdfe359e3461b Author: Thierry MERLE Date: Thu Oct 23 17:49:49 2008 -0300 V4L/DVB (9358): CinergyT2: fix Kconfig typo config\tDVB_USB_CINERGY_T2 causes the make_kconfig.pl to forget to enable by default the compilation of cinergyT2 module. Signed-off-by: Thierry MERLE Signed-off-by: Mauro Carvalho Chehab commit 0e8bac9791b1539b72b8049b18218eb762d94d71 Author: Matthias Schwarzott Date: Fri Oct 24 10:47:07 2008 -0300 V4L/DVB (9357): cx88-dvb: Fix Oops in case i2c bus failed to register There already is an report at kernel bugzilla about this issue: http://bugzilla.kernel.org/show_bug.cgi?id=9455 When enabling extra checks for the i2c-bus of cx88 based cards by loading i2c_algo_bit with bit_test=1 this may trigger an oops when loading cx88_dvb. This is caused by the extra check code that detects that the sda-line is stuck high and thus does not register the i2c-bus. cx88-dvb however does not check if the i2c-bus is valid and just uses core->i2c_adap to attach dvb frontend modules. This leads to an oops at the first call to i2c_transfer: $ modprobe i2c_algo_bit bit_test=1 $ modprobe cx8802 cx88/2: cx2388x MPEG-TS Driver Manager version 0.0.6 loaded cx88[0]: quirk: PCIPCI_NATOMA -- set TBFX cx88[0]: subsystem: 0070:9202, board: Hauppauge Nova-S-Plus DVB-S [card=37,autodetected], frontend(s): 1 cx88[0]: TV tuner type 4, Radio tuner type -1 cx88[0]: SDA stuck high! cx88[0]: i2c register FAILED input: cx88 IR (Hauppauge Nova-S-Plus as /class/input/input5 cx88[0]/2: cx2388x 8802 Driver Manager cx88-mpeg driver manager 0000:00:10.2: enabling device (0154 -> 0156) cx88-mpeg driver manager 0000:00:10.2: PCI INT A -> Link[LNKD] -> GSI 9 (level, low) -> IRQ 9 cx88[0]/2: found at 0000:00:10.2, rev: 5, irq: 9, latency: 64, mmio: 0xfb000000 cx8802_probe() allocating 1 frontend(s) cx88/2: cx2388x dvb driver version 0.0.6 loaded cx88/2: registering cx8802 driver, type: dvb access: shared cx88[0]/2: subsystem: 0070:9202, board: Hauppauge Nova-S-Plus DVB-S [card=37] cx88[0]/2: cx2388x based DVB/ATSC card BUG: unable to handle kernel NULL pointer dereference at 00000000 IP: [] :i2c_core:i2c_transfer+0x1f/0x80 *pde = 00000000 Modules linked in: cx88_dvb(+) cx8802 cx88xx ir_common i2c_algo_bit tveeprom videobuf_dvb btcx_risc mga drm ipv6 fscpos eeprom nfsd exportfs stv0299 b2c2_flexcop_pci b2c2_flexcop cx24123 s5h1420 ves1x93 dvb_ttpci dvb_core saa7146_vv saa7146 videobuf_dma_sg videobuf_core videodev v4l1_compat ttpci_eeprom lirc_serial lirc_dev usbhid rtc uhci_hcd 8139too i2c_piix4 i2c_core usbcore evdev Pid: 4249, comm: modprobe Not tainted (2.6.27-gentoo #3) EIP: 0060:[] EFLAGS: 00010296 CPU: 0 EIP is at i2c_transfer+0x1f/0x80 [i2c_core] EAX: 00000000 EBX: ffffffa1 ECX: 00000002 EDX: d6c71e3c ESI: d80cd050 EDI: d8093c00 EBP: d6c71e20 ESP: d6c71e0c DS: 007b ES: 007b FS: 0000 GS: 0033 SS: 0068 Signed-off-by: Mauro Carvalho Chehab commit d522af581c6abd0e064278345ca638b0553a93fa Author: Suresh Siddha Date: Mon Oct 20 17:57:02 2008 -0300 V4L/DVB (9356): [PATCH] saa7134: fix resource map sanity check conflict Impact: driver could possibly stomp on resources outside of its scope {mchehab@redhat.com: I got two versions of the same patch (identical, except for whitespacing). One authored by Andy Burns and another authored by Suresh Siddha. Due to that, I'm applying the one that has less CodingStyle errors. I'm also adding both comments and the SOB's for both patches, since they are both interesting} Suresh Siddha commented: Alexey Fisher reported: > resource map sanity check conflict: 0xcfeff800 0xcff007ff 0xcfe00000 > 0xcfefffff PCI Bus 0000:01 BAR base is located in the middle of the 4K page and the hardcoded size argument makes the request span two pages causing the conflict. Fix the hard coded size argument in ioremap(). Andy Burns commented: I have already sent this patch on the linux-dvb list, but it didn't get much attention, so re-sending direct, I hope you all don't mind. While attempting to run mythtv in a xen domU, I encountered problems loading the driver for my saa7134 card, with an error from ioremap(). This error was due to the driver allocating an incorrectly sized mmio area, which was trapped by xen's permission checks, but this would go un-noticed on a kernel without xen. My card has a 1K sized mmio area, I've had information that other cards have 2K areas, perhaps others have different sizes, yet the driver always attempts to map 4K. I realise that the granularity of mapping is the page size, which typically would be 4K, but unless the card's base address happens to fall on a 4K boundary (mine does not) then the base+4K will end up spanning two pages, and this is when the error occurs under xen. My patch uses the pci_resource_len macro to determine the size required for the user's particular card, instead of the hardcoded 4K value. I've tested with a couple of printk() inside ioremap() that the start address and size do get rounded to the closest page boundary. With this patch I am able to successfully load the saa7134 driver and run mythtv under xen with my card, subject to correct pollirq settings in case of shared IRQ, I am still seeing occasional DMA panics, which I think are related to swiotlb handling by dom0/domU, usually the panic occurs when changing mux, once tuned to a mux, 12 hour continuous recordings are possible without errors. Reported-by: Alexey Fisher Tested-by: Alexey Fisher Signed-off-by: Suresh Siddha Signed-off-by: Andy Burns Signed-off-by: Ingo Molnar Signed-off-by: Mauro Carvalho Chehab commit 74084d33cb6221a5836a2a4438ec1bcf7a0797b0 Author: Jonathan Corbet Date: Fri Oct 17 20:19:29 2008 -0300 V4L/DVB (9355): de-BKL cafe_ccic.c Remove lock_kernel() call from cafe_ccic.c Commit d56dc61265d2527a63ab5b0f03199a43cd89ca36 added lock_kernel() calls to cafe_ccic.c. But that driver was written with proper locking and does not need the BKL, so take it back out. Signed-off-by: Jonathan Corbet Signed-off-by: Mauro Carvalho Chehab commit c7f09db6852d85e7f76322815051aad1c88d08cf Author: Gregor Jasny Date: Thu Oct 23 09:55:22 2008 -0300 V4L/DVB (9352): Add some missing compat32 ioctls This patch adds the missing compat ioctls that are needed to operate Skype in combination with libv4l and a MJPEG only camera. If you think it's trivial enough please submit it to -stable, too. Signed-off-by: Gregor Jasny Signed-off-by: Mauro Carvalho Chehab commit a24ddee36ca10a90451552e6620ff7c4ff7e44b5 Author: Mauro Carvalho Chehab Date: Thu Oct 23 09:53:56 2008 -0300 V4L/DVB (9351): ibmcam: Fix a regression caused by a482f327ff56bc3cf53176a7eb736cea47291a1d As reported by David Ellingsworth: > I'm not sure if it matters or not, but the ibmcam driver in the > Mauro's linux-2.6 git tree in the for_linus branch is currently > broken. uvd is equal to NULL during most of ibmcam_probe. Due to that, an OOPS is generated at dev_info. This patch replaces uvd->dev->dev to dev->dev inside this routine. Signed-off-by: Mauro Carvalho Chehab Reviewed-by: David Ellingsworth commit 69df96c3dad0704301cdbd665636d8184fb314c6 Author: Alexey Klimov Date: Thu Oct 23 09:20:27 2008 -0300 V4L/DVB (9350): radio-si470x: add support for kworld usb radio This patch add support for new device named KWorld USB FM Radio SnapMusic Mobile 700 (FM700). And changes few lines in comments. Signed-off-by: Alexey Klimov Acked-by: Tobias Lorenz Signed-off-by: Mauro Carvalho Chehab commit e62b47565a865d77133c88aee6a2a14838aeb9b8 Author: Antoine Jacquet Date: Tue Oct 21 17:54:51 2008 -0300 V4L/DVB (9348): dtv5100: add dependency on zl10353 Update Kconfig to add missing dependency on zl10353 for dtv5100 driver. Signed-off-by: Antoine Jacquet Signed-off-by: Mauro Carvalho Chehab commit 3b37a15c2d75585cc0da49b8e69345af91e227ce Author: Manu Abraham Date: Mon Oct 20 18:14:14 2008 -0300 V4L/DVB (9346): Optimization: Enable gate in a symmetric/disciplined way, rather than implementing different ways leading to confusion. This allows multiple gate_enable/disable's in the tuner_read/write functions, thereby lesser number of I/O operations throughout, eventually leading to better results. As a side effect demods that detect the STOP bit for auto closing of the gate can be avoided, thereby a very minimal gain in disabling the auto detect feature as well. Improves readability on the device control. Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit f7378995951a2c5e4e836df84e5669bc72c8dda8 Author: Jean Delvare Date: Sat Oct 18 11:05:58 2008 -0300 V4L/DVB (9337b): remove tuner-3036 and dpc7146 drivers from feature-removal-schedule.txt The tuner-3036 and dpc7146 drivers have been deleted now so we can remove the corresponding entries from feature-removal-schedule.txt. (Thanks for doing this, BTW.) Signed-off-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit 6a13378a56ce06afca9db75f3d4e663fba5f0992 Author: Alexey Klimov Date: Sun Oct 19 20:10:13 2008 -0300 V4L/DVB (9337a): HID: Don't allow KWorld radio fm700 be handled by usb hid drivers This device is already handled by radio-si470x driver, and we therefore want usbhid to ignore it. Signed-off-by: Alexey Klimov Acked-by: Tobias Lorenz Signed-off-by: Mauro Carvalho Chehab commit 5d5254f0d3b9bebc47d97e357374c0ad0c291a7d Author: Gautham R Shenoy Date: Sat Oct 25 10:22:38 2008 +0530 timers: handle HRTIMER_CB_IRQSAFE_UNLOCKED correctly from softirq context Impact: fix incorrect locking triggered during hotplug-intense stress-tests While migrating the the CB_IRQSAFE_UNLOCKED timers during a cpu-offline, we queue them on the cb_pending list, so that they won't go stale. Thus, when the callbacks of the timers run from the softirq context, they could run into potential deadlocks, since these callbacks assume that they're running with irq's disabled, thereby annoying lockdep! Fix this by emulating hardirq context while running these callbacks from the hrtimer softirq. ================================= [ INFO: inconsistent lock state ] 2.6.27 #2 -------------------------------- inconsistent {in-hardirq-W} -> {hardirq-on-W} usage. ksoftirqd/0/4 [HC0[0]:SC1[1]:HE1:SE0] takes: (&rq->lock){++..}, at: [] sched_rt_period_timer+0x9e/0x1fc {in-hardirq-W} state was registered at: [] __lock_acquire+0x549/0x121e [] native_sched_clock+0x88/0x99 [] clocksource_get_next+0x39/0x3f [] update_wall_time+0x616/0x7df [] lock_acquire+0x5a/0x74 [] scheduler_tick+0x3a/0x18d [] _spin_lock+0x1c/0x45 [] scheduler_tick+0x3a/0x18d [] scheduler_tick+0x3a/0x18d [] update_process_times+0x3a/0x44 [] tick_periodic+0x63/0x6d [] tick_handle_periodic+0x14/0x5e [] timer_interrupt+0x44/0x4a [] handle_IRQ_event+0x13/0x3d [] handle_level_irq+0x79/0xbd [] do_IRQ+0x69/0x7d [] common_interrupt+0x28/0x30 [] aac_probe_one+0x1a3/0x3f3 [] _spin_unlock_irqrestore+0x36/0x39 [] setup_irq+0x1be/0x1f9 [] start_kernel+0x259/0x2c5 [] 0xffffffff irq event stamp: 50102 hardirqs last enabled at (50102): [] _spin_unlock_irq+0x20/0x23 hardirqs last disabled at (50101): [] _spin_lock_irq+0xa/0x4b softirqs last enabled at (50088): [] do_softirq+0x37/0x4d softirqs last disabled at (50099): [] do_softirq+0x37/0x4d other info that might help us debug this: no locks held by ksoftirqd/0/4. stack backtrace: Pid: 4, comm: ksoftirqd/0 Not tainted 2.6.27 #2 [] print_usage_bug+0x13e/0x147 [] mark_lock+0x493/0x797 [] __lock_acquire+0x5be/0x121e [] lock_acquire+0x5a/0x74 [] sched_rt_period_timer+0x9e/0x1fc [] _spin_lock+0x1c/0x45 [] sched_rt_period_timer+0x9e/0x1fc [] sched_rt_period_timer+0x9e/0x1fc [] finish_task_switch+0x41/0xbd [] native_sched_clock+0x88/0x99 [] sched_rt_period_timer+0x0/0x1fc [] run_hrtimer_pending+0x54/0xe5 [] sched_rt_period_timer+0x0/0x1fc [] __do_softirq+0x7b/0xef [] do_softirq+0x37/0x4d [] ksoftirqd+0x56/0xc5 [] ksoftirqd+0x0/0xc5 [] kthread+0x38/0x5d [] kthread+0x0/0x5d [] kernel_thread_helper+0x7/0x10 ======================= Signed-off-by: Gautham R Shenoy Acked-by: Peter Zijlstra Acked-by: "Paul E. McKenney" Signed-off-by: Ingo Molnar commit cb8fdc69a2a80e81e1280ec58afd2c3217ac8a7f Author: Paul Mackerras Date: Tue Nov 11 19:39:26 2008 +1100 powerpc: Update desktop/server defconfigs Turned off CONFIG_PCI_LEGACY and turned on EXT4, and otherwise mostly took the defaults. This also updates ppc6xx_defconfig, which covers the 6xx/7xx/7xxx-based embedded boards. Signed-off-by: Paul Mackerras commit 77eb50aefa5dd2337246dce8b66e18e837c1a8bc Author: Andreas Schwab Date: Thu Nov 6 00:49:00 2008 +0000 powerpc: Fix msr check in compat_sys_swapcontext The new context may not be 16-byte aligned, so the real address of the mcontext structure should be read from the uc_regs pointer instead of directly using the (unaligned) uc_mcontext field. Signed-off-by: Andreas Schwab Signed-off-by: Paul Mackerras commit 45b86a96f17cb2900f291129b0e67287400e45b2 Merge: 072ba49... 4143c5c... Author: Ingo Molnar Date: Tue Nov 11 09:16:20 2008 +0100 Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent commit 0baf823a10bd4131f70e9712d1f02de3c247f1df Author: Keith Packard Date: Sat Nov 8 11:44:14 2008 +1000 drm/i915: Move legacy breadcrumb out of the reserved status page area Addresses in the hardware status page below index 0x20 are reserved for use by the hardware. The legacy breadcrumb was sitting at index 5. Move it to index 0x21, and make sure everyone uses the defined value instead of hard-coded constants. Signed-off-by: Keith Packard Signed-off-by: Dave Airlie commit afa21e0584f78964c092981fad94e45d38cda249 Author: Dave Airlie Date: Tue Nov 11 18:02:12 2008 +1000 drm/i915: Filter pci devices based on PCI_CLASS_DISPLAY_VGA This fixes hangs on 855-class hardware by avoiding double attachment of the driver due to the stub second head device having the same pci id as the real device. Other DRM drivers probably want this treatment as well, but I'm applying it just to this one for safety. But we should clean up the drm_pciids.h mess now so that each driver has its own pci id list header in its own directory. Lets do that in the next release. Signed-off-by: Eric Anholt Signed-off-by: Dave Airlie commit 19b723218bde79c60a394a3caee9eb156ac2d356 Author: Tejun Heo Date: Tue Nov 4 17:08:40 2008 +0900 libata: fix last_reset timestamp handling ehc->last_reset is used to ensure that resets are not issued too close to each other. It's initialized to jiffies minus one minute on EH entry. However, when new links are initialized after PMP is probed, new links have zero for this timestamp resulting in long wait depending on the current jiffies. This patch makes last_set considered iff ATA_EHI_DID_RESET is set, in which case last_reset is always initialized. As an added precaution, WARN_ON() is added so that warning is printed if last_reset is in future. This problem is spotted and debugged by Shane Huang. Signed-off-by: Tejun Heo Cc: Shane Huang Signed-off-by: Jeff Garzik commit 44901a96847b9967c057832b185e2f34ee6a14e5 Author: Roland Dreier Date: Tue Nov 4 10:34:48 2008 -0800 libata: Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127 Phillip O'Donnell pointed out that the same sign extension bug that was fixed in commit ba14a9c2 ("libata: Avoid overflow in ata_tf_to_lba48() when tf->hba_lbal > 127") also appears to exist in ata_tf_read_block(). Fix this by adding a cast to u64. Signed-off-by: Roland Dreier Signed-off-by: Jeff Garzik commit a12d6c9a09c644cb4a35be099eb5124d38e4feb8 Author: Marc Pignat Date: Thu Nov 6 11:44:34 2008 +0100 [libata] pata_pcmcia: another memory card support Support for Apacer photo steno pro card. Signed-off-by: Marc Pignat Signed-off-by: Jeff Garzik commit bc170e656881306d65eb1318c98032e1ab305ee8 Author: Mark Salter Date: Thu Nov 6 08:03:23 2008 -0500 [libata] pata_sch: notice attached slave devices I posted this last month, but was prompted to do so again in bz#467457 Add capability flag to support slave devices with pata_sch driver. Signed-off-by: Mark Salter Signed-off-by: Jeff Garzik commit bd6b52a17b9af630c38bb4f89609be5654d71e1e Author: Qinghuang Feng Date: Sat Nov 8 16:32:02 2008 +0800 [libata] pata_cs553*.c: cleanup kernel-doc No arguments named @deadline in cs5535_cable_detect() and cs5536_cable_detect(). Remove them. Signed-off-by: Qinghuang Feng Signed-off-by: Jeff Garzik commit 78538bf14995a136c2d9a22159ada49937359119 Author: Dave Airlie Date: Tue Nov 11 17:56:16 2008 +1000 drm/radeon: map registers at load time Now that the radeon driver has suspend/resume functions, it needs to map its registers at load time or it will likely crash if a suspend operation occurs before the driver has been initialized. This patch moves the register mapping code from firstopen to load and makes the mapping into a _DRM_DRIVER one so that the core won't remove it at lastclose time. Fixes (at least partially) kernel bz #11891. Signed-off-by: Jesse Barnes Signed-off-by: Dave Airlie commit 5d8e6bb7a20b6206e1fe44565efc383a941b81fa Author: Eric Anholt Date: Tue Nov 4 18:36:29 2008 -0800 drm: Remove infrastructure for supporting i915's vblank swapping. It's not used in any other drivers, and doesn't look like it will be from drm.git master. Signed-off-by: Eric Anholt Signed-off-by: Dave Airlie commit bd95e0a4a6bb9485fe35dda62719663f6ceabae1 Author: Eric Anholt Date: Tue Nov 4 12:01:24 2008 -0800 i915: Remove racy delayed vblank swap ioctl. When userland detected that this ioctl was supported (by version number check), it used it in a racy way -- dispatch delayed swap, wait for vblank, continue rendering. As there was no mechanism for it to wait for the swap to finish, sometimes it would render before the swap and garbage would be displayed on the screen. By removing the ioctl and returning -EINVAL, userland returns to its previous, correct rendering path of waiting for a vblank then dispatching a swap. The only path that could have used this ioctl correctly was page flipping, which relied on only one client running and emitting wait-for-vblank-before-rendering in the command stream. That path also falls back correctly, at the performance cost of not being able to queue up rendering before the flip occurs. Signed-off-by: Eric Anholt Signed-off-by: Dave Airlie commit d3e74d0237b102d34979015fbf6df02ca4413074 Author: Eric Anholt Date: Mon Nov 3 14:46:17 2008 -0800 i915: Don't whine when pci_enable_msi() fails. This probably just means the chipset doesn't support MSI, which is fine. Signed-off-by: Eric Anholt Signed-off-by: Dave Airlie commit 6a47baa6ce7e6fb5fed8d1fd0af36a96a4ad133f Author: Owen Taylor Date: Mon Nov 3 14:38:17 2008 -0800 i915: Don't attempt to short-circuit object_wait_rendering by checking domains. This could return early when reading after writing a buffer, if somebody had already put it on the flushing list (write domains are 0, but still active), leading to glReadPixels failure. Signed-off-by: Eric Anholt Signed-off-by: Dave Airlie commit ad42ca8f4490de06462aee234ea0083cbd8b46aa Author: Keith Packard Date: Sun Nov 2 23:38:20 2008 -0800 i915: Clean up sarea pointers on leavevt This corresponds to the setup of the sarea pointers in DMA initialization, though neither is exactly the point at which the sarea is set up or torn down. Signed-off-by: Keith Packard Signed-off-by: Eric Anholt Signed-off-by: Dave Airlie commit 881ee9889c8b98671c5491e43666bf5d4f78a180 Author: Keith Packard Date: Sun Nov 2 23:08:44 2008 -0800 i915: Save/restore MCHBAR_RENDER_STANDBY on GM965/GM45 This register is set by the 2D driver to prevent lockups, and so it needs to be preserved across suspend/resume too. This makes my X200s work. Signed-off-by: Keith Packard Signed-off-by: Eric Anholt Signed-off-by: Dave Airlie commit ad474caca3e2a0550b7ce0706527ad5ab389a4d4 Author: Oleg Nesterov Date: Mon Nov 10 15:39:30 2008 +0100 fix for account_group_exec_runtime(), make sure ->signal can't be freed under rq->lock Impact: fix hang/crash on ia64 under high load This is ugly, but the simplest patch by far. Unlike other similar routines, account_group_exec_runtime() could be called "implicitly" from within scheduler after exit_notify(). This means we can race with the parent doing release_task(), we can't just check ->signal != NULL. Change __exit_signal() to do spin_unlock_wait(&task_rq(tsk)->lock) before __cleanup_signal() to make sure ->signal can't be freed under task_rq(tsk)->lock. Note that task_rq_unlock_wait() doesn't care about the case when tsk changes cpu/rq under us, this should be OK. Thanks to Ingo who nacked my previous buggy patch. Signed-off-by: Oleg Nesterov Acked-by: Peter Zijlstra Signed-off-by: Ingo Molnar Reported-by: Doug Chapman commit df02c6ff2e3937379b31ea161b53229134fe92f7 Author: Lennert Buytenhek Date: Mon Nov 10 21:53:12 2008 -0800 dsa: fix master interface allmulti/promisc handling Before commit b6c40d68ff6498b7f63ddf97cf0aa818d748dee7 ("net: only invoke dev->change_rx_flags when device is UP"), the dsa driver could sort-of get away with only fiddling with the master interface's allmulti/promisc counts in ->change_rx_flags() and not touching them in ->open() or ->stop(). After this commit (note that it was merged almost simultaneously with the dsa patches, which is why this wasn't caught initially), the breakage that was already there became more apparent. Since it makes no sense to keep the master interface's allmulti or promisc count pinned for a slave interface that is down, copy the vlan driver's sync logic (which does exactly what we want) over to dsa to fix this. Bug report from Dirk Teurlings and Peter van Valderen . Signed-off-by: Lennert Buytenhek Tested-by: Dirk Teurlings Tested-by: Peter van Valderen Signed-off-by: David S. Miller commit 14ee6742b1b5df275cd2d771b4562b4f808c9419 Author: Lennert Buytenhek Date: Mon Nov 10 21:52:42 2008 -0800 dsa: fix skb->pkt_type when mac address of slave interface differs When a dsa slave interface has a mac address that differs from that of the master interface, eth_type_trans() won't explicitly set skb->pkt_type back to PACKET_HOST -- we need to do this ourselves before calling eth_type_trans(). Signed-off-by: Lennert Buytenhek Signed-off-by: David S. Miller commit 5cd33db2120b5ce972568711156f91da83bff2d7 Author: Lennert Buytenhek Date: Mon Nov 10 21:45:05 2008 -0800 net: fix setting of skb->tail in skb_recycle_check() Since skb_reset_tail_pointer() reads skb->data, we need to set skb->data before calling skb_reset_tail_pointer(). This was causing spurious skb_over_panic()s from skb_put() being called on a recycled skb that had its skb->tail set to beyond where it should have been. Bug report from Peter van Valderen . Signed-off-by: Lennert Buytenhek Signed-off-by: David S. Miller commit b971e7ac834e9f4bda96d5a96ae9abccd01c1dd8 Author: Eric Dumazet Date: Mon Nov 10 21:43:08 2008 -0800 net: fix /proc/net/snmp as memory corruptor icmpmsg_put() can happily corrupt kernel memory, using a static table and forgetting to reset an array index in a loop. Remove the static array since its not safe without proper locking. Signed-off-by: Alexey Dobriyan Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 013cd397532e5803a1625954a884d021653da720 Author: Jianjun Kong Date: Mon Nov 10 21:37:39 2008 -0800 mac80211: fix a buffer overrun in station debug code net/mac80211/debugfs_sta.c The trailing zero was written to state[4], it's out of bounds. Signed-off-by: Jianjun Kong Signed-off-by: David S. Miller commit 4143c5cb36331155a1823af8b3a8c761a59fed71 Author: Steven Rostedt Date: Mon Nov 10 21:46:01 2008 -0500 ring-buffer: prevent infinite looping on time stamping Impact: removal of unnecessary looping The lockless part of the ring buffer allows for reentry into the code from interrupts. A timestamp is taken, a test is preformed and if it detects that an interrupt occurred that did tracing, it tries again. The problem arises if the timestamp code itself causes a trace. The detection will detect this and loop again. The difference between this and an interrupt doing tracing, is that this will fail every time, and cause an infinite loop. Currently, we test if the loop happens 1000 times, and if so, it will produce a warning and disable the ring buffer. The problem with this approach is that it makes it difficult to perform some types of tracing (tracing the timestamp code itself). Each trace entry has a delta timestamp from the previous entry. If a trace entry is reserved but and interrupt occurs and traces before the previous entry is commited, the delta timestamp for that entry will be zero. This actually makes sense in terms of tracing, because the interrupt entry happened before the preempted entry was commited, so one may consider the two happening at the same time. The order is still preserved in the buffer. With this idea, instead of trying to get a new timestamp if an interrupt made it in between the timestamp and the test, the entry could simply make the delta zero and continue. This will prevent interrupts or tracers in the timer code from causing the above loop. Signed-off-by: Steven Rostedt commit bf5e6519b85b3853f2d0bb4f17a4e2eaeffeb574 Author: Steven Rostedt Date: Mon Nov 10 21:46:00 2008 -0500 ftrace: disable tracing on resize Impact: fix for bug on resize This patch addresses the bug found here: http://bugzilla.kernel.org/show_bug.cgi?id=11996 When ftrace converted to the new unified trace buffer, the resizing of the buffer was not protected as much as it was originally. If tracing is performed while the resize occurs, then the buffer can be corrupted. This patch disables all ftrace buffer modifications before a resize takes place. Signed-off-by: Steven Rostedt commit b7b45f47d6f8c83a0f958d7e2924468b6942dd9e Author: Harvey Harrison Date: Mon Nov 10 16:46:06 2008 -0800 netfilter: payload_len is be16, add size of struct rather than size of pointer payload_len is a be16 value, not cpu_endian, also the size of a ponter to a struct ipv6hdr was being added, not the size of the struct itself. Signed-off-by: Harvey Harrison Signed-off-by: David S. Miller commit 87b30a6530218cde431a659f2c118cb72175507c Author: Benjamin Thery Date: Mon Nov 10 16:34:11 2008 -0800 ipv6: fix ip6_mr_init error path The order of cleanup operations in the error/exit section of ip6_mr_init() is completely inversed. It should be the other way around. Also a del_timer() is missing in the error path. Signed-off-by: Benjamin Thery Signed-off-by: David S. Miller commit 1207e795568a368928dfd23d6817e47f2e8097e3 Author: Dan Williams Date: Fri Nov 7 01:47:17 2008 +0000 [4/4] dca: fixup initialization dependency Mark dca_init as a subsys_initcall since it needs to be ready to go before dependent drivers start registering themselves. Cc: Reported-and-tested-by: Mark Rustad Acked-by: Maciej Sosnowski Signed-off-by: Dan Williams Signed-off-by: David S. Miller commit 12ccea24e309d815d058cdc6ee8bf2c4b85f0c5f Author: Maciej Sosnowski Date: Fri Nov 7 01:46:55 2008 +0000 [3/4] I/OAT: fix async_tx.callback checking async_tx.callback should be checked for the first not the last descriptor in the chain. Cc: Signed-off-by: Maciej Sosnowski Signed-off-by: David S. Miller commit c2c0b4c5434c0a25f7f7796b29155d53805909f5 Author: Maciej Sosnowski Date: Fri Nov 7 01:46:33 2008 +0000 [2/4] I/OAT: fix dma_pin_iovec_pages() error handling Error handling needs to be modified in dma_pin_iovec_pages(). It should return NULL instead of ERR_PTR (pinned_list is checked for NULL in tcp_recvmsg() to determine if iovec pages have been successfully pinned down). In case of error for the first iovec, local_list->nr_iovecs needs to be initialized. Cc: Signed-off-by: Maciej Sosnowski Signed-off-by: David S. Miller commit c3d4f44f50b65b0b0290e357f8739cfb3f4bcaca Author: Maciej Sosnowski Date: Fri Nov 7 01:45:52 2008 +0000 [1/4] I/OAT: fix channel resources free for not allocated channels If the ioatdma driver is loaded but not used it does not allocate descriptors. Before it frees channel resources it should first be sure that they have been previously allocated. Cc: Signed-off-by: Maciej Sosnowski Tested-by: Tom Picard Signed-off-by: Dan Williams Signed-off-by: David S. Miller commit fd0fcf5c29dd0339c5f5d86eb2cbe9fdad5bcd73 Author: Michael Buesch Date: Thu Nov 6 10:49:21 2008 +0000 ssb: Fix DMA-API compilation for non-PCI systems This fixes compilation of the SSB DMA-API code on non-PCI platforms. Signed-off-by: Michael Buesch Signed-off-by: David S. Miller commit 9581483444d002e0b3807d9e66f552f372a6fc5e Author: Mike Frysinger Date: Thu Nov 6 01:37:00 2008 +0000 SSB: hide empty sub menu If the target system cannot support SSB, then don't show the menu option as it'll simply be an empty submenu. Signed-off-by: Mike Frysinger Signed-off-by: David S. Miller commit ae99286b4f1be7788f2d6947c66a91dbd6351eec Author: Thomas Gleixner Date: Mon Nov 10 13:20:23 2008 +0100 nohz: disable tick_nohz_kick_tick() for now Impact: nohz powersavings and wakeup regression commit fb02fbc14d17837b4b7b02dbb36142c16a7bf208 (NOHZ: restart tick device from irq_enter()) causes a serious wakeup regression. While the patch is correct it does not take into account that spurious wakeups happen on x86. A fix for this issue is available, but we just revert to the .27 behaviour and let long running softirqs screw themself. Disable it for now. Signed-off-by: Thomas Gleixner commit 309f796f301bf1c2731d9b9eb8642c76b523ebf7 Author: Ferenc Wagner Date: Mon Nov 10 13:37:40 2008 -0800 vlan: Fix typos in proc output string Signed-off-by: Ferenc Wagner Signed-off-by: David S. Miller commit ee5f80a993539490a07477ff2526bf62c503fbb4 Author: Thomas Gleixner Date: Fri Nov 7 11:06:00 2008 +0100 irq: call __irq_enter() before calling the tick_idle_check Impact: avoid spurious ksoftirqd wakeups The tick idle check which is called from irq_enter() was run before the call to __irq_enter() which did not set the in_interrupt() bits in preempt_count. That way the raise of a softirq woke up softirqd for nothing as the softirq was handled on return from interrupt. Call __irq_enter() before calling into the tick idle check code. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar commit 4694516d1987303dd83bfd0efdd36fa5b65d701b Author: Rafael J. Wysocki Date: Mon Nov 10 21:52:47 2008 +0100 x86: Make NUMA on 32-bit depend on BROKEN While investigating the failure of hibernation on 32-bit x86 with CONFIG_NUMA set, as described in this message http://marc.info/?l=linux-kernel&m=122634118116226&w=4 I asked some people for help and I was told that it wasn't really worth the effort, because CONFIG_NUMA was generally broken on 32-bit x86 systems and it shouldn't be used in such configs. For this reason, make CONFIG_NUMA depend on BROKEN instead of EXPERIMENTAL on x86-32. Signed-off-by: Rafael J. Wysocki Cc: Andi Kleen Cc: Pavel Machek Cc: Peter Zijlstra Signed-off-by: Linus Torvalds commit 1f8f5cf6e4f038552a3e47b66085452c08556d71 Author: David Howells Date: Mon Nov 10 19:00:05 2008 +0000 KEYS: Make request key instantiate the per-user keyrings Make request_key() instantiate the per-user keyrings so that it doesn't oops if it needs to get hold of the user session keyring because there isn't a session keyring in place. Signed-off-by: David Howells Tested-by: Steve French Tested-by: Rutger Nijlunsing Signed-off-by: Linus Torvalds commit ec5d7657f746c46b5fbb3dbec6d0f7d8b6b82961 Author: Trent Piepho Date: Mon Nov 10 13:09:21 2008 -0800 powerpc: Repair device bindings documentation Commit d0fc2eaaf4c56a95f5ed29b6bfb609e19714fc16 "powerpc/fsl: Refactor device bindings" split out a number of device bindings from booting-without-of.txt into separate files. Having them all in one file was a frequent source of merge conflicts. However, in the next merge, 49997d75152b3d23c53b0fa730599f2f74c92c65, there was another conflict. Some of the bindings removed from booting-without-of.txt were mistakenly added back in and the copies in dts-bindings were kept as well. This patch re-removes "Freescale Display Interface" and "Freescale on board FPGA" and fixes the table of contents. Signed-off-by: Trent Piepho Signed-off-by: Kumar Gala commit 12de512ae1d6d150f95b7157cb3293ef7545676d Author: David S. Miller Date: Mon Nov 10 12:35:29 2008 -0800 sparc64: Update defconfig. Signed-off-by: David S. Miller commit 29b143281657e0b064ee0553837cf9dd4d2441f9 Author: David S. Miller Date: Fri Nov 7 22:57:16 2008 -0800 Revert "sparc: correct section of current_pc()" This reverts commit 8dd9453737822469837d48d5da3785ce70fb2118. This fixes a boot failure reported by Robert Reif. The code above the section change expects to fallthrough, so we can't make such a section change here. commit 6c1e183e12dbd78a897a859f13220406296fee31 Author: Tiger Yang Date: Sun Nov 2 19:04:21 2008 +0800 ocfs2: Check search result in ocfs2_xattr_block_get() ocfs2_xattr_block_get() calls ocfs2_xattr_search() to find an external xattr, but doesn't check the search result that is passed back via struct ocfs2_xattr_search. Add a check for search result, and pass back -ENODATA if the xattr search failed. This avoids a later NULL pointer error. Signed-off-by: Tiger Yang Signed-off-by: Mark Fasheh commit de29c08528bae45e3fa1171d190f1340e37e0f70 Author: Mark Fasheh Date: Wed Oct 29 14:45:30 2008 -0700 ocfs2: fix printk related build warnings in xattr.c Signed-off-by: Mark Fasheh commit c435400140d24fbcb3da6b1e006be831f9056cb6 Author: Dmitri Monakhov Date: Mon Oct 27 13:01:49 2008 -0700 ocfs2: truncate outstanding block after direct io failure Signed-off-by: Dmitri Monakhov Cc: Jeff Moyer Cc: Mark Fasheh Cc: Joel Becker Cc: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Mark Fasheh commit 80bcaf3469b8aefd316d4ceb27d9af7cfbb0b913 Author: Tao Ma Date: Mon Oct 27 06:06:24 2008 +0800 ocfs2/xattr: Proper hash collision handle in bucket division In ocfs2/xattr, we must make sure the xattrs which have the same hash value exist in the same bucket so that the search schema can work. But in the old implementation, when we want to extend a bucket, we just move half number of xattrs to the new bucket. This works in most cases, but if we are lucky enough we will move 2 xattrs into 2 different buckets. This means that an xattr from the previous bucket cannot be found anymore. This patch fix this problem by finding the right position during extending the bucket and extend an empty bucket if needed. Signed-off-by: Tao Ma Cc: Joel Becker Signed-off-by: Mark Fasheh commit 4c1bbf1ba631d7db61ce3462349a3f5d14ae3009 Author: Tao Ma Date: Mon Oct 6 16:59:55 2008 +0800 ocfs2: return 0 in page_mkwrite to let VFS retry. In ocfs2_page_mkwrite, we return -EINVAL when we found the page mapping isn't updated, and it will cause the user space program get SIGBUS and exit. The reason is that during race writeable mmap, we will do unmap_mapping_range in ocfs2_data_downconvert_worker. The good thing is that if we reuturn 0 in page_mkwrite, VFS will retry fault and then call page_mkwrite again, so it is safe to return 0 here. Signed-off-by: Tao Ma Signed-off-by: Mark Fasheh commit ae0dff683076b2798763288c7ac2f09a18c4a998 Author: Sunil Mushran Date: Wed Oct 22 13:24:29 2008 -0700 ocfs2: Set journal descriptor to NULL after journal shutdown Patch sets journal descriptor to NULL after the journal is shutdown. This ensures that jbd2_journal_release_jbd_inode(), which removes the jbd2 inode from txn lists, can be called safely from ocfs2_clear_inode() even after the journal has been shutdown. Signed-off-by: Sunil Mushran Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit d32647993c211901fc4819ef3327f62d1859241b Author: Tao Ma Date: Fri Oct 24 07:57:28 2008 +0800 ocfs2: Fix check of return value of ocfs2_start_trans() in xattr.c. On failure, ocfs2_start_trans() returns values like ERR_PTR(-ENOMEM), so we should check whether handle is NULL. Fix them to use IS_ERR(). Jan has made the patch for other part in ocfs2(thank Jan for it), so this is just the fix for fs/ocfs2/xattr.c. Signed-off-by: Tao Ma Cc: Jan Kara Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit b99835c1684918b9975851d71455c5c007d1715b Author: Jan Kara Date: Mon Oct 20 19:23:54 2008 +0200 ocfs2: Let inode be really deleted when ocfs2_mknod_locked() fails We forgot to set i_nlink to 0 when returning due to error from ocfs2_mknod_locked() and thus inode was not properly released via ocfs2_delete_inode() (e.g. claimed space was not released). Fix it. Signed-off-by: Jan Kara Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit 87cfa004321c62aec681713ea48e0b846336d9f4 Author: Jan Kara Date: Mon Oct 20 19:23:53 2008 +0200 ocfs2: Fix checking of return value of new_inode() new_inode() does not return ERR_PTR() but NULL in case of failure. Correct checking of the return value. Signed-off-by: Jan Kara Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit fa38e92cb34e27e60d0faf1035934eb9b44aa1d4 Author: Jan Kara Date: Mon Oct 20 19:23:51 2008 +0200 ocfs2: Fix check of return value of ocfs2_start_trans() On failure, ocfs2_start_trans() returns values like ERR_PTR(-ENOMEM). Thus checks for !handle are wrong. Fix them to use IS_ERR(). Signed-off-by: Jan Kara Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit 8573f79d30077875e2b6e83849b5245bfbb08685 Author: Tao Ma Date: Fri Oct 24 22:24:17 2008 +0800 ocfs2: Fix some typos in xattr annotations. Fix some typos in the xattr annotations. Signed-off-by: Tao Ma Reported-by: Coly Li Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit 63fd77573723841d5d44a79471258f1b261f4482 Author: Tao Ma Date: Fri Oct 17 12:44:36 2008 +0800 ocfs2: Remove unused ocfs2_restore_xattr_block(). Since now ocfs2 supports empty xattr buckets, we will never remove the xattr index tree even if all the xattrs are removed, so this function will never be called. So remove it. Signed-off-by: Tao Ma Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit 54f443f4e7265a1333886dbace31cb6eb1991c72 Author: Joel Becker Date: Mon Oct 20 18:43:07 2008 -0700 ocfs2: Don't repeat ocfs2_xattr_block_find() ocfs2_xattr_block_get() looks up the xattr in a startlingly familiar way; it's identical to the function ocfs2_xattr_block_find(). Let's just use the later in the former. Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit eb6ff2397d1fdfc6a7629c99896338e5b5c508e5 Author: Joel Becker Date: Mon Oct 20 18:32:48 2008 -0700 ocfs2: Specify appropriate journal access for new xattr buckets. There are a couple places that get an xattr bucket that may be reading an existing one or may be allocating a new one. They should specify the correct journal access mode depending. Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit bd60bd37ade4321ecce4ed4442f68c88febd76d5 Author: Joel Becker Date: Mon Oct 20 18:25:56 2008 -0700 ocfs2: Check errors from ocfs2_xattr_update_xattr_search() The ocfs2_xattr_update_xattr_search() function can return an error when trying to read blocks off of disk. The caller needs to check this error before using those (possibly invalid) blocks. Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit b37c4d84e9d16fd5b6f31197f02ea0a112fc9e99 Author: Joel Becker Date: Mon Oct 20 18:24:03 2008 -0700 ocfs2: Don't return -EFAULT from a corrupt xattr entry. If the xattr disk structures are corrupt, return -EIO, not -EFAULT. Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit f6087fb799e097e7c9d912daa75701de9d62dc53 Author: Joel Becker Date: Mon Oct 20 18:20:43 2008 -0700 ocfs2: Check xattr block signatures properly. The xattr.c code is currently memcmp()ing naking buffer pointers. Create the OCFS2_IS_VALID_XATTR_BLOCK() macro to match its peers and use that. In addition, failed signature checks were returning -EFAULT, which is completely wrong. Return -EIO. Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit c988fd045f1195e62c0970384903ab9da26a9359 Author: Tiger Yang Date: Thu Oct 23 16:34:44 2008 +0800 ocfs2: add handler_map array bounds checking Make the handler_map array as large as the possible value range to avoid a fencepost error. [ Utilize alternate method -- Joel ] Signed-off-by: Tiger Yang Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit ceb1eba3dc2ad94b25764785ff7d2082c6094115 Author: Tiger Yang Date: Thu Oct 23 16:34:13 2008 +0800 ocfs2: remove duplicate definition in xattr Include/linux/xattr.h already has the definition about xattr prefix, so remove the duplicate definitions in xattr.c. Signed-off-by: Tiger Yang Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit 0030e001505d2d1503c083c917a747c033eaf8cd Author: Tiger Yang Date: Thu Oct 23 16:33:33 2008 +0800 ocfs2: fix function declaration and definition in xattr Because we merged the xattr sources into one file, some functions no longer belong in the header file. Signed-off-by: Tiger Yang Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit c3cb6827353102fee62f3b9401a03ee29b297e5b Author: Tiger Yang Date: Thu Oct 23 16:33:03 2008 +0800 ocfs2: fix license in xattr This patch fixes the license in xattr.c and xattr.h. Signed-off-by: Tiger Yang Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit 3ad4f597058301c97f362e500a32f63f5c950a45 Merge: 8a8bc22... 6b42566... Author: Linus Torvalds Date: Mon Nov 10 09:13:37 2008 -0800 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: ALSA: hda - Make the HP EliteBook 8530p use AD1884A model laptop ALSA: gusextreme: Fix build errors ALSA: hdsp: check for iobox and upload firmware during ioctl ALSA: HDSP: check for io box before uploading firmware ALSA: hda - Add another HP model (6730s) for AD1884A alsa: fix snd_BUG_on() and friends ALSA: hda - Add a quirk for MEDION MD96630 ALSA: hda - Limit the number of GPIOs show in proc commit 6b425660f45cdea177fe95388e081afa947b1506 Merge: 7aeb6d7... 0f101fa... 2542483... Author: Takashi Iwai Date: Mon Nov 10 17:58:46 2008 +0100 Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus commit 254248313aed7e6ff295ca21a82ca989b1f69c16 Author: Travis Place Date: Mon Nov 10 17:56:23 2008 +0100 ALSA: hda - Make the HP EliteBook 8530p use AD1884A model laptop Added a QUIRK to patch_analog.c for the HP Elitebook 8530p (IDs 0x103c:0x30e7) to use AD1884A model 'laptop' by default. Playback and Capture confirmed working. Signed-off-by: Travis Place Signed-off-by: Takashi Iwai commit 5ceb1a04187553e08c6ab60d30cee7c454ee139a Author: Matt Fleming Date: Sun Nov 2 22:23:13 2008 +0000 x86: HPET: enter hpet_interrupt_handler with interrupts disabled Some functions that may be called from this handler require that interrupts are disabled. Also, combining IRQF_DISABLED and IRQF_SHARED does not reliably disable interrupts in a handler, so remove IRQF_SHARED from the irq flags (this irq is not shared anyway). Signed-off-by: Matt Fleming Cc: mingo@elte.hu Cc: venkatesh.pallipadi@intel.com Cc: "Will Newton" Signed-off-by: Thomas Gleixner commit 89d77a1eb60be916d85d9394bedbfa2037af89c5 Author: Matt Fleming Date: Sun Nov 2 16:04:20 2008 +0000 x86: HPET: read from HPET_Tn_CMP() not HPET_T0_CMP In hpet_next_event() we check that the value we just wrote to HPET_Tn_CMP(timer) has reached the chip. Currently, we're checking that the value we wrote to HPET_Tn_CMP(timer) is in HPET_T0_CMP, which, if timer is anything other than timer 0, is likely to fail. Signed-off-by: Matt Fleming Cc: mingo@elte.hu Cc: venkatesh.pallipadi@intel.com Signed-off-by: Thomas Gleixner commit 1de5b0854623d30d01d72cd4ea323eb5f39d1f16 Author: Matt Fleming Date: Sun Nov 2 16:04:18 2008 +0000 x86: HPET: convert WARN_ON to WARN_ON_ONCE It is possible to flood the console with call traces if the WARN_ON condition is true because of the frequency with which this function is called. Signed-off-by: Matt Fleming Cc: mingo@elte.hu Cc: venkatesh.pallipadi@intel.com Signed-off-by: Thomas Gleixner commit 8a8bc22332ee6ea49137508467a76aa7f4367719 Author: Tejun Heo Date: Mon Nov 10 14:48:21 2008 +0900 libata: revert convert-to-block-tagging patches This patch reverts the following three commits which convert libata to use block layer tagging. 43a49cbdf31e812c0d8f553d433b09b421f5d52c e013e13bf605b9e6b702adffbe2853cfc60e7806 2fca5ccf97d2c28bcfce44f5b07d85e74e3cd18e Although using block layer tagging is the right direction, due to the tight coupling among tag number, data structure allocation and hardware command slot allocation, libata doesn't work correctly with the current conversion. The biggest problem is guaranteeing that tag 0 is always used for non-NCQ commands. Due to the way blk-tag is implemented and how SCSI starts and finishes requests, such guarantee can't be made. I'm not sure whether this would actually break any low level driver but it doesn't look like a good idea to break such assumption given the frailty of ATA controllers. So, for the time being, keep using the old dumb in-libata qc allocation. Signed-off-by: Tejun Heo Cc: Jens Axobe Cc: Jeff Garzik Signed-off-by: Linus Torvalds commit 5ac5c4d604bf894ef672a7971d03fefdc7ea7e49 Author: Peter Zijlstra Date: Mon Nov 10 10:46:32 2008 +0100 sched: clean up debug info Impact: clean up and fix debug info printout While looking over the sched_debug code I noticed that we printed the rq schedstats for every cfs_rq, ammend this. Also change nr_spead_over into an int, and fix a little buglet in min_vruntime printing. Signed-off-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit 220ca310a53200b4bfbc7c4c6e365eea284ec44f Author: David Chinner Date: Thu Oct 30 17:40:09 2008 +1100 [XFS] XFS: Check for valid transaction headers in recovery When we are about to add a new item to a transaction in recovery, we need to check that it is valid first. Currently we just assert that header magic number matches, but in production systems that is not present and we add a corrupted transaction to the list to be processed. This results in a kernel oops later when processing the corrupted transaction. Instead, if we detect a corrupted transaction, abort recovery and leave the user to clean up the mess that has occurred. SGI-PV: 988145 SGI-Modid: xfs-linux-melb:xfs-kern:32356a Signed-off-by: David Chinner Signed-off-by: Tim Shimmin Signed-off-by: Eric Sandeen Signed-off-by: Lachlan McIlroy commit 8f330f5149ef41ff943b04d914406cc417f62784 Author: Dave Chinner Date: Mon Nov 10 16:50:24 2008 +1100 [XFS] handle memory allocation failures during log initialisation When there is no memory left in the system, xfs_buf_get_noaddr() can fail. If this happens at mount time during xlog_alloc_log() we fail to catch the error and oops. Catch the error from xfs_buf_get_noaddr(), and allow other memory allocations to fail and catch those errors too. Report the error to the console and fail the mount with ENOMEM. Tested by manually injecting errors into xfs_buf_get_noaddr() and xlog_alloc_log(). Version 2: o remove unnecessary casts of the returned pointer from kmem_zalloc() SGI-PV: 987246 Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Lachlan McIlroy commit 0f101fa6bccdc797ddcee40fd4c55e879155a40f Author: Ville Syrjala Date: Sun Nov 9 20:32:40 2008 +0200 ALSA: gusextreme: Fix build errors gusextreme depends on opl3 support. Add the approriate select to Kconfig. Also remove the unnecessary hwdep select. Relevant build errors: ERROR: "snd_opl3_hwdep_new" [sound/isa/gus/snd-gusextreme.ko] undefined! ERROR: "snd_opl3_create" [sound/isa/gus/snd-gusextreme.ko] undefined! Signed-off-by: Ville Syrjala Signed-off-by: Takashi Iwai commit 6f9f51adb6ac0a49fce49e01c47dcfc2810c6e9d Author: David Chinner Date: Thu Oct 30 17:38:12 2008 +1100 [XFS] Account for allocated blocks when expanding directories When we create a directory, we reserve a number of blocks for the maximum possible expansion of of the directory due to various btree splits, freespace allocation, etc. Unfortunately, each allocation is not reflected in the total number of blocks still available to the transaction, so the maximal reservation is used over and over again. This leads to problems where an allocation group has only enough blocks for *some* of the allocations required for the directory modification. After the first N allocations, the remaining blocks in the allocation group drops below the total reservation, and subsequent allocations fail because the allocator will not allow the allocation to proceed if the AG does not have the enough blocks available for the entire allocation total. This results in an ENOSPC occurring after an allocation has already occurred. This results in aborting the directory operation (leaving the directory in an inconsistent state) and cancelling a dirty transaction, which results in a filesystem shutdown. Avoid the problem by reflecting the number of blocks allocated in any directory expansion in the total number of blocks available to the modification in progress. This prevents a directory modification from being aborted part way through with an ENOSPC. SGI-PV: 988144 SGI-Modid: xfs-linux-melb:xfs-kern:32340a Signed-off-by: David Chinner Signed-off-by: Lachlan McIlroy commit 2cf7f0da3ae225848a2ee10d4e216448a770fd00 Author: Lachlan McIlroy Date: Thu Oct 30 16:59:06 2008 +1100 [XFS] Wait for all I/O on truncate to zero file size It's possible to have outstanding xfs_ioend_t's queued when the file size is zero. This can happen in the direct I/O path when a direct I/O write fails due to ENOSPC. In this case the xfs_ioend_t will still be queued (ie xfs_end_io_direct() does not know that the I/O failed so can't force the xfs_ioend_t to be flushed synchronously). When we truncate a file on unlink we don't know to wait for these xfs_ioend_ts and we can have a use-after-free situation if the inode is reclaimed before the xfs_ioend_t is finally processed. As was suggested by Dave Chinner lets wait for all I/Os to complete when truncating the file size to zero. SGI-PV: 981668 SGI-Modid: xfs-linux-melb:xfs-kern:32216a Signed-off-by: Lachlan McIlroy Signed-off-by: Christoph Hellwig commit 9ccbece546cf836f67f6d9bb4bf2f70f7476cb2c Author: Lachlan McIlroy Date: Thu Oct 30 16:53:25 2008 +1100 [XFS] Fix use-after-free with log and quotas Destroying the quota stuff on unmount can access the log - ie XFS_QM_DONE() ends up in xfs_dqunlock() which calls xfs_trans_unlocked_item() and then xfs_log_move_tail(). By this time the log has already been destroyed. Just move the cleanup of the quota code earlier in xfs_unmountfs() before the call to xfs_log_unmount(). Moving XFS_QM_DONE() up near XFS_QM_DQPURGEALL() seems like a good spot. SGI-PV: 987086 SGI-Modid: xfs-linux-melb:xfs-kern:32148a Signed-off-by: Lachlan McIlroy Signed-off-by: Christoph Hellwig Signed-off-by: Peter Leckie commit 3ae7e2e22900b90bbe1d19454405950893c110be Author: Tim Blechmann Date: Sat Nov 8 14:42:18 2008 +0100 ALSA: hdsp: check for iobox and upload firmware during ioctl currently, the error message when trying to run hdspmixer or hdspconf if the breakout box is not connected is somehow misleading, since it asks the user to upload the firmware. this patch adds a test, whether the breakout box is connected and tries to upload the firmware in the case, that it is not present, e.g. because of power failures of the breakout box. [Minor coding-style fixes by tiwai] Signed-off-by: Tim Blechmann Signed-off-by: Takashi Iwai commit 00c9ddd1d4cc73aa0077f379279d716cb0ab0ba5 Author: Tim Blechmann Date: Sun Nov 9 12:50:52 2008 +0100 ALSA: HDSP: check for io box before uploading firmware currently the hdsp driver tries to upload the firmware, even if the io box is not connected. this patch adds a check for the io box before trying to upload the firmware. thus instead of messages complaining about the fifo status and firmware loading failure, the driver gives a message that no multiface or digiface is connected. [A minor coding-style fix by tiwai] Signed-off-by: Tim Blechmann Signed-off-by: Takashi Iwai commit 65b92e5cbc8acd14ea83190b4d016f765dce6075 Author: Michel Marti Date: Sat Nov 8 11:33:32 2008 +0100 ALSA: hda - Add another HP model (6730s) for AD1884A Added model=laptop for another HP machine (103c:3614) with AD1884A codec. Signed-off-by: Michel Marti Signed-off-by: Takashi Iwai commit ea37194d680ff62c5cd187b40d6ea78fa2631ec1 Author: Kumar Gala Date: Sat Nov 8 12:32:41 2008 -0600 powerpc: Updated Freescale PPC related defconfigs unset CONFIG_PCI_LEGACY in the defconfigs as none of them enable ISDN drivers which seem to be the only place we are using pci_find_device Signed-off-by: Kumar Gala commit 2b48706560cd4811654582a4a194c67a8562d602 Author: Li Yang Date: Sat Nov 8 20:51:34 2008 +0300 powerpc: Update QE/CPM2 usb_ctlr structures for USB support Fixes following build error: CC drivers/usb/gadget/fsl_qe_udc.o drivers/usb/gadget/fsl_qe_udc.c: In function 'qe_eprx_stall_change': drivers/usb/gadget/fsl_qe_udc.c:156: error: 'struct usb_ctlr' has no member named 'usb_usep' drivers/usb/gadget/fsl_qe_udc.c:163: error: 'struct usb_ctlr' has no member named 'usb_usep' drivers/usb/gadget/fsl_qe_udc.c: In function 'qe_eptx_stall_change': drivers/usb/gadget/fsl_qe_udc.c:173: error: 'struct usb_ctlr' has no member named 'usb_usep' drivers/usb/gadget/fsl_qe_udc.c:180: error: 'struct usb_ctlr' has no member named 'usb_usep' drivers/usb/gadget/fsl_qe_udc.c: In function 'qe_eprx_nack': drivers/usb/gadget/fsl_qe_udc.c:201: error: 'struct usb_ctlr' has no member named 'usb_usep' drivers/usb/gadget/fsl_qe_udc.c:201: error: 'struct usb_ctlr' has no member named 'usb_usep' drivers/usb/gadget/fsl_qe_udc.c: In function 'qe_eprx_normal': drivers/usb/gadget/fsl_qe_udc.c:218: error: 'struct usb_ctlr' has no member named 'usb_usep' drivers/usb/gadget/fsl_qe_udc.c:218: error: 'struct usb_ctlr' has no member named 'usb_usep' drivers/usb/gadget/fsl_qe_udc.c: In function 'qe_ep_reset': drivers/usb/gadget/fsl_qe_udc.c:325: error: 'struct usb_ctlr' has no member named 'usb_usep' drivers/usb/gadget/fsl_qe_udc.c:342: error: 'struct usb_ctlr' has no member named 'usb_usep' drivers/usb/gadget/fsl_qe_udc.c: In function 'qe_ep_register_init': drivers/usb/gadget/fsl_qe_udc.c:515: error: 'struct usb_ctlr' has no member named 'usb_usep' drivers/usb/gadget/fsl_qe_udc.c: In function 'ch9getstatus': drivers/usb/gadget/fsl_qe_udc.c:1981: error: 'struct usb_ctlr' has no member named 'usb_usep' make[2]: *** [drivers/usb/gadget/fsl_qe_udc.o] Error 1 Signed-off-by: Li Yang Signed-off-by: Anton Vorontsov Signed-off-by: Kumar Gala commit 33d2d78baaed06dda9f4de105388832850fb3555 Author: Martyn Welch Date: Fri Nov 7 13:43:43 2008 +0000 powerpc/86xx: Correct SOC bus-frequency in GE Fanuc SBC610 DTS This patch corrects the bus-frequency value provided in the SBC610's dts. Signed-off-by: Martyn Welch Signed-off-by: Kumar Gala commit 0a0e9e0cb90170f95b4351597fd5c0e65fab6bc5 Author: Matthias Fuchs Date: Wed Nov 5 21:53:56 2008 +0100 powerpc: Fix Book-E watchdog timer interval setting This patch fixes the setting of the Book-E watchdog timer interval setup on initialization and by ioctl(). On initialization the period bits have to be masked before setting a new period. In WDIOC_SETTIMEOUT ioctl we have to use the correct mask. Signed-off-by: Matthias Fuchs Acked-by: Timur Tabi Signed-off-by: Kumar Gala commit b41d6fee37e2bebd58ad3623c288197e75787905 Author: Kumar Gala Date: Tue Nov 4 14:56:55 2008 -0600 powerpc/fsl-booke: Fix synchronization bug w/local tlb invalidates The implemetation of _tlbil_pid() on Freescale Book-E cores needs an msync & isync after we flash invalidate the TLBs. This was causing the following oops reported by Sebastian Andrzej Siewior: VFS: Mounted root (nfs filesystem) readonly. Freeing unused kernel memory: 148k init BUG: sleeping function called from invalid context at /home/bigeasy/git/linux-2.6-powerpc/mm/mmap.c:234 in_atomic():1, irqs_disabled():0 Call Trace: [df189df0] [c0007160] show_stack+0x48/0x148 (unreliable) [df189e30] [c0029480] __might_sleep+0xf0/0x100 [df189e40] [c0070ac0] remove_vma+0x28/0x98 [df189e50] [c0070c1c] exit_mmap+0xec/0x128 [df189e80] [c002d2f4] mmput+0x54/0xec [df189ea0] [c0030b6c] exit_mm+0x10c/0x120 [df189ed0] [c003288c] do_exit+0x1ac/0x6e8 [df189f20] [c0032e48] do_group_exit+0x80/0xac [df189f40] [c000e9dc] ret_from_syscall+0x0/0x3c BUG: scheduling while atomic: udevd/956/0x10000002 Modules linked in: Call Trace: [df189df0] [c0007160] show_stack+0x48/0x148 (unreliable) [df189e30] [c002ac88] __schedule_bug+0x58/0x6c [df189e40] [c023e6cc] schedule+0xa8/0x4a8 [df189e90] [c002ad6c] __cond_resched+0x38/0x64 [df189ea0] [c023ebc8] _cond_resched+0x3c/0x58 [df189eb0] [c0030e70] put_files_struct+0x90/0xec [df189ed0] [c00328a8] do_exit+0x1c8/0x6e8 [df189f20] [c0032e48] do_group_exit+0x80/0xac [df189f40] [c000e9dc] ret_from_syscall+0x0/0x3c Signed-off-by: Kumar Gala commit 2dba1b5d87e08a294da5cdfa4d32908000e9b085 Author: Thomas Renninger Date: Fri Aug 1 17:38:03 2008 +0200 thinkpad_acpi: fingers off backlight if video.ko is serving this functionality Signed-off-by: Thomas Renninger Acked-by: Zhang Rui Acked-by: Henrique de Moraes Holschuh Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit 540b8bb9c33935183ceb5bed466a42ad72b2af56 Author: Thomas Renninger Date: Fri Aug 1 17:38:02 2008 +0200 sony-laptop: fingers off backlight if video.ko is serving this functionality Signed-off-by: Thomas Renninger Acked-by: Zhang Rui Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit a598c82f39892069a8f6693459b1179fd9ef30e1 Author: Thomas Renninger Date: Fri Aug 1 17:38:01 2008 +0200 msi-laptop: fingers off backlight if video.ko is serving this functionality Signed-off-by: Thomas Renninger Acked-by: Zhang Rui Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit 7d5c89a615c5dae039094a3cf4a56fe6aab81765 Author: Thomas Renninger Date: Fri Aug 1 17:38:00 2008 +0200 fujitsu-laptop: fingers off backlight if video.ko is serving this functionality Signed-off-by: Thomas Renninger Acked-by: Zhang Rui Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit a2bf8c01048f855fbf65a8fc41460aef71ca39dc Author: Thomas Renninger Date: Fri Aug 1 17:37:59 2008 +0200 eeepc-laptop: fingers off backlight if video.ko is serving this functionality Signed-off-by: Thomas Renninger Acked-by: Zhang Rui Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit 29454f17124c655236d2972dad21907e15ca294b Author: Thomas Renninger Date: Fri Aug 1 17:37:58 2008 +0200 compal: fingers off backlight if video.ko is serving this functionality Signed-off-by: Thomas Renninger Acked-by: Zhang Rui Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit 6766fec3669d5053b987e111afb348b885237bfc Author: Thomas Renninger Date: Fri Aug 1 17:37:57 2008 +0200 asus-acpi: fingers off backlight if video.ko is serving this functionality Signed-off-by: Thomas Renninger Acked-by: Zhang Rui Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit febf2d95a71cd594182e4b3defb0e0ffdfe61482 Author: Thomas Renninger Date: Fri Aug 1 17:37:56 2008 +0200 Acer-WMI: fingers off backlight if video.ko is serving this functionality Signed-off-by: Thomas Renninger Acked-by: Zhang Rui Signed-off-by: Andi Kleen Acked-by: Carlos Corbacho Signed-off-by: Len Brown commit c3d6de698c84efdbdd3781b7058bcc339ab43da8 Author: Thomas Renninger Date: Fri Aug 1 17:37:55 2008 +0200 ACPI video: if no ACPI backlight support, use vendor drivers If an ACPI graphics device supports backlight brightness functions (cmp. with latest ACPI spec Appendix B), let the ACPI video driver control backlight and switch backlight control off in vendor specific ACPI drivers (asus_acpi, thinkpad_acpi, eeepc, fujitsu_laptop, msi_laptop, sony_laptop, acer-wmi). Currently it is possible to load above drivers and let both poke on the brightness HW registers, the video and vendor specific ACPI drivers -> bad. This patch provides the basic support to check for BIOS capabilities before driver loading time. Driver specific modifications are in separate follow up patches. "acpi_backlight=vendor" Prever vendor driver over ACPI driver for backlight. "acpi_backlight=video" (default) Prever ACPI driver over vendor driver for backlight. Signed-off-by: Thomas Renninger Acked-by: Zhang Rui Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit 22c13f9d8179f4c9caecfcb60a95214562b9addc Author: Thomas Renninger Date: Fri Aug 1 17:37:54 2008 +0200 ACPI: video: Ignore devices that aren't present in hardware This is a reimplemention of commit 0119509c4fbc9adcef1472817fda295334612976 from Matthew Garrett This patch got removed because of a regression: ThinkPads with a Intel graphics card and an Integrated Graphics Device BIOS implementation stopped working. In fact, they only worked because the ACPI device of the discrete, the wrong one, got used (via int10). So ACPI functions were poking on the wrong hardware used which is a sever bug. The next patch provides support for above ThinkPads to be able to switch brightness via the legacy thinkpad_acpi driver and automatically detect when to use it. Original commit message from Matthew Garrett: Vendors often ship machines with a choice of integrated or discrete graphics, and use the same DSDT for both. As a result, the ACPI video module will locate devices that may not exist on this specific platform. Attempt to determine whether the device exists or not, and abort the device creation if it doesn't. http://bugzilla.kernel.org/show_bug.cgi?id=9614 Signed-off-by: Thomas Renninger Acked-by: Zhang Rui Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit a1a8d334f9e8c89a15bba8f34e443a37c29079c3 Author: Lin Ming Date: Thu Jul 31 23:02:28 2008 +0200 Delete an unwanted return statement at evgpe.c Len's tree branch release-2.6.27, found an unwanted return statement at evgpe.c. (git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 release-2.6.27) Signed-of-by Lin Ming Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit a0d84a92df43b7206b9c1330a2cccf109cf0a41a Author: Bjorn Helgaas Date: Fri Nov 7 16:58:05 2008 -0700 ACPI: update debug parameter documentation Reformat acpi.debug_layer and acpi.debug_level documentation so it's more readable, add some clues about how to figure out the mask bits that enable a specific ACPI_DEBUG_PRINT statement, and include some useful examples. Move the list of masks to Documentation/acpi/debug.txt (these are copies of the authoritative values in acoutput.h and acpi_drivers.h). Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit 87b586088ef953c602680e5aff8ab83a2e299498 Author: Bjorn Helgaas Date: Fri Nov 7 16:58:00 2008 -0700 ACPI: turn off all debug output by default When CONFIG_ACPI_DEBUG=y, the default acpi_dbg_layer and acpi_dbg_level values built into the ACPI CA have some debug output enabled. We'd rather be quiet unless the user actually specified the acpi.debug_level argument. This enables distros to ship with CONFIG_ACPI_DEBUG=y without inundating users with debug output. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit bdd7279919f682da8752fb47784a1ee302f8b7ea Author: Bjorn Helgaas Date: Fri Nov 7 16:57:55 2008 -0700 ACPI: add driver component definitions to sysfs debug_layers /sys/module/acpi/parameters/debug_layers used to contain only the debug layers defined by the ACPI CA. This patch adds the additional layer definitions for ACPI drivers. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit 44342f9e8dfbe8c0fadf940bf6b5c2eaaffe6850 Author: Bjorn Helgaas Date: Fri Nov 7 16:57:50 2008 -0700 ACPI: fix conflicting component definitions Some of the component definitions that were previous scattered around the drivers conflict with each other. That doesn't hurt anything except that setting one bit in the debug_layer mask would turn on debugging in two different modules. This patch fixes the conflicts. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit 89595b8f2850a080d290bf778ec933ea1d99f78e Author: Bjorn Helgaas Date: Fri Nov 7 16:57:45 2008 -0700 ACPI: consolidate ACPI_*_COMPONENT definitions in acpi_drivers.h Move all the component definitions for drivers to a single shared place, include/acpi/acpi_drivers.h. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit d21cf3c16b1191f3154a51e0b20c82bf851cc553 Author: Alexey Starikovskiy Date: Mon Nov 3 14:26:40 2008 -0500 ACPI EC: Fix regression due to use of uninitialized variable breakage introduced by following patch commit 27663c5855b10af9ec67bc7dfba001426ba21222 Author: Matthew Wilcox Date: Fri Oct 10 02:22:59 2008 -0400 acpi_evaluate_integer() does not clear passed variable if there is an error at evaluation. So if we ignore error, we must supply initialized variable. http://bugzilla.kernel.org/show_bug.cgi?id=11917 Signed-off-by: Alexey Starikovskiy Tested-by: Alan Jenkins Signed-off-by: Len Brown commit ffaf4c76526aaf94698e0c0612f09a6128437ad4 Merge: 70e9067... 939a951... Author: David S. Miller Date: Fri Nov 7 01:39:27 2008 -0800 Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit 939a9516416ad8ccec27aa05bd19236c550c0c03 Author: Jonathan McDowell Date: Tue Nov 4 07:51:38 2008 +0000 [netdrvr] usb/hso: Cleanup rfkill error handling Yup, this appears to be the problem, thanks. I think &hso_net->net->dev is more intuitive for the error message, so I've used that. I've also added missing line endings on the error messages and set our local rfkill structure element to NULL on failure so we don't try to call rfkill_unregister on driver removal if we failed to register at all. The patch below Works For Me (TM); the device is detected fine, can be removed without problems and connects ok. I'll have a prod at why the rfkill stuff isn't working next, but I believe this cleanup of the error handling is appropriate no matter what the issue with registration is. Signed-Off-By: Jonathan McDowell Signed-off-by: Jeff Garzik commit cd17fa7b8f1dd24b23c464ebcb14e7c058e15097 Author: Ben Hutchings Date: Mon Nov 3 23:08:04 2008 +0000 sfc: Correct address of gPXE boot configuration in EEPROM Due to a hardware bug, the originally assigned range cannot reliably be used for boot configuration and must not be modifiable through ethtool. Signed-off-by: Ben Hutchings Signed-off-by: Jeff Garzik commit 08809b25cf64a7d8deb336b779e527e88830eac9 Author: Al Viro Date: Sat Nov 1 18:20:19 2008 +0000 el3_common_init() should be __devinit, not __init Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit db053c6b447d083f3c63e5540b70a3e521b468ca Author: Paulius Zaleckas Date: Tue Nov 4 13:32:31 2008 +0200 hso: rfkill type should be WWAN Signed-off-by: Paulius Zaleckas Cc: Denis Joseph Barrow Signed-off-by: Jeff Garzik commit c1adbb9681c30e984272b66623c4d5774b3981e1 Author: Yevgeny Petrilin Date: Wed Nov 5 16:53:50 2008 +0200 mlx4_en: Start port error flow bug fix Tried to deactivate rx ring that wasn't activated, used wrong index. Signed-off-by: Yevgeny Petrilin Signed-off-by: Jeff Garzik commit 70e90679ffce0937deb77e2bd8bd918a24a897fd Author: Alexey Dobriyan Date: Thu Nov 6 23:08:37 2008 -0800 af_key: mark policy as dead before destroying xfrm_policy_destroy() will oops if not dead policy is passed to it. On error path in pfkey_compile_policy() exactly this happens. Oopsable for CAP_NET_ADMIN owners. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 4feba70a2c1a1a0c96909f657f48b2e11e682370 Author: Peter Gruber Date: Mon Oct 27 23:59:36 2008 -0400 ACPI: avoid empty file name in sysfs Since commit bc45b1d39a925b56796bebf8a397a0491489d85c acpi tables are allowed to have an empty signature and /sys/firmware/acpi/tables uses the signature as filename. Applications using naive recursion through /sys loop forever. A possible solution would be: (replacing the zero length filename with the string "NULL") http://bugzilla.kernel.org/show_bug.cgi?id=11539 Acked-by: Zhang Rui Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 14a63ba821ac2a0f5166789b31241c0b7eb147d9 Author: Yinghai Lu Date: Wed Oct 29 14:13:22 2008 -0700 ACPI: use macro to replace hard number Impact: cleanup Use MACRO for rev 3 fadt id instead of 3 directly. Signed-off-by: Yinghai Lu Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit afeb12b7478fee31888e7c34804bee2f658e7765 Author: Randy Dunlap Date: Wed Oct 29 14:13:20 2008 -0700 fujitsu-laptop: fix section mismatch warning Could fix a bug in a hotplug add scenario. WARNING: drivers/misc/fujitsu-laptop.o(.text+0xbde): Section mismatch in reference from the function acpi_fujitsu_add() to the variable .init.data:fujitsu_dmi_table The function acpi_fujitsu_add() references the variable __initdata fujitsu_dmi_table. This is often because acpi_fujitsu_add lacks a __initdata annotation or the annotation of fujitsu_dmi_table is wrong. Signed-off-by: Randy Dunlap Acked-by: Jonathan Woithe Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 0794469da3f7b2093575cbdfc1108308dd3641ce Author: Kay Sievers Date: Thu Oct 30 01:18:59 2008 +0100 ACPI: struct device - replace bus_id with dev_name(), dev_set_name() This patch is part of a larger patch series which will remove the "char bus_id[20]" name string from struct device. The device name is managed in the kobject anyway, and without any size limitation, and just needlessly copied into "struct device". To set and read the device name dev_name(dev) and dev_set_name(dev) must be used. If your code uses static kobjects, which it shouldn't do, "const char *init_name" can be used to statically provide the name the registered device should have. At registration time, the init_name field is cleared, to enforce the use of dev_name(dev) to access the device name at a later time. We need to get rid of all occurrences of bus_id in the entire tree to be able to enable the new interface. Please apply this patch, and possibly convert any remaining remaining occurrences of bus_id. We want to submit a patch to -next, which will remove bus_id from "struct device", to find the remaining pieces to convert, and finally switch over to the new api, which will remove the 20 bytes array and does no longer have a size limitation. Acked-by: Greg Kroah-Hartman Signed-Off-By: Kay Sievers Signed-off-by: Len Brown commit 2d59f6a73e1cb4415cdd5a0083b1196cceffa275 Author: Bjorn Helgaas Date: Fri Aug 1 10:01:12 2008 -0600 PNP: add Bjorn Helgaas as PNP co-maintainer Update Adam's email address and add myself as PNP co-maintainer. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit d17cb18a07c587b8f9ff174a1bf6d03413eabe64 Author: Len Brown Date: Thu Nov 6 20:51:59 2008 -0500 Revert "ACPI: Ingore the RESET_REG_SUP bit when using ACPI reset mechanism" This reverts commit 8fd145917fb62368a9b80db59562c20576238f5a. http://bugzilla.kernel.org/show_bug.cgi?id=11942 Signed-off-by: Len Brown commit f4a9bc4c7de4cef83e86a7052eb2e88b193668e4 Author: Thomas, Sujith Date: Wed Nov 5 16:15:31 2008 +0530 intel_menlow: MAINTAINERS Signed-off-by: Sujith Thomas Signed-off-by: Len Brown commit d65dcdcf0cd55b4be1fd1f5025388e91042d63fc Author: Thomas, Sujith Date: Wed Nov 5 16:15:13 2008 +0530 intel_menlow: Add comment documenting legal GTHS values Signed-off-by: Sujith Thomas Signed-off-by: Len Brown commit 5b53ed69158eeff115004f246193d07a083445f6 Author: Myron Stowe Date: Tue Nov 4 14:53:05 2008 -0700 ACPI: 80 column adherence and spelling fix (no functional change) Signed-off-by: Myron Stowe Signed-off-by: Len Brown commit b26e9286fb438eb78bcdb68b67a3dbb8bc539125 Author: Myron Stowe Date: Tue Nov 4 14:53:00 2008 -0700 ACPI: Behave uniquely based on processor declaration definition type Associating a Local SAPIC with a processor object is dependent upon the processor object's definition type. CPUs declared as "Processor" should use the Local SAPIC's 'processor_id', and CPUs declared as "Device" should use the 'uid'. Note that for "Processor" declarations, even if a '_UID' child object exists, it has no bearing with respect to mapping Local SAPICs (see section 5.2.11.13 - Local SAPIC Structure; "Advanced Configuration and Power Interface Specification", Revision 3.0b). This patch changes the lsapic mapping logic to rely on the distinction of how the processor object was declared - the mapping can't just try both types of matches regardless of declaration type and rely on one failing as is currently being done. Signed-off-by: Myron Stowe Signed-off-by: Len Brown commit ad93a765c1834db031b5bf1c2baf2a50d0462ca4 Author: Myron Stowe Date: Tue Nov 4 14:52:55 2008 -0700 ACPI: Disambiguate processor declaration type Declaring processors in ACPI namespace can be done using either a "Processor" definition or a "Device" definition (see section 8.4 - Declaring Processors; "Advanced Configuration and Power Interface Specification", Revision 3.0b). Currently the two processor declaration types are conflated. This patch disambiguates the processor declaration's definition type enabling subsequent code to behave uniquely based explicitly on the declaration's type. Signed-off-by: Myron Stowe Signed-off-by: Len Brown commit fcef7836a31c6432b41a38867d413ed3d6aa8261 Author: Andrew Morton Date: Thu Nov 6 12:05:21 2008 -0800 alsa: fix snd_BUG_on() and friends sound/pci/pcxhr/pcxhr_core.c: In function 'pcxhr_set_pipe_cmd_params': sound/pci/pcxhr/pcxhr_core.c:700: warning: statement with no effect sound/pci/pcxhr/pcxhr_core.c:706: warning: statement with no effect sound/pci/pcxhr/pcxhr_core.c:710: warning: statement with no effect Due to try to fix this, and be more conventional about the empty stubs. Signed-off-by: Andrew Morton Signed-off-by: Takashi Iwai commit 8950d89acaa8c353869e681772479d7955ae6f7a Author: Bjorn Helgaas Date: Wed Nov 5 16:18:03 2008 -0700 ACPI: remove CONFIG_ACPI_EC Remove CONFIG_ACPI_EC. It was always set the same as CONFIG_ACPI, and it had no menu label, so there was no way to set it to anything other than "y". Per section 6.5.4 of the ACPI 3.0b specification, OSPM must make Embedded Controller operation regions, accessed via the Embedded Controllers described in ECDT, available before executing any control method. The ECDT table is optional, but if it is present, the above text means that the EC it describes is a required part of the ACPI subsystem, so CONFIG_ACPI_EC=n wouldn't make sense. Signed-off-by: Bjorn Helgaas Acked-by: Alexey Starikovskiy Signed-off-by: Len Brown commit fefe5ab3d67b0ade6200fec5ed6f2812cbcbb658 Author: Bjorn Helgaas Date: Wed Nov 5 16:17:58 2008 -0700 ACPI: remove CONFIG_ACPI_POWER Remove CONFIG_ACPI_POWER. It was always set the same as CONFIG_ACPI, and it had no menu label, so there was no way to set it to anything other than "y". The interfaces under CONFIG_ACPI_POWER (acpi_device_sleep_wake(), acpi_power_transition(), etc) are called unconditionally from the ACPI core, so we already depend on it always being present. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit 5b881479af4352791e5004b74e3639f1416c5fe4 Author: Bjorn Helgaas Date: Wed Nov 5 16:17:47 2008 -0700 ACPI: SBS: remove useless acpi_cm_sbs_init() initcall acpi_cm_sbs_init() doesn't do anything, so we can just remove it. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit 5704d626e7c770ef4a984a697bac7eff07420a39 Author: Bjorn Helgaas Date: Wed Nov 5 16:17:42 2008 -0700 ACPI: remove comments about debug layer/level to use I don't think there's any point in cluttering the code with these. Better to improve the documentation so *anybody* can figure out what layer & level to use. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit 7f3abf5c7c9a9febdd643b9d4005382144525475 Author: Vladimir Sokolovsky Date: Wed Nov 5 10:56:52 2008 -0800 IB/mlx4: Set umem field to NULL in mlx4_ib_alloc_fast_reg_mr() Set mr->umem to NULL in mlx4_ib_alloc_fast_reg_mr(). Otherwise ib_dereg_mr() may invoke ib_umem_release() on a random pointer value and get an oops. Signed-off-by: Vladimir Sokolovsky Signed-off-by: Roland Dreier commit 959973b92d3ba235edfa5dcb5df1be1e5d1deba2 Author: Takashi Iwai Date: Wed Nov 5 11:30:56 2008 +0100 ALSA: hda - Add a quirk for MEDION MD96630 Use model=lenovo-ms7195-dig for MEDION MD96630 laptop (17c0:4085) with ALC888 codec. Reference: Novell bnc#412548 https://bugzilla.novell.com/show_bug.cgi?id=412528 Signed-off-by: Takashi Iwai commit 072ba49838b42c873c496d72c91bb237914cf3b6 Author: Eric Anholt Date: Sun Oct 26 15:26:57 2008 -0700 ftrace: fix breakage in bin_fmt results In 777e208d40d0953efc6fb4ab58590da3f7d8f02d we changed from outputting field->cpu (a char) to iter->cpu (unsigned int), increasing the resulting structure size by 3 bytes. Signed-off-by: Eric Anholt Signed-off-by: Ingo Molnar commit 7b0f5df4c88bac46fe749d36d905fc7ad0296587 Author: Roland Dreier Date: Tue Nov 4 11:18:56 2008 -0800 mlx4_core: Fix unused variable warning Fix drivers/net/mlx4/profile.c:55: warning: 'res_name' defined but not used by making mlx4_dbg() always use all of its parameters, regardless of whether CONFIG_MLX4_DEBUG is set or not. Reported-by: Alexander Beregalov Signed-off-by: Roland Dreier commit c4dc5071859bf666a5a9d6565f16c51a261a88b7 Author: Takashi Iwai Date: Tue Nov 4 13:30:57 2008 +0100 ALSA: hda - Limit the number of GPIOs show in proc Limit the number of GPIOs shown in proc. Otherwise it gets too long unnecessarily, and hard to analyze. Signed-off-by: Takashi Iwai commit 42ec632e7b0185d3776aa5d23380cbdc963151f2 Author: Steven Rostedt Date: Mon Nov 3 15:18:56 2008 -0500 ftrace: ftrace.txt version update Impact: Documentation update only Update the version that the ftrace document was written for. Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit 9b803c0fc37dc49d06d99d63741e78274801c644 Author: Steven Rostedt Date: Mon Nov 3 15:15:08 2008 -0500 ftrace: update txt document Impact: Documentation update only A lot of changes have gone into ftrace. This patch updates the ftrace.txt document. Signed-off-by: Steven Rostedt Acked-by: Randy Dunlap Signed-off-by: Ingo Molnar commit c2d06fe338912ee56c2ddd7de5574d5396ed8050 Author: Zhang Rui Date: Thu Sep 11 10:56:00 2008 +0800 intel_menlow: don't set max_state a negative value max_state is unsigned long. don't set max_state a negative value Cc : Thomas Sujith Cc : Roel Kluin Signed-off-by: Zhang Rui Signed-off-by: Len Brown commit 633693660045b3e46a63ed618eb38a54339fbcc0 Author: Chien Tung Date: Sun Nov 2 21:40:55 2008 -0800 RDMA/nes: Mitigate compatibility issue regarding PCIe write credits Under heavy load, there is an compatibility issue regarding PCIe write credits with certain chipsets. It can be mitigated by limiting read requests to 256 Bytes. This workaround is always enabled for Tbird2 on Gladius. We also add a module parameter to enable workaround for non-Gladius cards. Signed-off-by: Chien Tung Signed-off-by: Roland Dreier commit 2e369544ac14de7bd0d76b369c1f6110eefbea8a Author: Vadim Makhervaks Date: Sun Nov 2 21:39:17 2008 -0800 RDMA/nes: Fix CQ allocation scheme for multicast receive queue apps Fix CQ allocation for multicast receive queue applications. Before this patch, the CQ was not lined up with the right NIC. Signed-off-by: Vadim Makhervaks Signed-off-by: Chien Tung Signed-off-by: Roland Dreier commit 35c6d6942c966e6d74ea801d8b5007d7f900ce92 Author: Chien Tung Date: Sun Nov 2 21:37:35 2008 -0800 RDMA/nes: Correct handling of PBL resources * Roll back allocated structures on failures. * Use GFP_ATOMIC instead of GFP_KERNEL since we are holding a lock. * Acquire nesadapter->pbl_lock when modifying PBL counters. * Decrement PBL counters on deallocation. Signed-off-by: Chien Tung Signed-off-by: Roland Dreier commit 5880ff19fa29466cb9d7e293710e6aebecfecdd1 Author: Ilpo Järvinen Date: Thu Oct 30 13:39:43 2008 +0200 RDMA/nes: Reindent mis-indented spinlocks Signed-off-by: Ilpo Järvinen Signed-off-by: Roland Dreier commit af2b0a1ec37c61513d83d2d123658b4ef69d2ce9 Author: Roland Dreier Date: Sat Nov 1 12:55:37 2008 -0700 RDMA/cxgb3: Fix too-big reserved field zeroing in iwch_post_zb_read() The array wqe->read.reserved has only two entries, but iwch_post_zb_read() sets [0], [1], and [2], which is one too many. This is harmless since it runs into the next field, rem_stag, which is initialized correctly immediately after, but we might as well get things right, especially since it makes the code smaller. This was spotted by the Coverity checker (CID 2475). Signed-off-by: Roland Dreier Acked-by: Steve Wise commit ed206fac87d65917280b6c3edd3f01125d4095c9 Author: Zhang Rui Date: Mon Oct 27 14:01:02 2008 -0700 ACPI: bugfix reporting of event handler status Introduce a new flag showing whether the event has an event handler/method. For all the GPEs and Fixed Events, 1. ACPI_EVENT_FLAG_HANDLE is cleared, it's an "invalid" ACPI event. 2. Both ACPI_EVENT_FLAG_HANDLE and ACPI_EVENT_FLAG_DISABLE are set, it's "disabled". 3. Both ACPI_EVENT_FLAG_HANDLE and ACPI_EVENT_FLAG_ENABLE are set, it's "enabled". 4. Both ACPI_EVENT_FLAG_HANDLE and ACPI_EVENT_FLAG_WAKE_ENABLE are set, it's "wake_enabled". Among other things, this prevents incorrect reporting of ACPI events as being "invalid" when it's really just (temporarily) "disabled". Signed-off-by: Zhang Rui Signed-off-by: David Brownell Signed-off-by: Len Brown commit 676962dac6e267ce7c13f73962208f9124a084bb Author: Zhao Yakui Date: Mon Oct 27 16:05:39 2008 +0800 ACPI: fan: Delete the strict check in power transition On some laptops the Fan device is turned on/off by controlling the corresponding power resource. For example: If the power resource defined in _PR0 object is turned off, it indicates that the FAN device is in off state(the ACPI state is in D3 state). Maybe the device is already in D3 state and expected to be transited to D3 state. As there is no _PR3 object, the power transition can't be finished and it will be switched to the Unknown state. Maybe it is more reasonable that the strick check in power transistion is deleted. http://bugzilla.kernel.org/show_bug.cgi?id=9485 Signed-off-by: yakui.zhao@intel.com Signed-off-by: Len Brown commit b1b57fbe9bb10d94682a975456de7a727d1dbc84 Author: Zhao Yakui Date: Mon Oct 27 16:04:53 2008 +0800 ACPI: fix de-reference bug in power resource driver change state to *state in the function of acpi_power_get_state() Signed-off-by: yakui.zhao@intel.com Signed-off-by: Len Brown commit bd2b064ecd5504a9e9eeaa5742b9f8bcc6d27637 Author: Matthew Garrett Date: Thu Oct 16 17:29:10 2008 -0400 sony-laptop: Ignore missing _DIS method on pic device At least the Vaio VGN-Z540N doesn't have this method, so let's not fail to suspend just because it doesn't exist. Signed-off-by: Adam Jackson Acked-by: Mattia Dongili Signed-off-by: Len Brown commit 2830c9fb8e66cee70b8bffdfb0de01c144c7e643 Author: Venki Pallipadi Date: Fri Oct 24 11:00:35 2008 -0700 i7300_idle: Kconfig, show menu only on x86_64 ...since today it contains only a single driver which is visible to just x86_64 Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit a8b56f296d7d977fea2512e353a131f8da490aa5 Author: Ralph Campbell Date: Mon Oct 27 15:31:25 2008 -0700 IB/ipath: Fix RDMA write with immediate copy of last packet When the last packet of a RDMA write with immediate is received, the next receive work queue entry ID should be used to generate a completion entry. The code was incorrectly resetting part of the state used to copy the last packet. Signed-off-by: Ralph Campbell Signed-off-by: Roland Dreier