commit d2ef5ebb4c4fe141a82252d4db8d8521e6765c5a tree 390aee5c110aa8314f30efa95367d7e27e6ebeb9 parent 1a57198609615a936ff57da37b6957db9bafde83 parent ed1189b7e8cd8144f0b232c220aed4ee26d89463 author Linus Torvalds Tue, 29 Nov 2005 20:17:08 -0800 committer Linus Torvalds Tue, 29 Nov 2005 20:17:08 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc-merge commit 1a57198609615a936ff57da37b6957db9bafde83 tree baf0ddace16f0650698166d73e744d01d789142d parent 49d5c7b08713c3a482d62b5a0ad41b4ec32905a5 author Mark Fortescue Tue, 29 Nov 2005 19:34:44 -0800 committer Linus Torvalds Tue, 29 Nov 2005 19:47:04 -0800 [PATCH] fbdev: cg3fb: Kconfig fix A cut and past error regarding the CG3 frame buffer needs to be fixed. It also affects Creator/Creator3D/Elite3D. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 49d5c7b08713c3a482d62b5a0ad41b4ec32905a5 tree 8437a91b94c03979832a8511ce95f542e06be1d7 parent fe655d3a06488c8a188461bca493e9f23fc8c448 author Antonino A. Daplas Tue, 29 Nov 2005 19:34:43 -0800 committer Linus Torvalds Tue, 29 Nov 2005 19:47:04 -0800 [PATCH] fbdev: cirrusfb: Driver cleanup and bug fixes - pseudo_palette is only 16 entries long - the pseudo_palette, if using the generic drawing functions, must always be u32 regardless of bpp - the fillrect accelerator is using region->color regardless of the visual. region->color is the index to the pseudo_palette if visual is truecolor Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fe655d3a06488c8a188461bca493e9f23fc8c448 tree fa8f655041f7a98382cf1122cbcc875a74bd5df4 parent b0b623c3b22d57d6941b200321779d56c4e79e6b author Shaohua Li Tue, 29 Nov 2005 19:34:42 -0800 committer Linus Torvalds Tue, 29 Nov 2005 19:47:04 -0800 [PATCH] setting irq affinity is broken in ia32 with MSI enabled Setting irq affinity stops working when MSI is enabled. With MSI, move_irq is empty, so we can't change irq affinity. It appears a typo in Ashok's original commit for this issue. X86_64 actually is using move_native_irq. Signed-off-by: Shaohua Li Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b0b623c3b22d57d6941b200321779d56c4e79e6b tree a2d9a2e047ff4cb5a9f7123084a00b2c3ecc23fa parent 576f6d79564d0d2c1f43088e6805674d2e122935 author Roman Zippel Tue, 29 Nov 2005 19:34:41 -0800 committer Linus Torvalds Tue, 29 Nov 2005 19:47:03 -0800 [PATCH] hfsplus: don't modify journaled volume Access to a journaled HFS+ volume is not officially supported under Linux, so mount such a volume read-only, but users can override this behaviour using the "force" mount option. The minimum requirement to relax this check is to at least check that the journal is empty and so nothing needs to be replayed to make sure the volume is consistent. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 576f6d79564d0d2c1f43088e6805674d2e122935 tree fcd2bc41909102b122d8c3b9b915396d0173787f parent 9f232a125bf86b0dae09f8ea4a0553535cf6b658 author Jeff Mahoney Tue, 29 Nov 2005 19:34:39 -0800 committer Linus Torvalds Tue, 29 Nov 2005 19:47:03 -0800 [PATCH] reiserfs: handle cnode allocation failure gracefully If an external device is used for a journal, by default it will use the entire device. The reiserfs journal code allocates structures per journal block when it mounts the file system. If the journal device is too large, and memory cannot be allocated for the structures, it will continue and ultimately panic when it can't pull one off the free list. This patch handles the allocation failure gracefully and prints an error message at mount time. Changes: Updated error message to be more descriptive to the user. Discussed and approved on ReiserFS Mailing List, Nov 28. Signed-off-by: Jeff Mahoney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9f232a125bf86b0dae09f8ea4a0553535cf6b658 tree 2ba12b9889cef8568ae9ce04b8672162fa2283ff parent 123d3c13e2853a11b4d599d754b356acb12886e2 author Paolo Galtieri Tue, 29 Nov 2005 19:34:38 -0800 committer Linus Torvalds Tue, 29 Nov 2005 19:47:03 -0800 [PATCH] ppc: fix floating point register corruption I recently discovered a bug on PPC which causes the floating point registers to get corrupted when CONFIG_PREEMPT=y. The problem occurred while running a multi threaded Java application that does floating point. The problem could be reproduced in anywhere from 2 to 6 hours. With the patch I have included below it ran for over a week without failure. Signed-off-by: Paolo Galtieri Cc: Kumar Gala Cc: Matt Porter Cc: Tom Rini Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 123d3c13e2853a11b4d599d754b356acb12886e2 tree 6127e78c2dabcb2ca70de896b7aba53f12213d82 parent d91b14c463306eb6527550ba48617e7f5500d3ae author Pavel Machek Tue, 29 Nov 2005 19:34:37 -0800 committer Linus Torvalds Tue, 29 Nov 2005 19:47:03 -0800 [PATCH] fix swsusp on machines not supporting S4 Fix swsusp on machines not supporting S4. With recent changes, it is not possible to trigger it using /sys filesystem. Swsusp does not really need any support from low-level code, it is possible to reboot or halt at the end of suspend. Signed-off-by: Pavel Machek Cc: "Brown, Len" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d91b14c463306eb6527550ba48617e7f5500d3ae tree 674e16ed108754da2a28c9abf59c78288f7ea396 parent 5bd0190bf3d7e53043a048e809ffa29d41b9d6ac author Thierry Vignaud Tue, 29 Nov 2005 19:34:35 -0800 committer Linus Torvalds Tue, 29 Nov 2005 19:47:03 -0800 [PATCH] fix rebooting on HP nc6120 laptop Anne NICOLAS and Andres Kaaber reported their HP laptop didn't reboot smoothly. Signed-off-by: Thierry Vignaud Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5bd0190bf3d7e53043a048e809ffa29d41b9d6ac tree c6fba8d5a532ecfa53dc97a3841d13d972964854 parent df69a60dc6afc2936d79054d30b481c1fd9720e5 author David Gibson Tue, 29 Nov 2005 19:34:32 -0800 committer Linus Torvalds Tue, 29 Nov 2005 19:47:03 -0800 [PATCH] Fix crash when ptrace poking hugepage areas set_page_dirty() will not cope with being handed a page * which is part of a compound page, but not the master page in that compound page. This case can occur via access_process_vm() if you attemp to write to another process's hugepage memory area using ptrace() (causing an oops or hang). This patch fixes the bug by only calling set_page_dirty() from access_process_vm() if the page is not a compound page. We already use a similar fix in bio_set_pages_dirty() for the case of direct io to hugepages. Signed-off-by: David Gibson Acked-by: William Irwin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit df69a60dc6afc2936d79054d30b481c1fd9720e5 tree 9f64f677964ae214dd6654947c553d8416720049 parent 12074a35b4ef36d7a971beaf42412b22f304cdd1 author Matt Helsley Tue, 29 Nov 2005 19:34:31 -0800 committer Linus Torvalds Tue, 29 Nov 2005 19:47:03 -0800 [PATCH] process events connector: uid_t gid_t size issues The uid_t and gid_t fields appear to present a 32/64-bit userspace/kernel problem for some archs. This patch addresses the problem by fixing the size to the largest size for uid_t/gid_t used in the kernel. This preserves the total size of the event structure while ensuring that the layouts of the ID change event match in 32 and 64-bit kernels and applications. Signed-off-by: Matt Helsley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ed1189b7e8cd8144f0b232c220aed4ee26d89463 tree ec9cd615f8915c4bb43c7844984da08982795b97 parent 48abec07cf8063184d397560a6a5f27eaf9caddf author Olaf Hering Tue, 29 Nov 2005 14:04:05 +0100 committer Paul Mackerras Wed, 30 Nov 2005 13:55:59 +1100 [PATCH] powerpc: prevent stack corruption in call_prom_ret Use the correct pointer to clear the memory of the return values, to prevent stack corruption in the callers stackframe. Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit 48abec07cf8063184d397560a6a5f27eaf9caddf tree c96acc7a1176d1848d4c8c9f623f8ed39a1f63de parent 8117ce76c28ef0cab8545b518fa0543f6d1437e6 author Paul Mackerras Wed, 30 Nov 2005 13:20:54 +1100 committer Paul Mackerras Wed, 30 Nov 2005 13:20:54 +1100 powerpc: Fix bug causing FP registers corruption on UP + preempt This fixes a bug noticed by Paolo Galtieri and fixed for ARCH=ppc in the previous commit (ppc: fix floating point register corruption). This fixes the arch/powerpc code by adding preempt_disable/enable, and also cleans it up a bit by pulling out the code that discards any lazily-switched CPU register state into a new function, rather than having that code repeated in three places. Signed-off-by: Paul Mackerras commit 8117ce76c28ef0cab8545b518fa0543f6d1437e6 tree eeff68fc67e3b48cfb0156cd041d136c97229083 parent 12074a35b4ef36d7a971beaf42412b22f304cdd1 author Paolo Galtieri Tue, 29 Nov 2005 14:26:47 -0800 committer Paul Mackerras Wed, 30 Nov 2005 13:17:05 +1100 [PATCH] ppc: fix floating point register corruption I recently discovered a bug on PPC which causes the floating point registers to get corrupted when CONFIG_PREEMPT=y. The problem occurred while running a multi threaded Java application that does floating point. The problem could be reproduced in anywhere from 2 to 6 hours. With the patch I have included below it ran for over a week without failure. Signed-off-by: Paolo Galtieri Cc: Kumar Gala Cc: Matt Porter Cc: Tom Rini Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Paul Mackerras commit 12074a35b4ef36d7a971beaf42412b22f304cdd1 tree ee52353367f9b2f2bd983d18806a3e64f00886f3 parent 49c91fb01ff3948285608c65754b3ffbf57d50f2 parent 34a0b3cdc078746788ffc49e56da0db62b8b6ea4 author Linus Torvalds Tue, 29 Nov 2005 17:32:08 -0800 committer Linus Torvalds Tue, 29 Nov 2005 17:32:08 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 49c91fb01ff3948285608c65754b3ffbf57d50f2 tree f229ea6c060fb927080fe668a0f277d0aee3ef8a parent 2f12c74f0cfdc93e1d47ac70766e837ef29472fd author Trond Myklebust Tue, 29 Nov 2005 19:27:22 -0500 committer Linus Torvalds Tue, 29 Nov 2005 17:29:57 -0800 [PATCH] VM: Fix typos in get_locked_pte Signed-off-by: Trond Myklebust Signed-off-by: Linus Torvalds commit 34a0b3cdc078746788ffc49e56da0db62b8b6ea4 tree 9505e971ed1f001a96c372f0c6c5ebe1ced87d14 parent d127e94a5cf1c9c996b8c67cd2595b96c3e35e4c author Adrian Bunk Tue, 29 Nov 2005 16:28:56 -0800 committer David S. Miller Tue, 29 Nov 2005 16:28:56 -0800 [IPV6]: make two functions static This patch makes two needlessly global functions static. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit d127e94a5cf1c9c996b8c67cd2595b96c3e35e4c tree d79df4d600f0c81e7b156bc5e8c6448e28ab6ee7 parent 4b30b1c6a3e58dc74f2dbb0aa39f16a23cfcdd56 author Adrian Bunk Tue, 29 Nov 2005 16:28:18 -0800 committer David S. Miller Tue, 29 Nov 2005 16:28:18 -0800 [NETFILTER] ipv4: small cleanups This patch contains the following cleanups: - make needlessly global code static - ip_conntrack_core.c: ip_conntrack_flush() -> ip_conntrack_flush(void) Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 4b30b1c6a3e58dc74f2dbb0aa39f16a23cfcdd56 tree 5aee91f75b2f7f0ecdcf6d3defb836a40f05e958 parent 9b5b5cff9a6655dbb6d2e2be365bb95eec3950eb author Adrian Bunk Tue, 29 Nov 2005 16:27:20 -0800 committer David S. Miller Tue, 29 Nov 2005 16:27:20 -0800 [IPV4]: make two functions static This patch makes two needlessly global functions static. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 9b5b5cff9a6655dbb6d2e2be365bb95eec3950eb tree 80517910c731fc48512ba9c31aa823575db405b3 parent fb29644994744a63bc57186cefa79534b5d9b5a9 author Arjan van de Ven Tue, 29 Nov 2005 16:21:38 -0800 committer David S. Miller Tue, 29 Nov 2005 16:21:38 -0800 [NET]: Add const markers to various variables. the patch below marks various variables const in net/; the goal is to move them to the .rodata section so that they can't false-share cachelines with things that get written to, as well as potentially helping gcc a bit with optimisations. (these were found using a gcc patch to warn about such variables) Signed-off-by: Arjan van de Ven Signed-off-by: David S. Miller commit fb29644994744a63bc57186cefa79534b5d9b5a9 tree 74b51ef327dee136caa88a40242cddbe6bbcbdf6 parent 64bf69ddff7637b7ed7acf9b2a823cc0ee519439 author Chas Williams Tue, 29 Nov 2005 16:17:11 -0800 committer David S. Miller Tue, 29 Nov 2005 16:17:11 -0800 [ATM]: [adummy] dummy ATM driver (similar to net/dummy) Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 64bf69ddff7637b7ed7acf9b2a823cc0ee519439 tree fb3a746e36bcfa307979bef2a20ce5f1d32ec537 parent aaaaaadbe7a663d110814db50fcbe7d320eb4c32 author Stanislaw Gruszka Tue, 29 Nov 2005 16:16:41 -0800 committer David S. Miller Tue, 29 Nov 2005 16:16:41 -0800 [ATM]: deregistration removes device from atm_devs list immediately atm_dev_deregister() removes device from atm_dev list immediately to prevent operations on a phantom device. Decision to free device based only on ->refcnt now. Remove shutdown_atm_dev() use atm_dev_deregister() instead. atm_dev_deregister() also asynchronously releases all vccs related to device. Signed-off-by: Stanislaw Gruszka Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit aaaaaadbe7a663d110814db50fcbe7d320eb4c32 tree 316bdbd49e3a6ac7a78cad8797d148f79a343d45 parent 49693280262a149e5430d3401e263e464c88334a author Stanislaw Gruszka Tue, 29 Nov 2005 16:16:21 -0800 committer David S. Miller Tue, 29 Nov 2005 16:16:21 -0800 [ATM]: avoid race conditions related to atm_devs list Use semaphore to protect atm_devs list, as no one need access to it from interrupt context. Avoid race conditions between atm_dev_register(), atm_dev_lookup() and atm_dev_deregister(). Fix double spin_unlock() bug. Signed-off-by: Stanislaw Gruszka Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 49693280262a149e5430d3401e263e464c88334a tree 22c565a2b8d7523d21868f6490400afd1025f730 parent 5045b6d34c6a9efa4a8a1815265ca9fcf44d6a7c author Mitchell Blank Jr Tue, 29 Nov 2005 16:15:59 -0800 committer David S. Miller Tue, 29 Nov 2005 16:15:59 -0800 [ATM]: [lanai] kill lanai_ioctl() which just contains some old debugging code Signed-off-by: Mitchell Blank Jr Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 5045b6d34c6a9efa4a8a1815265ca9fcf44d6a7c tree ea4f599750ef7ac71fb967011765c114e27bc628 parent 50accc9c428273501dd2a6295c84a533dd1fe645 author Chas Williams Tue, 29 Nov 2005 16:15:38 -0800 committer David S. Miller Tue, 29 Nov 2005 16:15:38 -0800 [ATM]: linux/config.h only needed for #ifdef __KERNEL__ section Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 50accc9c428273501dd2a6295c84a533dd1fe645 tree 54a94b2c84b3a7af78887383b4c828e0a4953fe1 parent e91a73568b19b4a8145fc6e05314d522ee35a0b1 author Mitchell Blank Jr Tue, 29 Nov 2005 16:15:18 -0800 committer David S. Miller Tue, 29 Nov 2005 16:15:18 -0800 [ATM]: attempt to autoload atm drivers From: Mitchell Blank Jr Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit e91a73568b19b4a8145fc6e05314d522ee35a0b1 tree 125076fb56dc1b1f7d3441638c6154a354274afc parent fd22f1e037be33040f5583fe091d39d1e632e183 author Jan Pieter Tue, 29 Nov 2005 16:14:58 -0800 committer David S. Miller Tue, 29 Nov 2005 16:14:58 -0800 [ATM]: drivers/atm/atmdev_init.c no longer necessary From: Jan Pieter Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit fd22f1e037be33040f5583fe091d39d1e632e183 tree 3b81446f87f05d616c6bf9ce1e3a84ea326637bd parent c22c28f69b1e28505bd0d26bd0f64554a9e66fe8 author Dave Jones Tue, 29 Nov 2005 16:14:33 -0800 committer David S. Miller Tue, 29 Nov 2005 16:14:33 -0800 [ATM]: [lanai] lanai missing unregister Signed-off-by: Dave Jones Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit c22c28f69b1e28505bd0d26bd0f64554a9e66fe8 tree 083b721ba4dae4d103fc205cbc52e69246058569 parent c219750b2e667f4f79f4d8faca5057dad793db87 author Mitchell Blank Jr Tue, 29 Nov 2005 16:14:12 -0800 committer David S. Miller Tue, 29 Nov 2005 16:14:12 -0800 [ATM]: [lanai] better constification Signed-off-by: Mitchell Blank Jr Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit c219750b2e667f4f79f4d8faca5057dad793db87 tree 0a307e50392ee969c56f74fbcf3514c087e556d1 parent c9933d0856d6d0ede6b4b30e5e7330614f5203af author Mitchell Blank Jr Tue, 29 Nov 2005 16:13:55 -0800 committer David S. Miller Tue, 29 Nov 2005 16:13:55 -0800 [ATM]: atm_pcr_goal() doesn't modify its argument's contents -- mark it as const Signed-off-by: Mitchell Blank Jr Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit c9933d0856d6d0ede6b4b30e5e7330614f5203af tree 5f31d09df861fd83fc327a7eb5b5ac12bfc4188e parent 18955cfcb2a5d75a08e0cb297f13ccfb6904de48 author Mitchell Blank Jr Tue, 29 Nov 2005 16:13:32 -0800 committer David S. Miller Tue, 29 Nov 2005 16:13:32 -0800 [ATM]: always return the first interface for ATM_ITF_ANY From: Mitchell Blank Jr Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 18955cfcb2a5d75a08e0cb297f13ccfb6904de48 tree 0cd153fab98e3fc09b4741f811e55e81d5719111 parent 2f12c74f0cfdc93e1d47ac70766e837ef29472fd author Mike Stroyan Tue, 29 Nov 2005 16:12:55 -0800 committer David S. Miller Tue, 29 Nov 2005 16:12:55 -0800 [IPV4] tcp/route: Another look at hash table sizes The tcp_ehash hash table gets too big on systems with really big memory. It is worse on systems with pages larger than 4KB. It wastes memory that could be better used. It also makes the netstat command slow because reading /proc/net/tcp and /proc/net/tcp6 needs to go through the full hash table. The default value should not be larger for larger page sizes. It seems that the effect of page size is an unintended error dating back a long time. I also wonder if the default value really should be a larger fraction of memory for systems with more memory. While systems with really big ram can afford more space for hash tables, it is not clear to me that they benefit from increasing the allocation ratio for this table. The amount of memory allocated is determined by net/ipv4/tcp.c:tcp_init and mm/page_alloc.c:alloc_large_system_hash. tcp_init calls alloc_large_system_hash passing parameters- bucketsize=sizeof(struct tcp_ehash_bucket) numentries=thash_entries scale=(num_physpages >= 128 * 1024) ? (25-PAGE_SHIFT) : (27-PAGE_SHIFT) limit=0 On i386, PAGE_SHIFT is 12 for a page size of 4K On ia64, PAGE_SHIFT defaults to 14 for a page size of 16K The num_physpages test above makes the allocation take a larger fraction of the total memory on systems with larger memory. The threshold size for a i386 system is 512MB. For an ia64 system with 16KB pages the threshold is 2GB. For smaller memory systems- On i386, scale = (27 - 12) = 15 On ia64, scale = (27 - 14) = 13 For larger memory systems- On i386, scale = (25 - 12) = 13 On ia64, scale = (25 - 14) = 11 For the rest of this discussion, I'll just track the larger memory case. The default behavior has numentries=thash_entries=0, so the allocated size is determined by either scale or by the default limit of 1/16 of total memory. In alloc_large_system_hash- | numentries = (flags & HASH_HIGHMEM) ? nr_all_pages : nr_kernel_pages; | numentries += (1UL << (20 - PAGE_SHIFT)) - 1; | numentries >>= 20 - PAGE_SHIFT; | numentries <<= 20 - PAGE_SHIFT; At this point, numentries is pages for all of memory, rounded up to the nearest megabyte boundary. | /* limit to 1 bucket per 2^scale bytes of low memory */ | if (scale > PAGE_SHIFT) | numentries >>= (scale - PAGE_SHIFT); | else | numentries <<= (PAGE_SHIFT - scale); On i386, numentries >>= (13 - 12), so numentries is 1/8196 of bytes of total memory. On ia64, numentries <<= (14 - 11), so numentries is 1/2048 of bytes of total memory. | log2qty = long_log2(numentries); | | do { | size = bucketsize << log2qty; bucketsize is 16, so size is 16 times numentries, rounded down to a power of two. On i386, size is 1/512 of bytes of total memory. On ia64, size is 1/128 of bytes of total memory. For smaller systems the results are On i386, size is 1/2048 of bytes of total memory. On ia64, size is 1/512 of bytes of total memory. The large page effect can be removed by just replacing the use of PAGE_SHIFT with a constant of 12 in the calls to alloc_large_system_hash. That makes them more like the other uses of that function from fs/inode.c and fs/dcache.c Signed-off-by: David S. Miller commit 2f12c74f0cfdc93e1d47ac70766e837ef29472fd tree 92e5c54b3f82254922f7f2ed6395e93d589356f5 parent 92af254a1b7ea8c09ddff83887e5edc1342b37f8 parent cab3f16febeaf1a60e38159ff578f609f9976544 author Linus Torvalds Tue, 29 Nov 2005 14:23:38 -0800 committer Linus Torvalds Tue, 29 Nov 2005 14:23:38 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit 92af254a1b7ea8c09ddff83887e5edc1342b37f8 tree 1a390e67b4b047cb706bd26f6e9c52670153c3ac parent f747307ed1defcdfd37a3ef84c48e3138691cd26 parent 5a94bcfd2a18edcf368b3128c7df07b58e529932 author Linus Torvalds Tue, 29 Nov 2005 14:23:21 -0800 committer Linus Torvalds Tue, 29 Nov 2005 14:23:21 -0800 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 commit f747307ed1defcdfd37a3ef84c48e3138691cd26 tree 137e2fe4178b0ca77005a92f208a6a1f2055ef37 parent 325f04dbca60a4cfe4ac25e7cf246edd07eb4c5f author Linus Torvalds Tue, 29 Nov 2005 14:21:57 -0800 committer Linus Torvalds Tue, 29 Nov 2005 14:21:57 -0800 Revert "[PATCH] drivers/message/fusion/mptbase.c: make code static" This reverts commit 252ac865535e1ea9cc2d28be83f477d8d8b961a2. It impacts the LSI customers using the mptstm target mode drivers (source tar-ball at ftp://ftp.lsil.com/HostAdapterDrivers/linux/Fusion-MPT/mptstm-1.00.13-src.tar.gz for those who care). Signed-off-by: Linus Torvalds commit 325f04dbca60a4cfe4ac25e7cf246edd07eb4c5f tree eb9e9fb10b1897fae3130c55c4821b829748767b parent e5bbe4dfc8dbfc50ef89f8641e020616d4d1e69e author Hugh Dickins Tue, 29 Nov 2005 16:55:48 +0000 committer Linus Torvalds Tue, 29 Nov 2005 14:09:17 -0800 [PATCH] pfnmap: do_no_page BUG_ON again Use copy_user_highpage directly instead of cow_user_page in do_no_page: in the immediately following page_cache_release, and elsewhere, it is assuming that new_page is normal. If any VM_PFNMAP driver can get to do_no_page, it's just a BUG (but not in the case of do_anonymous_page). Signed-off-by: Hugh Dickins Signed-off-by: Linus Torvalds commit e5bbe4dfc8dbfc50ef89f8641e020616d4d1e69e tree 8bf22ece18b6f7e20024bef19d8afd2a0b07556a parent 5d2a2dbbc1025dbf7998b9289574d9592b8f21cc author Hugh Dickins Tue, 29 Nov 2005 16:54:51 +0000 committer Linus Torvalds Tue, 29 Nov 2005 14:09:16 -0800 [PATCH] pfnmap: remove src_page from do_wp_page Clean away do_wp_page's "src_page": cow_user_page makes it unnecessary. Signed-off-by: Hugh Dickins Signed-off-by: Linus Torvalds commit 5d2a2dbbc1025dbf7998b9289574d9592b8f21cc tree b4f3f45190b814b5196235c21f983fbc7878a47b parent c9cfcddfd65735437a4cb8563d6b66a6da8a5ed6 author Linus Torvalds Tue, 29 Nov 2005 14:07:55 -0800 committer Linus Torvalds Tue, 29 Nov 2005 14:07:55 -0800 cow_user_page: fix page alignment High Dickins points out that the user virtual address passed to the page fault handler isn't necessarily page-aligned. Also, add a comment on why the copy could fail for the user address case. Signed-off-by: Linus Torvalds commit c9cfcddfd65735437a4cb8563d6b66a6da8a5ed6 tree 618cdf37baafe8b283bcc9923d9dde89d6428fb5 parent 4168f7a31801bba6acc18662978d24ec850bbbd0 author Linus Torvalds Tue, 29 Nov 2005 14:03:14 -0800 committer Linus Torvalds Tue, 29 Nov 2005 14:03:14 -0800 VM: add common helper function to create the page tables This logic was duplicated four times, for no good reason. Signed-off-by: Linus Torvalds commit cab3f16febeaf1a60e38159ff578f609f9976544 tree 94fdc12b7ae46d285180be9fa8d03e7be6d63f71 parent 4168f7a31801bba6acc18662978d24ec850bbbd0 author David S. Miller Tue, 29 Nov 2005 13:59:03 -0800 committer David S. Miller Tue, 29 Nov 2005 13:59:03 -0800 [SPARC64]: Fix >8K I/O mappings. Increment the PFN field of the PTE so that the tests on vm_pfn in mm/memory.c match up. The TLB ignores these lower bits for larger page sizes, so it's OK to set things like this. Signed-off-by: David S. Miller commit 4168f7a31801bba6acc18662978d24ec850bbbd0 tree 7949f782d118bb72024de37d2cc7bb06cc74e045 parent 238f9b063dcc9f23493a0d3fecca29fe332d4905 parent 2b9175c174b83b8d97db9398efe948fa9092938f author Linus Torvalds Tue, 29 Nov 2005 13:04:07 -0800 committer Linus Torvalds Tue, 29 Nov 2005 13:04:07 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6 commit 238f9b063dcc9f23493a0d3fecca29fe332d4905 tree a2ddb44e978ade378774290a4fb697a232a890b6 parent 238f58d898df941aa9d1cb390fb27ff4febe8965 author Christoph Hellwig Tue, 29 Nov 2005 21:36:16 +0100 committer Linus Torvalds Tue, 29 Nov 2005 13:03:01 -0800 [PATCH] fix megaraid.c locking This fixes locking in megaraid.c, namely: (1) make sure megaraid_queue release the adapter lock by changing the code to have a single return (2) remove the errornous scsi_assign_lock call Testing by Burton Windle. Signed-off-by: Christoph Hellwig Acked-by: Burton Windle Signed-off-by: Linus Torvalds commit 238f58d898df941aa9d1cb390fb27ff4febe8965 tree 4a897b3a47e7d209e3ff8601febd3dde16f3803e parent eca351336acb2fa943611e0846562ce3997ef53b author Linus Torvalds Tue, 29 Nov 2005 13:01:56 -0800 committer Linus Torvalds Tue, 29 Nov 2005 13:01:56 -0800 Support strange discontiguous PFN remappings These get created by some drivers that don't generally even want a pfn remapping at all, but would really mostly prefer to just map pages they've allocated individually instead. For now, create a helper function that turns such an incomplete PFN remapping call into a loop that does that explicit mapping. In the long run we almost certainly want to export a totally different interface for that, though. Signed-off-by: Linus Torvalds commit eca351336acb2fa943611e0846562ce3997ef53b tree 9b7b022d7b2d5f2f23bc979fa8bf5c1e418456bd parent d70aa5e4b54aa7e704c886838715ac8a45d5750f author Ben Collins Tue, 29 Nov 2005 11:45:26 -0800 committer Linus Torvalds Tue, 29 Nov 2005 12:57:17 -0800 [PATCH] Fix missing pfn variables caused by vm changes I image this showed up because of "unused var..." when the changes occured, because flush_cache_page() is a noop in most places. This showed up for me on parisc however, where flush_cache_page() is a real function. Signed-off-by: Linus Torvalds commit 2b9175c174b83b8d97db9398efe948fa9092938f tree 636ccdc70d45b3bb1268dfd00f985c2015b8d7dc parent ee2d49de3e3a0b846ecedb36fec0e4a5ff222dcb author Adrian Bunk Tue, 29 Nov 2005 14:49:38 +0000 committer Thomas Gleixner Tue, 29 Nov 2005 19:54:58 +0100 [MTD] Make functions static, include header files with prototypes This patch contains the following possible cleanups: - every file should #include the headers containing the prototypes for it's global functions - make needlessly global functions static Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit ee2d49de3e3a0b846ecedb36fec0e4a5ff222dcb tree 1036f584a62815db5af35b78d544ce28c6d7d0af parent 72af3b2c5a9946e78125e143b636f3d7217bcf08 author Richard Purdie Tue, 29 Nov 2005 14:28:31 +0000 committer Thomas Gleixner Tue, 29 Nov 2005 19:49:03 +0100 [MTD] chips: make sharps driver usable again Update the pre-CFI Sharp driver sharps.c so it compiles. map_read32 / map_write32 no longer exist in the kernel so the driver is totally broken as it stands. The replacement functions use different parameters resulting in the other changes. Change collie to use this driver until someone works out why the cfi driver fails on that machine. Signed-off-by: Richard Purdie Tested-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit 72af3b2c5a9946e78125e143b636f3d7217bcf08 tree fce756150625a506421d7ad4cd35c8dbf6157ddc parent e2602b347aa6f62b61754c5f65191ef67ffd0dc7 author Thomas Gleixner Mon, 28 Nov 2005 22:36:12 +0000 committer Thomas Gleixner Tue, 29 Nov 2005 19:46:16 +0100 [MTD] Remove bogus PQ2FADS driver Remove disfunctional driver, which slipped through the review mechanism Signed-off-by: Thomas Gleixner commit e2602b347aa6f62b61754c5f65191ef67ffd0dc7 tree 014d8dad65ad55bbccbe6ad88cf7f05a5dcc382f parent 8bc3b3804a6123e634be26359558aa998102506a author Luiz Capitulino Tue, 29 Nov 2005 14:30:03 +0000 committer Thomas Gleixner Tue, 29 Nov 2005 19:37:56 +0100 [MTD] maps: sparse fixup The patch below fixes the following sparse warning: drivers/mtd/maps/nettel.c:482:27: warning: Using plain integer as NULL pointer Signed-off-by: Luiz Capitulino Signed-off-by: Thomas Gleixner commit 8bc3b3804a6123e634be26359558aa998102506a tree 87141f0f991a81f6e18c2c5b7a7c7cc62ce1fd7f parent 7ac571f8d0f843fb818f7c70ec77784545e91bc4 author Nicolas Pitre Wed, 23 Nov 2005 22:07:56 +0000 committer Thomas Gleixner Tue, 29 Nov 2005 19:36:35 +0100 [MTD] cfi_cmdset_0001: relax locking rules for multi hardware partition support Signed-off-by: Nicolas Pitre Signed-off-by: Thomas Gleixner commit 7ac571f8d0f843fb818f7c70ec77784545e91bc4 tree 521f7281afe5668479b53fa9a29a7656808b44fe parent 3c77354794939143fdf1dd669895a812f94f9a38 author David Woodhouse Thu, 17 Nov 2005 08:20:31 +0000 committer Thomas Gleixner Tue, 29 Nov 2005 19:33:50 +0100 [MTD] Make some tables 'const' so they can live in .rodata arjan: drivers/mtd/maps/sc520cdp.c:167: warning: par_table is never written to and should be declared 'const' arjan: drivers/mtd/maps/pci.c:105: warning: mtd_pci_map is never written to and should be declared 'const' arjan: mind fixing those up ? Signed-off-by: David Woodhouse Signed-off-by: Thomas Gleixner commit 3c77354794939143fdf1dd669895a812f94f9a38 tree c85c06f6501557e4e17a1e03d65dc971984f14ae parent 987d24018dc83d27e491674c50ff2272f51eb719 author John Bowler Wed, 16 Nov 2005 16:23:25 +0000 committer Thomas Gleixner Tue, 29 Nov 2005 19:29:37 +0100 [MTD] maps/ixp4xx: half-word boundary and little-endian fixups ixp4xx updates: - Handle reads that don't start on a half-word boundary. - Make it work when CPU is in little-endian mode. Signed-off-by: John Bowler Signed-off-by: Alessandro Zummo Signed-off-by: David Vrabel Signed-off-by: Thomas Gleixner commit 987d24018dc83d27e491674c50ff2272f51eb719 tree 3cef69b2a161db4a194cec81b9f3bd28b009dc0c parent 3eb8ceac486ed9b6eceed098423f1ca6b180ec9d author Todd Poynor Tue, 15 Nov 2005 23:28:20 +0000 committer Thomas Gleixner Tue, 29 Nov 2005 19:27:24 +0100 [MTD] CFI: Use 16-bit access to autoselect/read device id data Recent models of Intel/Sharp and Spansion CFI flash now have significant bits in the upper byte of device ID codes, read via what Spansion calls "autoselect" and Intel calls "read device identifier". Currently these values are truncated to the low 8 bits in the mtd data structures, as all CFI read query info has previously been read one byte at a time. Add a new method for reading 16-bit info, currently just manufacturer and device codes; datasheets hint at future uses for upper bytes in other fields. Signed-off-by: Todd Poynor Signed-off-by: Thomas Gleixner commit 3eb8ceac486ed9b6eceed098423f1ca6b180ec9d tree e1b2e98897563dbc03b44c349246aa89d847fdf3 parent 21eeb7aa116b1f59fc23339521173cbb13e57f1a author Maciej W. Rozycki Mon, 14 Nov 2005 13:41:51 +0000 committer Thomas Gleixner Tue, 29 Nov 2005 19:25:47 +0100 [MTD] devices/ms02-nv: phys/virt address fixups Merge from linux-mips: Use physical addresses at the interface level, letting drivers remap them as appropriate. Signed-off-by: Maciej W. Rozycki Signed-off-by: Thomas Gleixner commit 5a94bcfd2a18edcf368b3128c7df07b58e529932 tree 12e6240717e2dbdce0e157a097629b76d07afdae parent b77dae5293efba42ea1ff04d410ee68e66d5b0cf author Keshavamurthy Anil S Tue, 22 Nov 2005 14:15:49 -0800 committer Tony Luck Tue, 29 Nov 2005 09:24:39 -0800 [IA64] Remove getting break_num by decoding instruction break.b always sets cr.iim to 0 and the current code tries to get the break_num by decoding instruction. However, their seems to be a race condition while reading the regs->cr_iip, as on other cpu the break.b at regs->cr_iip might have been replaced with the original instruction as a result of unregister_kprobe() and hence decoding instruction to obtain break_num will result in wrong value in this case. Also includes changes to kprobes.c which now has to handle break number zero. Signed-off-by: Anil S Keshavamurthy Signed-off-by: Tony Luck commit b77dae5293efba42ea1ff04d410ee68e66d5b0cf tree e7cff6570c32d55e4743f0e59c53ab9086c1efd6 parent 624f54be206adf970cd8eece16446b027913e533 author Dean Roe Wed, 09 Nov 2005 14:25:06 -0600 committer Tony Luck Tue, 29 Nov 2005 09:24:10 -0800 [IA64] - Make pfn_valid more precise for SGI Altix systems A single SGI Altix system can be divided into multiple partitions, each running their own instance of the Linux kernel. pfn_valid() is currently not optimal for any but the first partition, since it does not compare the pfn with min_low_pfn before calling the more costly ia64_pfn_valid(). Signed-off-by: Dean Roe Signed-off-by: Tony Luck commit d70aa5e4b54aa7e704c886838715ac8a45d5750f tree 9604b37c2530212b42e06391eefefc09d758a418 parent 4570cd6a65f0559b0e11a6f953f5204fea5c719d parent 220bbd748335f73aafb472a97716762a42cb0d58 author Linus Torvalds Tue, 29 Nov 2005 08:06:51 -0800 committer Linus Torvalds Tue, 29 Nov 2005 08:06:51 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 4570cd6a65f0559b0e11a6f953f5204fea5c719d tree b09ce26ab076decded3d7a6d6b1693ac3bdb103f parent fa2a455b028f3b6ca4dae129c6337d7edf21f12c parent 666acb94d155106e494c6dfdd8b2fae44e0fad61 author Linus Torvalds Tue, 29 Nov 2005 08:05:54 -0800 committer Linus Torvalds Tue, 29 Nov 2005 08:05:54 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge commit 21eeb7aa116b1f59fc23339521173cbb13e57f1a tree aca16132a18dca8c8bf3417d118ad9d98834db32 parent bc4117f8767203927e78b92e9e5b3ddb71d6a84d author Thomas Gleixner Tue, 29 Nov 2005 16:57:17 +0100 committer Thomas Gleixner Tue, 29 Nov 2005 16:57:17 +0100 [JFFS2] Fix the slab cache constructor of 'struct jffs2_inode_info' objects. JFFS2 initialize f->sem mutex as "locked" in the slab constructor which is a bug. Objects are freed with unlocked f->sem mutex. So, when they allocated again, f->sem is unlocked because the slab cache constructor is not called for them. The constructor is called only once when memory pages are allocated for objects (namely, when the slab layer allocates new slabs). So, sometimes 'struct jffs2_inode_info' are allocated with unlocked f->sem, sometimes with locked. This is a bug. Instead, initialize f->sem as unlocked in the constructor. I.e., in the "constructed" state f->sem must be unlocked. From: Keijiro Yano Acked-by: Artem B. Bityutskiy Signed-off-by: Thomas Gleixner commit fa2a455b028f3b6ca4dae129c6337d7edf21f12c tree 42b147522c5c112e26efa55b8173a97b424149a5 parent 624f54be206adf970cd8eece16446b027913e533 author Nick Piggin Tue, 29 Nov 2005 18:43:17 +1100 committer Linus Torvalds Tue, 29 Nov 2005 07:53:32 -0800 [PATCH] Fix vma argument in get_usr_pages() for gate areas The system call gate area handling called vm_normal_page() with the wrong vma (which was always NULL, and caused an oops). Signed-off-by: Nick Piggin Signed-off-by: Linus Torvalds commit bc4117f8767203927e78b92e9e5b3ddb71d6a84d tree bf87bd373c97fb7b63ab88687afb8742a42e7aad parent 624f54be206adf970cd8eece16446b027913e533 author Sean Young Tue, 29 Nov 2005 11:48:00 +0000 committer Thomas Gleixner Tue, 29 Nov 2005 16:52:26 +0100 [MTD] RFD_FTL: Use lanana assigned major device number A major block device number is now assigned by lanana. Signed-off-by: Sean Young Signed-off-by: Thomas Gleixner commit 220bbd748335f73aafb472a97716762a42cb0d58 tree 7bbcf26661ba53bb6c782dff0b8afee7bc417f27 parent 624f54be206adf970cd8eece16446b027913e533 author YOSHIFUJI Hideaki Mon, 28 Nov 2005 22:27:11 -0800 committer David S. Miller Mon, 28 Nov 2005 22:27:11 -0800 [IPV6]: Implement appropriate dummy rule 4 in ipv6_dev_get_saddr(). Ensure to update hiscore.rule in dummy rule 4 in ipv6_dev_get_saddr(). Pointed out by Yan Zheng . Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 666acb94d155106e494c6dfdd8b2fae44e0fad61 tree a6c2dfb66883b6ccf95307a74d875f3a66458eab parent 0e2d94f6a09d0a2d39c3b7d9529ac5c378098245 author Paul Mackerras Tue, 29 Nov 2005 15:50:58 +1100 committer Paul Mackerras Tue, 29 Nov 2005 15:50:58 +1100 powerpc: Export __flush_icache_range for 32-bit Both 32-bit and 64-bit use the same inline flush_icache_range definition now, so both need to export __flush_icache_range, not just 64-bit. Signed-off-by: Paul Mackerras commit 0e2d94f6a09d0a2d39c3b7d9529ac5c378098245 tree 7bfb43f912357e193dd9d8ef6de2f2388c7d9b4a parent 5d240918e6813b5c050eeff0c06480ee29e66df9 author Otavio Salvador Tue, 29 Nov 2005 08:02:24 +1100 committer Paul Mackerras Tue, 29 Nov 2005 13:23:28 +1100 [PATCH] ppc: Export symbol needed by MOL Export symbol needed to allow MOL to run. This was changed to be inline in past and forgot to be change here. Signed-off-by: Paul Mackerras