commit 10ee39fe3ff618d274e1cd0f6abbc2917b736bfd tree 8479297b76b427b713ac18a96911ef9ec09f7b33 parent e2fbf1ace5cfefdd192f29fd4a027422f567c62d author Christian Trefzer Tue, 14 Feb 2006 13:53:26 -0800 committer Linus Torvalds Tue, 14 Feb 2006 16:09:35 -0800 [PATCH] neofb: avoid resetting display config on unblank Fix issues with the NeoMagic framebuffer driver. It nicely complements my previous fix already in linus' tree. The only thing missing now is that the external CRT will not be activated at neofb init when external-only is selected, either by register read or module/kernel parameter. Testing was done on a Dell Latitude CPi-A/NM2200 chip. Previous behaviour: - before booting linux, set the preferred display config X via FN+F8 - boot linux, neofb stores the register values in a private variable - change the display config to Y via keystroke - leave the machine in peace until display is blanked - touching any key will result in display config X being restored - booting up, the BIOS will acknowledge config Y, though... Current behaviour: At the time of unblanking, config Y is honoured because we now read back register contents instead of just overwriting them with outdated values. Signed-off by: Christian Trefzer Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e2fbf1ace5cfefdd192f29fd4a027422f567c62d tree d82d72e4b3f2966e926dd346d3f79a14e747242c parent 581141cb4b10ebd865dcb7b80f5e712e2def5408 author Thomas Meyer Tue, 14 Feb 2006 13:53:21 -0800 committer Linus Torvalds Tue, 14 Feb 2006 16:09:35 -0800 [PATCH] x86: gitignore some autogenerated files for i386 Add some more gitignore files for i386 architecture. This files are created during the build process of a i386 kernel. Signed-off-by: Thomas Meyer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 581141cb4b10ebd865dcb7b80f5e712e2def5408 tree cd9c6e4ac3c53196586f1246439e417410b90a4f parent 28baebae73c3ea8b75c7cae225a7db817ab825a9 author Albert D. Cahalan Tue, 14 Feb 2006 13:53:20 -0800 committer Linus Torvalds Tue, 14 Feb 2006 16:09:35 -0800 [PATCH] x86: document sysenter path This path isn't obvious. It looks as if the kernel will be taking three args from the user stack, but it only takes one from there. Signed-off-by: Albert Cahalan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 28baebae73c3ea8b75c7cae225a7db817ab825a9 tree 940476b4d03b96480d451b7b5b6f3df3f0ff18dc parent 68f624fc8b9fa50de9cc0ebd612ef7b7b9fa32d0 author David Howells Tue, 14 Feb 2006 13:53:20 -0800 committer Linus Torvalds Tue, 14 Feb 2006 16:09:35 -0800 [PATCH] FRV: Use virtual interrupt disablement Make the FRV arch use virtual interrupt disablement because accesses to the processor status register (PSR) are relatively slow and because we will soon have the need to deal with multiple interrupt controls at the same time (separate h/w and inter-core interrupts). The way this is done is to dedicate one of the four integer condition code registers (ICC2) to maintaining a virtual interrupt disablement state whilst inside the kernel. This uses the ICC2.Z flag (Zero) to indicate whether the interrupts are virtually disabled and the ICC2.C flag (Carry) to indicate whether the interrupts are physically disabled. ICC2.Z is set to indicate interrupts are virtually disabled. ICC2.C is set to indicate interrupts are physically enabled. Under normal running conditions Z==0 and C==1. Disabling interrupts with local_irq_disable() doesn't then actually physically disable interrupts - it merely sets ICC2.Z to 1. Should an interrupt then happen, the exception prologue will note ICC2.Z is set and branch out of line using one instruction (an unlikely BEQ). Here it will physically disable interrupts and clear ICC2.C. When it comes time to enable interrupts (local_irq_enable()), this simply clears the ICC2.Z flag and invokes a trap #2 if both Z and C flags are clear (the HI integer condition). This can be done with the TIHI conditional trap instruction. The trap then physically reenables interrupts and sets ICC2.C again. Upon returning the interrupt will be taken as interrupts will then be enabled. Note that whilst processing the trap, the whole exceptions system is disabled, and so an interrupt can't happen till it returns. If no pending interrupt had happened, ICC2.C would still be set, the HI condition would not be fulfilled, and no trap will happen. Saving interrupts (local_irq_save) is simply a matter of pulling the ICC2.Z flag out of the CCR register, shifting it down and masking it off. This gives a result of 0 if interrupts were enabled and 1 if they weren't. Restoring interrupts (local_irq_restore) is then a matter of taking the saved value mentioned previously and XOR'ing it against 1. If it was one, the result will be zero, and if it was zero the result will be non-zero. This result is then used to affect the ICC2.Z flag directly (it is a condition code flag after all). An XOR instruction does not affect the Carry flag, and so that bit of state is unchanged. The two flags can then be sampled to see if they're both zero using the trap (TIHI) as for the unconditional reenablement (local_irq_enable). This patch also: (1) Modifies the debugging stub (break.S) to handle single-stepping crossing into the trap #2 handler and into virtually disabled interrupts. (2) Removes superseded fixup pointers from the second instructions in the trap tables (there's no a separate fixup table for this). (3) Declares the trap #3 vector for use in .org directives in the trap table. (4) Moves irq_enter() and irq_exit() in do_IRQ() to avoid problems with virtual interrupt handling, and removes the duplicate code that has now been folded into irq_exit() (softirq and preemption handling). (5) Tells the compiler in the arch Makefile that ICC2 is now reserved. (6) Documents the in-kernel ABI, including the virtual interrupts. (7) Renames the old irq management functions to different names. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 68f624fc8b9fa50de9cc0ebd612ef7b7b9fa32d0 tree 2e25482dd6a482ccf1378d2b01b863f99603bab5 parent 06027bdd278a32a84b273e41db68a5db8ffd2bb6 author David Howells Tue, 14 Feb 2006 13:53:18 -0800 committer Linus Torvalds Tue, 14 Feb 2006 16:09:35 -0800 [PATCH] FRV: Miscellaneous fixes Make various alterations and fixes to the FRV arch: (1) Resyncs the FRV system call collection with the i386 arch. (2) Discards __iounmap() as it's not used. (3) Fixes the use of the SWAP/SWAPI instruction to get the arguments the right way around in atomic.h, and also to get the asm constraints correct. (4) Moves copy_to/from_user_page() to asm/cacheflush.h to be consistent with other archs. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 06027bdd278a32a84b273e41db68a5db8ffd2bb6 tree d22c98848c3964104fc5c617da60c14af5b4a1f0 parent e35a6619e7be59aa38249346327c89207663bb37 author Ingo Molnar Tue, 14 Feb 2006 13:53:15 -0800 committer Linus Torvalds Tue, 14 Feb 2006 16:09:35 -0800 [PATCH] hrtimer: round up relative start time on low-res arches CONFIG_TIME_LOW_RES is a temporary way for architectures to signal that they simply return xtime in do_gettimeoffset(). In this corner-case we want to round up by resolution when starting a relative timer, to avoid short timeouts. This will go away with the GTOD framework. Signed-off-by: Ingo Molnar Cc: Roman Zippel Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e35a6619e7be59aa38249346327c89207663bb37 tree 937b4ef45b317dd1b6854c9c5682af3ddeb55faf parent 5a1342f77304da8dc698e0ecf09925438764d80f author Heiko Carstens Tue, 14 Feb 2006 13:53:14 -0800 committer Linus Torvalds Tue, 14 Feb 2006 16:09:35 -0800 [PATCH] s390: fix __delay implementation Fix __delay implementation. Called with an argument "1" or "0" it would loop nearly forever (since (1/2)-1 = 0xffffffff). Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a1342f77304da8dc698e0ecf09925438764d80f tree d9370a39cda0c855fadacfb80611a6e0a2988595 parent d6077cb80cde4506720f9165eba99ee07438513f author Adrian Bunk Tue, 14 Feb 2006 13:53:10 -0800 committer Linus Torvalds Tue, 14 Feb 2006 16:09:35 -0800 [PATCH] fix a typo in the CPU_H8300H dependencies Jean-Luc Leger found this obvious typo. Signed-off-by: Adrian Bunk Cc: Yoshinori Sato Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6077cb80cde4506720f9165eba99ee07438513f tree f4462e51cf0a14a113c0c524711636c8429424bb parent f822566165dd46ff5de9bf895cfa6c51f53bb0c4 author Chen, Kenneth W Tue, 14 Feb 2006 13:53:10 -0800 committer Linus Torvalds Tue, 14 Feb 2006 16:09:34 -0800 [PATCH] sched: revert "filter affine wakeups" Revert commit d7102e95b7b9c00277562c29aad421d2d521c5f6: [PATCH] sched: filter affine wakeups Apparently caused more than 10% performance regression for aim7 benchmark. The setup in use is 16-cpu HP rx8620, 64Gb of memory and 12 MSA1000s with 144 disks. Each disk is 72Gb with a single ext3 filesystem (courtesy of HP, who supplied benchmark results). The problem is, for aim7, the wake-up pattern is random, but it still needs load balancing action in the wake-up path to achieve best performance. With the above commit, lack of load balancing hurts that workload. However, for workloads like database transaction processing, the requirement is exactly opposite. In the wake up path, best performance is achieved with absolutely zero load balancing. We simply wake up the process on the CPU that it was previously run. Worst performance is obtained when we do load balancing at wake up. There isn't an easy way to auto detect the workload characteristics. Ingo's earlier patch that detects idle CPU and decide whether to load balance or not doesn't perform with aim7 either since all CPUs are busy (it causes even bigger perf. regression). Revert commit d7102e95b7b9c00277562c29aad421d2d521c5f6, which causes more than 10% performance regression with aim7. Signed-off-by: Ken Chen Acked-by: Ingo Molnar Cc: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f822566165dd46ff5de9bf895cfa6c51f53bb0c4 tree e052f406d5a14140d17f76dc8914d33bbc8e5f1d parent 8861da31e3b3e3df7b05e7b157230de3d486e53b author Michael S. Tsirkin Tue, 14 Feb 2006 13:53:08 -0800 committer Linus Torvalds Tue, 14 Feb 2006 16:09:34 -0800 [PATCH] madvise MADV_DONTFORK/MADV_DOFORK Currently, copy-on-write may change the physical address of a page even if the user requested that the page is pinned in memory (either by mlock or by get_user_pages). This happens if the process forks meanwhile, and the parent writes to that page. As a result, the page is orphaned: in case of get_user_pages, the application will never see any data hardware DMA's into this page after the COW. In case of mlock'd memory, the parent is not getting the realtime/security benefits of mlock. In particular, this affects the Infiniband modules which do DMA from and into user pages all the time. This patch adds madvise options to control whether memory range is inherited across fork. Useful e.g. for when hardware is doing DMA from/into these pages. Could also be useful to an application wanting to speed up its forks by cutting large areas out of consideration. Signed-off-by: Michael S. Tsirkin Acked-by: Hugh Dickins Cc: Michael Kerrisk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8861da31e3b3e3df7b05e7b157230de3d486e53b tree 15b8874fbad4dc1170f64cd8a5be7df4eced9686 parent 61b9a26ae6d308ade964db122e0e89299586422c author Jim Keniston Tue, 14 Feb 2006 13:53:06 -0800 committer Linus Torvalds Tue, 14 Feb 2006 16:09:34 -0800 [PATCH] kprobes: Update Documentation/kprobes.txt Update Documentation/kprobes.txt to reflect Kprobes enhancements and other recent developments. Acked-by: Ananth Mavinakayanahalli Signed-off-by: Jim Keniston Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 61b9a26ae6d308ade964db122e0e89299586422c tree c44154348b93b8ab95772b482f43ae4274b1f977 parent 8b09fb34513225d87d511c7e8f29c0fd3cf860e0 author Karsten Keil Tue, 14 Feb 2006 13:53:06 -0800 committer Linus Torvalds Tue, 14 Feb 2006 16:09:34 -0800 [PATCH] Fix NULL pointer dereference in isdn_tty_at_cout The changes in the tty related code introduced wrong parenthesis in a if condition in the isdn_tty_at_cout function. This caused access to index -1 in the dev->drv[] array. This patch change it back to the correct condition from the previous versions. Signed-off-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b09fb34513225d87d511c7e8f29c0fd3cf860e0 tree 3742919b1f14cd0edd2c6584703ebcc8b9ff134e parent 5ac5f9d1ce8492163dbde5d357dc5d03becf7e36 author James Bottomley Tue, 14 Feb 2006 13:53:05 -0800 committer Linus Torvalds Tue, 14 Feb 2006 16:09:34 -0800 [PATCH] fix x86 topology export in sysfs for subarchitectures The correct way to export hyperthreading based functions is to predicate them on CONFIG_X86_HT. Without this, the topology exporting patch breaks the build on all non-PC x86 subarchitectures. Signed-off-by: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ac5f9d1ce8492163dbde5d357dc5d03becf7e36 tree 3ce7f36c074e37dd565b91490582c4a4902f2b18 parent 7c8903f6373f9abecf060bad53ca36bc4ac037f2 author Trond Myklebust Tue, 14 Feb 2006 13:53:04 -0800 committer Linus Torvalds Tue, 14 Feb 2006 16:09:34 -0800 [PATCH] NLM: Fix the NLM_GRANTED callback checks If 2 threads attached to the same process are blocking on different locks on different files (maybe even on different servers) but have the same lock arguments (i.e. same offset+length - actually quite common, since most processes try to lock the entire file) then the first GRANTED call that wakes one up will also wake the other. Currently when the NLM_GRANTED callback comes in, lockd walks the list of blocked locks in search of a match to the lock that the NLM server has granted. Although it checks the lock pid, start and end, it fails to check the filehandle and the server address. By checking the filehandle and server IP address, we ensure that this only happens if the locks truly are referencing the same file. Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7c8903f6373f9abecf060bad53ca36bc4ac037f2 tree 473644b1f2999e3e516cd4f55a3535d9bb29595d parent be5efffb762fa4a7b9a7a45ebf34b13e3bf5a2d8 author Mark Fasheh Tue, 14 Feb 2006 13:53:03 -0800 committer Linus Torvalds Tue, 14 Feb 2006 16:09:34 -0800 [PATCH] jbd: revert checkpoint list changes This patch reverts commit f93ea411b73594f7d144855fd34278bcf34a9afc: [PATCH] jbd: split checkpoint lists This broke journal_flush() for OCFS2, which is its method of being sure that metadata is sent to disk for another node. And two related commits 8d3c7fce2d20ecc3264c8d8c91ae3beacdeaed1b and 43c3e6f5abdf6acac9b90c86bf03f995bf7d3d92 with the subjects: [PATCH] jbd: log_do_checkpoint fix [PATCH] jbd: remove_transaction fix These seem to be incremental bugfixes on the original patch and as such are no longer needed. Signed-off-by: Mark Fasheh Cc: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit be5efffb762fa4a7b9a7a45ebf34b13e3bf5a2d8 tree b5bf63cab3daf805c89d8a3438b19bd96964d64c parent da965822abd18a17d7cffe1d511f48951c82dfb6 author Bjorn Helgaas Tue, 14 Feb 2006 13:53:02 -0800 committer Linus Torvalds Tue, 14 Feb 2006 16:09:34 -0800 [PATCH] HPET: handle multiple ACPI EXTENDED_IRQ resources When the _CRS for a single HPET contains multiple EXTENDED_IRQ resources, we overwrote hdp->hd_nirqs every time we found one. So the driver worked when all the IRQs were described in a single EXTENDED_IRQ resource, but failed when multiple resources were used. (Strictly speaking, I think the latter is actually more correct, but both styles have been used.) Someday we should remove all the ACPI stuff from hpet.c and use PNP driver registration instead. But currently PNP_MAX_IRQ is 2, and HPETs often have more IRQs. Hint, hint, Adam :-) Signed-off-by: Bjorn Helgaas Acked-by: Bob Picco Cc: Venkatesh Pallipadi Cc: Len Brown Cc: Adam Belay Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da965822abd18a17d7cffe1d511f48951c82dfb6 tree b5a64fd33374661dbc689d3192a5c9134b3672e5 parent 16bf134840da3920ded1290973c56ec214636f12 author Paul Fulghum Tue, 14 Feb 2006 13:53:00 -0800 committer Linus Torvalds Tue, 14 Feb 2006 16:09:33 -0800 [PATCH] tty reference count fix Fix hole where tty structure can be released when reference count is non zero. Existing code can sleep without tty_sem protection between deciding to release the tty structure (setting local variables tty_closing and otty_closing) and setting TTY_CLOSING to prevent further opens. An open can occur during this interval causing release_dev() to free the tty structure while it is still referenced. This should fix bugzilla.kernel.org [Bug 6041] New: Unable to handle kernel paging request In Bug 6041, tty_open() oopes on accessing the tty structure it has successfully claimed. Bug was on SMP machine with the same tty being opened and closed by multiple processes, and DEBUG_PAGEALLOC enabled. Signed-off-by: Paul Fulghum Cc: Alan Cox Cc: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 16bf134840da3920ded1290973c56ec214636f12 tree 1aacddb873bd383030a65e13e78c2ced38edfa23 parent d98c7a09843621f1b145ca5ae8ed03ff04085edb author Hugh Dickins Tue, 14 Feb 2006 13:52:59 -0800 committer Linus Torvalds Tue, 14 Feb 2006 16:09:33 -0800 [PATCH] compound page: no access_process_vm check The PageCompound check before access_process_vm's set_page_dirty_lock is no longer necessary, so remove it. But leave the PageCompound checks in bio_set_pages_dirty, dio_bio_complete and nfs_free_user_pages: at least some of those were introduced as a little optimization on hugetlb pages. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d98c7a09843621f1b145ca5ae8ed03ff04085edb tree 764b943efb177ca506fad61a63bb9e8cbf56a3a7 parent 41d78ba55037468e6c86c53e3076d1a74841de39 author Hugh Dickins Tue, 14 Feb 2006 13:52:59 -0800 committer Linus Torvalds Tue, 14 Feb 2006 16:09:33 -0800 [PATCH] compound page: default destructor Somehow I imagined that calling a NULL destructor would free a compound page rather than oopsing. No, we must supply a default destructor, __free_pages_ok using the order noted by prep_compound_page. hugetlb can still replace this as before with its own free_huge_page pointer. The case that needs this is not common: rarely does put_compound_page's put_page_testzero bring the count down to 0. But if get_user_pages is applied to some part of a compound page, without immediate release (e.g. AIO or Infiniband), then it's possible for its put_page to come after the containing vma has been unmapped and the driver done its free_pages. That's just the kind of case compound pages are supposed to be guarding against (but Nick points out, nor did PageReserved handle this right). Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 41d78ba55037468e6c86c53e3076d1a74841de39 tree d970f18d18532009b17c736583429401dbd64ade parent 7277232374680595cdbc774fd246b206f56db015 author Hugh Dickins Tue, 14 Feb 2006 13:52:58 -0800 committer Linus Torvalds Tue, 14 Feb 2006 16:09:33 -0800 [PATCH] compound page: use page[1].lru If a compound page has its own put_page_testzero destructor (the only current example is free_huge_page), that is noted in page[1].mapping of the compound page. But that's rather a poor place to keep it: functions which call set_page_dirty_lock after get_user_pages (e.g. Infiniband's __ib_umem_release) ought to be checking first, otherwise set_page_dirty is liable to crash on what's not the address of a struct address_space. And now I'm about to make that worse: it turns out that every compound page needs a destructor, so we can no longer rely on hugetlb pages going their own special way, to avoid further problems of page->mapping reuse. For example, not many people know that: on 50% of i386 -Os builds, the first tail page of a compound page purports to be PageAnon (when its destructor has an odd address), which surprises page_add_file_rmap. Keep the compound page destructor in page[1].lru.next instead. And to free up the common pairing of mapping and index, also move compound page order from index to lru.prev. Slab reuses page->lru too: but if we ever need slab to use compound pages, it can easily stack its use above this. (akpm: decoded version of the above: the tail pages of a compound page now have ->mapping==NULL, so there's no need for the set_page_dirty[_lock]() caller to check that they're not compund pages before doing the dirty). Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7277232374680595cdbc774fd246b206f56db015 tree de128d380c1aae7f826aebc645a9c29f38dff0ee parent 948423e5ccc33bc257384ad4b339214c577bc926 author Peter Osterlund Tue, 14 Feb 2006 13:52:56 -0800 committer Linus Torvalds Tue, 14 Feb 2006 16:09:33 -0800 [PATCH] pktcdvd: Reduce stack usage Reduce stack usage in the pkt_start_write() function. Even though it's not currently a real problem, the pages and offsets arrays can be eliminated, which saves approximately 1000 bytes of stack space. Signed-off-by: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 948423e5ccc33bc257384ad4b339214c577bc926 tree fca922bbce34cf69c561b34bb40c796cd982ae27 parent 01fd9fda2ce462b44bafdac2fe6aacacf23531f2 author Peter Osterlund Tue, 14 Feb 2006 13:52:56 -0800 committer Linus Torvalds Tue, 14 Feb 2006 16:09:33 -0800 [PATCH] pktcdvd: Don't unlock the door if the disc is in use Unlocking the door when the disc is in use is obviously not good, because then it's possible to eject the disc at the wrong time and cause severe disc data corruption. Signed-off-by: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 01fd9fda2ce462b44bafdac2fe6aacacf23531f2 tree c587c37f36d3800fae2fbfd0007f983b646a4c6c parent 61a34937982cace51853b5dc88f86380e31998c0 author Peter Osterlund Tue, 14 Feb 2006 13:52:55 -0800 committer Linus Torvalds Tue, 14 Feb 2006 16:09:33 -0800 [PATCH] pktcdvd: Allow non-writable media to be mounted If opening for write fails, the open method should return -EROFS. This makes "mount" try again with a read-only mount, instead of just giving up. Signed-off-by: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 61a34937982cace51853b5dc88f86380e31998c0 tree f99d8c86a769d42a22091c29ec3f30d3f0047e88 parent f78cf0dc7b7b13d0550d1e02cf221b65969ff926 author Peter Osterlund Tue, 14 Feb 2006 13:52:54 -0800 committer Linus Torvalds Tue, 14 Feb 2006 16:09:33 -0800 [PATCH] pktcdvd: Don't spam the kernel log when nothing is wrong Change some messages that don't indicate an error so that they are only printed when debugging is enabled. Signed-off-by: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f78cf0dc7b7b13d0550d1e02cf221b65969ff926 tree d2bb41e6edb5f70ccb09ed50f5cfb35eda22f844 parent 4cbf8767902c578481ff3df366c77d24fe68fd26 parent 7d2babc4874825027848db04d11784070da4456d author Linus Torvalds Tue, 14 Feb 2006 13:49:37 -0800 committer Linus Torvalds Tue, 14 Feb 2006 13:49:37 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband commit 4cbf8767902c578481ff3df366c77d24fe68fd26 tree 761833a5031845e5b21f5cb16128a0c47629699d parent 9cf8ff96447f995d5ea18ec9f25dc8dae26501a2 author Atsushi Nemoto Tue, 14 Feb 2006 22:40:45 +0900 committer Ralf Baechle Tue, 14 Feb 2006 19:13:26 +0000 [MIPS] Fix typo in _sys32_rt_sigreturn and _sysn32_rt_sigreturn. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 9cf8ff96447f995d5ea18ec9f25dc8dae26501a2 tree 62e9c25e9e471da770500891e8357c85f9070bff parent 387a154d0db113690ce85185a003e39e7c87009e author Maciej W. Rozycki Mon, 13 Feb 2006 09:15:49 +0000 committer Ralf Baechle Tue, 14 Feb 2006 19:13:25 +0000 [MIPS] Fix CPU type bitmasks for MIPS III, IV and V. Signed-off-by: Maciej W. Rozycki Signed-off-by: Ralf Baechle commit 387a154d0db113690ce85185a003e39e7c87009e tree 58e0ef97b1cbf5f42421092d8d58224ada3c818f parent 74a96d943ac96ce607a841a74ff0f84eeb0c3343 author Thomas Koeller Fri, 10 Feb 2006 17:36:27 +0100 committer Ralf Baechle Tue, 14 Feb 2006 19:13:25 +0000 [MIPS] RM9000: Fix buggy I-cache workaround. Signed-off-by: Thomas Koeller Signed-off-by: Ralf Baechle commit 74a96d943ac96ce607a841a74ff0f84eeb0c3343 tree fbd438db5e470dedf5f9b723be8b28071658c85f parent fdc9bb16d3e16f674e52aa69306df5732d7f951b author Ralf Baechle Fri, 10 Feb 2006 16:03:47 +0000 committer Ralf Baechle Tue, 14 Feb 2006 19:13:25 +0000 [MIPS] MT: Propagate config7 into VPE. Signed-off-by: Ralf Baechle commit fdc9bb16d3e16f674e52aa69306df5732d7f951b tree 67e7b262ed114462cf716d6e43fdd9e31f825693 parent fbb6b3a4ac0ccf12a97c98881d9d873d6dc26fe5 author Ralf Baechle Fri, 10 Feb 2006 14:25:16 +0000 committer Ralf Baechle Tue, 14 Feb 2006 19:13:25 +0000 [MIPS] MT: Fix c0 back-to-back hazard. Signed-off-by: Ralf Baechle commit fbb6b3a4ac0ccf12a97c98881d9d873d6dc26fe5 tree 142b03c1852dec27cbb3a3654c34679e19617a2b parent 3218357c94af92478ef39163163a81e654385320 author Ralf Baechle Fri, 10 Feb 2006 14:13:08 +0000 committer Ralf Baechle Tue, 14 Feb 2006 19:13:25 +0000 [MIPS] Get rid of kludgery needed to keep stdargs of old compilers working. Signed-off-by: Ralf Baechle commit 3218357c94af92478ef39163163a81e654385320 tree 459be556900bb4a78d93e0185d49df8ed8a7aff4 parent 41700e73995d6c814932cb55e12525bd34be1ca5 author Ralf Baechle Fri, 10 Feb 2006 01:31:24 +0000 committer Ralf Baechle Tue, 14 Feb 2006 19:13:24 +0000 [MIPS] More uaccess.h fixes with gcc >= 4.0.1. From Richard Sandiford : This patch caused a miscompilation of the restore_gp_regs() block in restore_sigcontext(). This was in a 32-bit kernel compiled with GCC CVS head. restore_gp_regs() copies 64-bit user fields into 32-bit variables, and in this combination, the new __get_user_asm_ll32() clobbers too many registers. It says: /* * Get a long long 64 using 32 bit registers. */ { \ __asm__ __volatile__( \ "1: lw %1, (%3) \n" \ "2: lw %D1, 4(%3) \n" \ " move %0, $0 \n" \ "3: .section .fixup,\"ax\" \n" \ "4: li %0, %4 \n" \ " move %1, $0 \n" \ " move %D1, $0 \n" \ " j 3b \n" \ " .previous \n" \ " .section __ex_table,\"a\" \n" \ " " __UA_ADDR " 1b, 4b \n" \ " " __UA_ADDR " 2b, 4b \n" \ " .previous \n" \ : "=r" (__gu_err), "=&r" (val) \ : "0" (0), "r" (addr), "i" (-EFAULT)); \ } and this requires val (%1) to be a 64-bit value. In the case I saw, gcc was using $3 for the 32-bit val, and wasn't expecting $4 to be clobbered. Signed-off-by: Ralf Baechle commit 41700e73995d6c814932cb55e12525bd34be1ca5 tree 559759cbda13bb50720cfd0e317fa65a467d59fa parent 63077519899721120b61d663a68adced068a459d author Atsushi Nemoto Fri, 10 Feb 2006 00:39:06 +0900 committer Ralf Baechle Tue, 14 Feb 2006 19:13:24 +0000 [MIPS] Add protected_blast_icache_range, blast_icache_range, etc. Add blast_xxx_range(), protected_blast_xxx_range() etc. for common use. They are built by __BUILD_BLAST_CACHE_RANGE(). Use protected_cache_op() macro for various protected_ routines. Output code should be logically same. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 63077519899721120b61d663a68adced068a459d tree 54ed1587edae13a209f4cd2754ce4487fc3d6376 parent 1bdfd0d9632f0254a4fc01d17c9933ae6107dec4 author Atsushi Nemoto Wed, 08 Feb 2006 01:48:03 +0900 committer Ralf Baechle Tue, 14 Feb 2006 19:13:24 +0000 [MIPS] Rewrite get_wchan and its helper functions using kallsyms_lookup. Implement get_wchan() and frame_info_init() using kallsyms_lookup(). This fixes problem with static sched/lock functions and mfinfo[] maintenance issue. If CONFIG_KALLSYMS was disabled, get_wchan() just returns thread_saved_pc() value. Also unwind stackframe based on "addiu sp,-imm" analysis instead of frame pointer. This fixes problem with functions compiled without -fomit-frame-pointer. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 1bdfd0d9632f0254a4fc01d17c9933ae6107dec4 tree fd38736a1a9ca5e9668964055b04c88fc1a63ee7 parent 359bbd42a5a205234d5943571fc7bf946967ee59 author Ralf Baechle Thu, 09 Feb 2006 12:26:35 +0000 committer Ralf Baechle Tue, 14 Feb 2006 19:13:24 +0000 [MIPS] Remove commented out function prom_build_cpu_map. Signed-off-by: Ralf Baechle commit 359bbd42a5a205234d5943571fc7bf946967ee59 tree 01e7ea8ebeb7baf7ae4505675e749e02f6cb5060 parent a3c9dc38313d05e4254c100e86af205cf33e8cd3 author Ralf Baechle Thu, 09 Feb 2006 12:13:28 +0000 committer Ralf Baechle Tue, 14 Feb 2006 19:13:23 +0000 [MIPS] Fold non-__mips64 case into CONFIG_32BIT case. Signed-off-by: Ralf Baechle commit a3c9dc38313d05e4254c100e86af205cf33e8cd3 tree dbcff76f99b43708f30cd973bd84c0df23466d43 parent f32ec77b421ee15bf5a42082b60679e997c07993 author Ralf Baechle Tue, 14 Feb 2006 19:13:23 +0000 committer Ralf Baechle Tue, 14 Feb 2006 19:13:23 +0000 [MIPS] Update docs to reflect the latest status of the Alchemy IDE driver. Signed-off-by: Ralf Baechle commit f32ec77b421ee15bf5a42082b60679e997c07993 tree 5e395bf5cdb39bc297a5b4f5ff506a4ad6ac531d parent 5552c28f6937d2a2b873d06c6d09b96204722dd0 author Ralf Baechle Mon, 28 Nov 2005 13:10:54 +0000 committer Ralf Baechle Tue, 14 Feb 2006 19:13:23 +0000 [MIPS] RM200: Give RM200 it's own timex.h. So we can get rid of config.h and the #ifdef crapola in the generic timex.h. Signed-off-by: Ralf Baechle commit 5552c28f6937d2a2b873d06c6d09b96204722dd0 tree 041a8ba94166d9c75c34dc385d5298ae4d59d9fe parent 303794400992b907b7cac0d91788603636c7e0fe author Alan Cox Tue, 14 Feb 2006 17:50:54 +0000 committer Linus Torvalds Tue, 14 Feb 2006 10:01:39 -0800 [PATCH] Fix locking error in esp Noted by Al Viro. Also remove unused tmp_buf Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 303794400992b907b7cac0d91788603636c7e0fe tree 012781f808f48d80b32e435a4f27b6e8524d0ff0 parent b739db79a434aec89027a109d85de305e6bdeb93 author Gerald Britton Tue, 14 Feb 2006 10:19:04 -0500 committer Linus Torvalds Tue, 14 Feb 2006 08:25:29 -0800 [PATCH] x86: fix oprofile kernel callgraph regression Fix x86 oprofile regression introduced by: commit c34d1b4d165c67b966bca4aba026443d7ff161eb [PATCH] mm: kill check_user_page_readable That commit reorganized tests for the userspace stack walking moving all those tests into dump_backtrace(), however, dump_backtrace() was used for both userspace and kernel stalk walking. The result is typically no recorded callgraph information for kernel samples. Revive the original function as dump_kernel_backtrace() and rename the other to dump_user_backtrace() to avoid future confusion. Signed-off-by: Gerald Britton Apology-from: Hugh Dickins Signed-off-by: Linus Torvalds commit b739db79a434aec89027a109d85de305e6bdeb93 tree e67bdf2272e9a3deedef7d65dfde03ccafb85074 parent 18539966bc1d663eb232877bb3e9e7dca67e89e6 parent 41d9c98fe76298cebc5907bcebfb2db28017a277 author Linus Torvalds Tue, 14 Feb 2006 08:22:57 -0800 committer Linus Torvalds Tue, 14 Feb 2006 08:22:57 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 commit 18539966bc1d663eb232877bb3e9e7dca67e89e6 tree 2ecc65bc92766a5c684bc51f30601421170f07f2 parent 108dff7d2b721759b5e025ab18024967c1294792 parent 16f05be7be0bf121491d83bd97337fe179b3b323 author Linus Torvalds Tue, 14 Feb 2006 08:21:57 -0800 committer Linus Torvalds Tue, 14 Feb 2006 08:21:57 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 commit 41d9c98fe76298cebc5907bcebfb2db28017a277 tree 6b794e2fb6b3ae58d1f2d67db6e6003efd4ef197 parent be79c383254cd3eb50953d8c0a7cacdbf6db31c0 author Jean Delvare Wed, 08 Feb 2006 20:38:29 +0100 committer Greg Kroah-Hartman Mon, 13 Feb 2006 22:30:10 -0800 [PATCH] i2c: Drop outdated probe/remove code in i2c-isa Probe and remove methods are now defined at bus level. No more need to redefine them at driver level in i2c-isa. This lets us get rid of these annoying messages: Driver 'it87-isa' needs updating - please use bus_type methods Thanks to Nicolas Mailhot for reporting the problem and testing the fix. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit be79c383254cd3eb50953d8c0a7cacdbf6db31c0 tree 18c8be9725b3e315f6acbb445e94744917e23d63 parent a40f0b0f2466483fad94e62177272d6a5711e50a author Jean Delvare Tue, 07 Feb 2006 17:53:32 +0100 committer Greg Kroah-Hartman Mon, 13 Feb 2006 22:30:10 -0800 [PATCH] it87: Fix oops on removal Fix an oops on it87 module removal when no supported hardware was found. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit a40f0b0f2466483fad94e62177272d6a5711e50a tree 79ffb1c4639767a448f34521c6921fbec057db02 parent c7f5d7edd8b3fa4204389efc4c9081cc90a811d2 author Jean Delvare Sun, 05 Feb 2006 23:17:34 +0100 committer Greg Kroah-Hartman Mon, 13 Feb 2006 22:30:09 -0800 [PATCH] w83627hf: Document the reset module parameter Document the reset module parameter which was recently added to the w83627hf driver. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit c7f5d7edd8b3fa4204389efc4c9081cc90a811d2 tree 1264bb18887b398ea2dccbba03ade05bf9fe9539 parent e3efa5a7392e07471b5d0ef7e7cd7ab862f70284 author Jean Delvare Sun, 05 Feb 2006 23:13:48 +0100 committer Greg Kroah-Hartman Mon, 13 Feb 2006 22:30:09 -0800 [PATCH] w83781d: Use real-time status registers Use the real-time status registers of the Winbond W83782D, W83783S and W83627HF chips, instead of the interrupt status registers. Interrupts cannot be trusted at least for voltage inputs, as they are two-times triggers (as opposed to comparator mode, which we want.) The w83627hf driver was fixed in a similar way some times ago. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit e3efa5a7392e07471b5d0ef7e7cd7ab862f70284 tree c4b118150c8d78d7220669144d83559aafcab5a4 parent 75c0141ca2fdae7c332d8f17412fbe0939dd005f author Jean Delvare Sun, 05 Feb 2006 23:11:16 +0100 committer Greg Kroah-Hartman Mon, 13 Feb 2006 22:30:09 -0800 [PATCH] vt8231: Fix sysfs temperature interface The VT8231 low temperature limits are actually hysteresis temperatures to the high limits. Signed-off-by: Jean Delvare Cc: Roger Lucas Signed-off-by: Greg Kroah-Hartman commit 16f05be7be0bf121491d83bd97337fe179b3b323 tree c33fdb0065cbaff83900becbf46480c914d75ca2 parent 982db2a127b29c9e1f5896d2ba691e84446cc858 author Phil Dibowitz Mon, 13 Feb 2006 15:59:42 -0800 committer Greg Kroah-Hartman Mon, 13 Feb 2006 21:33:40 -0800 [PATCH] USB: unusual-devs bugfix The following patch looks good to me. It adds an unusual_devs entry as well as fixing an ordering bug. Please apply. From: Bohdan Linda Signed-off-by: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman commit 982db2a127b29c9e1f5896d2ba691e84446cc858 tree 4e64b464d4f79e092f50e9ad908a1d0da01deab3 parent 1d614a4b0d2613d83f7bf0978e213ba29aebc44f author Alan Stern Mon, 13 Feb 2006 10:16:04 -0500 committer Greg Kroah-Hartman Mon, 13 Feb 2006 21:33:40 -0800 [PATCH] USB: unusual_devs.h entry: iAUDIO M5 Another unusual_devs.h entry (as652). Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 1d614a4b0d2613d83f7bf0978e213ba29aebc44f tree 4dddb4fa0505b350f803d2df4252cb350f03c811 parent ba3e93ad3c6e511f68c1b3e46954feff6cdd5a62 author Alan Stern Mon, 13 Feb 2006 10:15:22 -0500 committer Greg Kroah-Hartman Mon, 13 Feb 2006 21:33:40 -0800 [PATCH] USB: unusual_devs.h entry: TrekStor i.Beat A new unusual_devs.h entry (as651). Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit ba3e93ad3c6e511f68c1b3e46954feff6cdd5a62 tree 4248f96e5ad174e3ae9d917988ce97e4d7a32159 parent a2149bce2535047371a1309f032f0320b05db791 author Alan Stern Mon, 30 Jan 2006 10:19:43 -0500 committer Greg Kroah-Hartman Mon, 13 Feb 2006 21:33:40 -0800 [PATCH] usb-storage: unusual_devs entry Here is a new entry for unusual_devs.h (as630). Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit a2149bce2535047371a1309f032f0320b05db791 tree 0d38aed6149c4368136fac9032a4ec61d7c630ff parent a0c53f1dca10acc93462339cbd0bf24b10d60a13 author Alan Stern Thu, 02 Feb 2006 09:52:45 -0500 committer Greg Kroah-Hartman Mon, 13 Feb 2006 21:33:40 -0800 [PATCH] usb-storage: new unusual_devs entry This patch (as631) for unusual_devs.h fixes bugzilla entry 5913. Signed-off-by: Alan Stern Signed-off-by: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman commit a0c53f1dca10acc93462339cbd0bf24b10d60a13 tree 99b5e0d6bc58a0b38cfc98ee0c2b09049c5db462 parent c6c27721a42b991965bb792d5c196b8331d008d5 author David Brownell Mon, 06 Feb 2006 12:15:15 -0800 committer Greg Kroah-Hartman Mon, 13 Feb 2006 21:33:39 -0800 [PATCH] USB: sl811_cs needs platform_device conversion too The switchover to "platform_driver" from "device_driver" missed one rather essential usage, which broke the sl811_cs driver ... this resolves the omission. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit c6c27721a42b991965bb792d5c196b8331d008d5 tree 24f84202e04931c8943e3257632b2e82d2fd1353 parent 343a65cadb3a6a102f08513d9c64eb7e317478f0 author Christian Lindner Wed, 01 Feb 2006 14:10:52 +0100 committer Greg Kroah-Hartman Mon, 13 Feb 2006 21:33:39 -0800 [PATCH] USB: PL2303: Leadtek 9531 GPS-Mouse The patch adds the USB ID (0413:2101) for the Leadtek GPS-Mouse 9531 to the driver pl2303. Signed-off-by: Christian Lindner Signed-off-by: Greg Kroah-Hartman commit 343a65cadb3a6a102f08513d9c64eb7e317478f0 tree b4fb5906ebed9c64566565958c302427aa9e344b parent ba3e66e94b9fb8c2a370a90729e068314845549d author Michael Hund Thu, 02 Feb 2006 09:37:02 +0100 committer Greg Kroah-Hartman Mon, 13 Feb 2006 21:33:39 -0800 [PATCH] USB: change ldusb's experimental state Signed-off-by: Michael Hund Signed-off-by: Greg Kroah-Hartman commit ba3e66e94b9fb8c2a370a90729e068314845549d tree f021a85387443d00be8d6b108579a38cec63e37c parent a38408cd8d6bc0e5d16e609d4b1fdf9ba2e099ce author Michael Hund Thu, 02 Feb 2006 09:36:43 +0100 committer Greg Kroah-Hartman Mon, 13 Feb 2006 21:33:39 -0800 [PATCH] USB: add new device ids to ldusb Signed-off-by: Michael Hund Signed-off-by: Greg Kroah-Hartman commit a38408cd8d6bc0e5d16e609d4b1fdf9ba2e099ce tree 5a559a05117c481f0cefd3c67a1d01e744cf7946 parent 75c0141ca2fdae7c332d8f17412fbe0939dd005f author David Brownell Thu, 09 Feb 2006 16:35:31 -0500 committer Greg Kroah-Hartman Mon, 13 Feb 2006 21:33:39 -0800 [PATCH] USB: fix up the usb early handoff logic for EHCI Disable some dubious "early" USB handoff code that allegedly works around bugs on some systems (we don't know which ones) but rudely breaks some others. Also make the kernel warnings reporting BIOS handoff problems be more useful, reporting the register whose value displays the trouble. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 108dff7d2b721759b5e025ab18024967c1294792 tree 463be206b5c354fa652890f0bae132b5fb57fedd parent a110d514a582553e7439e92d92fb062d80b3e21d author Kyle McMartin Mon, 13 Feb 2006 22:44:22 -0500 committer Linus Torvalds Mon, 13 Feb 2006 19:58:47 -0800 [PATCH] sys_newfstatat -> sys_fstatat64 parisc defines ARCH_WANT_STAT64, so we want to use fstatat64. It does not appear that it needs to be ENTRY_COMP, because struct stat64 is the same on both 32-bit and 64-bit (unlike on other platforms which did define a compat_sys_fstatat64.) Signed-off-by: Grant Grundler Signed-off-by: Kyle McMartin Signed-off-by: Linus Torvalds commit a110d514a582553e7439e92d92fb062d80b3e21d tree aa8fd4abd430fa393c00e880d7d8145e4f7ee0a2 parent 934a3595b30c986bab52bc9c08d12c8962c88c8a parent 28b2425ac76b0f043f2efd34521f2a3c7ec8ccc5 author Linus Torvalds Mon, 13 Feb 2006 19:40:19 -0800 committer Linus Torvalds Mon, 13 Feb 2006 19:40:19 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6 commit 934a3595b30c986bab52bc9c08d12c8962c88c8a tree 1aa2acda1b45d97ce7b4027327a23a2a3c8dc81a parent b4d9eda028e8becbb5057b554e63eea12e496a88 parent 7d5e350fab47f1273bc8b52d5f133ed6e4baeb7f author Linus Torvalds Mon, 13 Feb 2006 19:10:43 -0800 committer Linus Torvalds Mon, 13 Feb 2006 19:10:43 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq commit b4d9eda028e8becbb5057b554e63eea12e496a88 tree f3dfa4aa380fe89a4aeff049c2f5b13b72404a1b parent 00de651d14baabc5c1d2f32c49d9a984d8891c8e author David S. Miller Mon, 13 Feb 2006 16:06:10 -0800 committer David S. Miller Mon, 13 Feb 2006 16:06:10 -0800 [NET]: Revert skb_copy_datagram_iovec() recursion elimination. Revert the following changeset: bc8dfcb93970ad7139c976356bfc99d7e251deaf Recursive SKB frag lists are really possible and disallowing them breaks things. Noticed by: Jesse Brandeburg Signed-off-by: David S. Miller commit 00de651d14baabc5c1d2f32c49d9a984d8891c8e tree dee86291586baf00e9c34dd8f4545088a36877ef parent 6d3e85ecf22a5e3610df47b9c3fb2fc32cfd35bf author Herbert Xu Mon, 13 Feb 2006 16:01:27 -0800 committer David S. Miller Mon, 13 Feb 2006 16:01:27 -0800 [IPSEC]: Fix strange IPsec freeze. Problem discovered and initial patch by Olaf Kirch: there's a problem with IPsec that has been bugging some of our users for the last couple of kernel revs. Every now and then, IPsec will freeze the machine completely. This is with openswan user land, and with kernels up to and including 2.6.16-rc2. I managed to debug this a little, and what happens is that we end up looping in xfrm_lookup, and never get out. With a bit of debug printks added, I can this happening: ip_route_output_flow calls xfrm_lookup xfrm_find_bundle returns NULL (apparently we're in the middle of negotiating a new SA or something) We therefore call xfrm_tmpl_resolve. This returns EAGAIN We go to sleep, waiting for a policy update. Then we loop back to the top Apparently, the dst_orig that was passed into xfrm_lookup has been dropped from the routing table (obsolete=2) This leads to the endless loop, because we now create a new bundle, check the new bundle and find it's stale (stale_bundle -> xfrm_bundle_ok -> dst_check() return 0) People have been testing with the patch below, which seems to fix the problem partially. They still see connection hangs however (things only clear up when they start a new ping or new ssh). So the patch is obvsiouly not sufficient, and something else seems to go wrong. I'm grateful for any hints you may have... I suggest that we simply bail out always. If the dst decides to die on us later on, the packet will be dropped anyway. So there is no great urgency to retry here. Once we have the proper resolution queueing, we can then do the retry again. Signed-off-by: Herbert Xu Acked-by: Olaf Kirch Signed-off-by: David S. Miller commit 6d3e85ecf22a5e3610df47b9c3fb2fc32cfd35bf tree d82d346f7b4c03f1e323cec0df8ee74052f0a31c parent 72fb630dad170084026bda6728b8d8f21ed48ff1 author Nicolas DICHTEL Mon, 13 Feb 2006 15:56:13 -0800 committer David S. Miller Mon, 13 Feb 2006 15:56:13 -0800 [IPV6] Don't store dst_entry for RAW socket Signed-off-by: Nicolas DICHTEL Signed-off-by: David S. Miller commit 72fb630dad170084026bda6728b8d8f21ed48ff1 tree 0330cc2c63332eb5d0a561447f505324de14ae56 parent e200bd8065e4db6297cd8db071a9188cf9aa6b56 author Andrew Morton Mon, 13 Feb 2006 15:53:41 -0800 committer David S. Miller Mon, 13 Feb 2006 15:53:41 -0800 [APPLETALK]: warning fix drivers/net/appletalk/cops.c: In function `cops_load': drivers/net/appletalk/cops.c:539: warning: assignment discards qualifiers from pointer target type drivers/net/appletalk/cops.c:547: warning: assignment discards qualifiers from pointer target type Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit e200bd8065e4db6297cd8db071a9188cf9aa6b56 tree 80c9ced19aa5a0fa0cc9be69d34ca45cf92394ad parent 178a3259f2508e786fb1bd6538365a167cee35c1 author Jamal Hadi Salim Mon, 13 Feb 2006 15:51:24 -0800 committer David S. Miller Mon, 13 Feb 2006 15:51:24 -0800 [NETLINK] genetlink: Fix bugs spotted by Andrew Morton. - panic() doesn't return. - Don't forget to unlock on genl_register_family() error path - genl_rcv_msg() is called via pointer so there's no point in declaring it `inline'. Notes: genl_ctrl_event() ignores the genlmsg_multicast() return value. lots of things ignore the genl_ctrl_event() return value. Signed-off-by: Jamal Hadi Salim Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 178a3259f2508e786fb1bd6538365a167cee35c1 tree 3736fd620ecdec6193b52505982e8fa12698c695 parent a6c1cd572642478528165ac44db4d2daae125a21 author Stephen Hemminger Mon, 13 Feb 2006 15:43:58 -0800 committer David S. Miller Mon, 13 Feb 2006 15:43:58 -0800 [BRIDGE]: Better fix for netfilter missing symbol has_bridge_parent Horms patch was the best of the three fixes. Dave, already applied Harald's version, so this patch converts that to the better one. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit a6c1cd572642478528165ac44db4d2daae125a21 tree c622476fd8a0092710dd325d5154c2b49fc7a898 parent 15c38c6ecd772ae4cc497955f916f40e803e7528 author Harald Welte Mon, 13 Feb 2006 15:42:48 -0800 committer David S. Miller Mon, 13 Feb 2006 15:42:48 -0800 [NETFILTER] Fix Kconfig menu level for x_tables The new x_tables related Kconfig options appear at the wrong menu level without this patch. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 15c38c6ecd772ae4cc497955f916f40e803e7528 tree f3a967377a58a2e6aae2cfd7f72400deee6a2433 parent 99e382afd297d91ab150ae46c28c4585f925818c parent 9225806386e398eeba46958a7befa017bda73f58 author David S. Miller Mon, 13 Feb 2006 15:40:55 -0800 committer David S. Miller Mon, 13 Feb 2006 15:40:55 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6 commit 99e382afd297d91ab150ae46c28c4585f925818c tree 8a2ab5c8437bff91919588976294f7b38b7e57e8 parent 77decfc716d460b3f7037bb19bd4eb12cd0dc996 author Dave Jones Mon, 13 Feb 2006 15:38:42 -0800 committer David S. Miller Mon, 13 Feb 2006 15:38:42 -0800 [P8023]: Fix tainting of kernel. Missing license tag. I've assumed this is GPL. (It could also use a MODULE_AUTHOR) Signed-off-by: Dave Jones Signed-off-by: David S. Miller commit 77decfc716d460b3f7037bb19bd4eb12cd0dc996 tree e6fca07597e12c07af4bd90cfffc80a3f694387e parent bf3883c12fece9189ab4f7bb6e2690451db1366e author Dave Jones Mon, 13 Feb 2006 15:36:21 -0800 committer David S. Miller Mon, 13 Feb 2006 15:36:21 -0800 [IPV4] ICMP: Invert default for invalid icmp msgs sysctl isic can trigger these msgs to be spewed at a very high rate. There's already a sysctl to turn them off. Given these messages aren't useful for most people, this patch disables them by default. Signed-off-by: Dave Jones Signed-off-by: David S. Miller commit bf3883c12fece9189ab4f7bb6e2690451db1366e tree 044a6678fff7b3325169794d2a06f2d25ef95616 parent 7a11c4d0635d9f6995736390b8c3346fe6f63d57 author Dave Jones Mon, 13 Feb 2006 15:34:58 -0800 committer David S. Miller Mon, 13 Feb 2006 15:34:58 -0800 [ATM]: Ratelimit atmsvc failure messages This seems to be trivial to trigger. Signed-off-by: Dave Jones Signed-off-by: David S. Miller commit 7a11c4d0635d9f6995736390b8c3346fe6f63d57 tree 462aa4a17b5ef59350f726ca39035c513bd2e5a5 parent 75c0141ca2fdae7c332d8f17412fbe0939dd005f author Joe Perches Mon, 13 Feb 2006 15:34:11 -0800 committer David S. Miller Mon, 13 Feb 2006 15:34:11 -0800 [IRDA]: Ratelimit messages. From: Joe Perches Based upon a patch by Dave Jones. Signed-off-by: Dave Jones Signed-off-by: David S. Miller commit 7d2babc4874825027848db04d11784070da4456d tree e97b125497031f13b974db376df1b80e04dd166f parent 20b83382d1c5d4d1a73fc5671261db5239d1dbb3 author Roland Dreier Mon, 13 Feb 2006 12:19:44 -0800 committer Roland Dreier Mon, 13 Feb 2006 12:19:44 -0800 IB/mthca: bump driver version and release date Signed-off-by: Roland Dreier commit 75c0141ca2fdae7c332d8f17412fbe0939dd005f tree 42c793ae47f694ebfbd6b2feb26c8c93280d5978 parent 90947ef26fa689a3252aa8282a01f60648e70fdb author Dave Jones Mon, 13 Feb 2006 12:46:58 -0500 committer Linus Torvalds Mon, 13 Feb 2006 11:14:45 -0800 [PATCH] Remove "RV370 5B60 [Radeon X300 (PCIE)]" from DRI list I get a machine check exception, triple fault, or NMI watchdog lockup when DRI gets enabled on this card. (And Mauro Tassinari reports hung kernels too in http://lkml.org/lkml/2006/1/26/97) [ Adrian Bunk also states that this is the only RV350 entry for an RV370 in our lists, which implies that it's just buggy ] Cc: Adrian Bunk Cc: Dave Jones Cc: Mauro Tassinari Cc: Dave Airlie Signed-off-by: Linus Torvalds commit 90947ef26fa689a3252aa8282a01f60648e70fdb tree 317ab8984d68fed9e4ad6e259c44134907b3021a parent 326a625748535c4cdb1c632b1dcb07030989a393 author Jeff Mahoney Mon, 13 Feb 2006 11:12:36 -0500 committer Linus Torvalds Mon, 13 Feb 2006 08:56:01 -0800 [PATCH] reiserfs: fix potential (unlikely) oops in reiserfs_get_acl This fixes a potential oops if there is an error reported by posix_acl_from_disk(). This is mostly theoretical due to the use of magics and checksums in xattrs, but is still possible. Signed-off-by: Jeff Mahoney Signed-off-by: Linus Torvalds commit 326a625748535c4cdb1c632b1dcb07030989a393 tree 1615fa184eac201aca79b569727b7769415a8b82 parent 40ad7a6afc53217ad95b5ae2221e42d7655e057b author Yoichi Yuasa Mon, 13 Feb 2006 18:07:30 +0900 committer Linus Torvalds Mon, 13 Feb 2006 07:47:03 -0800 [PATCH] MIPS 32bit machines need fstatat64 support. As noted by Jan Dittmer Signed-off-by: Yoichi Yuasa Signed-off-by: Linus Torvalds commit 9225806386e398eeba46958a7befa017bda73f58 tree 425bb3d66554d10f45138795335545615cace048 parent 7b005bd34c895ebeefd1c62f90a329730b88946b author Marcel Holtmann Mon, 13 Feb 2006 11:40:07 +0100 committer Marcel Holtmann Mon, 13 Feb 2006 11:40:07 +0100 [Bluetooth] Fix firmware loading problem of BT3C driver Before the PCMCIA subsystem was fully integrated into the device and driver model, the BT3C driver had to workaround this when loading the firmware. This workaround is broken and makes the driver oops when loading the firmware. This patch removes this workaround and uses now the provided device structure from the PCMCIA subsystem. Signed-off-by: Marcel Holtmann commit 7b005bd34c895ebeefd1c62f90a329730b88946b tree 7a7143c1b29b902122fe5e17a10ad4cb2ec66291 parent 56f3a40a5e7586043260669cc794e56fa58339e1 author Marcel Holtmann Mon, 13 Feb 2006 11:40:03 +0100 committer Marcel Holtmann Mon, 13 Feb 2006 11:40:03 +0100 [Bluetooth] Fix NULL pointer dereferences of the HCI socket This patch fixes the two NULL pointer dereferences found by the sfuzz tool from Ilja van Sprundel. The first one was a call of getsockname() for an unbound socket and the second was calling accept() while this operation isn't implemented for the HCI socket interface. Signed-off-by: Marcel Holtmann commit 56f3a40a5e7586043260669cc794e56fa58339e1 tree a2a756d86f8ff9da8d5668d2dfbf51f5107c53ce parent e9bb4c9929a63b23dcc637fae312b36b038bdc61 author Marcel Holtmann Mon, 13 Feb 2006 11:39:57 +0100 committer Marcel Holtmann Mon, 13 Feb 2006 11:39:57 +0100 [Bluetooth] Reduce L2CAP MTU for RFCOMM connections This patch reduces the default L2CAP MTU for all RFCOMM connections from 1024 to 1013 to improve the interoperability with some broken RFCOMM implementations. To make this more flexible the L2CAP MTU becomes also a module parameter and so it can changed at runtime. Signed-off-by: Marcel Holtmann commit 40ad7a6afc53217ad95b5ae2221e42d7655e057b tree a164f00f514bb816abe370b1050c88799a8572f4 parent e9bb4c9929a63b23dcc637fae312b36b038bdc61 author David S. Miller Sun, 12 Feb 2006 23:30:11 -0800 committer David S. Miller Sun, 12 Feb 2006 23:30:11 -0800 [SPARC]: sys_newfstatat --> sys_fstatat64 Signed-off-by: David S. Miller commit 20b83382d1c5d4d1a73fc5671261db5239d1dbb3 tree 331685789ab2d86b1e126b0eb7c997642150d5d8 parent f295c79b6766b25fe8c1aad88211c54d1caa7e0b author Roland Dreier Sat, 11 Feb 2006 12:22:12 -0800 committer Roland Dreier Sat, 11 Feb 2006 12:22:12 -0800 IPoIB: Yet another fix for send-only joins Even after the last fix, it's still possible for a send-only join to start before the join for the broadcast group has finished. This could cause us to create a multicast group using attributes from the broadcast group that haven't been initialized yet, so we would use garbage for the Q_Key, etc. Fix this by waiting until the broadcast group's attached flag is set before starting send-only joins. Signed-off-by: Roland Dreier commit f295c79b6766b25fe8c1aad88211c54d1caa7e0b tree 116e8255895a00c133637b3b7aa9559daba02a94 parent 7bcb974ef6a0ae903888272c92c66ea779388c01 author Roland Dreier Fri, 10 Feb 2006 18:02:44 -0800 committer Roland Dreier Fri, 10 Feb 2006 18:02:44 -0800 IB/mthca: Don't print debugging info until we have all values When debugging is enabled, the mthca_QUERY_DEV_LIM() firmware command function prints out some of the device limits that it queries. However the debugging prints happen before all of the fields are extracted from the firmware response, so some of the values that get printed are uninitialized junk. Move the prints to the end of the function to fix this. Signed-off-by: Roland Dreier commit 28b2425ac76b0f043f2efd34521f2a3c7ec8ccc5 tree 042919a71832de77463ab0ca77c1983e7951477d parent 7ec14e49b72da20d7212c707f226271525aee4ae author Kyle McMartin Wed, 08 Feb 2006 23:33:15 -0500 committer Kyle McMartin Wed, 08 Feb 2006 23:27:58 -0500 [PARISC] Stub out pselect6/ppoll until TIF_RESTORE_SIGMASK is done Swap out pselect6/ppoll for ni_syscall for now. We also have to switch the macro to ENTRY_SAME since compat_sys_ni_syscall does not exist. Signed-off-by: Kyle McMartin commit 7ec14e49b72da20d7212c707f226271525aee4ae tree 2cc1345d2ebb9259dc951fe3a492b7ff2b185ff9 parent f823bcae2b9f194cfc164b8cbb87d71695dec563 author Kyle McMartin Mon, 06 Feb 2006 10:10:15 -0700 committer Kyle McMartin Wed, 08 Feb 2006 22:56:22 -0500 [PARISC] Convert sba_iommu.c to use seq_file Use seq_file interface for proc output in sba_iommu. Also clean up the bus root assignment, and give the proc files a more logical name. Tested on my J6000. Signed-off-by: Kyle McMartin commit f823bcae2b9f194cfc164b8cbb87d71695dec563 tree 7a6d5e8c65069c29539e8edc7c0117176b13a532 parent 0bdd340c092b0936f78a54bdbd3927463ed4fca3 author Kyle McMartin Sun, 05 Feb 2006 20:37:53 -0700 committer Kyle McMartin Wed, 08 Feb 2006 22:56:16 -0500 [PARISC] Convert ccio-dma.c to use seq_file Gut ccio-dma.c of the ugly proc append and snprintf cruft and just use seq_printf instead. Tested on a K-class. Signed-off-by: Kyle McMartin commit 7bcb974ef6a0ae903888272c92c66ea779388c01 tree 926245a2e120dd5884f3bab92020612fcfbd78bf parent 479a079663bd4c5f3d2714643b1b8c406aaba3e0 author Michael S. Tsirkin Tue, 07 Feb 2006 16:39:26 -0800 committer Roland Dreier Tue, 07 Feb 2006 16:39:26 -0800 IPoIB: Fix another send-only join race Further, there's an additional issue that I saw in testing: ipoib_mcast_send may get called when priv->broadcast is NULL (e.g. if the device was downed and then upped internally because of a port event). If this happends and the send-only join request gets completed before priv->broadcast is set, we get an oops. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 479a079663bd4c5f3d2714643b1b8c406aaba3e0 tree e484f9a2dce6ee68f1c328d54f18acbf137c1999 parent 8cf3f04f45694db0699f608c0e3fb550c607cc88 author Michael S. Tsirkin Tue, 07 Feb 2006 16:37:08 -0800 committer Roland Dreier Tue, 07 Feb 2006 16:37:08 -0800 IPoIB: Don't start send-only joins while multicast thread is stopped Fix the following race scenario: - Device is up. - Port event or set mcast list triggers ipoib_mcast_stop_thread, this cancels the query and waits on mcast "done" completion. - Completion is called and "done" is set. - Meanwhile, ipoib_mcast_send arrives and starts a new query, re-initializing "done". Fix this by adding a "multicast started" bit and checking it before starting a send-only join. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 8cf3f04f45694db0699f608c0e3fb550c607cc88 tree aab58ffbfc1650e66251b46eb1e4bef24ec82ec4 parent 3c3b809e256c417847f1a96b2f9d9f66c7fcb02c author Ralph Campbell Fri, 03 Feb 2006 14:28:48 -0800 committer Roland Dreier Fri, 03 Feb 2006 14:28:48 -0800 IB/mad: Handle DR SMPs with a LID routed part Fix handling of directed route SMPs with a beginning or ending LID routed part. Signed-off-by: Ralph Campbell Signed-off-by: Hal Rosenstock Signed-off-by: Roland Dreier commit 7d5e350fab47f1273bc8b52d5f133ed6e4baeb7f tree 24318712260f30ea36db8e47c40a1ba5f0dd66a5 parent a85f7bd310dbc9010309bfe70b6b02432a11ef59 author Dave Jones Thu, 02 Feb 2006 17:03:42 -0500 committer Dave Jones Thu, 02 Feb 2006 17:03:42 -0500 [CPUFREQ] Whitespace/CodingStyle cleanups Signed-off-by: Dave Jones commit a85f7bd310dbc9010309bfe70b6b02432a11ef59 tree 569a7cb38a5f99579a693749508fd01a9e9912c7 parent 9d2725bb815d915fc6c8531097d9e71b579a8763 author Thomas Renninger Wed, 01 Feb 2006 11:36:04 +0100 committer Dave Jones Thu, 02 Feb 2006 16:56:41 -0500 [CPUFREQ] Check whether driver init did not initialize current freq Check whether driver init did not initialize current freq Signed-off-by: Thomas Renninger Signed-off-by: Dave Jones commit 9d2725bb815d915fc6c8531097d9e71b579a8763 tree 0183fb3860cef820a15b5f66ca5d574918c16640 parent e4472cb3706ceea42797ae1dc79d624026986694 author Thomas Renninger Wed, 01 Feb 2006 11:38:37 +0100 committer Dave Jones Thu, 02 Feb 2006 16:51:44 -0500 [CPUFREQ] Check for not initialized freq on cpufreq changes Test for old_freq equals 0 to insure not to divide by 0: ______________________________________________ Check for not initialized freq on cpufreq changes Signed-off-by: Thomas Renninger Signed-off-by: Dave Jones commit e4472cb3706ceea42797ae1dc79d624026986694 tree 3b6276a2c0caca47fbf7b53f9ec26593ff0cf5fa parent c0672860199ac009af7cf198a134ee7a4c3a9bb3 author Dave Jones Tue, 31 Jan 2006 15:53:55 -0800 committer Dave Jones Tue, 31 Jan 2006 15:53:55 -0800 [CPUFREQ] cpufreq_notify_transition cleanup. Introduce caching of cpufreq_cpu_data[freqs->cpu], which allows us to make the function a lot more readable, and as a nice side-effect, it now fits in < 80 column displays again. Signed-off-by: Dave Jones