commit 63172cb3d5ef762dcb60a292bc7f016b85cf6e1f tree 038e1fd143ea3e9957c6dcae16dd391decfde011 parent 25f407f0b668f5e4ebd5d13e1fb4306ba6427ead author Chris Wright Fri, 21 Oct 2005 16:56:08 -0700 committer Linus Torvalds Fri, 21 Oct 2005 17:08:30 -0700 [PATCH] typo fix in last cpufreq powernow patch Not sure how it slipped by, but here's a trivial typo fix for powernow. Signed-off-by: Chris Wright [ It's "nurter" backwards.. Maybe we have a hillbilly The Shining fan? ] Signed-off-by: Linus Torvalds commit 25f407f0b668f5e4ebd5d13e1fb4306ba6427ead tree 10d8661419da9e0d6be6d22ef319582d052c4a26 parent 9465bee863bc4c6cf1566c12d6f92a8133e3da5c author Roland McGrath Fri, 21 Oct 2005 15:03:29 -0700 committer Linus Torvalds Fri, 21 Oct 2005 15:38:08 -0700 [PATCH] Call exit_itimers from do_exit, not __exit_signal When I originally moved exit_itimers into __exit_signal, that was the only place where we could reliably know it was the last thread in the group dying, without races. Since then we've gotten the signal_struct.live counter, and do_exit can reliably do group-wide cleanup work. This patch moves the call to do_exit, where it's made without locks. This avoids the deadlock issues that the old __exit_signal code's comment talks about, and the one that Oleg found recently with process CPU timers. [ This replaces e03d13e985d48ac4885382c9e3b1510c78bd047f, which is why it was just reverted. ] Signed-off-by: Roland McGrath Signed-off-by: Linus Torvalds commit 9465bee863bc4c6cf1566c12d6f92a8133e3da5c tree 339f5d3f7554afe2226eb6bdf9fa63851ae73311 parent 0213df74315bbab9ccaa73146f3e11972ea6de46 author Linus Torvalds Fri, 21 Oct 2005 15:36:00 -0700 committer Linus Torvalds Fri, 21 Oct 2005 15:36:00 -0700 Revert "Fix cpu timers exit deadlock and races" Revert commit e03d13e985d48ac4885382c9e3b1510c78bd047f, to be replaced by a much nicer fix from Roland. commit 0213df74315bbab9ccaa73146f3e11972ea6de46 tree 68a71915bb58a18168cd13744772bd447bcf8b29 parent 3078fcc1d18c7235b034dc889642c5300959fa20 author Dave Jones Fri, 21 Oct 2005 17:21:03 -0400 committer Linus Torvalds Fri, 21 Oct 2005 14:28:58 -0700 [PATCH] cpufreq: fix pending powernow timer stuck condition AMD recently discovered that on some hardware, there is a race condition possible when a C-state change request goes onto the bus at the same time as a P-state change request. Both requests happen, but the southbridge hardware only acknowledges the C-state change. The PowerNow! driver is then stuck in a loop, waiting for the P-state change acknowledgement. The driver eventually times out, but can no longer perform P-state changes. It turns out the solution is to resend the P-state change, which the southbridge will acknowledge normally. Thanks to Johannes Winkelmann for reporting this and testing the fix. Signed-off-by: Mark Langsdorf Signed-off-by: Dave Jones Signed-off-by: Linus Torvalds commit 3078fcc1d18c7235b034dc889642c5300959fa20 tree 7d4a495e007a8edc59901fc40aaeeec448fd5883 parent 2c86c83bf4e7fa1ef0d625e297607dc5d0d94dd4 author David Gibson Fri, 21 Oct 2005 13:41:19 +1000 committer Linus Torvalds Fri, 21 Oct 2005 12:24:41 -0700 [PATCH] ppc64: Fix typo bug in iSeries hash code This fixes a stupid typo bug in the iSeries hash table code. When we place a hash PTE in the secondary bucket, instead of setting the SECONDARY flag bit, as we should, we (redundantly) set the VALID flag. This was introduced with the patch abolishing bitfields from the hash table code. Mea culpa, oops. It hasn't been noticed until now because in practice we don't hit the secondary bucket terribly often. Signed-off-by: David Gibson Signed-off-by: Linus Torvalds commit 2c86c83bf4e7fa1ef0d625e297607dc5d0d94dd4 tree fe1fca67f5cac43036bc7ee75283807446c634c9 parent cffc7b38a23960d5f83b0aec5e67f189a6ae8062 parent d18566376055046fca0b51ad536f1778ef34966a author Linus Torvalds Fri, 21 Oct 2005 12:23:07 -0700 committer Linus Torvalds Fri, 21 Oct 2005 12:23:07 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit cffc7b38a23960d5f83b0aec5e67f189a6ae8062 tree 2d3d5f6bd4447a482d4fcf51a788e2fc4c34c20d parent e29971f9a4ca08c3c31b98be96c293ef9f7dcc32 parent b2cc99f04c5a732c793519aca61a20f719b50db4 author Linus Torvalds Fri, 21 Oct 2005 12:22:33 -0700 committer Linus Torvalds Fri, 21 Oct 2005 12:22:33 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6 commit e29971f9a4ca08c3c31b98be96c293ef9f7dcc32 tree 9542decf5a838b36bee07fd5961e059d328da128 parent 5d96551541a8f5521dcc8c634a18d42a3d349ec9 author Dave Airlie Thu, 20 Oct 2005 23:49:00 +0100 committer Linus Torvalds Fri, 21 Oct 2005 12:18:09 -0700 [PATCH] drm: another mga bug The wrong state emission routines were being called for G550, and consistent maps weren't correctly mapped... Signed-off-by: Dave Airlie Signed-off-by: Linus Torvalds commit 5d96551541a8f5521dcc8c634a18d42a3d349ec9 tree 6aad2e082c3e57f00024f86287444a8ded086933 parent a1c7e111934b6375baf07a970d6c890d18d7e34f author Benjamin Herrenschmidt Fri, 21 Oct 2005 14:12:51 +1000 committer Linus Torvalds Fri, 21 Oct 2005 12:17:43 -0700 [PATCH] ppc64: Fix pages marked dirty abusively While working on 64K pages, I found this little buglet in our update_mmu_cache() implementation. The code calls __hash_page() passing it an "access" parameter (the type of access that triggers the hash) containing the bits _PAGE_RW and _PAGE_USER of the linux PTE. The latter is useless in this case and the former is wrong. In fact, if we have a writeable PTE and we pass _PAGE_RW to hash_page(), it will set _PAGE_DIRTY (since we track dirty that way, by hash faulting !dirty) which is not what we want. In fact, the correct fix is to always pass 0. That means that only read-only or already dirty read write PTEs will be preloaded. The (hopefully rare) case of a non dirty read write PTE can't be preloaded this way, it will have to fault in hash_page on the actual access. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit a1c7e111934b6375baf07a970d6c890d18d7e34f tree 8a6c05fbf5917b82866059bf8d2ff5db0103f5bd parent 024358eeafd44ecffd0e7a1002ef3ccc1d0acd4d author Paul Mackerras Fri, 21 Oct 2005 22:39:36 +1000 committer Linus Torvalds Fri, 21 Oct 2005 12:17:43 -0700 [PATCH] ppc64: Fix typo in time calculations This fixes a typo in the div128_by_32 function used in the timekeeping calculations on ppc64. If you look at the code it's quite obvious that we need (rb + c) rather than (rb + b). The "b" is clearly just a typo. Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 024358eeafd44ecffd0e7a1002ef3ccc1d0acd4d tree a0ff602027b59745c01d69976f3c00e9c9fc47bb parent ac9b9c667c2e1194e22ebe0a441ae1c37aaa9b90 author Eric Moore Fri, 21 Oct 2005 20:56:36 +0200 committer Linus Torvalds Fri, 21 Oct 2005 12:17:43 -0700 [PATCH] mptsas: fix phy identifiers This fixes handling of the phy identifiers in mptsas. Signed-off-by: Eric Moore [ split it a pre-2.6.14 portion from Eric's bigger patch ] Signed-off-by: Christoph Hellwig Signed-off-by: Linus Torvalds commit d18566376055046fca0b51ad536f1778ef34966a tree e613d875248d2dcd585e3c5b361562799e3fadca parent 7fe8785e4198ad6b5dfd4a76c44c97e9b4463534 author Russell King Fri, 21 Oct 2005 10:17:37 +0100 committer Russell King Fri, 21 Oct 2005 10:17:37 +0100 [ARM] Fix Integrator IM/PD-1 support Signed-off-by: Russell King commit 7fe8785e4198ad6b5dfd4a76c44c97e9b4463534 tree 72b3df4ec83116fad9546c41f0ef549dad52236b parent b048dbf4d428c89f219efc2eddf2771f13500503 author Ben Dooks Thu, 20 Oct 2005 23:21:20 +0100 committer Russell King Thu, 20 Oct 2005 23:21:20 +0100 [ARM] 3028/1: S3C2410 - add DCLK mask definitions Patch from Ben Dooks From: Guillaume Gourat Add MASK definitions for DCLK0 and DCLK1 Signed-off-by: Guillaume Gourat Signed-off-by: Ben Dooks Signed-off-by: Russell King commit b048dbf4d428c89f219efc2eddf2771f13500503 tree 4aadcb79d1f70b14ee1c411501fc8f7345e6e4da parent a7ce8edc8232da51dc3a804ec9c734019d115b40 author Ben Dooks Thu, 20 Oct 2005 23:21:19 +0100 committer Russell King Thu, 20 Oct 2005 23:21:19 +0100 [ARM] 3027/1: BAST - reduce NAND timings slightly Patch from Ben Dooks The current Simtec BAST nand area timings are a little too slow to be obtained by a 2410 running at 266MHz, so reduce the timings slightly to bring them into the acceptable range. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit a7ce8edc8232da51dc3a804ec9c734019d115b40 tree 05d79d60b96b59d62709b11c2b1c1b497cb70902 parent b2640b420a806c91f6b8799314ca96bb88a246d2 author Ben Dooks Thu, 20 Oct 2005 23:21:18 +0100 committer Russell King Thu, 20 Oct 2005 23:21:18 +0100 [ARM] 3026/1: S3C2410 - avoid possible overflow in pll calculations Patch from Ben Dooks Avoid the possiblity that if the board is using a 16.9334 or higher crystal with a high PLL multiplier, then the pll value could overflow the capability of an int. Also fix the value types of the intermediate variables to unsigned int. Rewrite of patch from Guillaume Gourat Signed-off-by: Ben Dooks Signed-off-by: Russell King commit b2640b420a806c91f6b8799314ca96bb88a246d2 tree a80d5105162a0c29b77f8fd84d05801597497d20 parent 93918e9afc76717176e9e114e79cdbb602a45ae8 author Matt Reimer Thu, 20 Oct 2005 23:21:18 +0100 committer Russell King Thu, 20 Oct 2005 23:21:18 +0100 [ARM] 3025/1: Add I2S platform device for PXA Patch from Matt Reimer Adds an I2S platform_device for PXA. I2S is used to interface with sound chips on systems like iPAQ h1910/h2200/hx4700 and Asus 716. Signed-off-by: mreimer@vpop.net Signed-off-by: Russell King commit b2cc99f04c5a732c793519aca61a20f719b50db4 tree 0614c2c1d40926cec4bfe91524bf50c6aff0063f parent 49c5bfaffe8ae6e6440dc4bf78b03800960d93f5 author Herbert Xu Thu, 20 Oct 2005 17:13:13 -0200 committer Arnaldo Carvalho de Melo Thu, 20 Oct 2005 17:13:13 -0200 [TCP] Allow len == skb->len in tcp_fragment It is legitimate to call tcp_fragment with len == skb->len since that is done for FIN packets and the FIN flag counts as one byte. So we should only check for the len > skb->len case. Signed-off-by: Herbert Xu Signed-off-by: Arnaldo Carvalho de Melo commit 49c5bfaffe8ae6e6440dc4bf78b03800960d93f5 tree dbd4565b42697a7fdeee8d088f017eb7df8bc594 parent ffa29347dfbc158d1f47f5925324a6f5713659c1 author Herbert Xu Tue, 18 Oct 2005 12:03:28 +1000 committer Arnaldo Carvalho de Melo Thu, 20 Oct 2005 14:49:59 -0200 [DCCP]: Clear the IPCB area Turns out the problem has nothing to do with use-after-free or double-free. It's just that we're not clearing the CB area and DCCP unlike TCP uses a CB format that's incompatible with IP. Signed-off-by: Herbert Xu Signed-off-by: Ian McDonald Signed-off-by: Arnaldo Carvalho de Melo commit ffa29347dfbc158d1f47f5925324a6f5713659c1 tree 66c0360d21cc842af830b9c7ffd6e924652e7ce3 parent fda0fd6c5b722cc48e904e0daafedca275d332af author Herbert Xu Sun, 16 Oct 2005 21:08:46 +1000 committer Arnaldo Carvalho de Melo Thu, 20 Oct 2005 14:44:29 -0200 [DCCP]: Make dccp_write_xmit always free the packet icmp_send doesn't use skb->sk at all so even if skb->sk has already been freed it can't cause crash there (it would've crashed somewhere else first, e.g., ip_queue_xmit). I found a double-free on an skb that could explain this though. dccp_sendmsg and dccp_write_xmit are a little confused as to what should free the packet when something goes wrong. Sometimes they both go for the ball and end up in each other's way. This patch makes dccp_write_xmit always free the packet no matter what. This makes sense since dccp_transmit_skb which in turn comes from the fact that ip_queue_xmit always frees the packet. Signed-off-by: Herbert Xu Signed-off-by: Arnaldo Carvalho de Melo commit fda0fd6c5b722cc48e904e0daafedca275d332af tree a575ee8872964b55a8ef64ed9f57f52f26e25979 parent ac9b9c667c2e1194e22ebe0a441ae1c37aaa9b90 author Herbert Xu Fri, 14 Oct 2005 16:38:49 +1000 committer Arnaldo Carvalho de Melo Thu, 20 Oct 2005 14:25:28 -0200 [DCCP]: Use skb_set_owner_w in dccp_transmit_skb when skb->sk is NULL David S. Miller wrote: > One thing you can probably do for this bug is to mark data packets > explicitly somehow, perhaps in the SKB control block DCCP already > uses for other data. Put some boolean in there, set it true for > data packets. Then change the test in dccp_transmit_skb() as > appropriate to test the boolean flag instead of "skb_cloned(skb)". I agree. In fact we already have that flag, it's called skb->sk. So here is patch to test that instead of skb_cloned(). Signed-off-by: Herbert Xu Acked-by: Ian McDonald Signed-off-by: Arnaldo Carvalho de Melo commit ac9b9c667c2e1194e22ebe0a441ae1c37aaa9b90 tree 3903d87d0b56a49ead39c0460b5bc0b86b040775 parent 93918e9afc76717176e9e114e79cdbb602a45ae8 author Hugh Dickins Thu, 20 Oct 2005 16:24:28 +0100 committer Linus Torvalds Thu, 20 Oct 2005 09:02:07 -0700 [PATCH] Fix handling spurious page fault for hugetlb region This reverts commit 3359b54c8c07338f3a863d1109b42eebccdcf379 and replaces it with a cleaner version that is purely based on page table operations, so that the synchronization between inode size and hugetlb mappings becomes moot. Signed-off-by: Hugh Dickins Signed-off-by: Linus Torvalds