commit 5666c0947ede0432ba5148570aa66ffb9febff5b Author: Linus Torvalds Date: Wed Nov 30 22:25:15 2005 -0800 Linux v2.6.15-rc4 commit 346f7dbb17cb7d84317b4410df2e8f7bf2e57f44 Author: Linus Torvalds Date: Wed Nov 30 10:22:30 2005 -0800 Revert "[PATCH] pci_ids.h: remove duplicate entries" This reverts commit c9d6073fb3cda856132dd544d537679f9715436c. It was totally bogus. Signed-off-by: Linus Torvalds commit a145dd411eb28c83ee4bb68b66f62c326c0f764e Author: Linus Torvalds Date: Wed Nov 30 09:35:19 2005 -0800 VM: add "vm_insert_page()" function This is what a lot of drivers will actually want to use to insert individual pages into a user VMA. It doesn't have the old PageReserved restrictions of remap_pfn_range(), and it doesn't complain about partial remappings. The page you insert needs to be a nice clean kernel allocation, so you can't insert arbitrary page mappings with this, but that's not what people want. Signed-off-by: Linus Torvalds commit c801147c5a103eec864afee348c4ee3fdb0f380c Author: Egbert Eich Date: Wed Nov 30 15:32:59 2005 +0100 [PATCH] SiS DRM: Fix possible NULL dereference This fixes a NULL pointer reference in DRM. The SiS driver tries to allocate a big chunk of memory, but the return value is never checked. Reported in Novell bugzilla #132271: https://bugzilla.novell.com/show_bug.cgi?id=132271 Signed-off-by: Takashi Iwai Signed-off-by: Linus Torvalds commit 25741b3e43151bc207dd2b850b0bb157c442682b Author: Steve French Date: Tue Nov 29 22:38:43 2005 -0800 [CIFS] For previous fix, mode on mkdir needed S_IFDIR left out. Signed-off-by: Steve French commit 8926bfa7462d4c3f8b05cca929e0c4bcde93ae38 Author: David Brownell Date: Mon Nov 28 08:40:38 2005 -0800 [PATCH] USB: ehci fixups Rename the EHCI "reset" routine so it better matches what it does (setup); and move the one-time data structure setup earlier, before doing anything that implicitly relies on it having been completed already. From: David Brownell Signed-off-by: Greg Kroah-Hartman commit 8de98402652c01839ae321be6cb3054cf5735d83 Author: Benjamin Herrenschmidt Date: Fri Nov 25 09:59:46 2005 +1100 [PATCH] USB: Fix USB suspend/resume crasher (#2) This patch closes the IRQ race and makes various other OHCI & EHCI code path safer vs. suspend/resume. I've been able to (finally !) successfully suspend and resume various Mac models, with or without USB mouse plugged, or plugging while asleep, or unplugging while asleep etc... all without a crash. Alan, please verify the UHCI bit I did, I only verified that it builds. It's very simple so I wouldn't expect any issue there. If you aren't confident, then just drop the hunks that change uhci-hcd.c I also made the patch a little bit more "safer" by making sure the store to the interrupt register that disables interrupts is not posted before I set the flag and drop the spinlock. Without this patch, you cannot reliably sleep/wakeup any recent Mac, and I suspect PCs have some more sneaky issues too (they don't frankly crash with machine checks because x86 tend to silently swallow PCI errors but that won't last afaik, at least PCI Express will blow up in those situations, but the USB code may still misbehave). Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman commit d3420ba4930d61f4ec4abc046765de274182b4ed Author: Dave Jones Date: Mon Nov 28 13:44:52 2005 -0500 [PATCH] Additional device ID for Conexant AccessRunner USB driver Reported as working in Fedora bugzilla by Petr. From: Petr Tuma Signed-off-by: Dave Jones Signed-off-by: Greg Kroah-Hartman commit 620948a01c71060a32611bc2f792f58a88cf28b1 Author: Alan Stern Date: Mon Nov 28 15:22:55 2005 -0500 [PATCH] USB: documentation update This patch (as611) fixes a minor mistake and misspelling in the USB documentation. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit c9d6073fb3cda856132dd544d537679f9715436c Author: Grant Coady Date: Thu Nov 24 20:41:06 2005 +1100 [PATCH] pci_ids.h: remove duplicate entries G'day Albert, Andrew, commit 4fb80634d30f5e639a92b78c8f215f96a61ba8c7 Author: Albert Lee Date: Thu May 12 15:49:21 2005 -0400 duplicates symbols already appearing in pci_ids.h, appended patch removes them again :o) From: Grant Coady pci_ids: commit 4fb80634d30f5e639a92b78c8f215f96a61ba8c7 duplicated a couple existing symbols in pci_ids.h, remove them. Signed-off-by: Grant Coady Signed-off-by: Greg Kroah-Hartman commit 9632051963cb6e6f7412990f8b962209b9334e13 Author: Jean Delvare Date: Tue Nov 29 22:27:14 2005 +0100 [PATCH] hwmon: w83792d fix unused fan pins 1. This patch add check for fan4,5,6,7 and do not create device file if their pins are not configured as fan. 2. Fix the issue that can not set fan divisor to 128. 3. Fix the index out of bounds bug in w83792d_detect function. Signed-off-by: Yuan Mu Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 2a138ebb012ac42c082ae8b40c87c1f265664391 Author: Steve French Date: Tue Nov 29 21:22:19 2005 -0800 [CIFS] Missing parenthesis and typo in previous fix Signed-off-by: Steve French commit 6ab16d249513a50bef3f1b275cea6aa8d3f51832 Author: Steve French Date: Tue Nov 29 20:55:11 2005 -0800 [CIFS] Fix umount --force to wake up the pending response queue, not just the request queue. Also periodically wakeup response_q so threads can check if stuck requests have timed out. Workaround Windows server illegal smb length on transact2 findfirst response. Signed-off-by: Steve French commit 6473a559c336d5c407f9df412ca2f55357767ff8 Author: Steve French Date: Tue Nov 29 20:20:10 2005 -0800 [CIFS] Fix missing permission check on setattr when noperm mount option is disabled. Also set mode, uid, gid better on mkdir and create for the case when Unix Extensions is not enabled and setuids is enabled. This is necessary to fix the hole in which chown could be allowed for non-root users in some cases if root mounted, and also to display the mode and uid properly in some cases. Signed-off-by: Steve French commit 1a57198609615a936ff57da37b6957db9bafde83 Author: Mark Fortescue Date: Tue Nov 29 19:34:44 2005 -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 Author: Antonino A. Daplas Date: Tue Nov 29 19:34:43 2005 -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 Author: Shaohua Li Date: Tue Nov 29 19:34:42 2005 -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 Author: Roman Zippel Date: Tue Nov 29 19:34:41 2005 -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 Author: Jeff Mahoney Date: Tue Nov 29 19:34:39 2005 -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 Author: Paolo Galtieri Date: Tue Nov 29 19:34:38 2005 -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 Author: Pavel Machek Date: Tue Nov 29 19:34:37 2005 -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 Author: Thierry Vignaud Date: Tue Nov 29 19:34:35 2005 -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 Author: David Gibson Date: Tue Nov 29 19:34:32 2005 -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 Author: Matt Helsley Date: Tue Nov 29 19:34:31 2005 -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 Author: Olaf Hering Date: Tue Nov 29 14:04:05 2005 +0100 [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 Author: Paul Mackerras Date: Wed Nov 30 13:20:54 2005 +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 Author: Paolo Galtieri Date: Tue Nov 29 14:26:47 2005 -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 Signed-off-by: Andrew Morton Signed-off-by: Paul Mackerras commit 49c91fb01ff3948285608c65754b3ffbf57d50f2 Author: Trond Myklebust Date: Tue Nov 29 19:27:22 2005 -0500 [PATCH] VM: Fix typos in get_locked_pte Signed-off-by: Trond Myklebust Signed-off-by: Linus Torvalds commit 34a0b3cdc078746788ffc49e56da0db62b8b6ea4 Author: Adrian Bunk Date: Tue Nov 29 16:28:56 2005 -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 Author: Adrian Bunk Date: Tue Nov 29 16:28:18 2005 -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 Author: Adrian Bunk Date: Tue Nov 29 16:27:20 2005 -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 Author: Arjan van de Ven Date: Tue Nov 29 16:21:38 2005 -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 Author: Chas Williams Date: Tue Nov 29 16:17:11 2005 -0800 [ATM]: [adummy] dummy ATM driver (similar to net/dummy) Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 64bf69ddff7637b7ed7acf9b2a823cc0ee519439 Author: Stanislaw Gruszka Date: Tue Nov 29 16:16:41 2005 -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 Author: Stanislaw Gruszka Date: Tue Nov 29 16:16:21 2005 -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 Author: Mitchell Blank Jr Date: Tue Nov 29 16:15:59 2005 -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 Author: Chas Williams Date: Tue Nov 29 16:15:38 2005 -0800 [ATM]: linux/config.h only needed for #ifdef __KERNEL__ section Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 50accc9c428273501dd2a6295c84a533dd1fe645 Author: Mitchell Blank Jr Date: Tue Nov 29 16:15:18 2005 -0800 [ATM]: attempt to autoload atm drivers From: Mitchell Blank Jr Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit e91a73568b19b4a8145fc6e05314d522ee35a0b1 Author: Jan Pieter Date: Tue Nov 29 16:14:58 2005 -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 Author: Dave Jones Date: Tue Nov 29 16:14:33 2005 -0800 [ATM]: [lanai] lanai missing unregister Signed-off-by: Dave Jones Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit c22c28f69b1e28505bd0d26bd0f64554a9e66fe8 Author: Mitchell Blank Jr Date: Tue Nov 29 16:14:12 2005 -0800 [ATM]: [lanai] better constification Signed-off-by: Mitchell Blank Jr Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit c219750b2e667f4f79f4d8faca5057dad793db87 Author: Mitchell Blank Jr Date: Tue Nov 29 16:13:55 2005 -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 Author: Mitchell Blank Jr Date: Tue Nov 29 16:13:32 2005 -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 Author: Mike Stroyan Date: Tue Nov 29 16:12:55 2005 -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 f747307ed1defcdfd37a3ef84c48e3138691cd26 Author: Linus Torvalds Date: Tue Nov 29 14:21:57 2005 -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 Author: Hugh Dickins Date: Tue Nov 29 16:55:48 2005 +0000 [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 Author: Hugh Dickins Date: Tue Nov 29 16:54:51 2005 +0000 [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 Author: Linus Torvalds Date: Tue Nov 29 14:07:55 2005 -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 Author: Linus Torvalds Date: Tue Nov 29 14:03:14 2005 -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 Author: David S. Miller Date: Tue Nov 29 13:59:03 2005 -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 238f9b063dcc9f23493a0d3fecca29fe332d4905 Author: Christoph Hellwig Date: Tue Nov 29 21:36:16 2005 +0100 [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 Author: Linus Torvalds Date: Tue Nov 29 13:01:56 2005 -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 Author: Ben Collins Date: Tue Nov 29 11:45:26 2005 -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 Author: Adrian Bunk Date: Tue Nov 29 14:49:38 2005 +0000 [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 Author: Richard Purdie Date: Tue Nov 29 14:28:31 2005 +0000 [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 Author: Thomas Gleixner Date: Mon Nov 28 22:36:12 2005 +0000 [MTD] Remove bogus PQ2FADS driver Remove disfunctional driver, which slipped through the review mechanism Signed-off-by: Thomas Gleixner commit e2602b347aa6f62b61754c5f65191ef67ffd0dc7 Author: Luiz Capitulino Date: Tue Nov 29 14:30:03 2005 +0000 [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 Author: Nicolas Pitre Date: Wed Nov 23 22:07:56 2005 +0000 [MTD] cfi_cmdset_0001: relax locking rules for multi hardware partition support Signed-off-by: Nicolas Pitre Signed-off-by: Thomas Gleixner commit 7ac571f8d0f843fb818f7c70ec77784545e91bc4 Author: David Woodhouse Date: Thu Nov 17 08:20:31 2005 +0000 [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 Author: John Bowler Date: Wed Nov 16 16:23:25 2005 +0000 [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 Author: Todd Poynor Date: Tue Nov 15 23:28:20 2005 +0000 [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 Author: Maciej W. Rozycki Date: Mon Nov 14 13:41:51 2005 +0000 [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 Author: Keshavamurthy Anil S Date: Tue Nov 22 14:15:49 2005 -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 Author: Dean Roe Date: Wed Nov 9 14:25:06 2005 -0600 [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 21eeb7aa116b1f59fc23339521173cbb13e57f1a Author: Thomas Gleixner Date: Tue Nov 29 16:57:17 2005 +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 Author: Nick Piggin Date: Tue Nov 29 18:43:17 2005 +1100 [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 Author: Sean Young Date: Tue Nov 29 11:48:00 2005 +0000 [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 Author: YOSHIFUJI Hideaki Date: Mon Nov 28 22:27:11 2005 -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 Author: Paul Mackerras Date: Tue Nov 29 15:50:58 2005 +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 Author: Otavio Salvador Date: Tue Nov 29 08:02:24 2005 +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 commit 3abb92722ab1784b419dadb5444daf8ea9636905 Author: Steve French Date: Mon Nov 28 08:16:13 2005 -0800 [CIFS] When file is deleted locally but later recreated on the server fix cifs negative dentries so they are freed faster (not requiring umount or readdir e.g.) so the client recognizes the new file on the server more quickly. Signed-off-by: Steve French