commit c271180a3da1e5b1fc2c5649281f3592d087ac16 Author: Greg Kroah-Hartman Date: Mon Jul 24 20:36:01 2006 -0700 Linux 2.6.17.7 commit 8456c78dfa94a54d0ac78cf5190b3b8c7ea045cf Author: Kirill Korotaev Date: Fri Jul 14 00:23:49 2006 -0700 struct file leakage 2.6.16 leaks like hell. While testing, I found massive leakage (reproduced in openvz) in: *filp *size-4096 And 1 object leaks in *size-32 *size-64 *size-128 It is the fix for the first one. filp leaks in the bowels of namei.c. Seems, size-4096 is file table leaking in expand_fdtables. I have no idea what are the rest and why they show only accompanying another leaks. Some debugging structs? [akpm@osdl.org, Trond: remove the IS_ERR() check] Signed-off-by: Alexey Kuznetsov Cc: Kirill Korotaev Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 44896b17f1c2d8824250e06bd07d7b5a4b7e6be4 Author: Andrew Morton Date: Thu Jul 6 23:59:50 2006 -0700 serial 8250: sysrq deadlock fix Fix http://bugzilla.kernel.org/show_bug.cgi?id=6716 Doing a sysrq over a serial line into an SMP machine presently deadlocks. Cc: Russell King Cc: Enrico Scholz Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 7eb990848664564593c96c5d1cf148ce23b34732 Author: Pavel Machek Date: Sat Jul 8 17:37:31 2006 +0200 pdflush: handle resume wakeups 2.6.16 needs this. It was merged into 2.6.18-rc1 in http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d616e09ab33aa4d013a93c9b393efd5cebf78521 . pdflush is carefully designed to ensure that all wakeups have some corresponding work to do - if a woken-up pdflush thread discovers that it hasn't been given any work to do then this is considered an error. That all broke when swsusp came along - because a timer-delivered wakeup to a frozen pdflush thread will just get lost. This causes the pdflush thread to get lost as well: the writeback timer is supposed to be re-armed by pdflush in process context, but pdflush doesn't execute the callout which does this. Fix that up by ignoring the return value from try_to_freeze(): jsut proceed, see if we have any work pending and only go back to sleep if that is not the case. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Pavel Machek Signed-off-by: Greg Kroah-Hartman commit 3f2ffbcff824e464376eae8e62c4ef92deecdbc4 Author: Chuck Ebbert <76306.1226@compuserve.com> Date: Fri Jul 14 18:51:41 2006 -0400 ieee80211: TKIP requires CRC32 ieee80211_crypt_tkip will not work without CRC32. LD .tmp_vmlinux1 net/built-in.o: In function `ieee80211_tkip_encrypt': net/ieee80211/ieee80211_crypt_tkip.c:349: undefined reference to `crc32_le' Reported by Toralf Foerster Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Greg Kroah-Hartman commit 1e8cd841d65774e96f5a52b0faa898b7ffebcece Author: Patrick McHardy Date: Sat Jul 8 13:39:35 2006 -0700 Fix IPv4/DECnet routing rule dumping When more rules are present than fit in a single skb, the remaining rules are incorrectly skipped. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 1dff316b54b9db4e17f191b4e12f032cde57b921 Author: Kirill Korotaev Date: Tue Jul 11 04:37:37 2006 -0700 fix fdset leakage When found, it is obvious. nfds calculated when allocating fdsets is rewritten by calculation of size of fdtable, and when we are unlucky, we try to free fdsets of wrong size. Found due to OpenVZ resource management (User Beancounters). Signed-off-by: Alexey Kuznetsov Signed-off-by: Kirill Korotaev Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit b66a64d8fa30e003494040d4a7eb6587fa3fffcc Author: Takashi Iwai Date: Fri Jul 14 16:40:35 2006 +0200 Suppress irq handler mismatch messages in ALSA ISA drivers Suppress 'irq handler mismatch' messages at auto-probing of irqs in ALSA ISA drivers. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela Signed-off-by: Greg Kroah-Hartman commit 7c7b60b196c9fd91425cb801ad3f317961310c12 Author: Remy Bruno Date: Thu Jul 13 20:12:41 2006 +0200 ALSA: RME HDSP - fixed proc interface (missing {}) From: Remy Bruno Signed-off-by: Jaroslav Kysela Signed-off-by: Greg Kroah-Hartman commit e8967dfa4074fef1a114169b58ba05730165d143 Author: Takashi Iwai Date: Thu Jul 13 20:06:54 2006 +0200 ALSA: hda-intel - Fix race in remove Call iounmap after free_irq to avoid invalid accesses in the shared irq. The patch is taken from https://bugzilla.novell.com/show_bug.cgi?id=167869 Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman commit 7dd9dac03853e21bcc38f681bf01a890c24e1d15 Author: Takashi Iwai Date: Thu Jul 13 20:16:41 2006 +0200 ALSA: Fix workaround for AD1988A rev2 codec Fix the workaround for AD1988A rev2 codec not to apply to AD1988B codec chips. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela Signed-off-by: Greg Kroah-Hartman commit 5b6aeb44a10c08019f3d53c85de82317658e2ef5 Author: Takashi Iwai Date: Thu Jul 13 20:13:30 2006 +0200 ALSA: Fix undefined (missing) references in ISA MIRO sound driver WARNING: /lib/modules/2.6.18-rc1-mm1/kernel/sound/isa/opti9xx/snd-miro.ko needs unknown symbol snd_cs4231_create WARNING: /lib/modules/2.6.18-rc1-mm1/kernel/sound/isa/opti9xx/snd-miro.ko needs unknown symbol snd_cs4231_pcm WARNING: /lib/modules/2.6.18-rc1-mm1/kernel/sound/isa/opti9xx/snd-miro.ko needs unknown symbol snd_cs4231_timer WARNING: /lib/modules/2.6.18-rc1-mm1/kernel/sound/isa/opti9xx/snd-miro.ko needs unknown symbol snd_cs4231_mixer WARNING: /lib/modules/2.6.18-rc1-mm1/kernel/fs/reiser4/reiser4.ko needs unknown symbol generic_file_read Signed-off-by: Randy Dunlap Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela Signed-off-by: Greg Kroah-Hartman commit 08d60485398b5c66b6084ba210a5a12faa02e2fa Author: Takashi Iwai Date: Thu Jul 13 20:09:02 2006 +0200 ALSA: fix the SND_FM801_TEA575X dependencies CONFIG_SND_FM801=y, CONFIG_SND_FM801_TEA575X=m resulted in the following compile error: <-- snip --> ... LD vmlinux sound/built-in.o: In function 'snd_fm801_free': fm801.c:(.text+0x3c15b): undefined reference to 'snd_tea575x_exit' sound/built-in.o: In function 'snd_card_fm801_probe': fm801.c:(.text+0x3cfde): undefined reference to 'snd_tea575x_init' make: *** [vmlinux] Error 1 <-- snip --> This patch fixes kernel Bugzilla #6458. Signed-off-by: Adrian Bunk Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela Signed-off-by: Greg Kroah-Hartman commit eca58f40f141b0a209dd487ca0a0886ba8279bea Author: Takashi Iwai Date: Thu Jul 13 20:17:52 2006 +0200 ALSA: Fix mute switch on VAIO laptops with STAC7661 Fixed the master mute switch on VAIO laptops with STAC7661 codec chip. Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman commit 4b5ae6ca7b23f85091be1c17286762e58e2b700f Author: Takashi Iwai Date: Thu Jul 13 20:27:55 2006 +0200 ALSA: Fix model for HP dc7600 Changed the assigned model for HP dc7600 with ALC260 codec to match better with the actual I/O assignment. Patch taken from ALSA bug#2157. Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman commit 27f1b268d39125a116080a5831c883b6b276a97a Author: Takashi Iwai Date: Thu Jul 13 20:15:44 2006 +0200 ALSA: Fix missing array terminators in AD1988 codec support Fixed the missing array terminators in AD1988 codec support code. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela Signed-off-by: Greg Kroah-Hartman commit 62d99ac2aeb0a91d7f5f3a4f1532c686b736b37e Author: Takashi Iwai Date: Thu Jul 13 20:08:01 2006 +0200 ALSA: Fix a deadlock in snd-rtctimer Fix an occasional deadlock occuring with snd-rtctimer driver, added irqsave to the lock in tasklet (ALSA bug#952). Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela Signed-off-by: Greg Kroah-Hartman commit 954d53d3ea28bcd12396f7d26b78dd16719246c6 Author: Takashi Iwai Date: Thu Jul 13 20:10:13 2006 +0200 ALSA: au88x0 - Fix 64bit address of MPU401 MMIO port Fix 64bit address of MPU401 MMIO port on au88x0 chip. Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman commit cefc30b36a16abd1284425aff1aaf0cc2b51b047 Author: Herbert Xu Date: Thu Jul 13 19:11:01 2006 +1000 Add missing UFO initialisations This bug was unknowingly fixed the GSO patches (or rather, its effect was unknown at the time). Thanks to Marco Berizzi's persistence which is documented in the thread "ipsec tunnel asymmetrical mtu", we now know that it can have highly non-obvious symptoms. What happens is that uninitialised uso_size fields can cause packets to be incorrectly identified as UFO, which means that it does not get fragmented even if it's over the MTU. The fix is simple enough. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 949837a9ea1aba1c9ca19bf1969cd72c7de72d75 Author: Andrew Morton Date: Thu Jun 29 02:24:26 2006 -0700 generic_file_buffered_write(): handle zero-length iovec segments The recent generic_file_write() deadlock fix caused generic_file_buffered_write() to loop inifinitely when presented with a zero-length iovec segment. Fix. Note that this fix deliberately avoids calling ->prepare_write(), ->commit_write() etc with a zero-length write. This is because I don't trust all filesystems to get that right. This is a cautious approach, for 2.6.17.x. For 2.6.18 we should just go ahead and call ->prepare_write() and ->commit_write() with the zero length and fix any broken filesystems. So I'll make that change once this code is stabilised and backported into 2.6.17.x. The reason for preferring to call ->prepare_write() and ->commit_write() with the zero-length segment: a zero-length segment _should_ be sufficiently uncommon that this is the correct way of handling it. We don't want to optimise for poorly-written userspace at the expense of well-written userspace. Cc: "Vladimir V. Saveliev" Cc: Neil Brown Cc: Martin Schwidefsky Cc: Chris Wright Cc: Greg KH Cc: Cc: walt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Chris Wright commit b5e475eb0506f525abd38782e40c4acd0b280f28 Author: Vladimir V. Saveliev Date: Tue Jun 27 02:53:57 2006 -0700 generic_file_buffered_write(): deadlock on vectored write generic_file_buffered_write() prefaults in user pages in order to avoid deadlock on copying from the same page as write goes to. However, it looks like there is a problem when write is vectored: fault_in_pages_readable brings in current segment or its part (maxlen). OTOH, filemap_copy_from_user_iovec is called to copy number of bytes (bytes) which may exceed current segment, so filemap_copy_from_user_iovec switches to the next segment which is not brought in yet. Pagefault is generated. That causes the deadlock if pagefault is for the same page write goes to: page being written is locked and not uptodate, pagefault will deadlock trying to lock locked page. [akpm@osdl.org: somewhat rewritten] Cc: Neil Brown Cc: Martin Schwidefsky Cc: Signed-off-by: Andrew Morton Signed-off-by: Chris Wright commit ba4532fa45b99a866d253877372f086503a944c6 Author: Ian Abbott Date: Mon Jun 26 12:59:17 2006 +0100 USB serial ftdi_sio: Prevent userspace DoS (CVE-2006-2936) This patch limits the amount of outstanding 'write' data that can be queued up for the ftdi_sio driver, to prevent userspace DoS attacks (or simple accidents) that use up all the system memory by writing lots of data to the serial port. The original patch was by Guillaume Autran, who in turn based it on the same mechanism implemented in the 'visor' driver. I (Ian Abbott) re-targeted the patch to the latest sources, fixed a couple of errors, renamed his new structure members, and updated the implementations of the 'write_room' and 'chars_in_buffer' methods to take account of the number of outstanding 'write' bytes. It seems to work fine, though at low baud rates it is still possible to queue up an amount of data that takes an age to shift (a job for another day!). Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit 5bd9689ce4b9ffd657be1462f4b2f5a0d10cd450 Author: Jens Axboe Date: Mon Jul 10 11:00:01 2006 +0200 splice: fix problems with sys_tee() Several issues noticed/fixed: - We cannot reliably block in link_pipe() while holding both input and output mutexes. So do preparatory checks before locking down both mutexes and doing the link. - The ipipe->nrbufs vs i check was bad, because we could have dropped the ipipe lock in-between. This causes us to potentially look at unknown buffers if we were racing with someone else reading this pipe. Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman commit 015b18b4bff96be06c0396c03650be06091dafbc Author: Jens Axboe Date: Thu Jul 6 04:19:43 2006 -0700 cdrom: fix bad cgc.buflen assignment The code really means to mask off the high bits, not assign 0xff. Signed-off-by: Jens Axboe Cc: Marcus Meissner Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 88caad141b0245b150ab24579d5a168c7314fb67 Author: Randy Dunlap Date: Fri Jun 23 06:10:01 2006 +0000 Fix powernow-k8 SMP kernel on UP hardware bug. [CPUFREQ] Fix powernow-k8 SMP kernel on UP hardware bug. Fix powernow-k8 doesn't load bug. Reference: https://launchpad.net/distros/ubuntu/+source/linux-source-2.6.15/+bug/35145 Signed-off-by: Ben Collins Signed-off-by: Dave Jones Signed-off-by: Greg Kroah-Hartman commit 070cc2d0510eaa75f9c580f082bb3031d9c9faeb Author: Dave Jones Date: Tue Jun 20 03:11:32 2006 +0000 Make powernow-k7 work on SMP kernels. [CPUFREQ] Make powernow-k7 work on SMP kernels. Even though powernow-k7 doesn't work in SMP environments, it can work on an SMP configured kernel if there's only one CPU present, however recalibrate_cpu_khz was returning -EINVAL on such kernels, so we failed to init the cpufreq driver. Signed-off-by: Dave Jones Signed-off-by: Greg Kroah-Hartman commit 0fd4fe8a44fbc58608f27d7246927024bbcf934c Author: Michael Krufky Date: Thu Jul 6 14:26:45 2006 -0400 dvb-bt8xx: fix frontend detection for DViCO FusionHDTV DVB-T Lite rev 1.2 This patch adds support for the new revision of the DViCO FusionHDTV DVB-T Lite, based on the zl10353 demod instead of mt352. Both mt352 and zl10353 revisions of this card have the same PCI subsystem ID. Signed-off-by: Michael Krufky Acked-by: Chris Pascoe Acked-by: Manu Abraham Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman commit 54f8bab3f331ee569aad3074d9c81dfb395482c0 Author: Andrew de Quincey Date: Thu Jul 6 14:26:44 2006 -0400 v4l/dvb: stradis: dont export MODULE_DEVICE_TABLE This patch prevents the stradis driver from breaking all other saa7146 devices by removing the autodetection based on PCI subsystem ID 0000:0000 (no eeprom). Users that want to use the stradis driver will have to manually insert the module, or specify it in modprobe.conf Signed-off-by: Andrew de Quincey Signed-off-by: Michael Krufky Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman commit 5bb61972dababe40d58c08de886e5d01f2603163 Author: Oliver Endriss Date: Thu Jul 6 14:26:40 2006 -0400 v4l/dvb: Backport the budget driver DISEQC instability fix Backport the budget driver DISEQC instability fix. Signed-off-by: Oliver Endriss Signed-off-by: Andrew de Quincey Signed-off-by: Michael Krufky Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman commit 3900669ef7b9e732dc5b4a38f72afa0237486dd8 Author: Andrew de Quincey Date: Thu Jul 6 14:26:36 2006 -0400 v4l/dvb: Backport the DISEQC regression fix to 2.6.17.x Backport the DISEQC regression fix to 2.6.17.x Signed-off-by: Andrew de Quincey Signed-off-by: Michael Krufky Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman commit aacc143cb727db86692910ff5cf72bac8afe975b Author: Andrew de Quincey Date: Thu Jul 6 14:26:32 2006 -0400 v4l/dvb: Backport fix to artec USB DVB devices Backport fix to artec USB DVB devices Signed-off-by: Andrew de Quincey Signed-off-by: Michael Krufky Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman commit 07d1f3a0037a0e4b1b1aff13d97180189148f4f4 Author: Thomas Graf Date: Wed Jul 5 20:58:51 2006 -0700 PKT_SCHED: Fix error handling while dumping actions "return -err" and blindly inheriting the error code in the netlink failure exception handler causes errors codes to be returned as positive value therefore making them being ignored by the caller. May lead to sending out incomplete netlink messages. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman commit 0a5bad5657163f8f44f6220929a70acf297d3dd5 Author: Thomas Graf Date: Wed Jul 5 20:58:23 2006 -0700 PKT_SCHED: Return ENOENT if action module is unavailable Return ENOENT if action module is unavailable Signed-off-by: Thomas Graf Signed-off-by: David S. Miller Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman commit 5bf5d453cd5479783020d2cd76138812de947106 Author: Thomas Graf Date: Wed Jul 5 20:58:02 2006 -0700 PKT_SCHED: Fix illegal memory dereferences when dumping actions The TCA_ACT_KIND attribute is used without checking its availability when dumping actions therefore leading to a value of 0x4 being dereferenced. The use of strcmp() in tc_lookup_action_n() isn't safe when fed with string from an attribute without enforcing proper NUL termination. Both bugs can be triggered with malformed netlink message and don't require any privileges. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman commit d7f69eaa106a0b46474e116216a81f72ff28e507 Author: Michael Krufky Date: Thu Jun 29 01:03:46 2006 -0400 v4l/dvb: Kconfig: fix description and dependencies for saa7115 module This Kconfig description is incorrect, due to a previous merge a while back. CONFIG_SAA711X builds module saa7115, which is the newer v4l2 module, and is not obsoleted. Signed-off-by: Michael Krufky Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman commit 6d4764bead69f0092049fa6fe409d1c989e75af6 Author: Willy Tarreau Date: Wed Jul 5 22:34:52 2006 +0200 ethtool: oops in ethtool_set_pauseparam() The function pointers which were checked were for their get_* counterparts. Typically a copy-paste typo. Signed-off-by: Willy Tarreau Acked-by: Jeff Garzik Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman commit a78a731dfd6c060dfb6cbc93a0363defb4727212 Author: Francois Romieu Date: Sun Jul 2 11:54:53 2006 +0100 via-velocity: the link is not correctly detected when the device starts via-velocity: the link is not correctly detected when the device starts The patch fixes http://bugzilla.kernel.org/show_bug.cgi?id=6711 Signed-off-by: Roy Marples Signed-off-by: Francois Romieu Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman commit b5e47cc4d14da20f21c9399eafe6c274ff3317eb Author: Bob Moore Date: Sun Jul 2 11:53:01 2006 +0100 Reduce ACPI verbosity on null handle condition As detailed at http://bugs.gentoo.org/131534 : 2.6.16 converted many ACPI debug messages into error or warning messages. One extraneous message was incorrectly converted, resulting in logs being flooded by "Handle is NULL and Pathname is relative" messages on some systems. This patch (part of a larger ACPICA commit) converts the message back to debug level. Signed-off-by: Daniel Drake Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman commit a9eaad8dc41a6a700e3be89f4e13632db5e3184f Author: Andrew Morton Date: Sat Jul 1 04:36:37 2006 -0700 pnp: suppress request_irq() warning Suppress the "setup_irq: irq handler mismatch" coming out of pnp_check_irq(): failures are expected here. Cc: Santiago Garcia Mantinan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman commit 76e89d27432c00b797b8ef6106aaf5b2c393b5e6 Author: Andrew de Quincey Date: Fri Jun 30 15:52:07 2006 -0400 v4l/dvb: Fix CI interface on PRO KNC1 cards The original driver had a restriction that if a card as an saa7113 chip, then it cannot have a CI interface. This is not the case. Signed-off-by: Andrew de Quincey Signed-off-by: Michael Krufky Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman commit 572b3be58804375d728de9de50cd5716c07b7863 Author: Andrew de Quincey Date: Fri Jun 30 15:52:06 2006 -0400 v4l/dvb: Fix CI on old KNC1 DVBC cards These cards do not need the tda10021 configuration change when data is streamed through a CAM module. This disables it for these ones. Signed-off-by: Andrew de Quincey Signed-off-by: Michael Krufky Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman commit bdfb0d8e84cc4feb14509a3e4efeb5e2a48a3a4c Author: Andrew de Quincey Date: Fri Jun 30 15:52:04 2006 -0400 v4l/dvb: Fix budget-av frontend detection The budget-av needs this GPIO set low for most cards to work. Signed-off-by: Andrew de Quincey Signed-off-by: Michael Krufky Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman commit 4b6f4d57b81ba77366c329bd90c76bc0e5c5b20d Author: Yasunori Goto Date: Thu Jun 29 02:24:27 2006 -0700 memory hotplug: solve config broken: undefined reference to `online_page' Memory hotplug code of i386 adds memory to only highmem. So, if CONFIG_HIGHMEM is not set, CONFIG_MEMORY_HOTPLUG shouldn't be set. Otherwise, it causes compile error. In addition, many architecture can't use memory hotplug feature yet. So, I introduce CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG. Signed-off-by: Yasunori Goto Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman commit 9f24916834aaa1a31d90505c671e4746471200bf Author: Andi Kleen Date: Thu Jun 29 20:54:26 2006 +0200 BLOCK: Fix bounce limit address check This fixes some OOMs on 64bit systems with <4GB of RAM when accessing the cdrom. Do a safer check for when to enable DMA. Currently we enable ISA DMA for cases that do not need it, resulting in OOM conditions when ZONE_DMA runs out of space. Signed-off-by: Andi Kleen Signed-off-by: Jens Axboe Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman commit 395e8c5b6b0a3ceaf5e95b79f327028a8a48f481 Author: Piotr Kaczuba Date: Mon Jun 26 13:59:38 2006 +0200 x86_64: Fix modular pc speaker It turned out that the following change is needed when the speaker is compiled as a module. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman commit 14c620f9a7f2627953d6d52f196a5773d379533d Author: Michael S. Tsirkin Date: Wed Jun 28 20:14:28 2006 +0300 IB/mthca: restore missing PCI registers after reset mthca does not restore the following PCI-X/PCI Express registers after reset: PCI-X device: PCI-X command register PCI-X bridge: upstream and downstream split transaction registers PCI Express : PCI Express device control and link control registers This causes instability and/or bad performance on systems where one of these registers is set to a non-default value by BIOS. Signed-off-by: Michael S. Tsirkin Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman commit 9f67d487c336a68dd025ae99877115c7e016fe86 Author: Mandy Kirkconnell Date: Wed Jun 28 08:34:44 2006 +1000 XFS: corruption fix Fix nused counter. It's currently getting set to -1 rather than getting decremented by 1. Since nused never reaches 0, the "if (!free->hdr.nused)" check in xfs_dir2_leafn_remove() fails every time and xfs_dir2_shrink_inode() doesn't get called when it should. This causes extra blocks to be left on an empty directory and the directory in unable to be converted back to inline extent mode. Signed-off-by: Mandy Kirkconnell Signed-off-by: Nathan Scott Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman