commit 534afb90a9cd0b9643f62d660c164e1d924f39cf tree 7a10674e549b63257d9c95405f258480267efea8 parent 4aad724d3e52238e1ce005f166fbba5b4072a7f6 author Matt Porter Fri, 05 Aug 2005 16:10:10 -0700 committer Linus Torvalds Fri, 05 Aug 2005 16:53:03 -0700 [PATCH] ppc32: fix ppc440 pagetable attributes This patch fixes a bug in the PPC440 pagetable attributes that breaks swap support. It also adds some notes on the PPC440 attribute fields. Signed-off-by: Geoff Levand for CELF Signed-off-by: Matt Porter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4aad724d3e52238e1ce005f166fbba5b4072a7f6 tree c313006c1e59a41914a96c0c0b5b2b557736a0a9 parent 00a5dfdb93f74e4d95fb0d83c890728e331f8810 author Tim Yamin Mon, 25 Jul 2005 23:16:13 +0100 committer Linus Torvalds Fri, 05 Aug 2005 16:23:21 -0700 [PATCH] Update in-kernel zlib routines These bugs have been fixed in the standard zlib for a while. See for example a) http://sources.redhat.com/ml/bug-gnu-utils/1999-06/msg00183.html b) http://bugs.gentoo.org/show_bug.cgi?id=94584 Signed-off-by: Tim Yamin Signed-off-by: Tavis Ormandy Signed-off-by: Linus Torvalds commit 00a5dfdb93f74e4d95fb0d83c890728e331f8810 tree f1d1043d7d02ad6bde3b158807b28bcfdafa21f6 parent ba02508248e90a9d696aebd18b48a3290235b53c author Ingo Molnar Fri, 05 Aug 2005 23:05:27 +0200 committer Linus Torvalds Fri, 05 Aug 2005 15:56:41 -0700 [PATCH] Fix semundo lock leakage semundo->lock can leak if semundo->refcount goes from 2 to 1 while another thread has it locked. This causes major problems for PREEMPT kernels. The simplest fix for now is to undo the single-thread optimization. This bug was found via relentless testing by Dominik Karall. Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds commit ba02508248e90a9d696aebd18b48a3290235b53c tree 4167aecae57a5ceab6392e54189a271f3dfdebf8 parent c7546f8f03f5a4fa612605b6be930234d6026860 author Tejun Heo Fri, 05 Aug 2005 13:28:11 -0700 committer Linus Torvalds Fri, 05 Aug 2005 13:43:16 -0700 [PATCH] blk: fix tag shrinking (revive real_max_size) My patch in commit fa72b903f75e4f0f0b2c2feed093005167da4023 incorrectly removed blk_queue_tag->real_max_depth. The original resize implementation was incorrect in the following points. * actual allocation size of tag_index was shorter than real_max_size, but assumed to be of the same size, possibly causing memory access beyond the allocated area. * bits in tag_map between max_deptn and real_max_depth were initialized to 1's, making the tags permanently reserved. In an attempt to fix above two bugs, I had removed allocation optimization in init_tag_map and real_max_size. Tag map/index were allocated and freed immediately during resize. Unfortunately, I wasn't considering that tag map/index can be resized dynamically with tags beyond new_depth active. This led to accessing freed area after shrinking tags and led to the following bug reporting thread on linux-scsi. http://marc.theaimsgroup.com/?l=linux-scsi&m=112319898111885&w=2 To fix the problem, I've revived real_max_depth without allocation optimization in init_tag_map, and Andrew Vasquez confirmed that the problem was fixed. As Jens is not going to be available for a week, he asked me to make sure that this patch reaches you. http://marc.theaimsgroup.com/?l=linux-scsi&m=112325778530886&w=2 Also, a comment was added to make sure that real_max_size is needed for dynamic shrinking. Signed-off-by: Tejun Heo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c7546f8f03f5a4fa612605b6be930234d6026860 tree e372cdb3856c9585587283c21b5b99a792a1a41d parent e6cb99413da42af413c11a394538ddc8b9d201e1 author David Gibson Fri, 05 Aug 2005 11:59:35 -0700 committer Linus Torvalds Fri, 05 Aug 2005 12:22:37 -0700 [PATCH] Fix hugepage crash on failing mmap() This patch fixes a crash in the hugepage code. unmap_hugepage_area() was assuming that (due to prefault) PTEs must exist for all the area in question. However, this may not be the case, if mmap() encounters an error before the prefault and calls unmap_region() to clean up any partial mapping. Depending on the hugepage configuration, this crash can be triggered by an unpriveleged user. Signed-off-by: David Gibson Cc: William Lee Irwin III Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e6cb99413da42af413c11a394538ddc8b9d201e1 tree 696dea49d74289726ac50fdbdebbbaae0f794340 parent f9abb020405c94edb0717315f1510086b1574a22 author James Bottomley Fri, 05 Aug 2005 11:59:34 -0700 committer Linus Torvalds Fri, 05 Aug 2005 12:22:37 -0700 [PATCH] fix voyager compile after machine_emergency_restart breakage [PATCH] i386: Implement machine_emergency_reboot introduced this new function into arch/i386/reboot.c. However, subarchitectures are entitled to implement their own copies of reboot.c from which this new function is now missing. It looks like visws will also need a similar fixup Signed-off-by: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f9abb020405c94edb0717315f1510086b1574a22 tree 768cf082ab003287cdf24a5c09143cac96ebcd51 parent 30e835e36648b15fb80797ace0a0e2afcf97618d author Marcel Selhorst Fri, 05 Aug 2005 11:59:33 -0700 committer Linus Torvalds Fri, 05 Aug 2005 12:22:37 -0700 [PATCH] tpm_infineon: Support for new TPM 1.2 and PNPACPI This patch includes support for the new Infineon Trusted Platform Module SLB 9635 TT 1.2 and does further include ACPI-support for both chip versions (SLD 9630 TT 1.1 and SLB9635 TT 1.2). Since the ioports and configuration registers are not correctly set on some machines, the configuration is now done via PNPACPI, which reads out the correct values out of the DSDT-table. Note that you have to have CONFIG_PNP, CONFIG_ACPI_BUS and CONFIG_PNPACPI enabled to run this driver (assuming that mainboards including a TPM do have the need for ACPI anyway). Signed-off-by: Marcel Selhorst Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 30e835e36648b15fb80797ace0a0e2afcf97618d tree 93bfc6b0813579b8810fd4ae49b2693ed8bcbedb parent a866a5f4eab10080ca25785fcf53ad67cde28bed author Andrew Morton Fri, 05 Aug 2005 11:59:32 -0700 committer Linus Torvalds Fri, 05 Aug 2005 12:22:37 -0700 [PATCH] REPORTING-BUGS: track regressions Add a new record to the REPORTING-BUGS template: "Most recent kernel version which did not have the bug:". So we can spot regressions more easily. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a866a5f4eab10080ca25785fcf53ad67cde28bed tree 8a3e09a2d0d931d15f1393614160242b7f94d00d parent 107207aa8576963861e9f0c66b439d233f02a97d parent b7656e7f2944984befa3ab99a5b99f99a23b302b author Linus Torvalds Fri, 05 Aug 2005 07:49:30 -0700 committer Linus Torvalds Fri, 05 Aug 2005 07:49:30 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 107207aa8576963861e9f0c66b439d233f02a97d tree f84c6421f1006b9c462494db425e987145067030 parent 403fe5ae57c831968c3dbbaba291ae825a1c5aaa parent 3873658be7b3896e88648664e480a44d12083ad8 author Linus Torvalds Fri, 05 Aug 2005 07:42:20 -0700 committer Linus Torvalds Fri, 05 Aug 2005 07:42:20 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit 403fe5ae57c831968c3dbbaba291ae825a1c5aaa tree 0baa7533fc0b96127d03a39b2fa77f2b29564b1c parent 2f60f8d3573ff90fe5d75a6d11fd2add1248e7d6 author Petr Vandrovec Fri, 05 Aug 2005 15:50:07 +0200 committer Linus Torvalds Fri, 05 Aug 2005 06:57:44 -0700 [PATCH] rtc: msleep() cannot be used from interrupt Since the beginning of July my Opteron box was randomly crashing and being rebooted by hardware watchdog. Today it finally did it in front of me, and this patch will hopefully fix it. The problem is that at the end of June (the 28th, to be exact: commit 47f176fdaf8924bc83fddcf9658f2fd3ef60d573, "[PATCH] Using msleep() instead of HZ") rtc_get_rtc_time was converted to use msleep() instead of busy waiting. But rtc_get_rtc_time is used by hpet_rtc_interrupt, and scheduling is not allowed during interrupt. So I'm reverting this part of original change, replacing msleep() back with busy loop. The original code was busy waiting for up to 20ms, but on my hardware in the worst case update-in-progress bit was asserted for at most 363 passes through loop (on 2GHz dual Opteron), much less than even one jiffie, not even talking about 20ms. So I changed code to just wait only as long as necessary. Otherwise when RTC was set to generate 8192Hz timer, it stopped doing anything for 20ms (160 pulses were skipped!) from time to time, and this is rather suboptimal as far as I can tell. Signed-off-by: Petr Vandrovec Signed-off-by: Linus Torvalds commit b7656e7f2944984befa3ab99a5b99f99a23b302b tree bd7281aac296d0d0f7eac7989726f540318236fc parent 2f60f8d3573ff90fe5d75a6d11fd2add1248e7d6 author David S. Miller Fri, 05 Aug 2005 04:12:48 -0700 committer David S. Miller Fri, 05 Aug 2005 04:12:48 -0700 [IPV4]: Fix memory leak during fib_info hash expansion. When we grow the tables, we forget to free the olds ones up. Noticed by Yan Zheng. Signed-off-by: David S. Miller commit 2f60f8d3573ff90fe5d75a6d11fd2add1248e7d6 tree 173980b12459aa55586d3f4f56630abf5af1ffcc parent b68e9f857271189bd7a59b74c99890de9195b0e1 author Simon Derr Thu, 04 Aug 2005 19:52:03 -0700 committer Linus Torvalds Thu, 04 Aug 2005 21:43:14 -0700 [PATCH] __vm_enough_memory() signedness fix We have found what seems to be a small bug in __vm_enough_memory() when sysctl_overcommit_memory is set to OVERCOMMIT_NEVER. When this bug occurs the systems fails to boot, with /sbin/init whining about fork() returning ENOMEM. We hunted down the problem to this: The deferred update mecanism used in vm_acct_memory(), on a SMP system, allows the vm_committed_space counter to have a negative value. This should not be a problem since this counter is known to be inaccurate. But in __vm_enough_memory() this counter is compared to the `allowed' variable, which is an unsigned long. This comparison is broken since it will consider the negative values of vm_committed_space to be huge positive values, resulting in a memory allocation failure. Signed-off-by: Signed-off-by: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b68e9f857271189bd7a59b74c99890de9195b0e1 tree 92ef0899ca9ff07f64458febcb7ab8095e891042 parent 846998ae87a80b0fd45b4cf5cf001a159d746f27 author Herbert Xu Thu, 04 Aug 2005 19:52:02 -0700 committer Linus Torvalds Thu, 04 Aug 2005 21:43:14 -0700 [PATCH] tcp: fix TSO cwnd caching bug tcp_write_xmit caches the cwnd value indirectly in cwnd_quota. When tcp_transmit_skb reduces the cwnd because of tcp_enter_cwr, the cached value becomes invalid. This patch ensures that the cwnd value is always reread after each tcp_transmit_skb call. Signed-off-by: Herbert Xu Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 846998ae87a80b0fd45b4cf5cf001a159d746f27 tree a81d0f6d2b1f1817d557bd5f5611c81ff9026b51 parent 0c3dba1534569734ba353afdf3f11def497ff2ac author David S. Miller Thu, 04 Aug 2005 19:52:01 -0700 committer Linus Torvalds Thu, 04 Aug 2005 21:43:14 -0700 [PATCH] tcp: fix TSO sizing bugs MSS changes can be lost since we preemptively initialize the tso_segs count for an SKB before we %100 commit to sending it out. So, by the time we send it out, the tso_size information can be stale due to PMTU events. This mucks up all of the logic in our send engine, and can even result in the BUG() triggering in tcp_tso_should_defer(). Another problem we have is that we're storing the tp->mss_cache, not the SACK block normalized MSS, as the tso_size. That's wrong too. Signed-off-by: David S. Miller Cc: Herbert Xu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0c3dba1534569734ba353afdf3f11def497ff2ac tree ec52740643c710072aab5122e96851c63ed049a0 parent f10eff26831159f52353e8f15c37cdb2935d5fbf author John McCutchan Thu, 04 Aug 2005 21:12:54 -0400 committer Linus Torvalds Thu, 04 Aug 2005 21:37:39 -0700 [PATCH] Clean up inotify delete race fix This avoids the whole #ifdef mess by just getting a copy of dentry->d_inode before d_delete is called - that makes the codepaths the same for the INOTIFY/DNOTIFY cases as for the regular no-notify case. I've been running this under a Gnome session for the last 10 minutes. Inotify is being used extensively. Signed-off-by: John McCutchan Signed-off-by: Linus Torvalds commit f10eff26831159f52353e8f15c37cdb2935d5fbf tree d2ac006f16ba28ecfa6cfb5c1ddecd2e2e6eb28f parent 7dedacf4270a810fadcca887ac85d267b5f1882d author Olav Kongas Thu, 04 Aug 2005 18:06:47 -0700 committer Linus Torvalds Thu, 04 Aug 2005 21:32:46 -0700 [PATCH] USB: Fix setup packet initialization in isp116x-hcd When recently addressing remarks by Alexey Dobriyan about the isp116x-hcd, I introduced a bug in the driver. Please apply the attached patch to fix it. Signed-off-by: Olav Kongas Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 7dedacf4270a810fadcca887ac85d267b5f1882d tree 4e76d5bf3d96d142c018bc8dbba2e68ccccd0eed parent 003ba5153582427b1df2347553529299872961e5 author David Brownell Thu, 04 Aug 2005 18:06:41 -0700 committer Linus Torvalds Thu, 04 Aug 2005 21:32:46 -0700 [PATCH] USB: ehci: microframe handling fix This patch has a one line oops fix, plus related cleanups. - The bugfix uses microframe scheduling data given to the hardware to test "is this a periodic QH", rather than testing for nonzero period. (Prevents an oops by providing the correct answer.) - The cleanup going along with the patch should make it clearer what's going on whenever those bitfields are accessed. The bug came about when, around January, two new kinds of EHCI interrupt scheduling operation were added, involving both the high speed (24 KBytes per millisec) and low/full speed (1-64 bytes per millisec) microframe scheduling. A driver for the Edirol UA-1000 Audio Capture Unit ran into the oops; it used one of the newly supported high speed modes. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 003ba5153582427b1df2347553529299872961e5 tree a8ac2f20b32385331f84850eb31b0a16fde432ca parent 43c34735524d5b1c9b9e5d63b49dd4c1b394bde4 author Pete Zaitcev Thu, 04 Aug 2005 18:06:36 -0700 committer Linus Torvalds Thu, 04 Aug 2005 21:32:46 -0700 [PATCH] USB: ub documentation update The patch which went in was correct, but not quite what I had in mind. Here is a patch to update that a little bit. Original patch is at: http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4749f32da939d4e4160541b2cadc22492bb507ec Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 43c34735524d5b1c9b9e5d63b49dd4c1b394bde4 tree a61c11d4075f149be9c0aae6b6c0a935c94571af parent fec59a711eef002d4ef9eb8de09dd0a26986eb77 author Dominik Brodowski Thu, 04 Aug 2005 18:06:21 -0700 committer Linus Torvalds Thu, 04 Aug 2005 21:32:46 -0700 [PATCH] pci and yenta: pcibios_bus_to_resource In yenta_socket, we default to using the resource setting of the CardBus bridge. However, this is a PCI-bus-centric view of resources and thus needs to be converted to generic resources first. Therefore, add a call to pcibios_bus_to_resource() call in between. This function is a mere wrapper on x86 and friends, however on some others it already exists, is added in this patch (alpha, arm, ppc, ppc64) or still needs to be provided (parisc -- where is its pcibios_resource_to_bus() ?). Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit fec59a711eef002d4ef9eb8de09dd0a26986eb77 tree 4287cefdd94ce686ca0cad40f7897d8acd9c89dc parent c306895167c8384b88bc02945a0d226a04218fa5 author John W. Linville Thu, 04 Aug 2005 18:06:10 -0700 committer Linus Torvalds Thu, 04 Aug 2005 21:32:46 -0700 [PATCH] PCI: restore BAR values after D3hot->D0 for devices that need it Some PCI devices (e.g. 3c905B, 3c556B) lose all configuration (including BARs) when transitioning from D3hot->D0. This leaves such a device in an inaccessible state. The patch below causes the BARs to be restored when enabling such a device, so that its driver will be able to access it. The patch also adds pci_restore_bars as a new global symbol, and adds a correpsonding EXPORT_SYMBOL_GPL for that. Some firmware (e.g. Thinkpad T21) leaves devices in D3hot after a (re)boot. Most drivers call pci_enable_device very early, so devices left in D3hot that lose configuration during the D3hot->D0 transition will be inaccessible to their drivers. Drivers could be modified to account for this, but it would be difficult to know which drivers need modification. This is especially true since often many devices are covered by the same driver. It likely would be necessary to replicate code across dozens of drivers. The patch below should trigger only when transitioning from D3hot->D0 (or at boot), and only for devices that have the "no soft reset" bit cleared in the PM control register. I believe it is safe to include this patch as part of the PCI infrastructure. The cleanest implementation of pci_restore_bars was to call pci_update_resource. Unfortunately, that does not currently exist for the sparc64 architecture. The patch below includes a null implemenation of pci_update_resource for sparc64. Some have expressed interest in making general use of the the pci_restore_bars function, so that has been exported to GPL licensed modules. Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit c306895167c8384b88bc02945a0d226a04218fa5 tree d3f298c9cf8f36787acae2c829e64f05a392162c parent e8ed11b9dc07df0134248542ca8e7d40751a6052 author Andrew Morton Thu, 04 Aug 2005 16:49:32 -0700 committer Linus Torvalds Thu, 04 Aug 2005 16:57:49 -0700 [PATCH] revert "timer exit cleanup" Revert this June 17 patch: it broke persistence of timers across execve(). Cc: Roland McGrath Cc: george anzinger Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e8ed11b9dc07df0134248542ca8e7d40751a6052 tree fe86ae2bcc5b1bb0ffee134005bd2449aea0eada parent c91096d85c95c6b7fe8d7065e2aa6825e0bdaca9 author Daniel Jacobowitz Thu, 04 Aug 2005 13:41:09 -0700 committer Linus Torvalds Thu, 04 Aug 2005 16:28:27 -0700 [PATCH] x86_64: fix 32-bit thread debugging The IA32 ptrace emulation currently returns the wrong registers for fs/gs; it's returning what x86_64 calls gs_base. We need regs.gsindex in order for GDB to correctly locate the TLS area. Without this patch, the 32-bit GDB testsuite bombs on a 64-bit kernel. With it, results look about like I'd expect, although there are still a handful of kernel-related failures (vsyscall related?). Signed-off-by: Daniel Jacobowitz Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c91096d85c95c6b7fe8d7065e2aa6825e0bdaca9 tree 3f19ec2917f15fdf2428b60941a4d5c9d7e0422d parent 1c5ad84516ae7ea4ec868436a910a6bd8d20215a author Venkatesh Pallipadi Thu, 04 Aug 2005 15:36:10 -0700 committer Linus Torvalds Thu, 04 Aug 2005 16:27:58 -0700 [PATCH] remove special HPET_EMULATE_RTC config option We had a user whose apps weren't working correctly because his "rtc" wasn't working fully. For the sake of simplicity, it seems sensible to always enable HPET RTC emulation. Remove a special config option for HPET_EMULATE_RTC and make it directly depend on HPET_TIMER and RTC. This will avoid the hangs when EMULATE_RTC is not configured and when some userlevel script depends on RTC interrupt, as in: http://bugzilla.kernel.org/show_bug.cgi?id=4904 Signed-off-by: Venkatesh Pallipadi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1c5ad84516ae7ea4ec868436a910a6bd8d20215a tree 929e03789ee2191bbebe45fbd9b6c50865c5f9ca parent e234f35c54a30d040313e40833dcf623d14629b4 author Hugh Dickins Thu, 04 Aug 2005 13:07:09 -0700 committer Linus Torvalds Thu, 04 Aug 2005 13:11:15 -0700 [PATCH] fix VmSize and VmData after mremap mremap's move_vma is applying __vm_stat_account to the old vma which may have already been freed: move it to just before the do_munmap. mremapping to and fro with CONFIG_DEBUG_SLAB=y showed /proc//status VmSize and VmData wrapping just like in kernel bugzilla #4842, and fixed by this patch - worth including in 2.6.13, though not yet confirmed that it fixes that specific report from Frank van Maarseveen. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e234f35c54a30d040313e40833dcf623d14629b4 tree 6e23053de3e84c1d8f54531a52fda68cee2bf03b parent 3de11748c1b312833e8a148ab7ec47669ecc99dc author John McCutchan Thu, 04 Aug 2005 13:07:08 -0700 committer Linus Torvalds Thu, 04 Aug 2005 13:11:15 -0700 [PATCH] inotify delete race fix The included patch fixes a problem where a inotify client would receive a delete event before the file was actually deleted. The bug affects both dnotify & inotify. Signed-off-by: John McCutchan Signed-off-by: Robert Love Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3de11748c1b312833e8a148ab7ec47669ecc99dc tree edbec32248719b952fcaaf8f8e6c35371ce5343c parent 94efe72f762e2c147d8146d637d5ece5614c8d94 author Robert Love Thu, 04 Aug 2005 13:07:08 -0700 committer Linus Torvalds Thu, 04 Aug 2005 13:11:15 -0700 [PATCH] inotify: update help text The inotify help text still refers to the character device. Update it. Fixes kernel bug #4993. Signed-off-by: Robert Love Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94efe72f762e2c147d8146d637d5ece5614c8d94 tree 002e4719541ad838342e01a5f8ff63ae0a618b29 parent bcf945d36fa0598f41ac4ad46a9dc43135460263 author David Howells Thu, 04 Aug 2005 13:07:07 -0700 committer Linus Torvalds Thu, 04 Aug 2005 13:11:14 -0700 [PATCH] Destruction of failed keyring oopses The attached patch makes sure that a keyring that failed to instantiate properly is destroyed without oopsing [CAN-2005-2099]. The problem occurs in three stages: (1) The key allocator initialises the type-specific data to all zeroes. In the case of a keyring, this will become a link in the keyring name list when the keyring is instantiated. (2) If a user (any user) attempts to add a keyring with anything other than an empty payload, the keyring instantiation function will fail with an error and won't add the keyring to the name list. (3) The keyring's destructor then sees that the keyring has a description (name) and tries to remove the keyring from the name list, which oopses because the link pointers are both zero. This bug permits any user to take down a box trivially. Signed-Off-By: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bcf945d36fa0598f41ac4ad46a9dc43135460263 tree 7a2aa188442bf863f20055a001baf85143d7a5b9 parent 6fb0caa42308923d9e4ed7b36ec077b97c107e24 author David Howells Thu, 04 Aug 2005 13:07:06 -0700 committer Linus Torvalds Thu, 04 Aug 2005 13:11:14 -0700 [PATCH] Error during attempt to join key management session can leave semaphore pinned The attached patch prevents an error during the key session joining operation from hanging future joins in the D state [CAN-2005-2098]. The problem is that the error handling path for the KEYCTL_JOIN_SESSION_KEYRING operation has one error path that doesn't release the session management semaphore. Further attempts to get the semaphore will then sleep for ever in the D state. This can happen in four situations, all involving an attempt to allocate a new session keyring: (1) ENOMEM. (2) The users key quota being reached. (3) A keyring name that is an empty string. (4) A keyring name that is too long. Any user may attempt this operation, and so any user can cause the problem to occur. Signed-Off-By: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6fb0caa42308923d9e4ed7b36ec077b97c107e24 tree f1418651333a8afd9c487ef4aaf843301d93fd50 parent 7cfa132cd06639c8ac5fe9ef776a7650f1d8c3e6 parent fdd0edf2aca72e374d10e7a0957a006f18bffaf4 author Linus Torvalds Thu, 04 Aug 2005 13:08:29 -0700 committer Linus Torvalds Thu, 04 Aug 2005 13:08:29 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6 commit 7cfa132cd06639c8ac5fe9ef776a7650f1d8c3e6 tree 61a24fcb1333cfedf540978048fef13f36653948 parent 6d22d85a852b72398a81b8e476977b28b4400f7c parent c80f90ba15ed56ae36d1fb51f81a88f9ba0d8c8b author Linus Torvalds Thu, 04 Aug 2005 13:02:31 -0700 committer Linus Torvalds Thu, 04 Aug 2005 13:02:31 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 6d22d85a852b72398a81b8e476977b28b4400f7c tree 3824c246813b7c326bceedc0b8c3c8ca49c7fd0b parent 48f1f5328267f52a34e61b8b0e6fc55a23c1348a author Paul Mackerras Thu, 04 Aug 2005 12:53:37 -0700 committer Linus Torvalds Thu, 04 Aug 2005 13:00:55 -0700 [PATCH] ppc64: fix for kexec boot issue The kexec boot is not successful on some power machines since all CPUs are getting removed from global interrupt queue (GIQ) before kexec boot. Some systems always expect at least one CPU in GIQ. Hence, this patch will make sure that only secondary CPUs are removed from GIQ. Signed-off-by: Haren Myneni Signed-off-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 48f1f5328267f52a34e61b8b0e6fc55a23c1348a tree aba1dd52b8b0825cfb88f3ec2fd0b10efb07db01 parent d27a4dddd96f4ee898f8d1d597d38f8f4079bbb0 author Alasdair G Kergon Thu, 04 Aug 2005 12:53:37 -0700 committer Linus Torvalds Thu, 04 Aug 2005 13:00:55 -0700 [PATCH] dm-raid locking fix This code was never designed to handle more than one instance of do_work() running at once. Signed-Off-By: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d27a4dddd96f4ee898f8d1d597d38f8f4079bbb0 tree d10a9247d1fdc0a94b939c2e5dfec881ea25ce94 parent 6b8b3e8a8b3e62b4209eaa36697e3c9df457e196 author Jim Keniston Thu, 04 Aug 2005 12:53:35 -0700 committer Linus Torvalds Thu, 04 Aug 2005 13:00:55 -0700 [PATCH] Add Documentation/kprobes.txt Acked-by: Prasanna S Panchamukhi Signed-off-by: Jim Keniston Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6b8b3e8a8b3e62b4209eaa36697e3c9df457e196 tree 8b537e5b358cbe93cd8e8ea54a9281d56a7ce205 parent e3b9703e27aab3839dcdb76b00d98428b67d25b0 author NeilBrown Thu, 04 Aug 2005 12:53:35 -0700 committer Linus Torvalds Thu, 04 Aug 2005 13:00:54 -0700 [PATCH] md: make sure md bitmap updates are flushed when array is stopped. The recent change to never ignore the bitmap, revealed that the bitmap isn't begin flushed properly when an array is stopped. We call bitmap_daemon_work three times as there is a three-stage pipeline for flushing updates to the bitmap file. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e3b9703e27aab3839dcdb76b00d98428b67d25b0 tree f9b62479cd7062c65e54641cc6190975f529a08b parent 193f1c931517592ec4188d15bf261e4bff368207 author NeilBrown Thu, 04 Aug 2005 12:53:34 -0700 committer Linus Torvalds Thu, 04 Aug 2005 13:00:54 -0700 [PATCH] md: yet another attempt to get bitmap-based resync to do the right thing in all cases... Firstly, R1BIO_Degraded was being set in a number of places in the resync code, but is never used there, so get rid of those settings. Then: When doing a resync, we want to clear the bit in the bitmap iff the array will be non-degraded when the sync has completed. However the current code would clear the bitmap if the array was non-degraded when the resync *started*, which obviously isn't right (it is for 'resync' but not for 'recovery' - i.e. rebuilding a failed drive). This patch calculated 'still_degraded' and uses the to tell bitmap_start_sync whether this sync should clear the corresponding bit. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 193f1c931517592ec4188d15bf261e4bff368207 tree 5ba1f6a220f796422cf7314b17813e94aeb3e978 parent aa1595e9f3d0d731bcfc6c2680d5483b78f663dc author NeilBrown Thu, 04 Aug 2005 12:53:33 -0700 committer Linus Torvalds Thu, 04 Aug 2005 13:00:54 -0700 [PATCH] md: always honour md bitmap being read from disk The code currently will ignore the bitmap if the array seem to be in-sync. This is wrong if the array is degraded, and probably wrong anyway. If the bitmap says some chunks are not in in-sync, and the superblock says everything IS in sync, then something is clearly wrong, and it is safer to trust the bitmap. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aa1595e9f3d0d731bcfc6c2680d5483b78f663dc tree df42ce619d60ded32718e299ca471c8578e735b9 parent efd8be2a4280f334be9309fa4ca1fb8f4e29475d author NeilBrown Thu, 04 Aug 2005 12:53:32 -0700 committer Linus Torvalds Thu, 04 Aug 2005 13:00:54 -0700 [PATCH] md: make 'md' and alias for 'md-mod' Until the bitmap code was added, modprobe md would load the md module. But now the md module is called 'md-mod', so we really need an alias for backwards comparability. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit efd8be2a4280f334be9309fa4ca1fb8f4e29475d tree 8837ffe6f2949fcefcbb67bb8af6332d1a9783e9 parent 4dcef52400fa6b9eb2de589300ae0151a1c65b3b author NeilBrown Thu, 04 Aug 2005 12:53:32 -0700 committer Linus Torvalds Thu, 04 Aug 2005 13:00:54 -0700 [PATCH] md: remove a stray debugging printk. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4dcef52400fa6b9eb2de589300ae0151a1c65b3b tree f8023c75eb4ce1fad2e22560aaf1e52a27254046 parent 75eedfed3e2d05563f44d2f69efb991fad95d7f1 author Mauro Carvalho Chehab Thu, 04 Aug 2005 12:53:30 -0700 committer Linus Torvalds Thu, 04 Aug 2005 13:00:54 -0700 [PATCH] v4l: oopsfix for BTTV on badly behaved PCI chipsets no_overlay bttv parameter implemented to fix OOPS on some PCI chipsets (like some VIA) with these behaviors: 1) If pci_quicks does identify the chip as having troubles to handle PCI2PCI transfers, no_overlay defaults to 1. The user may force it to 0, to reenable (not recommended). 2) For newer chipsets not blacklisted, no_overlay=1 is provided as a workaround until PCI chipset included on /drivers/pci/quirks.c Thanks to Bodo Eggert <7eggert@gmx.de> Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 75eedfed3e2d05563f44d2f69efb991fad95d7f1 tree 9084036d93c38d3ad64d327c6ce4afe773bace60 parent 556e58febf90c8cb1da25669d0892bf5fd2ddac2 author Olof Johansson Thu, 04 Aug 2005 12:53:29 -0700 committer Linus Torvalds Thu, 04 Aug 2005 13:00:53 -0700 [PATCH] ppc64: Fix UP kernel build CONFIG_KEXEC breaks UP builds because of a misspelled smp_release_cpus(). Also, the function isn't defined unless built with CONFIG_SMP but it is needed if we are to go from a UP to SMP kernel. Enable it and document it. Thanks to Steven Winiecki for reporting this and to Milton for remembering how it's supposed to work and why. Signed-off-by: Olof Johansson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 556e58febf90c8cb1da25669d0892bf5fd2ddac2 tree 427c4e5c414a2308107673d1b5197608426b652b parent fd6f31c31825f62eb91f491e8316129e5ce81fc6 author Ravikiran G Thirumalai Thu, 04 Aug 2005 12:53:26 -0700 committer Linus Torvalds Thu, 04 Aug 2005 13:00:53 -0700 [PATCH] ide: fix kmalloc_node breakage in ide driver Patch fixes oops caused by ide interfaces not on pci. pcibus_to_node causes the kernel to crash otherwise. Patch also adds a BUG_ON to check if hwif is NULL. Signed-off-by: Christoph Lameter Signed-off-by: Shai Fultheim Signed-off-by: Ravikiran Thirumalai Cc: Andi Kleen Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c80f90ba15ed56ae36d1fb51f81a88f9ba0d8c8b tree f39fbaa96a3d1f03283fecd465d2ff6efdec97a6 parent c013622d5fe0ffeb0c74b2af4c2b1aad6164f709 author Michael Gernoth Thu, 04 Aug 2005 20:43:40 +0100 committer Russell King Thu, 04 Aug 2005 20:43:40 +0100 [PATCH] ARM: 2844/1: Add maintainer for Jornada 720 Patch from Michael Gernoth As discussed on the handhelds.org Jornada mailinglist, I take over maintainership of the currently unmaintained Jornada 720-port in the mainline kernel. Signed-off-by: Michael Gernoth Signed-off-by: Russell King commit fdd0edf2aca72e374d10e7a0957a006f18bffaf4 tree 884d14e8c9954e438a6c3602fcecbc5d13645cb5 parent 84e66ee7ec7aaa789945403b7cbde7a0b08c15ef author James Bottomley Thu, 04 Aug 2005 13:28:40 -0500 committer James Bottomley Thu, 04 Aug 2005 13:38:59 -0500 [SCSI] fix aic7xxx performance issues since 2.6.12-rc2 Several people noticed we dropped quite a bit on benchmark figures. OK, it was my fault but unfortunately I discovered I ran out of brown paper bags a while ago and forgot to reorder them. The issue is that a construct introduced in the conversion of the driver to use the transport class keyed off whether the block request was tagged or not. However, the aic7xxx driver doesn't properly set up the block layer TCQ (it uses the wrong API), so the driver now things all requests are untagged and we keep it to a queue depth of a single element. Oops. The fix is to use the correct TCQ API. Signed-off-by: James Bottomley commit fd6f31c31825f62eb91f491e8316129e5ce81fc6 tree 2fdc05b8695d8e04171c2e2d26c9ebbec1dbb954 parent 9d343219e33e8b49d754ea9b2e45f6c7da87f4fb parent 8edc81cc0b80b3ec8645711e1110a84235c7030d author Linus Torvalds Thu, 04 Aug 2005 10:36:25 -0700 committer Linus Torvalds Thu, 04 Aug 2005 10:36:25 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus commit 9d343219e33e8b49d754ea9b2e45f6c7da87f4fb tree 7071539fb438f624aa2ad737de380bacdcf2b572 parent ea48e705be4f886c16313c882a6623b442bab0eb parent ff2afb9df607dfcaacdaf67ea84b773c6fb08f4c author Linus Torvalds Thu, 04 Aug 2005 09:30:50 -0700 committer Linus Torvalds Thu, 04 Aug 2005 09:30:50 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit ea48e705be4f886c16313c882a6623b442bab0eb tree 4845014ed6cc478b245d9045b8ea1d8c7b6149ad parent 6e346228c76506e07e297744a28464022c6806ad parent 0dca0f7bf82face7b700890318d5550fd542cabf author Linus Torvalds Thu, 04 Aug 2005 09:20:23 -0700 committer Linus Torvalds Thu, 04 Aug 2005 09:20:23 -0700 Merge head 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband commit 6e346228c76506e07e297744a28464022c6806ad tree f2c484ca4408d12411bff11dd1fa9627108b12c8 parent 968002166cce2ef4ead8c9441a9dd5b945c9ed1e author Linus Torvalds Thu, 04 Aug 2005 08:33:38 -0700 committer Linus Torvalds Thu, 04 Aug 2005 08:33:38 -0700 It wasn't just x86-64 that had hardcoded VM_FAULT_xxx numbers Fix up arm26, cris, frv, m68k, parisc and sh64 too.. commit 968002166cce2ef4ead8c9441a9dd5b945c9ed1e tree 6142261f05e9ae16faa07b91e392f49513c02cf2 parent 1260f801b4e4ba7be200886b4a53d730de05ca19 author Alexander Nyberg Thu, 04 Aug 2005 16:14:57 +0200 committer Linus Torvalds Thu, 04 Aug 2005 08:20:48 -0700 [PATCH] x86-64: use proper VM_FAULT_xxx macros x86_64 had hardcoded the VM_ numbers so it broke down when the numbers were changed. Signed-off-by: Alexander Nyberg Signed-off-by: Linus Torvalds commit 1260f801b4e4ba7be200886b4a53d730de05ca19 tree 319a68125252ac50df21b6e84cc1131c96e60d6f parent c36f19e02a96488f550fdb678c92500afca3109b author David Howells Thu, 04 Aug 2005 11:50:01 +0100 committer Linus Torvalds Thu, 04 Aug 2005 08:20:47 -0700 [PATCH] Keys: Fix key management syscall interface bugs This fixes five bugs in the key management syscall interface: (1) add_key() returns 0 rather than EINVAL if the key type is "". Checking the key type isn't "" should be left to lookup_user_key(). (2) request_key() returns ENOKEY rather than EPERM if the key type begins with a ".". lookup_user_key() can't do this because internal key types begin with a ".". (3) Key revocation always returns 0, even if it fails. (4) Key read can return EAGAIN rather than EACCES under some circumstances. A key is permitted to by read by a process if it doesn't grant read access, but it does grant search access and it is in the process's keyrings. That search returns EAGAIN if it fails, and this needs translating to EACCES. (5) request_key() never adds the new key to the destination keyring if one is supplied. The wrong macro was being used to test for an error condition: PTR_ERR() will always return true, whether or not there's an error; this should've been IS_ERR(). Signed-Off-By: David Howells Signed-Off-By: Linus Torvalds commit c36f19e02a96488f550fdb678c92500afca3109b tree b446faa5bd5a0e506b20def0e5f0a1f210dce30a parent d95a1b4818f2fe38a3cfc9a7d5817dc9a1a69329 author Benjamin Herrenschmidt Thu, 04 Aug 2005 11:36:26 +0200 committer Linus Torvalds Thu, 04 Aug 2005 08:20:47 -0700 [PATCH] Remove suspend() calls from shutdown path This removes the calls to device_suspend() from the shutdown path that were added sometime during 2.6.13-rc*. They aren't working properly on a number of configs (I got reports from both ppc powerbook users and x86 users) causing the system to not shutdown anymore. I think it isn't the right approach at the moment anyway. We have already a shutdown() callback for the drivers that actually care about shutdown and the suspend() code isn't yet in a good enough shape to be so much generalized. Also, the semantics of suspend and shutdown are slightly different on a number of setups and the way this was patched in provides little way for drivers to cleanly differenciate. It should have been at least a different message. For 2.6.13, I think we should revert to 2.6.12 behaviour and have a working suspend back. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit c013622d5fe0ffeb0c74b2af4c2b1aad6164f709 tree 958eaf224a3ca3fc4f109ae0a8b4ce32797f17d5 parent ff2afb9df607dfcaacdaf67ea84b773c6fb08f4c author Richard Purdie Thu, 04 Aug 2005 15:06:59 +0100 committer Russell King Thu, 04 Aug 2005 15:06:59 +0100 [PATCH] ARM: 2838/1: Fix arm oprofile backtrace warning Patch from Richard Purdie Fix a typo causing a warning in the arm oprofile backtrace code. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 3873658be7b3896e88648664e480a44d12083ad8 tree efaa703103f650da42d072d7c517a33839d68baf parent d95a1b4818f2fe38a3cfc9a7d5817dc9a1a69329 author Christoph Hellwig Thu, 04 Aug 2005 07:05:37 -0700 committer David S. Miller Thu, 04 Aug 2005 07:05:37 -0700 [SPARC]: Fix up sleep_on() removal in vfc driver. Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit ff2afb9df607dfcaacdaf67ea84b773c6fb08f4c tree 8163106927016a97d336a2116518effabab6c0e3 parent d95a1b4818f2fe38a3cfc9a7d5817dc9a1a69329 author Russell King Thu, 04 Aug 2005 14:17:33 +0100 committer Russell King Thu, 04 Aug 2005 14:17:33 +0100 [PATCH] ARM: Fix ARM fault handler for get_user_pages() fixes. The ARM fault handler is optimised to make the fast path, err, fast. The renumbering of the VM_FAULT_* codes broke this because numbers were used instead of the definitions. Fix this. Signed-off-by: Russell King commit 8edc81cc0b80b3ec8645711e1110a84235c7030d tree 6488d39a0b867ef6db82993155013466162cf53d parent 11e981f1e02c2a36465cbb208b21cb8b6480f399 parent 62778ba1aa2589dc78c36a32edc6f5a6ccaf50c6 author Len Brown Wed, 03 Aug 2005 23:53:50 -0400 committer Len Brown Wed, 03 Aug 2005 23:53:50 -0400 Merge ../to-linus-stable commit 62778ba1aa2589dc78c36a32edc6f5a6ccaf50c6 tree 48fe41f8e5bd3b1a6fa7afad6eed6b8a0c527b21 parent 8066eff0a1a0703ad901dbe5646a47dbfc089ef2 parent d4ab025b73a2d10548e17765eb76f3b7351dc611 author Len Brown Wed, 03 Aug 2005 23:53:35 -0400 committer Len Brown Wed, 03 Aug 2005 23:53:35 -0400 /home/lenb/src/to-linus-stable branch 'acpi-2.6.12' commit 11e981f1e02c2a36465cbb208b21cb8b6480f399 tree d812a362e9e530f0cfd7a189d79ede3e8d5a7f96 parent 8066eff0a1a0703ad901dbe5646a47dbfc089ef2 author David Shaohua Li Wed, 03 Aug 2005 23:46:33 -0400 committer Len Brown Wed, 03 Aug 2005 23:50:36 -0400 [ACPI] S3 resume: avoid kmalloc() might_sleep oops symptom ACPI now uses kmalloc(...,GPF_ATOMIC) during suspend/resume. http://bugzilla.kernel.org/show_bug.cgi?id=3469 Signed-off-by: David Shaohua Li Signed-off-by: Len Brown commit d4ab025b73a2d10548e17765eb76f3b7351dc611 tree d26b975d480b15a950d1050002b9898c11bbbeaf parent 79cda7d0e1c8629996242c036d6fe0466038d8ba author Len Brown Wed, 03 Aug 2005 23:20:58 -0400 committer Len Brown Wed, 03 Aug 2005 23:22:10 -0400 [ACPI] delete Warning: Encountered executable code at module level, [AE_NOT_CONFIGURED] http://bugzilla.kernel.org/show_bug.cgi?id=4923 Signed-off-by: Len Brown commit d95a1b4818f2fe38a3cfc9a7d5817dc9a1a69329 tree 7f3e1e4ec9070d6db9ab0f8fb0d9cb94afed4791 parent 194d0710e1a7fe92dcf860ddd31fded8c3103b7a parent 8066eff0a1a0703ad901dbe5646a47dbfc089ef2 author Linus Torvalds Wed, 03 Aug 2005 16:50:19 -0700 committer Linus Torvalds Wed, 03 Aug 2005 16:50:19 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus commit 8066eff0a1a0703ad901dbe5646a47dbfc089ef2 tree 9d46f66ae3f1002073c317e10218a78775ff7e2d parent 9a351e30d72d409ec62c83f380e330e0baa584b4 parent 79cda7d0e1c8629996242c036d6fe0466038d8ba author Len Brown Wed, 03 Aug 2005 18:15:15 -0400 committer Len Brown Wed, 03 Aug 2005 18:15:15 -0400 /home/lenb/src/to-linus branch 'acpi-2.6.12' commit 79cda7d0e1c8629996242c036d6fe0466038d8ba tree 95cba1ce344cb0e9840143ebec8349dc9a6fdc65 parent b34a8030eeab4d59dcdd86de38f6927b9edd441f author Luming Yu Wed, 03 Aug 2005 18:07:59 -0400 committer Len Brown Wed, 03 Aug 2005 18:11:22 -0400 [ACPI] CONFIG_ACPI_HOTKEY is now "n" by default For 2.6.12 behaviour, this (EXPERIMENTAL) driver should not be built. Update the driver source with latest from Luming. Signed-off-by: Luming Yu Signed-off-by: Len Brown commit b34a8030eeab4d59dcdd86de38f6927b9edd441f tree b0bdf2532175ea0209b2782b9a077d25a6f33aec parent 7b15f5e7bb180ac7bfb8926dbbd8835fecc07fad author Alexey Starikovskiy Wed, 03 Aug 2005 17:55:21 -0400 committer Len Brown Wed, 03 Aug 2005 17:57:24 -0400 [ACPI] restore /proc/acpi/button/ (ala 2.6.12) Signed-off-by Alexey Starikovskiy Signed-off-by Len Brown commit 7b15f5e7bb180ac7bfb8926dbbd8835fecc07fad tree fa5b48a0041c2f4896805a4762befabdfcea3031 parent ecc21ebe603af31f172c43b8b261df79040790ef author Luming Yu Wed, 03 Aug 2005 17:38:04 -0400 committer Len Brown Wed, 03 Aug 2005 17:40:43 -0400 [ACPI] revert Embedded Controller to polling-mode by default (ala 2.6.12) Burst mode isn't ready for prime time, but can be enabled for test via "ec_burst=1" Signed-off-by: Luming Yu Signed-off-by: Len Brown commit 194d0710e1a7fe92dcf860ddd31fded8c3103b7a tree da03b56fa4dee221c53af5770492d391f0d09459 parent a68d2ebc1581a3aec57bd032651e013fa609f530 parent 9bbd03758945858c9303f3258b418b94c4ffd735 author Linus Torvalds Wed, 03 Aug 2005 13:09:43 -0700 committer Linus Torvalds Wed, 03 Aug 2005 13:09:43 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 9bbd03758945858c9303f3258b418b94c4ffd735 tree 74dca48bdcec507933ea3285d08c4f065563da8c parent 8c741ed74d121dbc97c9fb7f9a66c768d4c547c4 author Ian Campbell Wed, 03 Aug 2005 20:34:52 +0100 committer Russell King Wed, 03 Aug 2005 20:34:52 +0100 [PATCH] ARM: 2833/2: Remove support for WDIOF_MAGICCLOSE from sa1100-wdt Patch from Ian Campbell On PXA255 there is no way to disable the watchdog. Turning off OIER[E3] as suggested in the existing comment does not work. I posted a note to the ARM mailing list a little while ago asking for opinions from people using SA1100. There was one reponse from Nico who believes that the SA1100 is the same as the PXA255 in this respect. You also asked me to involve the watchdog maintainer which I tried to do but didn't hear anything back. There are only a couple of other drivers which can't stop the watchdog and there seems to be no consistancy regarding printing an error etc. I decided to print something since that matches the case for all the other drivers when NOWAYOUT is turned on. Also, I changed the device .name to "watchdog" like most of the other watchdogs. udev uses it as the device name (by default) and spaces etc. get in the way. Superceded 2833/1 because 2.6.13-rc4 caused rejects. Signed-off-by: Ian Campbell Signed-off-by: Russell King commit 8c741ed74d121dbc97c9fb7f9a66c768d4c547c4 tree f76456dabc65f20688993ae9fe4dc99354228432 parent 7b1fbf292bb4c855ddae8add8c459e94684f7543 author Deepak Saxena Wed, 03 Aug 2005 19:58:21 +0100 committer Russell King Wed, 03 Aug 2005 19:58:21 +0100 [PATCH] ARM: 2835/1: Add UPF_SKIP_TEST to IXP4xx serial ports Patch from Deepak Saxena This allows the serial driver autconf to work properly on all the IXP serial ports. W/o it we basically put the serial port in an unrecoverable state and lose console. Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit 7b1fbf292bb4c855ddae8add8c459e94684f7543 tree 8269bb5c858aaa0a0483cb81759ca947e0b396c1 parent 858297509590ef4aa5690e30c2f5505077b4f369 author Catalin Marinas Wed, 03 Aug 2005 19:53:25 +0100 committer Russell King Wed, 03 Aug 2005 19:53:25 +0100 [PATCH] ARM: 2841/1: Fix VFP +/-0 case for doubles addition Patch from Catalin Marinas The IEEE 754 standard specifies that the result of (x - x), where x is a valid number, should be -0 if the rounding mode is towards minus infinity or +0 otherwise. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 858297509590ef4aa5690e30c2f5505077b4f369 tree 3297d3fcf09f9ea28e0d4360902558aaadae337c parent 975ad141eecccb24fc8db1e0f4a08f5580f4a9a9 author Michael Burian Wed, 03 Aug 2005 19:49:18 +0100 committer Russell King Wed, 03 Aug 2005 19:49:18 +0100 [PATCH] ARM: 2840/1: Add mach-types to Documentation/dontdiff Patch from Michael Burian This file is maintained by RMK's machine registry, it should not be patched. Signed-off-by: Michael Burian Signed-off-by: Russell King commit 975ad141eecccb24fc8db1e0f4a08f5580f4a9a9 tree cc392df5cf9909b22bfa608755e0285fccb9b187 parent f148af2593ef76ac705d1cc6abe48f455c9912cc author Deepak Saxena Wed, 03 Aug 2005 19:49:17 +0100 committer Russell King Wed, 03 Aug 2005 19:49:17 +0100 [PATCH] ARM: 2839/1: Remove XScale cache and TLB locking code Patch from Deepak Saxena The XScale locking code is not something that has been validated on 2.6 and needs to be replaced with a more generic API to use with other ARMs that support locking features. Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit f148af2593ef76ac705d1cc6abe48f455c9912cc tree cd1e0b0959624234ca3489df8888434ffea5050e parent 1fcf844861eb08ee05e05dba13b5436f2f2e29ed author Richard Purdie Wed, 03 Aug 2005 19:49:17 +0100 committer Russell King Wed, 03 Aug 2005 19:49:17 +0100 [PATCH] ARM: 2837/2: Re: ARM: Make NWFPE preempt safe Patch from Richard Purdie NWFPE used global variables which meant it wasn't safe for use with preemptive kernels. This patch removes them and communicates the information between functions in a preempt safe manner. Generation of some exceptions was broken and this has also been corrected. Tests with glibc's maths test suite show no change in the results before/after this patch. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 1fcf844861eb08ee05e05dba13b5436f2f2e29ed tree 980c21c85eff8550c3fbada9e6f922dcf90f7f37 parent 5cb4cc0d8211c490537c8568001958fc76741312 author Ben Dooks Wed, 03 Aug 2005 19:49:16 +0100 committer Russell King Wed, 03 Aug 2005 19:49:16 +0100 [PATCH] ARM: 2832/1: BAST - limit clock-rate for IIC bus Patch from Ben Dooks The default clock rate does not specify a maximum, so the default of 400KHz is used. This rate is too fast for the PMU on the EB2410ITX, so we now specify platform data with a rate of around 100KHz. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit a68d2ebc1581a3aec57bd032651e013fa609f530 tree b41977c7157d7e26f37e9cb502cd1afbbddcbc17 parent f33ea7f404e592e4563b12101b7a4d17da6558d7 author Linus Torvalds Wed, 03 Aug 2005 10:07:09 -0700 committer Linus Torvalds Wed, 03 Aug 2005 10:07:09 -0700 Fix up recent get_user_pages() handling The VM_FAULT_WRITE thing is an extra bit, not a valid return value, and has to be treated as such by get_user_pages(). Signed-off-by: Linus Torvalds commit f33ea7f404e592e4563b12101b7a4d17da6558d7 tree 1d587ad8a06cb6d2e3a187f0312c8a524ffefe53 parent 5cb4cc0d8211c490537c8568001958fc76741312 author Nick Piggin Wed, 03 Aug 2005 20:24:01 +1000 committer Linus Torvalds Wed, 03 Aug 2005 09:12:05 -0700 [PATCH] fix get_user_pages bug Checking pte_dirty instead of pte_write in __follow_page is problematic for s390, and for copy_one_pte which leaves dirty when clearing write. So revert __follow_page to check pte_write as before, and make do_wp_page pass back a special extra VM_FAULT_WRITE bit to say it has done its full job: once get_user_pages receives this value, it no longer requires pte_write in __follow_page. But most callers of handle_mm_fault, in the various architectures, have switch statements which do not expect this new case. To avoid changing them all in a hurry, make an inline wrapper function (using the old name) that masks off the new bit, and use the extended interface with double underscores. Yes, we do have a call to do_wp_page from do_swap_page, but no need to change that: in rare case it's needed, another do_wp_page will follow. Signed-off-by: Hugh Dickins [ Cleanups by Nick Piggin ] Signed-off-by: Linus Torvalds commit ecc21ebe603af31f172c43b8b261df79040790ef tree d2468578cb327adbd3d69feb610a79b8b8a0f84d parent 3d35600a9de8e2816d0e3726f64b7271af6fdda4 author David Shaohua Li Wed, 03 Aug 2005 11:00:11 -0400 committer Len Brown Wed, 03 Aug 2005 11:04:10 -0400 [ACPI] PCI interrupt link suspend/resume - revert to 2.6.12 behaviour This patch disables the PCI Interrupt Link refernece counts, which should not co-exist with the 2.6.12 irq_router.resume method or else a double acpi_pci_link_set() could result on resume. Signed-off-by: David Shaohua Li Signed-off-by: Len Brown commit 5cb4cc0d8211c490537c8568001958fc76741312 tree 3a3844a79cff56d84ecafd65ba5d8da25e158d2b parent 0b2bfb4e7ff61f286676867c3508569bea6fbf7a author Haren Myneni Wed, 03 Aug 2005 15:08:18 +1000 committer Linus Torvalds Tue, 02 Aug 2005 22:16:45 -0700 [PATCH] Xmon bug fix for soft-reset For soft reset during system hang, got an error "CPU did not take control" for some CPUs even though they responded to soft-reset (called SystemReset, die and called debugger - xmon). First these CPUs entered into xmon by IPI callback and then got a soft-reset exception and re-entered into xmon again. The first CPU which re-entered into xmon got the output lock and made into xmon successfully without unlocking. Hence, the next CPU(s) which re-entered into xmon try to acquire a lock (get_output_lock). Therefore, we can not view state of those CPU(s). [This is a simple, very low risk, obvious fix for an obvious bug, and should go into 2.6.13. -- paulus] Signed-off-by: Haren Myneni Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 3d35600a9de8e2816d0e3726f64b7271af6fdda4 tree 47b234ce27a0a6b0857ded04b95075a18e0462bb parent 87bec66b9691522414862dd8d41e430b063735ef author Len Brown Wed, 03 Aug 2005 00:22:52 -0400 committer Len Brown Wed, 03 Aug 2005 00:23:45 -0400 [ACPI] fix 64-bit build warning in processor_idle.c Signed-off-by: Len Brown commit 0b2bfb4e7ff61f286676867c3508569bea6fbf7a tree 39c39d75aa916afcc3a3f736d3a5fd00a48ea003 parent 71db63acff69618b3d9d3114bd061938150e146b author Ivan Kokshaysky Wed, 03 Aug 2005 03:09:03 +0400 committer Linus Torvalds Tue, 02 Aug 2005 18:21:25 -0700 [PATCH] ACPI: increase PCIBIOS_MIN_IO on x86 We have increased PCIBIOS_MIN_IO to 0x4000, but still want motherboard resources to be allocated properly. So we need to state 0x1000 (according to the comment) limit explicitely. Signed-off-by: Ivan Kokshaysky Signed-off-by: Linus Torvalds commit 71db63acff69618b3d9d3114bd061938150e146b tree 49c43f9115648cd730e4a11e455877ad5ee680c5 parent 688d191821de7893043f5a37970472627aaffa4e author Ivan Kokshaysky Wed, 03 Aug 2005 02:59:47 +0400 committer Linus Torvalds Tue, 02 Aug 2005 18:21:25 -0700 [PATCH] increase PCIBIOS_MIN_IO on x86 There is a number of x86 laptops that have some non-PCI IO ports in the 0x1000-0x1fff range, and it's quite hard to control the correct order of resource allocation between PCI and other subsystems controlling these ports. Especially with modular kernel. So just increase PCIBIOS_MIN_IO to 0x4000 to prevent any new PCI resource allocations in the problematic range (this limitation must apply _only_ to the root bus resources - see Linus' change in pci_bus_alloc_resource). As PCIBIOS_MIN_IO and PCIBIOS_MIN_CARDBUS_IO are the same now on i386 and x86-64, we can remove the latter. Signed-off-by: Ivan Kokshaysky Signed-off-by: Linus Torvalds commit 688d191821de7893043f5a37970472627aaffa4e tree bee038b981147f4f9f3ac0ca23348376044678dd parent d7ed538a02c219119adb20f1dccbf0f8015e53f3 author Linus Torvalds Tue, 02 Aug 2005 14:55:40 -0700 committer Linus Torvalds Tue, 02 Aug 2005 14:55:40 -0700 pci: make bus resource start address override minimum IO address The reason we have PCIBIOS_MIN_IO and PCIBIOS_MIN_CARDBUS_IO is because we want to protect badly documented motherboard PCI resources and thus don't want to allocate new resources in low IO/MEM space. However, if we have already discovered a PCI bridge with a specified resource base, that should override that decision. This change will allow us to move the "careful" region upwards without resulting in problems allocating resources in low mappings. This was brought on by us having allocated a bus resource at 0x1000, conflicting with a undocumented VAIO Sony PI resources. commit d7ed538a02c219119adb20f1dccbf0f8015e53f3 tree d716ae7dc2e986b36c8180333839312dc0eab7e2 parent f7c80c9f77b0e8a59a19506fd3caf323408a5166 author Jens Axboe Tue, 02 Aug 2005 20:08:02 +0200 committer Linus Torvalds Tue, 02 Aug 2005 11:19:18 -0700 [PATCH] cfq-iosched: fix problem with barriers and max_depth == 1 CFQ will currently stall when using write barriers and the default max_depth setting of 1, since we artificially need a depth of 2 when pre-pending the first flush. So never deny the barrier request going to the device. This is a regression since 2.6.12, it was found in SUSE testing. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 84e66ee7ec7aaa789945403b7cbde7a0b08c15ef tree c8f9f71b8a9fea5f44d66b769b635e9f077b9f01 parent c2c96f46f46df072e49200a1181b3086cd2f08a6 author James Bottomley Tue, 02 Aug 2005 09:32:17 -0500 committer James Bottomley Tue, 02 Aug 2005 10:50:51 -0500 [SCSI] aic7xxx: final fixes for DT handling The aic7xxx can support Data Group transfers at periods > 12.5, so eliminate that restriction. Additionally wide is a requirement for DT so ensure wide is set if users request DT. Signed-off-by: James Bottomley commit f7c80c9f77b0e8a59a19506fd3caf323408a5166 tree 5306a5d77d38b363a1f04abeaf4bb7a234037e87 parent f7d1d23c301e0ce82c801f3b5800be6341752a1f author Olaf Hering Tue, 19 Jul 2005 20:04:24 +0200 committer Linus Torvalds Tue, 02 Aug 2005 08:43:59 -0700 [PATCH] aic byteorder fixes after recent cleanup Rebuild the aic7xxx firmware doesn't work anymore after this change which appeared int 2.6.13-rc1: [SCSI] aic7xxx/aic79xx: remove useless byte order macro cruft Two files did not include byteorder.h, resulting in aic dying with a panic "Unknown opcode encountered in seq program" This fixes it for me. Signed-off-by: Olaf Hering Acked-by: Christoph Hellwig Signed-off-by: Linus Torvalds commit f7d1d23c301e0ce82c801f3b5800be6341752a1f tree 12095ed260df39f8ee870f38d108d90519feb32f parent 9a351e30d72d409ec62c83f380e330e0baa584b4 author Paul Mackerras Tue, 02 Aug 2005 21:51:36 +1000 committer Linus Torvalds Tue, 02 Aug 2005 08:28:48 -0700 [PATCH] Obvious bugfix for yenta resource allocation Recent changes (well, dating from 12 July) have broken cardbus on my powerbook: I get 3 messages saying "no resource of type xxx available, trying to continue", and if I plug in my wireless card, it complains that there are no resources allocated to the card. This all worked in 2.6.12. Looking at the code in yenta_socket.c, function yenta_allocate_res, it's obvious what is wrong: if we get to line 639 (i.e. there wasn't a usable preassigned resource), we will always flow through to line 668, which is the printk that I was seeing, even if a resource was successfully allocated. It looks to me as though there should be a return statement after the two config_writel's in each of the 3 branches of the if statements, so that the function returns after successfully setting up the resource. The patch below adds these return statements, and with this patch, cardbus works on my powerbook once again. Signed-off-by: Paul Mackerras Acked-by: Dominik Brodowski Signed-off-by: Linus Torvalds commit c2c96f46f46df072e49200a1181b3086cd2f08a6 tree fd85a89e3f3d10d7f604b45ae985ecbbc6f28fb6 parent c1a15468d58e75debc5437b2e4e12d02a89bb3a2 author Kai Makisara Tue, 02 Aug 2005 12:21:51 +0300 committer James Bottomley Tue, 02 Aug 2005 10:14:36 -0500 [SCSI] Fix SCSI tape oops at module removal Removing the SCSI tape module results in an oops in class_device_destroy if any devices are present. The patch at the end of this message fixes the bug by moving class_destroy() later in exit_st() so that the class still exists when devices are removed. (The bug is old but class_simple_device_remove() did nothing when the class did not exist.) The patch also fixes a "class leak" in init_st() error path. I would like to get this into 2.6.13 but it may be too late? Signed-off-by: Kai Makisara Signed-off-by: James Bottomley commit c1a15468d58e75debc5437b2e4e12d02a89bb3a2 tree b4ddee7f1d11b2f61a5c8d2da7dff499c172dde2 parent f7ff898ad3971cd36967453d331c57d97d407007 author Jack Hammer Tue, 26 Jul 2005 10:20:33 -0400 committer James Bottomley Tue, 02 Aug 2005 10:09:03 -0500 [SCSI] ServeRAID V7.12.02 I am resubmitting the 2.6 kernel patch for the Version 7.12.02 ips driver. I have eliminated a couple of inappropriate changes pointed out by Arjan. Signed-off-by: Jack Hammer Signed-off-by: James Bottomley commit f7ff898ad3971cd36967453d331c57d97d407007 tree 825bf8e4bd9f6eb3c3e5edf69f4dab84033e946e parent e572f7cc28a0b01b96ede3f78f448ad55c5e67ad author James Bottomley Sat, 30 Jul 2005 10:37:55 -0500 committer James Bottomley Sat, 30 Jul 2005 10:44:38 -0500 [SCSI] aic7xxx: fix bug in DT handing Basically DT isn't reported or handled at all. The problem is that lines of code like this: spi_dt(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_DT_REQ; don't do what you think they do when spi_dt is a single bit variable. Signed-off-by: James Bottomley commit e572f7cc28a0b01b96ede3f78f448ad55c5e67ad tree c1794ceb5a56eea18d29b6bf482d9d1cd90ed785 parent 7cd7ae531c7896f90485ce6ebb2b1370a0a7d8c8 author Andrew Morton Wed, 27 Jul 2005 01:07:43 -0700 committer James Bottomley Sat, 30 Jul 2005 09:47:53 -0500 [SCSI] fc4 warning fix drivers/fc4/fc.c: In function `fcp_scsi_dev_reset': drivers/fc4/fc.c:933: warning: control reaches end of non-void function Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 7cd7ae531c7896f90485ce6ebb2b1370a0a7d8c8 tree df79e5962567bac1f527e40a1671a8d08933f091 parent b0825488a642cadcf39709961dde61440cb0731c author Linda Xie Fri, 15 Jul 2005 17:49:27 -0500 committer James Bottomley Sat, 30 Jul 2005 08:59:04 -0500 [SCSI] scsi/ibmvscsi/srp.h: Fix a wrong type code used for SRP_LOGIN_REJ This patch fixes srp.h which uses 0x80 for SRP_LOGIN_REJ instead of 0xc2. Signed-off-by: Linda Xie Signed-off-by: James Bottomley commit 0dca0f7bf82face7b700890318d5550fd542cabf tree 38f7a290fcca12bb13c7af19c5dafb99ca3bcaaa parent 4e38d36d88ead4e56f3155573976da84d5df18b3 author Hal Rosenstock Thu, 28 Jul 2005 13:17:26 -0700 committer Roland Dreier Thu, 28 Jul 2005 13:17:26 -0700 [PATCH] [IPoIB] Handle sending of unicast RARP responses RARP replies are another valid case where IPoIB may need to send a unicast packet with no neighbour structure. Signed-off-by: Hal Rosenstock Signed-off-by: Roland Dreier commit 4e38d36d88ead4e56f3155573976da84d5df18b3 tree f848ec6df10d92672919ac43f46912534fcaab0b parent 2ac6608c41f8c45371ea9dddae7f99bc2c15d5cf author Roland Dreier Thu, 28 Jul 2005 13:16:30 -0700 committer Roland Dreier Thu, 28 Jul 2005 13:16:30 -0700 [PATCH] [IB/cm]: Correct CM port redirect reject codes Reject code 24 is port and CM redirection, not just port redirection. Port redirection alone is code 25. Therefore we should rename code 24 to IB_CM_REJ_PORT_CM_REDIRECT and use IB_CM_REJ_PORT_REDIRECT for code 25. Signed-off-by: Roland Dreier