commit 7059abedd2f04b68bd7e1a79c9c72f7aeee134c0 Author: Linus Torvalds Date: Mon Oct 23 16:02:02 2006 -0700 Linux 2.6.19-rc3 commit 0c0e4668e0e65dd1404e8cf066d147235f95561d Author: Linus Torvalds Date: Mon Oct 23 14:25:30 2006 -0700 Revert unintentional and bogus change to drivers/pci/quirks.c In commit 4e8a5201506423e0241202de1349422af4260296 ("[PKT_SCHED] netem: Orphan SKB when adding to queue.") Davem mistakenly also included a temporary diff in his tree that disabled the pci_fixup_video VGA quirk, which broke sparc64. This reverts that part of the commit. Sayeth Davem: "Greg KH has a patch coming to you soon which will move that VGA code back into x86/x86_64/IA64 specific areas and will fix the sparc64 problem properly." Special thanks to Claudio Martins for noticing the error in the first place. Cc: Claudio Martins Cc: David Miller Signed-off-by: Linus Torvalds commit 04fed361dadb7921507a470947ac23d2f26352cf Author: Russell King Date: Sun Oct 22 15:57:18 2006 +0100 [PATCH] Remove __must_check for device_for_each_child() Eliminate more __must_check madness. The return code from device_for_each_child() depends on the values which the helper function returns. If the helper function always returns zero, it's utterly pointless to check the return code from device_for_each_child(). The only code which knows if the return value should be checked is the caller itself, so forcing the return code to always be checked is silly. Hence, remove the __must_check annotation. Signed-off-by: Russell King Signed-off-by: Linus Torvalds commit 68e7fffc0f3e95063ba5bd94ee6f9b8927247297 Author: Takashi Iwai Date: Mon Oct 23 13:40:59 2006 +0200 [ALSA] hda-intel - Add check of MSI availabity Check the availability of MSI and turn off MSI automatically when it's not available on the hardware. MSI seems broken on some hardwares but the kernel doesn't know exactly, thus we have to turn the MSI feature off on the sound driver manually. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit a94b1d1fd7ca3129e1d38d38167779fa6ee69780 Author: David S. Miller Date: Sun Oct 22 21:53:30 2006 -0700 [SPARC64]: 8-byte align return value from compat_alloc_user_space() Otherwise we get a ton of unaligned exceptions, for cases such as compat_sys_msgrcv() which go: p = compat_alloc_user_space(second + sizeof(struct msgbuf)); and here 'second' can for example be an arbitrary odd value. Based upon a bug report from Jurij Smakov. Signed-off-by: David S. Miller commit 4e8a5201506423e0241202de1349422af4260296 Author: David S. Miller Date: Sun Oct 22 21:00:33 2006 -0700 [PKT_SCHED] netem: Orphan SKB when adding to queue. The networking emulator can queue SKBs for a very long time, so if you're using netem on the sender side for large bandwidth/delay product testing, the SKB socket send queue sizes become artificially larger. Correct this by calling skb_orphan() in netem_enqueue(). Signed-off-by: David S. Miller commit 6a43487f43fbd4e03c606dcb62b98374a3af88fc Author: Randy Dunlap Date: Sun Oct 22 20:38:00 2006 -0700 [NET]: kernel-doc fix for sock.h Fix kernel-doc warning in include/net/sock.h: Warning(/var/linsrc/linux-2619-rc1-pv//include/net/sock.h:894): No description found for parameter 'rcu' Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit a5c81b648476f5b0594daeefb38bb98409da5340 Author: Jaroslav Kysela Date: Sun Oct 22 10:56:24 2006 +0200 [ALSA] version 1.0.13 Signed-off-by: Jaroslav Kysela commit ef35be7f52669cc00c780fa5a640abf0580d1ecf Author: Takashi Iwai Date: Thu Oct 19 17:38:31 2006 +0200 [ALSA] Fix addition of user-defined boolean controls Fixed the addition of user-defined boolean controls, the private data size is corrected to be handled properly. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit da43deb116c0cea9ca2174f2ac64985c4d53077e Author: Takashi Iwai Date: Thu Oct 19 15:20:08 2006 +0200 [ALSA] Fix AC97 power-saving mode Fix the bug in AC97 power-saving mode that the power isn't turned on when power_save is set to 1 via sysfs during the power off state. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit dbedca39fe30db87b6401e4396f959c63d90082e Author: Takashi Iwai Date: Wed Oct 18 19:09:46 2006 +0200 [ALSA] Fix re-use of va_list The va_list is designed to be used only once. The current code may pass va_list arguments multiple times and may cause Oops. Copy/release the arguments temporarily to avoid this problem. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 5b15c95f889c7bc43cb759c27211c597c0ad9f05 Author: Felix Kuehling Date: Mon Oct 16 12:49:47 2006 +0200 [ALSA] hda_intel: add ATI RS690 HDMI audio support This patch adds support for the HDMI codec of the ATI RS690 IGP northbridge. Signed-off-by: Felix Kuehling Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 264e6e3b0c5af44d8975153bf0c88ccf2cb10a2f Author: Takashi Iwai Date: Fri Oct 13 12:40:51 2006 +0200 [ALSA] hda-codec - Add model entry for ASUS U5F laptop Added a model entry for ASUS U5F laptop with AD1986A codec. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit c9949452f221077c22a4765ef380841e169f034b Author: Takashi Iwai Date: Thu Oct 12 21:10:21 2006 +0200 [ALSA] Fix dependency of snd-adlib driver in Kconfig Added the missing dependency on CONFIG_SND for snd-adlib driver. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 30b35399ceb2398d05837863476dcb12f12f3a82 Author: Takashi Iwai Date: Wed Oct 11 18:52:53 2006 +0200 [ALSA] Various fixes for suspend/resume of ALSA PCI drivers - Check the return value of pci_enable_device() and request_irq() in the suspend. If any error occurs there, disable the device using snd_card_disconnect(). - Call pci_set_power_state() properly with pci_choose_state(). - Fix the order to call pci_set_power_state(). - Removed obsolete house-made PM codes in some drivers. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit c06134d73cdc02bb8ab1fad180f6da1f28d2e049 Author: Takashi Iwai Date: Wed Oct 11 18:49:13 2006 +0200 [ALSA] hda-codec - Fix assignment of PCM devices for Realtek codecs Fixed the assignment of PCM devices for Realtek codecs. The secondary analog capture should be statically asigned to the third device regardless whether SPDIF exists or not. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 5019f75ea1a98c36e9139ffb2bf8614a2e9f0a03 Author: Amit Choudhary Date: Mon Oct 9 16:04:34 2006 +0200 [ALSA] sound/isa/opti9xx/opti92x-ad1848.c: check kmalloc() return value Check the return value of kmalloc() in function snd_card_opti9xx_pnp(), in file sound/isa/opti9xx/opti92x-ad1848.c. Signed-off-by: Amit Choudhary Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit b1e8a791c77bd35f88b678ce761928583efd8cd0 Author: Amit Choudhary Date: Mon Oct 9 16:03:52 2006 +0200 [ALSA] sound/isa/ad1816a/ad1816a.c: check kmalloc() return value Check the return value of kmalloc() in function snd_card_ad1816a_pnp(), in file sound/isa/ad1816a/ad1816a.c. Signed-off-by: Amit Choudhary Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit fbdbb2205a7ff3c3e19941477cde6f9a693637ef Author: Amit Choudhary Date: Mon Oct 9 16:03:23 2006 +0200 [ALSA] sound/isa/cmi8330.c: check kmalloc() return value Check the return value of kmalloc() in function snd_cmi8330_pnp(), in file sound/isa/cmi8330.c. Signed-off-by: Amit Choudhary Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 4a81a21b6095997f50ac9ca37e4fdfe48d789ad7 Author: Amit Choudhary Date: Mon Oct 9 16:02:49 2006 +0200 [ALSA] sound/isa/gus/interwave.c: check kmalloc() return value Check the return value of kmalloc() in function snd_interwave_pnp(), in file sound/isa/gus/interwave.c. Signed-off-by: Amit Choudhary Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 185b1aa122f87052d9154bb74990bc785372a750 Author: Eric Dumazet Date: Sat Oct 21 20:24:01 2006 -0700 [NET]: Reduce sizeof(struct flowi) by 20 bytes. As suggested by David, just kill off some unused fields in dnports to reduce sizef(struct flowi). If they come back, they should be moved to nl_u.dn_u in order not to enlarge again struct flowi [ Modified to really delete this stuff instead of using #if 0. -DaveM ] Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 375216ad0c303adeed45281ce82e153d41de679a Author: Thomas Graf Date: Sat Oct 21 20:20:54 2006 -0700 [IPv6] fib: initialize tb6_lock in common place to give lockdep a key Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 69c3014763966b0ae2bd190dac3654dd6cebdd45 Author: Alan Cox Date: Fri Oct 20 19:51:46 2006 -0700 [ATM] nicstar: Fix a bogus casting warning Not enough to make Nicstar 64bit friendly but got squashed in passing so might as well be applied Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 663bab6fd097c18ae0c7a7fd1b4a44558b998cdb Author: Jeff Garzik Date: Fri Oct 20 19:50:50 2006 -0700 [ATM] firestream: handle thrown error gcc emits the following warning: drivers/atm/firestream.c: In function ‘fs_open’: drivers/atm/firestream.c:870: warning: ‘tmc0’ may be used uninitialized in this function This indicates a real bug. We should check make_rate() return value for potential errors. Signed-off-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit b45eccdb51c102e3c5ff9eaecc36200ab2eb09c0 Author: Tobias Klauser Date: Fri Oct 20 19:49:45 2006 -0700 [ATM]: No need to return void The module_exit function has return-type void and pci_unregister_driver() returns void anyway. Signed-off-by: Tobias Klauser Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 97f80bc66f5c6384e3aab70c67340116b8c4284b Author: Jeff Garzik Date: Fri Oct 20 19:48:42 2006 -0700 [ATM]: handle sysfs errors Signed-off-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit fd169f15a67b47f23bd1704919c719a8e8409a73 Author: David S. Miller Date: Fri Oct 20 19:44:17 2006 -0700 [DCCP] ipv6: Fix opt_skb leak. Based upon a patch from Jesper Juhl. Try to match the TCP IPv6 code this was copied from as much as possible, so that it's easy to see where to add the ipv6 pktoptions support code. Signed-off-by: David S. Miller commit 82709531a800fcf8de71bb8c5d8e92462fb81f84 Author: Gerrit Renker Date: Wed Oct 11 16:26:54 2006 +0100 [DCCP]: Fix Oops in DCCPv6 I think I got the cause for the Oops observed in http://www.mail-archive.com/dccp@vger.kernel.org/msg00578.html The problem is always with applications listening on PF_INET6 sockets. Apart from the mentioned oops, I observed another one one, triggered at irregular intervals via timer interrupt: run_timer_softirq -> dccp_keepalive_timer -> inet_csk_reqsk_queue_prune -> reqsk_free -> dccp_v6_reqsk_destructor The latter function is the problem and is also the last function to be called in said kernel panic. In any case, there is a real problem with allocating the right request_sock which is what this patch tackles. It fixes the following problem: - application listens on PF_INET6 - DCCPv4 packet comes in, is handed over to dccp_v4_do_rcv, from there to dccp_v4_conn_request Now: socket is PF_INET6, packet is IPv4. The following code then furnishes the connection with IPv6 - request_sock operations: req = reqsk_alloc(sk->sk_prot->rsk_prot); The first problem is that all further incoming packets will get a Reset since the connection can not be looked up. The second problem is worse: --> reqsk_alloc is called instead of inet6_reqsk_alloc --> consequently inet6_rsk_offset is never set (dangling pointer) --> the request_sock_ops are nevertheless still dccp6_request_ops --> destructor is called via reqsk_free --> dccp_v6_reqsk_destructor tries to free random memory location (inet6_rsk_offset not set) --> panic I have tested this for a while, DCCP sockets are now handled correctly in all three scenarios (v4/v6 only/v4-mapped). Commiter note: I've added the dccp_request_sock_ops forward declaration to keep the tree building and to reduce the size of the patch for 2.6.19, later I'll move the functions to the top of the affected source code to match what we have in the TCP counterpart, where this problem hasn't existed in the first place, dumb me not to have done the same thing on DCCP land 8) Signed-off-by: Gerrit Renker Signed-off-by: Arnaldo Carvalho de Melo commit cb01fc720c629261b9c616b2d5fcc3d93cd8bb09 Author: Muli Ben-Yehuda Date: Sun Oct 22 00:41:15 2006 +0200 [PATCH] x86-64: increase PHB1 split transaction timeout This patch increases the timeout for PCI split transactions on PHB1 on the first Calgary to work around an issue with the aic94xx adapter. Fixes kernel.org bugzilla #7180 (http://bugzilla.kernel.org/show_bug.cgi?id=7180) Based on excellent debugging and a patch by Darrick J. Wong Signed-off-by: Muli Ben-Yehuda Signed-off-by: Jon Mason Signed-off-by: Andi Kleen Acked-by: Darrick J. Wong commit aa026ede513b7d672fa7d9106b2f2a475455dcf2 Author: Andi Kleen Date: Sun Oct 22 00:41:15 2006 +0200 [PATCH] x86-64: Fix C3 timer test There was a typo in the C3 latency test to decide of the TSC should be used or not. It used the C2 latency threshold, not the C3 one. Fix that. This should fix the time on various dual core laptops. Signed-off-by: Andi Kleen commit f8829caee311207afbc882794bdc5aa0db5caf33 Author: Ralf Baechle Date: Sat Oct 21 23:17:35 2006 +0100 [MIPS] Fix aliasing bug in copy_to_user_page / copy_from_user_page The current implementation uses a sequence of a cacheflush and a copy. This is racy in case of a multithreaded debuggee and renders GDB virtually unusable. Aside this fixes a performance hog rendering access to /proc/cmdline very slow and resulting in a enough cache stalls for the 34K AP/SP programming model to make the bare metal code on the non-Linux VPE miss RT deadlines. The main part of this patch was originally written by Ralf Baechle; Atushi Nemoto did the the debugging. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 224dc50ece1b40f8cff5ecadd42a6b2691e231de Author: Ralf Baechle Date: Sat Oct 21 02:05:20 2006 +0100 [MIPS] Cleanup remaining references to mips_counter_frequency. Noticed by Samium Gromoff but his patch got stale in flight ... Signed-off-by: Ralf Baechle commit fc22617e451f23b466d4d63bb016f5f6111b69e4 Author: Trond Myklebust Date: Sat Oct 21 10:24:24 2006 -0700 [PATCH] NFS: Cache invalidation fixup If someone has renamed a directory on the server, triggering the d_move code in d_materialise_unique(), then we need to invalidate the cached directory information in the source parent directory. Signed-off-by: Trond Myklebust Cc: Miklos Szeredi Cc: Maneesh Soni Cc: Dipankar Sarma Cc: Neil Brown Cc: Al Viro Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9eaef27b36a6b716384948da94b8fc5bfba7b712 Author: Trond Myklebust Date: Sat Oct 21 10:24:20 2006 -0700 [PATCH] VFS: Make d_materialise_unique() enforce directory uniqueness If the caller tries to instantiate a directory using an inode that already has a dentry alias, then we attempt to rename the existing dentry instead of instantiating a new one. Fail with an ELOOP error if the rename would affect one of our parent directories. This behaviour is needed in order to avoid issues such as http://bugzilla.kernel.org/show_bug.cgi?id=7178 Signed-off-by: Trond Myklebust Cc: Miklos Szeredi Cc: Maneesh Soni Cc: Dipankar Sarma Cc: Neil Brown Cc: Al Viro Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3f7705eab6722ad1a346d748c4aad55755d6c241 Author: Matthew Wilcox Date: Sat Oct 21 10:24:19 2006 -0700 [PATCH] cciss: Fix warnings (and bug on 1TB discs) CCISS was producing warnings about shifts being greater than the size of the type and pointers being of incompatible type. Turns out this is because it's calling do_div on a 32-bit quantity. Upon further investigation, the sector_t total_size is being assigned to an int, and then we're calling do_div on that int. Obviously, sector_div is called for here, and I took the chance to refactor the code a little. Signed-off-by: Matthew Wilcox Acked-by: Mike Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8a7822a61ca9c22f464c0b79f455e62cccee747e Author: Alexey Dobriyan Date: Sat Oct 21 10:24:17 2006 -0700 [PATCH] i2o/exec-osm.c: use "unsigned long flags;" Just like everyone else. Signed-off-by: Alexey Dobriyan Cc: Markus Lidel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit faf6bbcf94caee10ba34adb86db4ecca96bfd3bf Author: Paul Jackson Date: Sat Oct 21 10:24:17 2006 -0700 [PATCH] cpuset: mempolicy migration typo fix Mistyped an ifdef CONFIG_CPUSETS - fixed. I doubt that anyone ever noticed. The impact of this typo was that if someone: 1) was using MPOL_BIND to force off node allocations 2) while using cpusets to constrain memory placement 3) when that cpuset was migrating that jobs memory 4) while the tasks in that job were actively forking then there was a rare chance that future allocations using that MPOL_BIND policy would be node local, not off node. Signed-off-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aedb0eb107961a234f7c38e53da65a8f7ea992a9 Author: Christoph Lameter Date: Sat Oct 21 10:24:16 2006 -0700 [PATCH] Slab: Do not fallback to nodes that have not been bootstrapped yet The zonelist may contain zones of nodes that have not been bootstrapped and we will oops if we try to allocate from those zones. So check if the node information for the slab and the node have been setup before attempting an allocation. If it has not been setup then skip that zone. Usually we will not encounter this situation since the slab bootstrap code avoids falling back before we have setup the respective nodes but we seem to have a special needs for pppc. Signed-off-by: Christoph Lameter Acked-by: Andy Whitcroft Cc: Paul Mackerras Cc: Mike Kravetz Cc: Benjamin Herrenschmidt Acked-by: Mel Gorman Acked-by: Will Schmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7516795739bd53175629b90fab0ad488d7a6a9f7 Author: Andy Whitcroft Date: Sat Oct 21 10:24:14 2006 -0700 [PATCH] Reintroduce NODES_SPAN_OTHER_NODES for powerpc Reintroduce NODES_SPAN_OTHER_NODES for powerpc Revert "[PATCH] Remove SPAN_OTHER_NODES config definition" This reverts commit f62859bb6871c5e4a8e591c60befc8caaf54db8c. Revert "[PATCH] mm: remove arch independent NODES_SPAN_OTHER_NODES" This reverts commit a94b3ab7eab4edcc9b2cb474b188f774c331adf7. Also update the comments to indicate that this is still required and where its used. Signed-off-by: Andy Whitcroft Cc: Paul Mackerras Cc: Mike Kravetz Cc: Benjamin Herrenschmidt Acked-by: Mel Gorman Acked-by: Will Schmidt Cc: Christoph Lameter Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 047a66d4bb24aaf19f41d620f8f0534c2153cd0b Author: David Gibson Date: Sat Oct 21 10:24:13 2006 -0700 [PATCH] ibmveth: Fix index increment calculation The recent commit 751ae21c6cd1493e3d0a4935b08fb298b9d89773 introduced a bug in the producer/consumer index calculation in the ibmveth driver - incautious use of the post-increment ++ operator resulted in an increment being immediately reverted. This patch corrects the logic. Without this patch, the driver oopses almost immediately after activation on at least some machines. Signed-off-by: David Gibson Acked-by: Santiago Leon Cc: Jeff Garzik Cc: Martin Schwidefsky Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d42552c3ace1fa1f16ae02ce642f4c733cec40ca Author: Andrew Morton Date: Sat Oct 21 10:24:12 2006 -0700 [PATCH] pci: declare pci_get_device_reverse() We seem to have lost the declaration of pci_get_device_reverse(), if we ever had one. Add a CONFIG_PCI=0 stub too. Acked-by: Alan Cox Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 78f32668e64caea8f638b9133da7b97c5aec20d1 Author: Daniel Walker Date: Sat Oct 21 10:24:10 2006 -0700 [PATCH] clocksource: acpi_pm: add another greylist chipset I have an acpi_pm that goes backwards, but it's not intel. I tested the verified read and my acpi_pm started to function properly. So I added it to the greylist. I'm assuming that's the right spot. I also added an unlikely() to the while, cause it seems appropriate. Signed-off-by: Daniel Walker Acked-by: John Stultz Acked-by: OGAWA Hirofumi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4f2e639af4bd5e152fc79256e333643d3dd6c10f Author: NeilBrown Date: Sat Oct 21 10:24:09 2006 -0700 [PATCH] md: endian annotations for the bitmap superblock And a couple of bug fixes found by sparse. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1c05b4bc22cd640d3a534bd2851a8413d5df3709 Author: NeilBrown Date: Sat Oct 21 10:24:08 2006 -0700 [PATCH] md: endian annotation for v1 superblock access Includes a couple of bugfixes found by sparse. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da3ed32fe568148ede256975d40825ffcdac767b Author: NeilBrown Date: Sat Oct 21 10:24:08 2006 -0700 [PATCH] md: add another COMPAT_IOCTL for md .. so that you can use bitmaps with 32bit userspace on a 64 bit kernel. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e333e89860431d22816c1bdaa2ea72c2753396e Author: NeilBrown Date: Sat Oct 21 10:24:07 2006 -0700 [PATCH] md: fix calculation of ->degraded for multipath and raid10 Two less-used md personalities have bugs in the calculation of ->degraded (the extent to which the array is degraded). Signed-off-by: Neil Brown Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c5473f80770768ab5712eb5a7492c16e97209fe Author: Adrian Bunk Date: Sat Oct 21 10:24:06 2006 -0700 [PATCH] drivers/ide/pci/generic.c: re-add the __setup("all-generic-ide",...) The change from __setup() to module_param_named() requires users to prefix the option with "generic.". This patch re-adds the __setup() additionally to the module_param_named(). Usually it would make sense getting rid of such an obsolete __setup() at some time, but considering that drivers/ide/ is slowly approaching a RIP status it's already implicitely scheduled for removal. This patch fixes kernel Bugzilla #7353. Signed-off-by: Adrian Bunk Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86fbf1486a44a4bce4fdcbe3665a7d8a62ba958a Author: Jiri Slaby Date: Sat Oct 21 10:24:01 2006 -0700 [PATCH] Char: correct pci_get_device changes Commits 881a8c120acf7ec09c90289e2996b7c70f51e996 and efe1ec27837d6639eae82e1f5876910ba6433c3f corrects pci device matching in only one way; it no longer oopses/crashes, despite hotplug is not solved in these changes. Whenever pci_find_device -> pci_get_device change is performed, also pci_dev_get and pci_dev_put should be in most cases called to properly handle hotplug. This patch does exactly this thing -- increase refcount to let kernel know, that we are using this piece of HW just now. It affects moxa and rio char drivers. Cc: Acked-by: Amit Gud Acked-by: Greg Kroah-Hartman Acked-by: Alan Cox Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8eb166bf805cc1c1d38d57211e8737631376b9ba Author: Alan Cox Date: Mon Oct 16 16:24:50 2006 +0100 [PATCH] libata-sff: Allow for wacky systems There are some Linux supported platforms that simply cannot hit the low I/O addresses used by ATA legacy mode PCI mappings. These platforms have a window for PCI space that is fixed by the board logic and doesn't include the neccessary locations. Provide a config option so that such platforms faced with a controller that they cannot support simply error it and punt Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 12a87d36b3c5cb76a182c35f40d959a615d1c862 Author: Alan Cox Date: Mon Oct 16 16:21:40 2006 +0100 [PATCH] ahci: readability tweak Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 3343571d9f88a0de542d33aea9ab881f00ff866d Author: Tejun Heo Date: Thu Oct 19 14:44:53 2006 +0900 [PATCH] libata: typo fix Typo fix in commment. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit bf2d401bca3681f5380f711be65f2026255cc166 Author: Adrian Bunk Date: Fri Oct 20 14:39:35 2006 -0700 [PATCH] ATA must depend on BLOCK Fix the following compile error with CONFIG_ATA=y, CONFIG_BLOCK=n: ... CC drivers/ata/libata-scsi.o /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ata/libata-scsi.c: In function ‘ata_scsi_dev_config’: /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ata/libata-scsi.c:791: warning: implicit declaration of function ‘blk_queue_max_sectors’ /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ata/libata-scsi.c:799: error: ‘request_queue_t’ undeclared (first use in this function) /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ata/libata-scsi.c:799: error: (Each undeclared identifier is reported only once /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ata/libata-scsi.c:799: error: for each function it appears in.) /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ata/libata-scsi.c:799: error: ‘q’ undeclared (first use in this function) /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ata/libata-scsi.c:800: warning: implicit declaration of function ‘blk_queue_max_hw_segments’ /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ata/libata-scsi.c: In function ‘ata_scsi_slave_config’: /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ata/libata-scsi.c:831: warning: implicit declaration of function ‘blk_queue_max_phys_segments’ make[3]: *** [drivers/ata/libata-scsi.o] Error 1 Bug report by Jesper Juhl. Signed-off-by: Adrian Bunk Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 158f30c8945fea7cf0d0161cd9463cf2f3d2c19e Author: Kristen Carlson Accardi Date: Thu Oct 19 13:27:39 2006 -0700 [PATCH] libata: use correct map_db values for ICH8 Use valid values for ICH8 map_db. With the old values, when the controller was in Native mode, and SCC was 1 (drives configured for IDE), any drive plugged into a slave port was not recognized. For Combined Mode (and SCC is still 1), 2 is a value value for MAP.map_value, and needs to be recognized. Signed-off-by: Kristen Carlson Accardi Signed-off-by: Jeff Garzik commit 5826cade4341a6298eb10d476dccc5f403ca7ad8 Author: David Gibson Date: Fri Oct 13 14:20:59 2006 +1000 [PATCH] ibmveth: Fix index increment calculation On Thu, Oct 12, 2006 at 06:22:14PM +1000, David Gibson wrote: > Your recent ibmveth commit, 751ae21c6cd1493e3d0a4935b08fb298b9d89773 > ("fix int rollover panic"), causes a rapid oops on my test machine > (POWER5 LPAR). > > I've bisected it down to that commit, but am still investigating the > cause of the crash itself. Found the problem, I believe: an object lesson in the need for great caution using ++. [...] @@ -213,6 +213,7 @@ static void ibmveth_replenish_buffer_poo } free_index = pool->consumer_index++ % pool->size; + pool->consumer_index = free_index; index = pool->free_map[free_index]; ibmveth_assert(index != IBM_VETH_INVALID_MAP); Since the ++ is used as post-increment, the increment is not included in free_index, and so the added line effectively reverts the increment. The produced_index side has an analagous bug. The following change corrects this: The recent commit 751ae21c6cd1493e3d0a4935b08fb298b9d89773 introduced a bug in the producer/consumer index calculation in the ibmveth driver - incautious use of the post-increment ++ operator resulted in an increment being immediately reverted. This patch corrects the logic. Without this patch, the driver oopses almost immediately after activation on at least some machines. Signed-off-by: David Gibson Signed-off-by: Jeff Garzik commit cfadbd298e8b3e7f2e324696b653bb74094590db Author: Ralf Baechle Date: Wed Oct 18 02:15:37 2006 +0100 [PATCH] Fix timer race When closing the driver or reinitializing the hardware there is the usual del_timer() race condition that exists when timers re-add themselves. Fix by conversion to del_timer_sync(). Signed-off-by: Ralf Baechle Signed-off-by: Jeff Garzik commit 089fff2aa8cc2a0383ea9fce17afd10bfab9ac7c Author: Dave Jones Date: Wed Oct 18 00:30:27 2006 -0400 [PATCH] Remove useless comment from sb1250 Signed-off-by: Dave Jones Signed-off-by: Jeff Garzik commit 18a8e8649d2687283da51fbcf8218372dc5a8f6f Author: Li Yang Date: Thu Oct 19 21:07:34 2006 -0500 [PATCH] ucc_geth: changes to ucc_geth driver as a result of qe_lib changes and bugfixes changes due to qe_lib changes include: o removed inclusion of platform header file o removed platform_device code, replaced with of_device o removed typedefs o uint -> u32 conversions o removed following defines: QE_SIZEOF_BD, BD_BUFFER_ARG, BD_BUFFER_CLEAR, BD_BUFFER, BD_STATUS_AND_LENGTH_SET, BD_STATUS_AND_LENGTH, and BD_BUFFER_SET because they hid sizeof/in_be32/out_be32 operations from the reader. o removed irrelevant comments, added others to resemble removed BD_ defines o const'd and uncasted all get_property() assignments bugfixes, courtesy of Scott Wood, include: - Read phy_address as a u32, not u8. - Match on type == "network" as well as compatible == "ucc_geth", as device_is_compatible() will only compare up to the length of the test string, allowing "ucc_geth_phy" to match as well. - fixes the MAC setting code in ucc_geth.c. The old code was overwriting and dereferencing random stack contents. Signed-off-by: Li Yang Signed-off-by: Kim Phillips Signed-off-by: Scott Wood Signed-off-by: Jeff Garzik commit 470ea7eba4aaa517533f9b02ac9a104e77264548 Author: Stephen Hemminger Date: Fri Oct 20 17:06:11 2006 -0700 [PATCH] sky2: 88E803X transmit lockup The reason sky2 driver was locking up on transmit on the Yukon-FE chipset is that it was misconfiguring the internal RAM buffer so the transmitter and receiver were sharing the same space. The code assumed there was 16K of RAM on Yukon-FE (taken from vendor driver sk98lin which is even more f*cked up on this). Then it assigned based on that. The giveaway was that the registers would only hold 9bits so both RX/TX had 0..1ff for space. It is a wonder it worked at all! This patch addresses this, and fixes an easily reproducible hang on Transmit. Only the Yukon-FE chip is Marvell 88E803X (10/100 only) are affected. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 7347b03d25ad7d7f001373cf64f709457c6af618 Author: Linas Vepstas Date: Fri Oct 20 14:42:14 2006 -0700 [PATCH] e1000: Reset all functions after a PCI error During the handling of the PCI error recovery sequence, the current e1000 driver erroneously blocks a device reset for any but the first PCI function. It shouldn't -- this is a cut-n-paste error from a different driver (which tolerated only one hardware reset per hardware card). Signed-off-by: Linas Vepstas Cc: Jesse Brandeburg Acked-by: Auke Kok Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 6f0f6d87a2a5fc96fc54e90961d5244d668e5fbb Author: Jeff Garzik Date: Fri Oct 20 14:43:15 2006 -0700 [PATCH] WAN/pc300: handle, propagate minor errors - move definition of 'tmc' and 'br' locals closer to usage - handle clock_rate_calc() error - propagate errors back to upper level open routine Signed-off-by: Jeff Garzik Cc: Krzysztof Halasa Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 718ecac2ed7ae1b3d61388ddbff2938a377b1a11 Author: Deepak Saxena Date: Fri Oct 20 14:42:04 2006 -0700 [PATCH] Update smc91x driver with ARM Versatile board info We need to specify a Versatile-specific SMC_IRQ_FLAGS value or the new generic IRQ layer will complain thusly: No IRQF_TRIGGER set_type function for IRQ 25 () Signed-off-by: Deepak Saxena Cc: Jeff Garzik Cc: Russell King Cc: Nicolas Pitre Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit e70ea8c09db0e25ab58f84ba7f393e5c9125a8ee Author: Andi Kleen Date: Sat Oct 21 18:37:03 2006 +0200 [PATCH] x86-64: Revert timer routing behaviour back to 2.6.16 state By default route the 8254 over the 8259 and only disable it on ATI boards where this causes double timer interrupts. This should unbreak some Nvidia boards where the timer doesn't seem to tick of it isn't enabled in the 8259. At least one VIA board also seemed to have a little trouble with the disabled 8259. For 2.6.20 we'll try both dynamically without black listing, but I think for .19 this is the safer approach because it has been already well tested in earlier kernels. This also makes the x86-64 behaviour the same as i386. Command line options can change all this of course. Signed-off-by: Andi Kleen commit dbaab49f92ff6ae6255762a948375e4036cbdbd2 Author: Vivek Goyal Date: Sat Oct 21 18:37:03 2006 +0200 [PATCH] x86-64: Overlapping program headers in physical addr space fix o A recent change to vmlinux.ld.S file broke kexec as now resulting vmlinux program headers are overlapping in physical address space. o Now all the vsyscall related sections are placed after data and after that mostly init data sections are placed. To avoid physical overlap among phdrs, there are three possible solutions. - Place vsyscall sections also in data phdrs instead of user - move vsyscal sections after init data in bss. - create another phdrs say data.init and move all the sections after vsyscall into this new phdr. o This patch implements the third solution. Signed-off-by: Vivek Goyal Signed-off-by: Andi Kleen Cc: Magnus Damm Cc: Andi Kleen Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton commit 84f404f695b16bd142c8dd9910d5a398f54fb044 Author: Eric W. Biederman Date: Sat Oct 21 18:37:02 2006 +0200 [PATCH] x86-64: Put more than one cpu in TARGET_CPUS TARGET_CPUS is the default irq routing poicy. It specifies which cpus the kernel should aim an irq at. In physflat delivery mode we can route an irq to a single cpu. But that doesn't mean our default policy should only be a single cpu is allowed. By allowing the irq routing code to select from multiple cpus this enables systems with more irqs then we can service on a single processor to actually work. I just audited and tested the code and irqbalance doesn't care, and the io_apic.c doesn't care if we have extra cpus in the mask. Everything will use or assume we are using the lowest numbered cpu in the mask if we can't use them all. So this should result in no behavior changes except on systems that need it. Thanks for YH Lu for spotting this problem in his testing. Cc: Yinghai Lu Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen commit 8cf2c51927bbeefafc25193d01b91f9ed3806e96 Author: Andi Kleen Date: Sat Oct 21 18:37:02 2006 +0200 [PATCH] x86: Revert new unwind kernel stack termination Jan convinced me that it was unnecessary because the assembly stubs do this already on the stack. Cc: jbeulich@novell.com Signed-off-by: Andi Kleen commit 6bf2dafad18c119beb534cbb3d882fe7a6c3f529 Author: Eric W. Biederman Date: Sat Oct 21 18:37:02 2006 +0200 [PATCH] x86-64: Use irq_domain in ioapic_retrigger_irq Thanks to YH Lu for spotting this. It appears I missed this function when I refactored allocate_irq_vector and introduced irq_domain, with the result that all retriggered irqs would go to cpu 0 even if we were not prepared to receive them there. While reviewing YH's patch I also noticed that this function was missing locking, and since I am now reading two values from two diffrent arrays that looks like a race we might be able to hit in the real world. Cc: Yinghai Lu Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen commit a1bae67243512ca30ceda48e3e24e25b543f8ab7 Author: Andi Kleen Date: Sat Oct 21 18:37:02 2006 +0200 [PATCH] i386: Disable nmi watchdog on all ThinkPads Even newer Thinkpads have bugs in SMM code that causes hangs with NMI watchdog. Signed-off-by: Andi Kleen commit 581910e2eb952e541b8ca9b5f551d6c124903b61 Author: Andi Kleen Date: Sat Oct 21 18:37:02 2006 +0200 [PATCH] x86-64: Revert interrupt backlink changes They break more than they fix Signed-off-by: Andi Kleen commit cc7d479fe56133e79840beffe9cb4fd193af93aa Author: Jan Beulich Date: Sat Oct 21 18:37:02 2006 +0200 [PATCH] x86-64: Fix ENOSYS in system call tracing This patch: - out of range system calls failing to return -ENOSYS under system call tracing [AK: split out from another patch by Jan as separate bugfix] Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen commit 26fd5e084e470dbe8edc6f726fc918e89b9f988c Author: Jeremy Fitzhardinge Date: Sat Oct 21 18:37:02 2006 +0200 [PATCH] i386: Fix fake return address The fake return address was being set to __KERNEL_PDA, rather than 0. Push it earlier while %eax still equals 0. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Andi Kleen Cc: Andi Kleen Cc: Andrew Morton commit 7a71cef780404e8c90d23b1131142e158d94354b Author: bibo,mao Date: Sat Oct 21 18:37:02 2006 +0200 [PATCH] x86-64: x86_64 add NX mask for PTE entry If function change_page_attr_addr calls revert_page to revert to original pte value, mk_pte_phys does not mask NX bit. If NX bit is set on no NX hardware supported x86_64 machine, there is will be RSVD type page fault and system will crash. This patch adds NX mask bit for PTE entry. Signed-off-by: bibo,mao Signed-off-by: Andi Kleen commit 690a973f48b6ba2954465992c08e65059c8374fe Author: Jan Beulich Date: Sat Oct 21 18:37:01 2006 +0200 [PATCH] x86-64: Speed up dwarf2 unwinder This changes the dwarf2 unwinder to do a binary search for CIEs instead of a linear work. The linker is unfortunately not able to build a proper lookup table at link time, instead it creates one at runtime as soon as the bootmem allocator is usable (so you'll continue using the linear lookup for the first [hopefully] few calls). The code should be ready to utilize a build-time created table once a fixed linker becomes available. Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen commit cdfce1f5714fec7b24715f569b2fee1607350a6d Author: Andi Kleen Date: Sat Oct 21 18:37:01 2006 +0200 [PATCH] x86: Use -maccumulate-outgoing-args This avoids some problems with gcc 4.x and earlier generating invalid unwind information. In 4.1 the option is default when unwind information is enabled. And it seems to generate smaller code too, so it's probably a good thing on its own. With gcc 4.0: i386: 4683198 902112 480868 6066178 5c9002 vmlinux (before) 4449895 902112 480868 5832875 5900ab vmlinux (after) x86-64: 4939761 1449584 648216 7037561 6b6279 vmlinux (before) 4854193 1449584 648216 6951993 6a1439 vmlinux (after) On 4.1 it shouldn't make much difference because it is default when unwind is enabled anyways. Suggested by Michael Matz and Jan Beulich Cc: jbeulich@novell.com Signed-off-by: Andi Kleen commit 73bb8919b33d42cf75a0ed89bc9ca6a7128665be Author: Vivek Goyal Date: Sat Oct 21 18:37:01 2006 +0200 [PATCH] x86-64: fix page align in e820 allocator Currently some code pieces assume that address returned by find_e820_area() are page aligned. But looks like find_e820_area() had no such intention and hence one might end up stomping over some of the data. One such case is bootmem allocator initialization code stomped over bss. This patch modified find_e820_area() to return page aligned address. This might be little wasteful of memory but at the same time probably it is easier to handle page aligned memory. Signed-off-by: Vivek Goyal Signed-off-by: Andi Kleen Cc: Andi Kleen Signed-off-by: Andrew Morton commit 469b1d8741a5970ad49f2b5a837811579ba0b6f2 Author: Corey Minyard Date: Sat Oct 21 18:37:01 2006 +0200 [PATCH] x86-64: Fix for arch/x86_64/pci/Makefile CFLAGS The arch/x86_64/pci directory was giving problems in a wierd cross-compile environment. The exact cause is unknown, but the Makefile used CFLAGS instead of EXTRA_CFLAGS. From what I can tell from Documentation/kbuild/makefiles.txt, CFLAGS should not be used for this, it should be EXTRA_CFLAGS. And it solves the cross-compile problem. Signed-off-by: Corey Minyard Signed-off-by: Andi Kleen Cc: Andi Kleen Cc: Vojtech Pavlik Cc: Sam Ravnborg Signed-off-by: Andrew Morton commit da8604cc2d6cd4cbde873c7ba308365e402ac7bf Author: Andrew Morton Date: Sat Oct 21 18:37:01 2006 +0200 [PATCH] i386: fix .cfi_signal_frame copy-n-paste error This was copied, pasted but not edited. Cc: Andi Kleen Cc: Jan Beulich Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen commit 45edfd1db02f818b3dc7e4743ee8585af6b78f78 Author: Yinghai Lu Date: Sat Oct 21 18:37:01 2006 +0200 [PATCH] x86-64: typo in __assign_irq_vector when updating pos for vector and offset typo with cpu instead of new_cpu Signed-off-by: Yinghai Lu Signed-off-by: Andi Kleen commit 926fafebc48a3218fac675f12974f9a46473bd40 Author: keith mannthey Date: Sat Oct 21 18:37:01 2006 +0200 [PATCH] x86-64: x86_64 hot-add memory srat.c fix This patch corrects the logic used in srat.c to figure out what parsing what action to take when registering hot-add areas. Hot-add areas should only be added to the node information for the MEMORY_HOTPLUG_RESERVE case. When booting MEMORY_HOTPLUG_SPARSE hot-add areas on everything but the last node are getting include in the node data and during kernel boot the pages are setup then the kernel dies when the pages are used. This patch fixes this issue. Signed-off-by: Keith Mannthey Signed-off-by: Andi Kleen commit 13892de19eb9007ea47430c701bdbf69df71d883 Author: Andi Kleen Date: Sat Oct 21 18:37:01 2006 +0200 [PATCH] i386: Update defconfig Signed-off-by: Andi Kleen commit f248b6a34fdd726dd12b549fceba907b6df2771c Author: Andi Kleen Date: Sat Oct 21 18:37:00 2006 +0200 [PATCH] x86-64: Update defconfig Signed-off-by: Andi Kleen commit c7a3bd177f248d01ee18a01d22048c80e071c331 Author: Nicolas Pitre Date: Fri Oct 20 14:20:17 2006 -0700 [PATCH] fix PXA2xx UDC compilation error This was apparently missed by the move to the generic IRQ code. Signed-off-by: Nicolas Pitre Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e17e31e388b2e49ff1c9a2bdb39d7aeb2975c19a Author: Olaf Hering Date: Fri Oct 20 09:23:05 2006 +0200 [PATCH] Fix up rpaphp driver for pci hotplug header move Use grep instead of make during interface changes. Signed-off-by: Olaf Hering Signed-off-by: Linus Torvalds commit 559c9ac391c046710bdeee5581dc5d9dda794881 Author: Chandra Seetharaman Date: Tue Oct 10 15:15:55 2006 -0700 configfs: handle kzalloc() failure in check_perm() check_perm() does not drop the reference to the module when kzalloc() failure occurs. Signed-Off-By: Chandra Seetharaman Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit e2057c5a63821e17c8a54dab6db680c77ce7ee6c Author: Mark Fasheh Date: Tue Oct 3 17:53:05 2006 -0700 ocfs2: cond_resched() in ocfs2_zero_extend() The loop within ocfs2_zero_extend() can execute for a long time, causing spurious soft lockup warnings. Signed-off-by: Mark Fasheh commit 0effef776ff95b7a6d6e48a2ef407ecaa8c21f96 Author: Mark Fasheh Date: Tue Oct 3 17:44:42 2006 -0700 ocfs2: fix page zeroing during simple extends The page zeroing code was missing the region between old i_size and new i_size for those extends that didn't actually require a change in space allocation. Signed-off-by: Mark Fasheh commit 711a40fcaa83bfad87736544b69f6fdd6527482d Author: Sunil Mushran Date: Wed Oct 11 12:23:02 2006 -0700 ocfs2: remove spurious d_count check in ocfs2_rename() This was causing some folks to incorrectly get -EBUSY during rename. Signed-off-by: Sunil Mushran Signed-off-by: Mark Fasheh commit 79cd22d3ac921b9209bf813c7e75e6b69e74896c Author: Akinobu Mita Date: Thu Oct 12 14:29:33 2006 +0900 ocfs2: delete redundant memcmp() This patch deletes redundant memcmp() while looking up in rb tree. Signed-off-by: Akinbou Mita Signed-off-by: Mark Fasheh commit b2ef7858db6394b758818358a43c7dd5f232bbcc Author: Linus Torvalds Date: Fri Oct 20 10:40:48 2006 -0700 Revert "[mv643xx] Add pci device table for auto module loading." This reverts commit 4596c75c23dde2623cbeec69357d5eb13d28387e as requested by Olaf Hering. It causes compile errors, and says Olaf: "This change is also wrong, the autoloading works perfect with 2.6.18, no need to add random PCI ids. See commit a0245f7ad5214cb00131d7cd176446e067c913dc, platform devices have now a modalias entry in sysfs. The network card is not a PCI device." Signed-off-by: Linus Torvalds commit ac4e0aba7daf0a7c6ac20974070428481dc940f5 Author: Adrian Bunk Date: Thu Oct 19 23:29:14 2006 -0700 [PATCH] one more ARM IRQ fix Fix one more compile breakage caused by the post -rc1 IRQ changes. Signed-off-by: Adrian Bunk Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a047060a99f274a7c52cfea8159e4142a14b8a7 Author: NeilBrown Date: Thu Oct 19 23:29:13 2006 -0700 [PATCH] knfsd: fix race that can disable NFS server This patch is suitable for just about any 2.6 kernel. It should go in 2.6.19 and 2.6.18.2 and possible even the .17 and .16 stable series. This is a long standing bug that seems to have only recently become apparent, presumably due to increasing use of NFS over TCP - many distros seem to be making it the default. The SK_CONN bit gets set when a listening socket may be ready for an accept, just as SK_DATA is set when data may be available. It is entirely possible for svc_tcp_accept to be called with neither of these set. It doesn't happen often but there is a small race in svc_sock_enqueue as SK_CONN and SK_DATA are tested outside the spin_lock. They could be cleared immediately after the test and before the lock is gained. This normally shouldn't be a problem. The sockets are non-blocking so trying to read() or accept() when ther is nothing to do is not a problem. However: svc_tcp_recvfrom makes the decision "Should I accept() or should I read()" based on whether SK_CONN is set or not. This usually works but is not safe. The decision should be based on whether it is a TCP_LISTEN socket or a TCP_CONNECTED socket. Signed-off-by: Neil Brown Cc: Adrian Bunk Cc: Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e05d722e4555cd54677b4c8431d9e81fd047ef7a Author: Alexey Dobriyan Date: Thu Oct 19 23:29:12 2006 -0700 [PATCH] kernel/nsproxy.c: use kmemdup() Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e2a532b26b491706bd8b5c7cfc8d767b43b8f36 Author: OGAWA Hirofumi Date: Thu Oct 19 23:29:11 2006 -0700 [PATCH] ext3/4: fix J_ASSERT(transaction->t_updates > 0) in journal_stop() A disk generated some I/O error, after it, I hitted J_ASSERT(transaction->t_updates > 0) in journal_stop(). It seems to happened on ext3_truncate() path from stack trace. Then, maybe the following case may trigger J_ASSERT(transaction->t_updates > 0). ext3_truncate() -> ext3_free_branches() -> ext3_journal_test_restart() -> ext3_journal_restart() -> journal_restart() transaction->t_updates--; /* another process aborted journal */ -> start_this_handle() returns -EROFS without transaction->t_updates++; -> ext3_journal_stop() -> journal_stop() J_ASSERT(transaction->t_updates > 0) If journal was aborted in middle of journal_restart(), ext3_truncate() may trigger J_ASSERT(). Signed-off-by: OGAWA Hirofumi Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 82591e6ea234762eeaa8b2337fe060ed438c18dc Author: Nick Piggin Date: Thu Oct 19 23:29:10 2006 -0700 [PATCH] mm: more commenting on lock ordering Clarify lockorder comments now that sys_msync dropps mmap_sem before calling do_fsync. Signed-off-by: Nick Piggin Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b95936cb9267e4c90a0b92361609ef5fd85a0a5f Author: Doug Warzecha Date: Thu Oct 19 23:29:09 2006 -0700 [PATCH] firmware/dcdbas: add size check in smi_data_write Add a size check in smi_data_write to prevent possible wrapping problems with large pos values when calling smi_data_buf_realloc on 32-bit. Signed-off-by: Doug Warzecha Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1cd441f99819abdd2d919ff13e8c75af58a0fd9c Author: Dave Jones Date: Thu Oct 19 23:29:09 2006 -0700 [PATCH] ipmi: fix return codes in failure case These returns should be negative, like the others in this function. Signed-off-by: Dave Jones Acked-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c4ec7b0de4bc18ccb4380de638550984d9a65c25 Author: Dmitriy Monakhov Date: Thu Oct 19 23:29:08 2006 -0700 [PATCH] mm: D-cache aliasing issue in cow_user_page --=-=-= from mm/memory.c: 1434 static inline void cow_user_page(struct page *dst, struct page *src, unsigned long va) 1435 { 1436 /* 1437 * If the source page was a PFN mapping, we don't have 1438 * a "struct page" for it. We do a best-effort copy by 1439 * just copying from the original user address. If that 1440 * fails, we just zero-fill it. Live with it. 1441 */ 1442 if (unlikely(!src)) { 1443 void *kaddr = kmap_atomic(dst, KM_USER0); 1444 void __user *uaddr = (void __user *)(va & PAGE_MASK); 1445 1446 /* 1447 * This really shouldn't fail, because the page is there 1448 * in the page tables. But it might just be unreadable, 1449 * in which case we just give up and fill the result with 1450 * zeroes. 1451 */ 1452 if (__copy_from_user_inatomic(kaddr, uaddr, PAGE_SIZE)) 1453 memset(kaddr, 0, PAGE_SIZE); 1454 kunmap_atomic(kaddr, KM_USER0); #### D-cache have to be flushed here. #### It seems it is just forgotten. 1455 return; 1456 1457 } 1458 copy_user_highpage(dst, src, va); #### Ok here. flush_dcache_page() called from this func if arch need it 1459 } Following is the patch fix this issue: Signed-off-by: Dmitriy Monakhov Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ca926e80dcfd18adaf7c4304935da4cc8ded8364 Author: Satoru Takeuchi Date: Thu Oct 19 23:29:06 2006 -0700 [PATCH] doc: fixing cpu-hotplug documentation Fixing cpu-hotplug documentation as follows: - moving confusing asterisk on additional_cpus descrition - fixing some typos - unifying indentation for source code and command line example Signed-off-by: Satoru Takeuchi Cc: Ashok Raj Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fca4edb48b693d9df7de4c42d91b4158d8b7e347 Author: Amol Lad Date: Thu Oct 19 23:29:06 2006 -0700 [PATCH] drivers/isdn: ioremap balanced with iounmap ioremap must be balanced by an iounmap and failing to do so can result in a memory leak. Signed-off-by: Amol Lad Acked-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6220ec7844fda2686496013a66b5b9169976b991 Author: Andrew Morton Date: Thu Oct 19 23:29:05 2006 -0700 [PATCH] highest_possible_node_id() linkage fix Qooting Adrian: - net/sunrpc/svc.c uses highest_possible_node_id() - include/linux/nodemask.h says highest_possible_node_id() is out-of-line #if MAX_NUMNODES > 1 - the out-of-line highest_possible_node_id() is in lib/cpumask.c - lib/Makefile: lib-$(CONFIG_SMP) += cpumask.o CONFIG_ARCH_DISCONTIGMEM_ENABLE=y, CONFIG_SMP=n, CONFIG_SUNRPC=y -> highest_possible_node_id() is used in net/sunrpc/svc.c CONFIG_NODES_SHIFT defined and > 0 -> include/linux/numa.h: MAX_NUMNODES > 1 -> compile error The bug is not present on architectures where ARCH_DISCONTIGMEM_ENABLE depends on NUMA (but m32r isn't the only affected architecture). So move the function into page_alloc.c Cc: Adrian Bunk Cc: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e51959faa61278c762389802faf8ba1a40676628 Author: Zachary Amsden Date: Thu Oct 19 23:29:04 2006 -0700 [PATCH] Fix potential interrupts during alternative patching Interrupts must be disabled during alternative instruction patching. On systems with high timer IRQ rates, or when running in an emulator, timing differences can result in random kernel panics because of running partially patched instructions. This doesn't yet fix NMIs, which requires extricating the patch code from the late bug checking and is logically separate (and also less likely to cause problems). Signed-off-by: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a90b061c0bf712961cea40d9c916b300073d12e5 Author: Al Viro Date: Thu Oct 19 23:29:03 2006 -0700 [PATCH] nfsd: nfs_replay_me We are using NFS_REPLAY_ME as a special error value that is never leaked to clients. That works fine; the only problem is mixing host- and network- endian values in the same objects. Network-endian equivalent would work just as fine; switch to it. Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c7afef1f963bec198b186cc34b9e8c9b9ce2e266 Author: Al Viro Date: Thu Oct 19 23:29:02 2006 -0700 [PATCH] nfsd: misc endianness annotations Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f00f328fda1eeec575cd0f360da81b66bf4133a1 Author: Al Viro Date: Thu Oct 19 23:29:01 2006 -0700 [PATCH] xdr annotations: nfsd callback* Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b8dd7b9ab194d9ab322881f49fde42954757efae Author: Al Viro Date: Thu Oct 19 23:29:01 2006 -0700 [PATCH] nfsd: NFSv4 errno endianness annotations don't use the same variable to store NFS and host error values Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c4d987ba841dff4b2fc768e52d1d95af83f9f157 Author: Al Viro Date: Thu Oct 19 23:29:00 2006 -0700 [PATCH] nfsd: NFSv{2,3} trivial endianness annotations for error values Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b37ad28bcaa7c486a4ff0fb6c3bdaaacd67b86ce Author: Al Viro Date: Thu Oct 19 23:28:59 2006 -0700 [PATCH] nfsd: nfs4 code returns error values in net-endian Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6264d69d7df654ca64f625e9409189a0e50734e9 Author: Al Viro Date: Thu Oct 19 23:28:58 2006 -0700 [PATCH] nfsd: vfs.c endianness annotations don't use the same variable to store NFS and host error values Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ebbc012a9433a252be7ab4ce54e94bf7b21e506 Author: Al Viro Date: Thu Oct 19 23:28:58 2006 -0700 [PATCH] xdr annotations: NFSv4 server Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 91f07168cef8e99dd16f608fbc703e7a5af0237f Author: Al Viro Date: Thu Oct 19 23:28:57 2006 -0700 [PATCH] xdr annotations: NFSv3 server Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 131a21c2177c267ab259fcd06947c6f593a7de8e Author: Al Viro Date: Thu Oct 19 23:28:56 2006 -0700 [PATCH] xdr annotations: NFSv2 server Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad451d389f46f699832da3e9ad95f610cb8c0fd2 Author: Al Viro Date: Thu Oct 19 23:28:55 2006 -0700 [PATCH] xdr annotations: nfsd_dispatch() Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 83b11340d683a67a77e35a5ffb5ad4afbf0be4e5 Author: Al Viro Date: Thu Oct 19 23:28:55 2006 -0700 [PATCH] nfsfh simple endianness annotations Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 63f103111fdfc3cba00e4c94921d32362f375d93 Author: Al Viro Date: Thu Oct 19 23:28:54 2006 -0700 [PATCH] nfsd: nfserrno() endianness annotations Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 83bbe2ef63ec4f6a22aaaa0c03bd918b38300127 Author: Al Viro Date: Thu Oct 19 23:28:53 2006 -0700 [PATCH] nfs_common endianness annotations Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d21ec0c33d0a9eb7a6f6c716008863a97797709e Author: Al Viro Date: Thu Oct 19 23:28:52 2006 -0700 [PATCH] xdr annotations: mount_clnt [pulled from Alexey's patch] Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bc4785cd475a11ba125df7af674e16c6ea1cfc30 Author: Al Viro Date: Thu Oct 19 23:28:51 2006 -0700 [PATCH] nfs: verifier is network-endian Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5704fdeb41c9fb282ae576516f221ea0b8f64b2b Author: Al Viro Date: Thu Oct 19 23:28:51 2006 -0700 [PATCH] xdr annotations: fs/nfs/callback* on-the-wire data is big-endian [mostly pulled from Alexey's patch] Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e6f684f6443dd37384c63d2f27571350e0b5c8aa Author: Al Viro Date: Thu Oct 19 23:28:50 2006 -0700 [PATCH] fs/nfs/callback* passes error values big-endian [pulled from Alexey's patch] Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0dbb4c6799cf8fa8c5ba1926153a30960117477d Author: Al Viro Date: Thu Oct 19 23:28:49 2006 -0700 [PATCH] xdr annotations: NFS readdir entries on-the-wire data is big-endian [in large part pulled from Alexey's patch] Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8687b63afbe42103730bff4d3f7bfff3463c303e Author: Al Viro Date: Thu Oct 19 23:28:48 2006 -0700 [PATCH] xdr annotations: NFSv4 on-the-wire data is big-endian [in large part pulled from Alexey's patch] Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d61005a6855160091dca44b718db93fe7aa9876f Author: Al Viro Date: Thu Oct 19 23:28:48 2006 -0700 [PATCH] xdr annotations: NFSv3 on-the-wire data is big-endian [in large part pulled from Alexey's patch] Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9d787a75a00679c3ebcb88236a7af7b38a0b5932 Author: Al Viro Date: Thu Oct 19 23:28:47 2006 -0700 [PATCH] xdr annotations: NFSv2 on-the-wire data is big-endian [in large part pulled from Alexey's patch] Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52921e02a4f4163a7b1f4b5dde71e1debc71de4a Author: Al Viro Date: Thu Oct 19 23:28:46 2006 -0700 [PATCH] lockd endianness annotations Signed-off-by: Alexey Dobriyan Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7111c66e4e70588c9602035a4996c9cdc2087d2d Author: Al Viro Date: Thu Oct 19 23:28:45 2006 -0700 [PATCH] fix svc_procfunc declaration svc_procfunc instances return __be32, not int Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cc45f0175088e000ac7493e5e3f05579b6f7d240 Author: Al Viro Date: Thu Oct 19 23:28:44 2006 -0700 [PATCH] bug: nfsd/nfs4xdr.c misuse of ERR_PTR() a) ERR_PTR(nfserr_something) is a bad idea; IS_ERR() will be false for it. b) mixing nfserr_.... with -EOPNOTSUPP is even worse idea. nfsd4_path() does both; caller expects to get NFS protocol error out it if anything goes wrong, but if it does we either do not notice (see (a)) or get host-endian negative (see (b)). IOW, that's a case when we can't use ERR_PTR() to return error, even though we return a pointer in case of success. Signed-off-by: Al Viro Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b7766da7f7395b74dec9e52005b7dac0d09391a4 Author: Chuck Lever Date: Thu Oct 19 23:28:44 2006 -0700 [PATCH] SUNRPC: fix a typo Yes, this actually passed tests the way it was. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 71bdcf8056f910dc57ea3d0def80a9329e7dc52d Author: Chuck Lever Date: Thu Oct 19 23:28:43 2006 -0700 [PATCH] SUNRPC: fix race in in-kernel RPC portmapper client When submitting a request to a fast portmapper (such as the local rpcbind daemon), the request can complete before the parent task is even queued up on xprt->binding. Fix this by queuing before submitting the rpcbind request. Test plan: Connectathon locking test with UDP. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b87c0adfeaaf8d8310c4f790d76072a5961b3518 Author: Chuck Lever Date: Thu Oct 19 23:28:42 2006 -0700 [PATCH] NFS: remove unused check in nfs4_open_revalidate Coverity spotted a superfluous error check in nfs4_open_revalidate(). Remove it. Coverity: #cid 847 Test plan: Code inspection; another pass through Coverity. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 85233a7a436a48a0b98e7976a66797e5da79c9d6 Author: Chuck Lever Date: Thu Oct 19 23:28:42 2006 -0700 [PATCH] NFS: __nfs_revalidate_inode() can use "inode" before checking it is non-NULL The "!inode" check in __nfs_revalidate_inode() occurs well after the first time it is dereferenced, so get rid of it. Coverity: #cid 1372, 1373 Test plan: Code review; recheck with Coverity. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39cf8a1374dc51fea169190674d5e4996a7d7ea2 Author: Chuck Lever Date: Thu Oct 19 23:28:41 2006 -0700 [PATCH] NFS: fix minor bug in new NFS symlink code The original code confused a zero return code from pagevec_add() as success. Test plan: None. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd9ae2b6a75bb1fa0d370929c2d7a7da1ed719d9 Author: Trond Myklebust Date: Thu Oct 19 23:28:40 2006 -0700 [PATCH] NFS: Deal with failure of invalidate_inode_pages2() If invalidate_inode_pages2() fails, then it should in principle just be because the current process was signalled. In that case, we just want to ensure that the inode's page cache remains marked as invalid. Also add a helper to allow the O_DIRECT code to simply mark the page cache as invalid once it is finished writing, instead of calling invalidate_inode_pages2() itself. Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 13bbc06af8a5f65df0f888b442e557c617cadba7 Author: Trond Myklebust Date: Thu Oct 19 23:28:40 2006 -0700 [PATCH] NFS: Fix NFSv4 callback regression The change in semantics for nfs_find_client() introduced by David breaks the NFSv4 callback channel. Also, replace another completely broken BUG_ON() in nfs_find_client(). In initialised clients, clp->cl_cons_state == 0, and callers of that function should in any case never want to see clients that are uninitialised. Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7d9ac06f26fe8d477c813405f1a8c7c90eecef2d Author: J. Bruce Fields Date: Thu Oct 19 23:28:39 2006 -0700 [PATCH] nfs4: initialize cl_ipaddr David forgot to do this. I'm not sure if this is the right place to put it.... Signed-off-by: J. Bruce Fields Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eda3cef8dd2b83875affe82595db9d0c278879b2 Author: Trond Myklebust Date: Thu Oct 19 23:28:38 2006 -0700 [PATCH] NFS: Fix error handling in nfs_direct_write_result() If the RPC call tanked, we should not be checking the return value of data->res.verf->committed, since it is unlikely to even be initialised. Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6dff26a08189932eeb0fa4261e09e733b0fc540 Author: Trond Myklebust Date: Thu Oct 19 23:28:38 2006 -0700 [PATCH] NFS: Fix oops in nfs_cancel_commit_list Fix two bugs: - nfs_inode_remove_request will call nfs_clear_request, so we cannot reference req->wb_page after it. Move the call to dec_zone_page_state so that it occurs while req->wb_page is still valid. - Calling nfs_clear_page_writeback is unnecessary since the radix tree tags will have been cleared by the call to nfs_inode_remove_request. Replace with a simple call to nfs_unlock_request. Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 575b5c7870c940326a11614e0279b74356c1d44f Author: Trond Myklebust Date: Thu Oct 19 23:28:37 2006 -0700 [PATCH] NFSv4: Fix thinko in fs/nfs/super.c Duh. addr.sin_port should be in network byte order. Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0e7d73824e6b0024100701da246fec769dd8f087 Author: David Howells Date: Thu Oct 19 23:28:36 2006 -0700 [PATCH] autofs3: Make sure all dentries refs are released before calling kill_anon_super() Make sure all dentries refs are released before calling kill_anon_super() so that the assumption that generic_shutdown_super() can completely destroy the dentry tree for there will be no external references holds true. What was being done in the put_super() superblock op, is now done in the kill_sb() filesystem op instead, prior to calling kill_anon_super(). The call to shrink_dcache_sb() is removed as it is redundant since shrink_dcache_for_umount() will now be called after the cleanup routine. Signed-off-by: David Howells Acked-by: Ian Kent Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2fbc6c2dad7bbcbf226c094749534f1e84d3be2 Author: Randy Dunlap Date: Thu Oct 19 23:28:35 2006 -0700 [PATCH] fs/Kconfig: move GENERIC_ACL, fix acl() call errors GENERIC_ACL shouldn't be under Network File Systems (which made it depend on NET) as far as I can tell. Having it there and having many (FS) config symbols disabled gives this (which the patch fixes): mm/built-in.o: In function `shmem_check_acl': shmem_acl.c:(.text.shmem_check_acl+0x33): undefined reference to `posix_acl_permission' fs/built-in.o: In function `generic_acl_get': (.text.generic_acl_get+0x30): undefined reference to `posix_acl_to_xattr' fs/built-in.o: In function `generic_acl_set': (.text.generic_acl_set+0x75): undefined reference to `posix_acl_from_xattr' fs/built-in.o: In function `generic_acl_set': (.text.generic_acl_set+0x94): undefined reference to `posix_acl_valid' fs/built-in.o: In function `generic_acl_set': (.text.generic_acl_set+0xc1): undefined reference to `posix_acl_equiv_mode' fs/built-in.o: In function `generic_acl_init': (.text.generic_acl_init+0x7a): undefined reference to `posix_acl_clone' fs/built-in.o: In function `generic_acl_init': (.text.generic_acl_init+0xb4): undefined reference to `posix_acl_clone' fs/built-in.o: In function `generic_acl_init': (.text.generic_acl_init+0xc8): undefined reference to `posix_acl_create_masq' fs/built-in.o: In function `generic_acl_chmod': (.text.generic_acl_chmod+0x49): undefined reference to `posix_acl_clone' fs/built-in.o: In function `generic_acl_chmod': (.text.generic_acl_chmod+0x76): undefined reference to `posix_acl_chmod_masq' Signed-off-by: Randy Dunlap Acked-by: Andreas Gruenbacher Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6f8ff7381501887233666b508b9eac70143303d Author: Randy Dunlap Date: Thu Oct 19 23:28:34 2006 -0700 [PATCH] cad_pid sysctl with PROC_FS=n If CONFIG_PROC_FS=n: kernel/sysctl.c:148: warning: 'proc_do_cad_pid' used but never defined kernel/built-in.o:(.data+0x1228): undefined reference to `proc_do_cad_pid' make: *** [.tmp_vmlinux1] Error 1 Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c7c7c9bf39470c9689ad43cae3142cf948f4cfb Author: Ralf Baechle Date: Thu Oct 19 23:28:34 2006 -0700 [PATCH] Fix warnings for WARN_ON if CONFIG_BUG is disabled In most cases the return value of WARN_ON() is ignored. If the generic definition for the !CONFIG_BUG case is used this will result in a warning: CC kernel/sched.o In file included from include/linux/bio.h:25, from include/linux/blkdev.h:14, from kernel/sched.c:39: include/linux/ioprio.h: In function ‘task_ioprio’: include/linux/ioprio.h:50: warning: statement with no effect kernel/sched.c: In function ‘context_switch’: kernel/sched.c:1834: warning: statement with no effect Signed-off-by: Ralf Baechle Cc: Jeremy Fitzhardinge Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a31baca58cc16fe0584685f54c6d17494a231c92 Author: Alan Cox Date: Thu Oct 19 23:28:33 2006 -0700 [PATCH] irq updates: make eata_pio compile Signed-off-by: Alan Cox Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8ac773b4f73afa6fd66695131103944b975d5d5c Author: Alexey Dobriyan Date: Thu Oct 19 23:28:32 2006 -0700 [PATCH] OOM killer meets userspace headers Despite mm.h is not being exported header, it does contain one thing which is part of userspace ABI -- value disabling OOM killer for given process. So, a) create and export include/linux/oom.h b) move OOM_DISABLE define there. c) turn bounding values of /proc/$PID/oom_adj into defines and export them too. Note: mass __KERNEL__ removal will be done later. Signed-off-by: Alexey Dobriyan Cc: Nick Piggin Cc: David Woodhouse Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 887b95931b4072e60e3bf4253ff7bffe372bca46 Author: Yasunori Goto Date: Thu Oct 19 23:28:31 2006 -0700 [PATCH] acpi memory hotplug: remove strange add_memory fail message I wrote a patch to avoid redundant memory hot-add call at boot time. This was cause of strange fail message of memory hotplug like "ACPI: add_memory failed". Memory is recognized by early boot code with EFI/E820. But, if DSDT describes memory devices for them, then hot-add code is called for already recognized memory, and it shows fail messages with -EEXIST. So, sys admin will misunderstand this message as something wrong by it. This patch avoids them by preventing redundant hot-add call until completion of driver initialization. [akpm@osdl.org: cleanups] Signed-off-by: Yasunori Goto Cc: "Brown, Len" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6cbe44cd8d48a92856295f445183f52bf42a544d Author: Yasunori Goto Date: Thu Oct 19 23:28:30 2006 -0700 [PATCH] Change log level of a message of acpi_memhotplug to KERN_DEBUG I suppose this message seems quite useless except debugging. It just shows "Hotplug Mem Device". System admin can't know anything by this message. So, I would like to change it to KERN_DEBUG. Signed-off-by: Yasunori Goto Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 91fcdd4e0314145d7d4fa52dba2f9c2da25346fd Author: Borislav Petkov Date: Thu Oct 19 23:28:29 2006 -0700 [PATCH] readjust comments of task_timeslice for kernel doc Signed-off-by: Borislav Petkov Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 145fc655a1ceabda76cf2ad74f7cf96863c65b65 Author: Ingo Molnar Date: Thu Oct 19 23:28:28 2006 -0700 [PATCH] genirq: clean up irq-flow-type naming, fix Re-add the set_irq_chip_and_handler() prototype, it's still widely used. Signed-off-by: Ingo Molnar Cc: Olaf Hering Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c5a114f1fb2d3c54be62779a705e088471063b47 Author: Darrick J. Wong Date: Thu Oct 19 23:28:28 2006 -0700 [PATCH] fix "ACPI: Processor native C-states using MWAIT" This patch breaks C-state discovery on my IBM IntelliStation Z30 because the return value of acpi_processor_get_power_info_fadt is not assigned to "result" in the case that acpi_processor_get_power_info_cst returns -ENODEV. Thus, if ACPI provides C-state data via the FADT and not _CST (as is the case on this machine), we incorrectly exit the function with -ENODEV after reading the FADT. The attached patch sets the value of result so that we don't exit early. Signed-off-by: Darrick J. Wong Acked-by: "Pallipadi, Venkatesh" Acked-by: "Brown, Len" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74e8b51d254865b8abe4a94b5eb82b1940ec820c Author: Randy Dunlap Date: Thu Oct 19 23:28:26 2006 -0700 [PATCH] Kconfig serial typos Fix typo (repeated) in serial Kconfig. Signed-off-by: Randy Dunlap Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1ba0ce6f9c19a8573832e14b418dc835dc6f3bbd Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Oct 19 23:28:26 2006 -0700 [PATCH] uml: mmapper - remove just added but wrong "const" attribute When enabling the mmapper driver I got warnings because this "const" miscdevice structure is passed to function as non-const pointer; unlike struct tty_operations, however, I verified that misc_{de,}register _do_ modify their parameter, so this const attribute must be removed. Since the purpose of the change was to guarantee that no lock was needed, add a comment to prove this differently. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f43e6a5a72566675da3581dc0d7076042e6701f7 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Oct 19 23:28:25 2006 -0700 [PATCH] uml: kconfig - silence warning Silence useless warning about undefined symbol in Kconfig. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d9d645f06a8f50659bbae2be64ed8367ba068fc0 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Oct 19 23:28:24 2006 -0700 [PATCH] uml: cleanup run_helper() API to fix a leak Freeing the stack is left uselessly to the caller of run_helper in some cases - this is taken from run_helper_thread, but here it is useless, so no caller needs it and the only place where this happens has a potential leak - in case of error neither run_helper() nor xterm_open() call free_stack(). At this point passing a pointer is not needed - the stack pointer should be passed directly, but this change is not done here. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b2670eacfb013169b8bf151a5078a9ef8ef86466 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Oct 19 23:28:23 2006 -0700 [PATCH] uml: use DEFCONFIG_LIST to avoid reading host's config This should make sure that, for UML, host's configuration files are not considered, which avoids various pains to the user. Our dependency are such that the obtained Kconfig will be valid and will lead to successful compilation - however they cannot prevent an user from disabling any boot device, and if an option is not set in the read .config (say /boot/config-XXX), with make menuconfig ARCH=um, it is not set. This always disables UBD and all console I/O channels, which leads to non-working UML kernels, so this bothers users - especially now, since it will happen on almost every machine (/boot/config-`uname -r` exists almost on every machine). It can be workarounded with make defconfig ARCH=um, but it is non-obvious and can be avoided, so please _do_ merge this patch. Given the existence of options, it could be interesting to implement (additionally) "option required" - with it, Kconfig will refuse reading a .config file (from wherever it comes) if the given option is not set. With this, one could mark with it the option characteristic of the given architecture (it was an old proposal of Roman Zippel, when I pointed out our problem): config UML option required default y However this should be further discussed: *) for x86, it must support constructs like: ==arch/i386/Kconfig== config 64BIT option required default n where Kconfig must require that CONFIG_64BIT is disabled or not present in the read .config. *) do we want to do such checks only for the starting defconfig or also for .config? Which leads to: *) I may want to port a x86_64 .config to x86 and viceversa, or even among more different archs. Should that be allowed, and in which measure (the user may force skipping the check for a .config or it is only given a warning by default)? Cc: Roman Zippel Cc: Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 493e3758be1d5628b4d799fe21d68969edbe32aa Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Oct 19 23:28:22 2006 -0700 [PATCH] uml: reenable compilation of enable_timer, disabled by mistake CONFIG_MODE_TT does not work there, the UML_ prefixed version must be used - this causes a link-time failure when CONFIG_MODE_TT is enabled (i.e. always here, never by Jeff). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b028bcd0e746ae0f2f218b911032232a32dedd5 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Oct 19 23:28:21 2006 -0700 [PATCH] uml: code convention cleanup of a file Fix coding conventions violations is arch/um/os-Linux/helper.c. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c13e569073b89eb75216a2551e89ae93ad1f9951 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Oct 19 23:28:20 2006 -0700 [PATCH] uml: split memory allocation prototypes out of user.h user.h is too generic a header name. I've split out allocation routines from it. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 02a5323d8060d7259277e9e2936fd02129dc0984 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Oct 19 23:28:20 2006 -0700 [PATCH] uml: remove some leftover PPC code I happened to notice that this code is a leftover and it should be removed - since there are sporadical efforts to revive the PPC port doing such cleanups is not useless. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3fda982c501c6a8baa3fa79aaea1bfa7bb2a5def Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Oct 19 23:28:19 2006 -0700 [PATCH] fix typo in memory barrier docs Fix cut'n'paste typo - &a and &b are used in other examples, in this one the doc uses &u and &v. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a3e9ad163b77a3c7504f58f2780b5a62238c0ac Author: Jeff Dike Date: Thu Oct 19 23:28:18 2006 -0700 [PATCH] uml: MODE_TT is bust arch/um/sys-x86_64/ptrace.c:20:1: warning: "SC_SS" redefined In file included from arch/um/include/sysdep/ptrace.h:18, from include/asm/ptrace-generic.h:12, from include/asm/ptrace.h:15, from arch/um/sys-x86_64/ptrace.c:8: arch/um/include/sysdep/sc.h:38:1: warning: this is the location of the previous definition arch/um/sys-x86_64/ptrace.c: In function 'putreg': arch/um/sys-x86_64/ptrace.c:63: warning: implicit declaration of function 'SC_FS_BASE' arch/um/sys-x86_64/ptrace.c:63: error: invalid lvalue in unary '&' arch/um/sys-x86_64/ptrace.c:63: warning: implicit declaration of function 'SC_GS_BASE' arch/um/sys-x86_64/ptrace.c:63: error: invalid lvalue in unary '&' arch/um/sys-x86_64/ptrace.c: In function 'getreg': arch/um/sys-x86_64/ptrace.c:101: error: invalid lvalue in unary '&' arch/um/sys-x86_64/ptrace.c:101: error: invalid lvalue in unary '&' I'd have to say that the fix for this, for now, is this: Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34e856e6a522a8fc0feba7497f5b05aeaa13d473 Author: Ralf Baechle Date: Thu Oct 19 23:28:17 2006 -0700 [PATCH] Make userspace proof contains the constants for personality(2) but also some defintions that are useless or even harmful in userspace such as the personality() macro. Signed-off-by: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3fcfab16c5b86eaa3db3a9a31adba550c5b67141 Author: Andrew Morton Date: Thu Oct 19 23:28:16 2006 -0700 [PATCH] separate bdi congestion functions from queue congestion functions Separate out the concept of "queue congestion" from "backing-dev congestion". Congestion is a backing-dev concept, not a queue concept. The blk_* congestion functions are retained, as wrappers around the core backing-dev congestion functions. This proper layering is needed so that NFS can cleanly use the congestion functions, and so that CONFIG_BLOCK=n actually links. Cc: "Thomas Maier" Cc: "Jens Axboe" Cc: Trond Myklebust Cc: David Howells Cc: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 79e2de4bc53d7ca2a8eedee49e4a92479b4b530e Author: Thomas Maier Date: Thu Oct 19 23:28:15 2006 -0700 [PATCH] export clear_queue_congested and set_queue_congested Export the clear_queue_congested() and set_queue_congested() functions located in ll_rw_blk.c The functions are renamed to blk_clear_queue_congested() and blk_set_queue_congested(). (needed in the pktcdvd driver's bio write congestion control) Signed-off-by: Thomas Maier Cc: Peter Osterlund Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 26da82058e62ea173559a26881b16d10089645ba Author: Pekka Enberg Date: Thu Oct 19 23:28:14 2006 -0700 [PATCH] ecryptfs: use special_file() Use the special_file() macro to check whether an inode is special instead of open-coding it. Acked-by: Mike Halcrow Cc: Phillip Hellewell Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fb5527e68d495650a7658fec9a7246bf922db212 Author: Jeff Moyer Date: Thu Oct 19 23:28:13 2006 -0700 [PATCH] direct-io: sync and invalidate file region when falling back to buffered write When direct-io falls back to buffered write, it will just leave the dirty data floating about in pagecache, pending regular writeback. But normal direct-io semantics are that IO is synchronous, and that it leaves no pagecache behind. So change the fallback-to-buffered-write code to sync the file region and to then strip away the pagecache, just as a regular direct-io write would do. Acked-by: Jeff Moyer Cc: Zach Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e8e82b76e0312827f5ae04b573a05b02854a447e Author: Auke Kok Date: Thu Oct 19 23:28:12 2006 -0700 [PATCH] e100: fix reboot -f with netconsole enabled When rebooting with netconsole over e100, the driver shutdown code would deadlock with netpoll. Reduce shutdown code to a bare minimum while retaining WoL and suspend functionality. Signed-off-by: Auke Kok Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b7d8ac3e1779c30ddef0a8f38042076c5007a23d Author: Adrian Bunk Date: Thu Oct 19 16:02:07 2006 +0200 [GFS2] gfs2_dir_read_data(): fix uninitialized variable usage In the "if (extlen)" case, "bh" was used uninitialized. This patch changes the code to what seems to have been intended. Spotted by the Coverity checker. This patch also removes a pointless "bh = NULL" asignment (the variable is never accessed again after this point). Signed-off-by: Adrian Bunk Signed-off-by: Steven Whitehouse commit bbbe4512735eb0f15f09ffd14876091a8e91bc69 Author: Adrian Bunk Date: Thu Oct 19 15:27:00 2006 +0200 [GFS2] fs/gfs2/ops_fstype.c:fill_super_meta(): fix NULL dereference Don't dereference new->s_root when we do know it's NULL. Spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: Steven Whitehouse commit 348acd48f050f5ba7fa917b1421ae34443be97dd Author: Adrian Bunk Date: Thu Oct 19 15:20:04 2006 +0200 [GFS2] fs/gfs2/dir.c:gfs2_dir_write_data(): don't use an uninitialized variable In the "if (extlen)" case, "new" might be used uninitialized. Looking at the code, it should be initialized to 0. Spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: Steven Whitehouse commit b0cb66955f4bf7a72b544096ceef48a829361a3c Author: Adrian Bunk Date: Thu Oct 19 15:13:26 2006 +0200 [GFS2] fs/gfs2/ops_fstype.c:gfs2_get_sb_meta(): remove unused variable The Coverity checker spotted this unused variable. Signed-off-by: Adrian Bunk Signed-off-by: Steven Whitehouse commit abbdbd2065e74411dc2c401501c2c85a82f60e06 Author: Adrian Bunk Date: Thu Oct 19 15:12:24 2006 +0200 [GFS2] fs/gfs2/dir.c:gfs2_dir_write_data(): remove dead code The Coverity checker spotted this obviously dead code. Signed-off-by: Adrian Bunk Signed-off-by: Steven Whitehouse commit a2d7d021d78dbc00d24d9c809c64a7f3e61fa773 Author: Al Viro Date: Sat Oct 14 16:49:30 2006 +0100 [GFS2] gfs2 endianness bug: be16 assigned to be32 field Signed-off-by: Al Viro Signed-off-by: Steven Whitehouse commit 23591256d61354e20f12e98d7a496ad5c23de74c Author: Steven Whitehouse Date: Fri Oct 13 17:25:45 2006 -0400 [GFS2] Fix bmap to map extents properly This fix means that bmap will map extents of the length requested by the VFS rather than guessing at it, or just mapping one block at a time. The other callers of gfs2_block_map are audited to ensure they send the correct max extent lengths (i.e. set bh->b_size correctly). Signed-off-by: Steven Whitehouse commit 42fb00838a644d03f9a2a5fbbe0b668a5ff5df4d Author: Patrick Caulfield Date: Fri Oct 13 17:12:05 2006 +0100 [DLM] fix iovec length in recvmsg I didn't spot that the msg_iovlen was set to 2 if there were two elements in the iovec but left at zero if not :( I think this might be why bob was still seeing trouble. Signed-Off-By: Patrick Caulfield Signed-off-by: Steven Whitehouse commit 7b19ffc40b0247fcfe083644fdb621fdb3c05ef6 Author: Marcel Holtmann Date: Fri Oct 20 08:55:48 2006 +0200 [Bluetooth] Fix HID disconnect NULL pointer dereference The latest HID disconnect sequence change introduced a NULL pointer dereference. For the quirk to handle buggy remote HID implementations, it is enough to wait for a potential control channel disconnect from the remote side and it is also enough to wait only 500 msecs. Signed-off-by: Marcel Holtmann commit 8602b4fe6e82d5eeb479efd3bca19bc3dd722f5a Author: Marcel Holtmann Date: Fri Oct 20 08:55:34 2006 +0200 [Bluetooth] Add missing entry for Nokia DTL-4 PCMCIA card The device id for the Nokia DTL-4 PCMCIA card was missing. This patch adds it back to the list of supported devices. Signed-off-by: Marcel Holtmann commit 0eab934f4b9668669cffebfa8a9542fedf9082af Author: Marcel Holtmann Date: Fri Oct 20 08:55:29 2006 +0200 [Bluetooth] Add support for newer ANYCOM USB dongles This patch adds the vendor and product id of the ANYCOM Bluetooth USB-200 and USB-250 dongles and sets a flag to send HCI_Reset as the first command. Signed-off-by: Marcel Holtmann Date: Fri Oct 20 00:32:41 2006 -0700 [NET]: Can use __get_cpu_var() instead of per_cpu() in loopback driver. As BHs are off in loopback_xmit(), preemption cannot occurs, so we can use __get_cpu_var() instead of per_cpu() (and avoid a preempt_enable()/preempt_disable() pair) Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 6cf431d77c3e917399a847e3a7ec239d5163056b Author: David Woodhouse Date: Fri Oct 20 00:29:33 2006 -0700 [SPARC]: Clean up asm-sparc/elf.h pollution in userspace. We don't need to export sparc_elf_hwcap() to userspace, and it doesn't build there. Remove it by moving it inside #ifdef __KERNEL__, along with some other things which don't need to be exported. Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 78d79423179c0efc7ec34b55d287e7be4ca07da6 Author: Eric Dumazet Date: Fri Oct 20 00:28:35 2006 -0700 [IPV4] inet_peer: Group together avl_left, avl_right, v4daddr to speedup lookups on some CPUS Lot of routers/embedded devices still use CPUS with 16/32 bytes cache lines. (486, Pentium, ... PIII) It makes sense to group together fields used at lookup time so they fit in one cache line. This reduce cache footprint and speedup lookups. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 06ca719faddaf5ea46c6356b12847663c3ed8806 Author: Eric Dumazet Date: Fri Oct 20 00:22:25 2006 -0700 [TCP]: One NET_INC_STATS() could be NET_INC_STATS_BH in tcp_v4_err() I believe this NET_INC_STATS() call can be replaced by NET_INC_STATS_BH(), a little bit cheaper. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 82fac0542e11c0d3316cc8fdafd2a990d2aab692 Author: Björn Steinbrink Date: Fri Oct 20 00:21:10 2006 -0700 [NETFILTER]: Missing check for CAP_NET_ADMIN in iptables compat layer The 32bit compatibility layer has no CAP_NET_ADMIN check in compat_do_ipt_get_ctl, which for example allows to list the current iptables rules even without having that capability (the non-compat version requires it). Other capabilities might be required to exploit the bug (eg. CAP_NET_RAW to get the nfnetlink socket?), so a plain user can't exploit it, but a setup actually using the posix capability system might very well hit such a constellation of granted capabilities. Signed-off-by: Björn Steinbrink Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 206daaf77f68ce0f103164e6406336068c87a4a5 Author: Stephen Hemminger Date: Thu Oct 19 23:58:23 2006 -0700 [NETPOLL]: initialize skb for UDP Need to fully initialize skb to keep lower layers and queueing happy. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 66a740572d7bcb18469e71cb014bfed3ff75a773 Author: Paul Mundt Date: Fri Oct 20 15:30:55 2006 +0900 sh: Convert INTC2 to IRQ table registration. Currently the INTC2 code contains a fixed IRQ table that it iterates through to set the handler type, we move this in to the CPU subtype setup code instead and allow for submitting the table that way. This drops the ST40 tables, as nothing has been happening with those processors, while converting the only existing users to use the new table directly (SH7760 and SH7780). Signed-off-by: Paul Mundt commit 6bda57365a5fda4743d83a5987c6aab66e90771c Author: David S. Miller Date: Wed Oct 18 23:00:35 2006 -0700 [SPARC64]: Fix of_ioremap(). Use request_mem_region() if IORESOURCE_MEM. Signed-off-by: David S. Miller commit e83f214e45a80459d2931ae1259ab5fae82c8a8e Author: David S. Miller Date: Wed Oct 18 12:48:35 2006 -0700 [SPARC64]: Compute dma_end argument to sabre_pbm_init() correctly. virtual-dma property layout is [start, size] not [start, end]. Signed-off-by: David S. Miller commit 98978edb6278f0fb30c8d636c6a79a28f9164cb9 Author: John W. Linville Date: Tue Oct 17 10:54:36 2006 -0400 [PATCH] wireless: WE-20 compatibility for ESSID and NICKN ioctls WE-21 changed the ABI for the SIOC[SG]IW{ESSID,NICKN} ioctls by dropping NULL termination. This patch adds compatibility code so that WE-21 can work properly with WE-20 (and older) tools. Signed-off-by: John W. Linville commit 8c34e2d63231d4bf4852bac8521883944d770fe3 Author: Jens Axboe Date: Tue Oct 17 19:43:22 2006 +0200 [PATCH] Remove SUID when splicing into an inode Originally from Mark Fasheh generic_file_splice_write() does not remove S_ISUID or S_ISGID. This is inconsistent with the way we generally write to files. Signed-off-by: Mark Fasheh Signed-off-by: Jens Axboe commit 01de85e057328ecbef36e108673b1e81059d54c1 Author: Jens Axboe Date: Tue Oct 17 19:50:36 2006 +0200 [PATCH] Add lockless helpers for remove_suid() Right now users have to grab i_mutex before calling remove_suid(), in the unlikely event that a call to ->setattr() may be needed. Split up the function in two parts: - One to check if we need to remove suid - One to actually remove it The first we can call lockless. Signed-off-by: Jens Axboe commit 6da61809822c22634a3de2dcb3c60283b836a88a Author: Mark Fasheh Date: Tue Oct 17 18:43:07 2006 +0200 [PATCH] Introduce generic_file_splice_write_nolock() This allows file systems to manage their own i_mutex locking while still re-using the generic_file_splice_write() logic. OCFS2 in particular wants this so that it can order cluster locks within i_mutex. Signed-off-by: Mark Fasheh Signed-off-by: Jens Axboe commit 62752ee198dca9209b7dee504763e51b11e9e0ca Author: Mark Fasheh Date: Tue Oct 17 10:31:38 2006 +0200 [PATCH] Take i_mutex in splice_from_pipe() The splice_actor may be calling ->prepare_write() and ->commit_write(). We want i_mutex on the inode being written to before calling those so that we don't race i_size changes. The double locking behavior is done elsewhere in splice.c, and if we eventually want _nolock variants of generic_file_splice_write(), fs modules might have to replicate the nasty locking code. We introduce inode_double_lock() and inode_double_unlock() to consolidate the locking rules into one set of functions. Signed-off-by: Mark Fasheh Signed-off-by: Jens Axboe commit d89e36d8df547fde2beaea82211954868da2282d Author: Ralf Baechle Date: Thu Oct 19 14:21:47 2006 +0100 [MIPS] Fix iounmap argument to const volatile. With the existing prototype the following code: const void __iomem *io = ioremap(); x = readb(io); iounmap(io); did result in a warning. Signed-off-by: Ralf Baechle commit d2bcf87d0fcdc10d1be65b03fd032bec05efe49f Author: Ralf Baechle Date: Wed Oct 18 23:52:17 2006 +0100 [MIPS] Reserve syscall numbers for kexec_load. Signed-off-by: Ralf Baechle commit e7a6f9c1f4e46f7fd776c6ee38bdb8f8ae131a82 Author: Yoichi Yuasa Date: Wed Oct 18 23:48:31 2006 +0900 [MIPS] Update tb0287_defconfig Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 0895b19ebdbb44d6d2eee0d7a138f07b2ddb04ec Author: Yoichi Yuasa Date: Wed Oct 18 23:38:12 2006 +0900 [MIPS] Update pnx8550-v2pci_defconfig In the current pnx8550-v2pci_defconfig CONFIG_SGI_IP22 has been selected. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 00ddf2be159e3b96ba8872b407240e1bb449b75e Author: Yoichi Yuasa Date: Wed Oct 18 23:36:15 2006 +0900 [MIPS] Update pnx8500-jbs_defconfig In the current pnx8550-jbs_defconfig CONFIG_SGI_IP22 has been selected. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 94399ea62fc1047eded76b45b972e7850a800a1b Author: Yoichi Yuasa Date: Wed Oct 18 23:27:29 2006 +0900 [MIPS] More vr41xx pt_regs fixups Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit eea32d4c6e272b6c324c8c22df4c28274fcb5a21 Author: Atsushi Nemoto Date: Mon Oct 16 22:48:49 2006 +0900 [MIPS] save_context_stack fix CONFIG_KALLSYMS=n case is obviously wrong, though it is harmless since CONFIG_KALLSYMS is always enabled with CONFIG_STACKTRACE for now. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 089c7e7f2da7c3245de47377252683bd9edae738 Author: Ralf Baechle Date: Mon Oct 16 16:49:37 2006 +0100 [MIPS] Use compat_sys_mount. This fixes mount problems with smbfs, ncpfs and NFSv4. Signed-off-by: Ralf Baechle commit 53571ce47010562f5e67782ea00206f379a5cd65 Author: Thiemo Seufer Date: Sun Aug 13 00:53:29 2006 +0100 [MIPS] Fix O32 personality(2) call with 0xffffffff argument. A sign extension bug did result in sys_personality being invoked with a 0xffffffffffffffffUL argument, so querying the current personality didn't work. Signed-off-by: Thiemo Seufer Signed-off-by: Ralf Baechle commit 36d98e79b798fb27e38b9be4f36c5a96025f9281 Author: Ralf Baechle Date: Sun Oct 15 09:19:58 2006 +0100 [MIPS] A few more pt_regs fixups. Signed-off-by: Ralf Baechle commit ba38cdf94285a1fc6a01fd493bdc5304bc83f61e Author: Ralf Baechle Date: Sun Oct 15 09:17:43 2006 +0100 [MIPS] Malta: Fix uninitialized regs pointer. Signed-off-by: Ralf Baechle commit 22c56c3a03b377d21d8363f737aa2a855d892458 Author: Ralf Baechle Date: Sun Oct 15 09:15:19 2006 +0100 [MIPS] Delete unneeded pt_regs forward declaration. Signed-off-by: Ralf Baechle commit 55b7428303d390c53d3a1bc587de8592ce65900e Author: Franck Bui-Huu Date: Fri Oct 13 13:37:35 2006 +0200 [MIPS] Use kallsyms_lookup_size_offset() instead of kallsyms_lookup() This new routine doesn't lookup for symbol names. So we needn't to pass any char buffers or pointer since we don't care about names. Signed-off-by: Franck Bui-Huu Signed-off-by: Ralf Baechle commit 709bc44c31db4eeeec7dcf7d3f3fefd057adf7fb Author: Paul Mundt Date: Thu Oct 19 17:32:56 2006 +0900 sh: Updates for irq-flow-type naming changes. handle_irq_name() and set_irq_chip_and_handler() disappeared, update for desc->name and set_irq_chip_and_handler_name() use. Signed-off-by: Paul Mundt commit c2a560f5334c55da1e8bfa17586cc1d4e7f8ed85 Author: Paul Mundt Date: Thu Oct 19 17:31:22 2006 +0900 sh: Add some missing board headers. Some of these were dropped in the header directory rework, add the few missing ones back in. Signed-off-by: Paul Mundt commit 1f666587dbf6bc660b23d8dd8abb6c572ce3eae5 Author: Paul Mundt Date: Thu Oct 19 16:20:25 2006 +0900 sh: Fix exception_handling_table alignment. With the recent change ripping out interrupt_table, explicit padding of the table was missing, causing bad things to happen when manually inserting handlers in to the table. This problem particularly showed up in relation to do_fpu_state_restore() which was inserted quite deeply in to the table and ended up scribbling over a slab object. Signed-off-by: Paul Mundt commit 082c44d20eb4c6c4aa60ae7429ea184854cb0610 Author: Paul Mundt Date: Thu Oct 19 16:16:18 2006 +0900 sh: Cleanup board header directories. Now with the ide.h mess sorted out, most of these boards don't need their own directory. Move the headers out, and update the driver paths. Signed-off-by: Paul Mundt commit 4a58eaca7ca68abea37d6d2a4ea7deb394906183 Author: Paul Mundt Date: Thu Oct 19 16:15:13 2006 +0900 sh: Remove board-specific ide.h headers. The driver that these were using never made it in to drivers/ide, so kill off the rest of the cruft. These will have to be reworked for board-specific platform devices through libata when they're added back through the setup code. Signed-off-by: Paul Mundt commit 6b0022305f80cf249de69e746f6f5ccf7ffc5b7c Author: Paul Mundt Date: Thu Oct 12 17:07:45 2006 +0900 sh: Proper show_stack/show_trace() implementation. This splits out some of the previous show_stack() implementation which was mostly doing the show_trace() work without actually dumping any of the stack contents. This now gets split in to two sections, where we do the fetching of the stack pointer and subsequent stack dumping in show_stack(), while moving the call trace in to show_trace(). Signed-off-by: Paul Mundt commit 6723ab549df777742801716d7aeea397e6e97f2c Author: David S. Miller Date: Wed Oct 18 21:20:57 2006 -0700 [IPV6]: Fix route.c warnings when multiple tables are disabled. Signed-off-by: David S. Miller commit 6ba7511b7c8b71d5148f7516584d0b677acc384a Author: David S. Miller Date: Wed Oct 18 20:56:06 2006 -0700 [TG3]: Bump driver version and release date. Signed-off-by: David S. Miller commit bc3a9254a7925b6278f6d882746fe6a0bdf6f610 Author: Michael Chan Date: Wed Oct 18 20:55:18 2006 -0700 [TG3]: Add lower bound checks for tx ring size. The minimum tx ring size must be greater than MAX_SKB_FRAGS or 3 times that on some chips with TSO bugs. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 42952231c6a8623117ee3cc89c82d382dc69ca30 Author: Ranjit Manomohan Date: Wed Oct 18 20:54:26 2006 -0700 [TG3]: Fix set ring params tx ring size implementation Fixes the implementation of the ethtool set ring parameters for the tg3 transmit ring. The size of tx_pending is taken into account before doing a netif_wake_queue. This prevents the interface from locking up when smaller transmit ring sizes are used. Signed-off-by: Ranjit Manomohan Acked-by: Michael Chan Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 5175c3786c244f8b689854db24c9e79b1c6a084f Author: Eric Dumazet Date: Wed Oct 18 20:51:57 2006 -0700 [NET]: reduce per cpu ram used for loopback stats We dont need a full struct net_device_stats (currently 23 long : 184 bytes on x86_64) per possible CPU, but only two counters : bytes and packets We save few CPU cycles too in loopback_xmit() not updating 4 fields, but 2. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 9ce8ade015a3f82dbdf856df7a685878dd1cc0e1 Author: Thomas Graf Date: Wed Oct 18 20:46:54 2006 -0700 [IPv6] route: Fix prohibit and blackhole routing decision Lookups resolving to ip6_blk_hole_entry must result in silently discarding the packets whereas an ip6_pkt_prohibit_entry is supposed to cause an ICMPV6_ADM_PROHIBITED message to be sent. Thanks to Kim Nordlund for noticing this bug. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 3a31b9d2f2d98667832e87fa1853754ff062d6ef Author: Steven Whitehouse Date: Wed Oct 18 20:45:22 2006 -0700 [DECNET]: Fix input routing bug This patch fixes a silly bug that has been in the input routing code for s