commit 8bbde0e6d52265158ee9625f383500c1a7d09ba9 Author: Linus Torvalds Date: Tue Apr 18 20:00:49 2006 -0700 Linux v2.6.17-rc2 commit d34cb28a3718a7055ed14e2ec058fe3e4574af63 Author: Ralf Baechle Date: Wed Apr 19 04:14:30 2006 +0200 [MAINTAINERS] The ham radio code now has website at http://www.linux-ax25.org. commit 3c68da798a3facbf94d536b1ed7ff6f1e7f4ad8d Author: Atsushi Nemoto Date: Sat Apr 8 01:33:31 2006 +0900 [MIPS] Use __ffs() instead of ffs() for waybit calculation. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 9200c0b2a07c430bd98c546fc44b94f50e67ac62 Author: Ralf Baechle Date: Thu Apr 6 00:44:25 2006 +0100 [MIPS] Fix Makefile bugs for MIPS32/MIPS64 R1 and R2. This fixes kernel builds with gcc 3.2 (not 64-bit, that is looking like it is beyond recovery) and 3.3. With these bugs fixed we now also can get undo 3b4c4996a0c24da9e6f8be764e3950b756b18cc0 and similar bits for SMTC that were added in 79cc8007b93838a670b164b8a55ab3e735a12a8b. Signed-off-by: Ralf Baechle commit 7e3bfc7cfc402458b0386086ab650ce811720927 Author: Ralf Baechle Date: Wed Apr 5 20:42:04 2006 +0100 [MIPS] Handle IDE PIO cache aliases on SMP. Signed-off-by: Ralf Baechle commit bb12d612d4b2e6dc260fab081f69df783b74289f Author: Ralf Baechle Date: Wed Apr 5 09:45:49 2006 +0100 [MIPS] Make mips_srs_init static. Nothing outside traps.c uses it. Signed-off-by: Ralf Baechle commit b4ade4bf8811c7267b9f32b4a5d8fcfde714adac Author: Ralf Baechle Date: Wed Apr 5 09:45:48 2006 +0100 [MIPS] MIPS boards: Set HZ to 100. 1000Hz will bring an FPGA CPU down on it's knees and it's even worse on multithreaded cores. Signed-off-by: Ralf Baechle commit 8f6539d55919b8e013583df768312a2503f4125d Author: Ralf Baechle Date: Wed Apr 5 09:45:48 2006 +0100 [MIPS] kgdb: Let gcc compute the array size itself. This is the same method as used in the serial driver. Signed-off-by: Ralf Baechle commit f088fc84f94c1a36943e28ad704a9a740a35f877 Author: Ralf Baechle Date: Wed Apr 5 09:45:47 2006 +0100 [MIPS] FPU affinity for MT ASE. Signed-off-by: Ralf Baechle commit 41c594ab65fc89573af296d192aa5235d09717ab Author: Ralf Baechle Date: Wed Apr 5 09:45:45 2006 +0100 [MIPS] MT: Improved multithreading support. Signed-off-by: Ralf Baechle commit 2600990e640e3bef29ed89d565864cf16ee83833 Author: Ralf Baechle Date: Wed Apr 5 09:45:45 2006 +0100 [MIPS] kpsd and other AP/SP improvements. Signed-off-by: Ralf Baechle commit bce1a28686ed6527977a198f698278b67c6bf9ec Author: Ralf Baechle Date: Wed Apr 5 09:45:45 2006 +0100 [MIPS] R2: Instruction hazard barrier. Signed-off-by: Ralf Baechle commit a682a2417007ad6265cd71b97b751753fd10e2fb Author: Ralf Baechle Date: Tue Apr 4 16:59:37 2006 +0100 [MIPS] Fix genrtc compilation. Signed-off-by: Ralf Roesch Signed-off-by: Ralf Baechle commit 193dd2ce2a4a1c5b2e7814544572424d497069db Author: Ralf Baechle Date: Tue Apr 4 15:09:06 2006 +0100 [MIPS] R2: Implement shadow register allocation without spinlock. Signed-off-by: Ralf Baechle commit 62a442155ea58a17497b487324b27ec2f2dc5c5c Author: Yoichi Yuasa Date: Tue Apr 4 20:48:47 2006 +0900 [MIPS] Fix VR41xx build errors. Signed-off-by: Ralf Baechle Signed-off-by: Yoichi Yuasa commit 67a3f6de939a5f52e0aea6dcff7778d4bcca0734 Author: Atsushi Nemoto Date: Tue Apr 4 17:34:14 2006 +0900 [MIPS] Fix tx49_blast_icache32_page_indexed. Fix the cache index value in tx49_blast_icache32_page_indexed(). This is a damage by de62893bc0725f8b5f0445250577cd7a10b2d8f8 commit. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 1cc89038f3921f4d79a9d24c8490aa9c0549e371 Author: Atsushi Nemoto Date: Tue Apr 4 13:11:45 2006 +0900 [MIPS] Enable SCHED_NO_NO_OMIT_FRAME_POINTER for MIPS. MIPS get_wchan() no longer requires -fno-omit-frame-pointer. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 675055bfb5f99be56a20a6a214439adf23591786 Author: Ralf Baechle Date: Mon Apr 3 23:32:39 2006 +0100 [MIPS] Use "R" constraint for cache_op. Gcc might emit an absolute address for the the "m" constraint which gas unfortunately does not permit. Signed-off-by: Ralf Baechle commit e4ac58afdfac792c0583af30dbd9eae53e24c78b Author: Ralf Baechle Date: Mon Apr 3 17:56:36 2006 +0100 [MIPS] Rewrite all the assembler interrupt handlers to C. Saves like 1,600 lines of code, is way easier to debug, compilers frequently do a better job than the cut and paste type of handlers many boards had. And finally having all the stuff done in a single place also means alot of bug potencial for the MT ASE is gone. The only surviving handler in assembler is the DECstation one; I hope Maciej will rewrite it. Signed-off-by: Ralf Baechle commit d35d473c25d43d7db3e5e18b66d558d2a631cca8 Author: Ralf Baechle Date: Mon Apr 3 13:17:41 2006 +0100 [MIPS] Fix the crime against humanity that mipsIRQ.S is. Signed-off-by: Ralf Baechle commit fde3505c695e0de8ae7504b58d373db2d0ba498a Author: Ralf Baechle Date: Mon Apr 3 14:44:50 2006 +0100 [MIPS] Fixup damage done by 22a9835c350782a5c3257343713932af3ac92ee0. Signed-off-by: Ralf Baechle commit 9c1f1257a364467d091c5166049addaf3e7d7118 Author: Ralf Baechle Date: Mon Apr 3 10:17:21 2006 +0100 [MIPS] Replace redundant declarations of _end by . Signed-off-by: Ralf Baechle commit ba8990f2aec85b5b62643aa82a1e71c738efc487 Author: Ralf Baechle Date: Mon Apr 3 00:21:30 2006 +0100 [MIPS] JMR3927 build fixes for the RTC code. Signed-off-by: Ralf Baechle commit 67cbeb334ec2f1303dd11930b0eb0379e8e39559 Author: Ralf Baechle Date: Sun Apr 2 22:17:09 2006 +0100 [MIPS] EV96100: ev96100_cpu_irq needs a struct pt_regs argument. Signed-off-by: Ralf Baechle commit 2ef2e1d9731bd8b3d8565e31bacd52a7c13a0aed Author: Ralf Baechle Date: Sun Apr 2 22:07:36 2006 +0100 [MIPS] EV96100: Fix over two year old typo in variable name. Signed-off-by: Ralf Baechle commit c40b92e09c029ef2cb0b2287cbd222ff14ae3de8 Author: Ralf Baechle Date: Sun Apr 2 18:43:09 2006 +0100 [MIPS] Ocelot 3: Fix build errors after the recent move of Marvell headers. Signed-off-by: Ralf Baechle commit 088cf96a692a0369973aa19dcbf36134d9e6a529 Author: Ralf Baechle Date: Sun Apr 2 18:06:43 2006 +0100 [MIPS] MV6434x: Add prototype of interrupt dispatch function. Signed-off-by: Ralf Baechle commit ac2384a855c94e1d5467afe20bcb8ca23f0f3853 Author: Ralf Baechle Date: Sun Apr 2 13:48:57 2006 +0100 [MIPS] it8172: Fix build of serial driver. Signed-off-by: Ralf Baechle commit ed00e87fd09f113dd9e79672b835734801f2a9ea Author: Ralf Baechle Date: Sun Apr 2 13:47:51 2006 +0100 [MIPS] ITE: Glue build. Signed-off-by: Ralf Baechle commit 13626a887fad4220bc7ca85f4b42ca8cfb805e11 Author: Ralf Baechle Date: Sun Apr 2 13:17:58 2006 +0100 [MIPS] MV6434x: The name of the CPP symbol is __mips__, not __MIPS__. Signed-off-by: Ralf Baechle commit b56bce9a25e8c117794fe74c1b9bf790de10d554 Author: Ralf Baechle Date: Sun Apr 2 13:16:45 2006 +0100 [MIPS] Jaguar: Fix build errors after the recent move of Marvell headers. Some things were renamed because the PPC variant of the MV-643XX now uses the same header and the Jaguar code didn't catch up on that. Signed-off-by: Ralf Baechle commit 0428657d874edf228fcd5396bb0e095b806e954c Author: Ralf Baechle Date: Sun Apr 2 13:14:42 2006 +0100 [MIPS] ITE8172: Fix build error due to missmatching prototypes. Signed-off-by: Ralf Baechle commit f13b68e8174657b0253ca7cf263521ed3ac19125 Author: Ralf Baechle Date: Sun Apr 2 13:13:19 2006 +0100 [MIPS] Fix CONFIG_LIMITED_DMA build. This fix a build error for the Momentum Jaguar ATX eval board. Signed-off-by: Ralf Baechle commit 41d4f0e61283f6807553c129416fc20766a7043f Author: Ralf Baechle Date: Sat Apr 1 21:25:28 2006 +0100 [MIPS] PNX8550 build fix. Signed-off-by: Ralf Baechle commit 93373ed4d87fb02554ce020d929388ac16913664 Author: Ralf Baechle Date: Sat Apr 1 21:17:45 2006 +0100 [MIPS] Rewrite spurious_interrupt from assembler to C. Signed-off-by: Ralf Baechle commit c9e321e095384f25f2b7ffef456794cfa876dafc Author: Ralf Baechle Date: Sat Apr 1 20:43:58 2006 +0100 [MIPS] Fix breakage due to the grand makefile crapectomy. It's cc-option not cc-options. Signed-off-by: Ralf Baechle commit e49ed7f5917de5baa9e25cf8af332b3b35724e51 Author: Ralf Baechle Date: Sat Apr 1 07:49:52 2006 +0100 [MIPS] Sort out duplicate exports. Signed-off-by: Ralf Baechle commit a8d587a71b76328447de165b12495650721b9286 Author: Ralf Baechle Date: Sat Apr 1 07:49:21 2006 +0100 [MIPS] Wire up sync_file_range(2). Signed-off-by: Ralf Baechle commit f115da9cd60ccd5f27941dcf9fe8038ae9486a77 Author: Ralf Baechle Date: Fri Mar 31 09:27:20 2006 +0100 [MIPS] Wire splice syscall. Signed-off-by: Ralf Baechle commit 84ada9f85686a6bfdbd65c24fd23ef5d641b0776 Author: Ralf Baechle Date: Thu Mar 30 21:27:47 2006 +0100 [MIPS] More SHT_* and SHF_* ELF definitions. Signed-off-by: Ralf Baechle commit 91b05e6776e173da5ce7c96d67b3ad186c4fa49f Author: Ralf Baechle Date: Wed Mar 29 18:53:00 2006 +0100 [MIPS] Fix vectored interrupt support in TLB exception handler generator. Signed-off-by: Ralf Baechle commit 15c4f67ab81b07d3b579a11fc4a30da84c0d4858 Author: Ralf Baechle Date: Wed Mar 29 18:51:06 2006 +0100 [MIPS] Provide access functions for c0_badvaddr. Signed-off-by: Ralf Baechle commit ff3eab2a985f8efac239768fe7dda8fffc028ded Author: Ralf Baechle Date: Wed Mar 29 14:12:58 2006 +0100 [MIPS] Some formatting fixes. Signed-off-by: Ralf Baechle commit 7acb783ecd5273a864cfb588ed63c0df0e217a9e Author: Ralf Baechle Date: Wed Mar 29 14:11:22 2006 +0100 [MIPS] Fixup printk in mips_srs_init. Signed-off-by: Ralf Baechle commit e76038dcc06fc22134abdc554338d444f87791c6 Author: Ralf Baechle Date: Wed Mar 29 14:10:09 2006 +0100 [MIPS] Remove redundant initialization of sr_allocated. Signed-off-by: Ralf Baechle commit b4d05cb9cbbf206ab0dc2c1740938b87b3d3ee44 Author: Ralf Baechle Date: Wed Mar 29 14:09:14 2006 +0100 [MIPS] Make set_vi_srs_handler static. Signed-off-by: Ralf Baechle commit 6fd11a2173709cd598345e15382af480979cf4fc Author: Ralf Baechle Date: Fri Mar 24 13:21:50 2006 +0000 [MIPS] Cleanup free_initmem the same way as i386 did. Signed-off-by: Ralf Baechle commit 18b68e1561ff464c9b773f96e535d724c352fb8a Author: Yoichi Yuasa Date: Wed Mar 22 11:22:09 2006 +0900 [MIPS] Added tb0287_defconfig back. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit f2a1585244681b92fd416d071a85de0db79235d2 Author: Jean-Luc Léger Date: Tue Apr 18 16:19:53 2006 -0700 [SPARC64]: Fix dependencies of HUGETLB_PAGE_SIZE_64K This patch fixes dependencies of HUGETLB_PAGE_SIZE_64K Signed-off-by: Jean-Luc Léger Signed-off-by: David S. Miller commit 63903ca6af3d9424a0c2b176f927fa7e7ab2ae8e Author: Jesper Juhl Date: Tue Apr 18 14:51:44 2006 -0700 [NET]: Remove redundant NULL checks before [kv]free Redundant NULL check before kfree removal from net/ Signed-off-by: Jesper Juhl Acked-by: James Morris Signed-off-by: David S. Miller commit 40daafc80b0f6a950c9252f9f1a242ab5cb6a648 Author: Dmitry Mishin Date: Tue Apr 18 14:50:10 2006 -0700 unaligned access in sk_run_filter() This patch fixes unaligned access warnings noticed on IA64 in sk_run_filter(). 'ptr' can be unaligned. Signed-off-By: Dmitry Mishin Signed-off-By: Kirill Korotaev Signed-off-by: David S. Miller commit b809739a1b455396c21de13bcbf6669faf82f747 Author: YOSHIFUJI Hideaki Date: Tue Apr 18 14:48:45 2006 -0700 [IPV6]: Clean up hop-by-hop options handler. - Removed unused argument (nhoff) for ipv6_parse_hopopts(). - Make ipv6_parse_hopopts() to align with other extension header handlers. - Removed pointless assignment (hdr), which is not used afterwards. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit e5d25a90886d62d88fdd7cd5c3375f4fe436be64 Author: YOSHIFUJI Hideaki Date: Tue Apr 18 14:47:44 2006 -0700 [IPV6] XFRM: Fix decoding session with preceding extension header(s). We did not correctly decode session with preceding extension header(s). This was because we had already pulled preceding headers, skb->nh.raw + 40 + 1 - skb->data was minus, and pskb_may_pull() failed. We now have IP6CB(skb)->nhoff and skb->h.raw, and we can start parsing / decoding upper layer protocol from current position. Tracked down by Noriaki TAKAMIYA and tested by Kazunori Miyazawa . Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit e3cae904d7df4f86ea1d13d459e667d389cc35e3 Author: YOSHIFUJI Hideaki Date: Tue Apr 18 14:46:52 2006 -0700 [IPV6] XFRM: Don't use old copy of pointer after pskb_may_pull(). Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit ec6700958a776a83681ecb11239c0525730c42ba Author: YOSHIFUJI Hideaki Date: Tue Apr 18 14:46:26 2006 -0700 [IPV6]: Ensure to have hop-by-hop options in our header of &sk_buff. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit ef5cb9738b488140eb6c3f32fffab08f39a4905e Author: Herbert Xu Date: Tue Apr 18 13:24:14 2006 -0700 [TCP]: Fix truesize underflow There is a problem with the TSO packet trimming code. The cause of this lies in the tcp_fragment() function. When we allocate a fragment for a completely non-linear packet the truesize is calculated for a payload length of zero. This means that truesize could in fact be less than the real payload length. When that happens the TSO packet trimming can cause truesize to become negative. This in turn can cause sk_forward_alloc to be -n * PAGE_SIZE which would trigger the warning. I've copied the code DaveM used in tso_fragment which should work here. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 9180053cacfec4aa233a6cabf1256960e75b0abd Author: Adrian Bunk Date: Wed Apr 19 00:07:28 2006 +0200 [CPUFREQ] powernow-k8.c: fix a check-after-use This patch fixes a check-after-use introduced by commit 4211a30349e8d2b724cfb4ce2584604f5e59c299 and spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: Dave Jones commit 3aee086bd3ecce968283798ce4a73966c7ed44e3 Author: Tobias Klauser Date: Mon Apr 10 19:20:12 2006 +0200 [CPUFREQ] Remove duplicate check in powernow-k8 Remove a duplicate NULL pointer check introduced by commit 4211a30349e8d2b724cfb4ce2584604f5e59c299 Signed-off-by: Tobias Klauser Signed-off-by: Dave Jones commit 7b14dedd1fe72f33e128ed1b0cbf96d06acc7e9c Author: Adrian Bunk Date: Tue Apr 18 17:06:13 2006 +0200 [CPUFREQ] drivers/cpufreq/cpufreq.c: static functions mustn't be exported This patch removes the EXPORT_SYMBOL_GPL of the static function cpufreq_parse_governor(). Signed-off-by: Adrian Bunk Signed-off-by: Dave Jones commit 7970e08bf066900efcd7794a1a338c11eb8f5141 Author: Thomas Renninger Date: Thu Apr 13 15:14:04 2006 +0200 [CPUFREQ] If max_freq got reduced (e.g. by _PPC) a write to sysfs scaling_governor let cpufreq core stuck at low max_freq for ever The previous patch had bugs (locking and refcount). This one could also be related to the latest DELL reports. But they only slip into this if a user prog (e.g. powersave daemon does when AC got (un) plugged due to a scheme change) echos something to /sys/../cpufreq/scaling_governor while the frequencies got limited by BIOS. This one works: Subject: Max freq stucks at low freq if reduced by _PPC and sysfs gov access The problem is reproducable by(if machine is limiting freqs via BIOS): - Unplugging AC -> max freq gets limited - echo ${governor} >/sys/.../cpufreq/scaling_governor (policy->user_data.max gets overridden with policy->max and will never come up again.) This patch exchanged the cpufreq_set_policy call to __cpufreq_set_policy and duplicated it's functionality but did not override user_data.max. The same happens with overridding min/max values. If freqs are limited and you override the min freq value, the max freq global value will also get stuck to the limited freq, even if BIOS allows all freqs again. Last scenario does only happen if BIOS does not reduce the frequency to the lowest value (should never happen, just for correctness...) drivers/cpufreq/cpufreq.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) Signed-off-by: Thomas Renninger Signed-off-by: "Pallipadi, Venkatesh" Signed-off-by: Dave Jones commit 608c783aaa0abe39e3672f65b786cdade8db6df9 Author: Richard Purdie Date: Tue Apr 18 23:18:54 2006 +0100 [ARM] 3479/1: Corgi SSP: Fix potential concurrent access problem Patch from Richard Purdie corgi_ssp_probe() should not access GPDR directly but should use pxa_gpio_mode() which has appropriate locking and other safeguards. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 7ea3bbbc8997df1ae7dc4e736d163dabc00f4721 Author: Richard Purdie Date: Tue Apr 18 23:18:53 2006 +0100 [ARM] 3478/1: SharpSL SCOOP: Fix potenial build failure Patch from Richard Purdie Move platform_scoop_config from the SharpSL scoop PCMCIA driver to the SCOOP driver. This avoids build failures when PCMCIA is not built or is modular (scoop.c itself cannot be modular). Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 385910f2b275a636238f70844f1b6da9fda6f2da Author: Linus Torvalds Date: Tue Apr 18 13:22:59 2006 -0700 x86: be careful about tailcall breakage for sys_open[at] too Came up through a quick grep for other cases similar to the ftruncate() one in commit 0a489cb3b6a7b277030cdbc97c2c65905db94536. Also, add a comment, so that people who read the code understand why we do what looks like a no-op. (Again, this won't actually matter to any sane user, since libc will save and restore the register gcc stomps on, but it's still wrong to stomp on it) Signed-off-by: Linus Torvalds commit 0a489cb3b6a7b277030cdbc97c2c65905db94536 Author: Linus Torvalds Date: Tue Apr 18 13:02:48 2006 -0700 x86: don't allow tail-calls in sys_ftruncate[64]() Gcc thinks it owns the incoming argument stack, but that's not true for "asmlinkage" functions, and it corrupts the caller-set-up argument stack when it pushes the third argument onto the stack. Which can result in %ebx getting corrupted in user space. Now, normally nobody sane would ever notice, since libc will save and restore %ebx anyway over the system call, but it's still wrong. I'd much rather have "asmlinkage" tell gcc directly that it doesn't own the stack, but no such attribute exists, so we're stuck with our hacky manual "prevent_tail_call()" macro once more (we've had the same issue before with sys_waitpid() and sys_wait4()). Thanks to Hans-Werner Hilse for reporting the issue and testing the fix. Signed-off-by: Linus Torvalds commit 102e41fd9dfee357b71e21a38eec3c86ff557bc1 Author: Andi Kleen Date: Tue Apr 18 12:35:22 2006 +0200 [PATCH] i386: Move CONFIG_DOUBLEFAULT into arch/i386 where it belongs. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit f1233ab2cebb22a98df55de206a33a6693e3a78b Author: Andi Kleen Date: Tue Apr 18 12:35:19 2006 +0200 [PATCH] x86_64: Add tee and sync_file_range tee was already there for some reason for native 64bit, but sys_sync_file_range was missing. Also add it to the compat layer. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 6fa679fdea22cd96287d4aa11ee771bcd46c6dfb Author: Andi Kleen Date: Tue Apr 18 12:35:16 2006 +0200 [PATCH] x86_64: Increase NUMA hash function nodemap Needed for some big Opteron systems to compute a numa hash function They have more than 12 bits significant address. TBD switch this over to dynamic allocation or use better hash Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 8bcc5280e68878d2b989c91d98305109e391c86a Author: Vivek Goyal Date: Tue Apr 18 12:35:13 2006 +0200 [PATCH] x86_64: x86_64 add crashdump trigger points o Start booting into the capture kernel after an Oops if system is in a unrecoverable state. System will boot into the capture kernel, if one is pre-loaded by the user, and capture the kernel core dump. o One of the following conditions should be true to trigger the booting of capture kernel. - panic_on_oops is set. - pid of current thread is 0 - pid of current thread is 1 - Oops happened inside interrupt context. Signed-off-by: Vivek Goyal Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 87cb23a48c208f31ab87c7a2aad37dbb355575f3 Author: Andi Kleen Date: Tue Apr 18 12:35:10 2006 +0200 [PATCH] i386/x86-64: Fix ACPI disabled LAPIC handling mismerge The patch I submitted earlier to fix disabled LAPIC handling in ACPI was mismerged for some reason I still don't quite understand. Parts of it was applied to the wrong function. This patch fixes it up. Cc: len.brown@intel.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d16e86243ecf6f8fb97b5b7d685e0afa77a123e5 Author: Andi Kleen Date: Tue Apr 18 12:35:07 2006 +0200 [PATCH] x86_64: Update defconfig Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit be3b075354e170368a0d29558cae492205e80a64 Author: OGAWA Hirofumi Date: Tue Apr 18 19:18:31 2006 +0200 [PATCH] cfq: Further rbtree traversal and cfq_exit_queue() race fix In current code, we are re-reading cic->key after dead cic->key check. So, in theory, it may really re-read *after* cfq_exit_queue() seted NULL. To avoid race, we copy it to stack, then use it. With this change, I guess gcc will assign cic->key to a register or stack, and it wouldn't be re-readed. Signed-off-by: OGAWA Hirofumi Signed-off-by: Jens Axboe commit f39224a8c1828bdd327539da72a53d8a13595838 Author: Paul Mackerras Date: Tue Apr 18 21:49:11 2006 +1000 powerpc: Use correct sequence for putting CPU into nap mode We weren't using the recommended sequence for putting the CPU into nap mode. When I changed the idle loop, for some reason 7447A cpus started hanging when we put them into nap mode. Changing to the recommended sequence fixes that. The complexity here is that the recommended sequence is a loop that keeps putting the cpu back into nap mode. Clearly we need some way to break out of the loop when an interrupt (external interrupt, decrementer, performance monitor) occurs. Here we use a bit in the thread_info struct to indicate that we need this, and the exception entry code notices this and arranges for the exception to return to the value in the link register, thus breaking out of the loop. We use a new `local_flags' field in the thread_info which we can alter without needing to use an atomic update sequence. The PPC970 has the same recommended sequence, so we do the same thing there too. This also fixes a bug in the kernel stack overflow handling code on 32-bit, since it was causing a value that we needed in a register to get trashed. Signed-off-by: Paul Mackerras commit d253258c80117c2afaa644554e613201992e4ee9 Author: Jayachandran C Date: Mon Apr 10 23:18:28 2006 -0700 drm: Fix further issues in drivers/char/drm/via_irq.c Fix de-reference of 'dev_priv' before NULL check. Signed-off-by: Jayachandran C. Cc: Dave Airlie Signed-off-by: Andrew Morton commit 031de96af0e7ed6ad4a7ec2b74a77bf9782f966e Author: Adrian Bunk Date: Mon Apr 10 23:18:27 2006 -0700 drivers/char/drm/drm_memory.c: possible cleanups - #if 0 the following unused global function: - drm_ioremap_nocache() - make the following needlessly global functions static: - agp_remap() - drm_lookup_map() Signed-off-by: Adrian Bunk Cc: Dave Airlie Signed-off-by: Andrew Morton commit dbecf3ab40b5a6cc4499543778cd9f9682c0abad Author: OGAWA Hirofumi Date: Tue Apr 18 09:45:18 2006 +0200 [PATCH 2/2] cfq: fix cic's rbtree traversal When queue dies, we set cic->key=NULL as dead mark. So, when we traverse a rbtree, we must check whether it's still valid key. if it was invalidated, drop it, then restart the traversal from top. Signed-off-by: OGAWA Hirofumi Signed-off-by: Jens Axboe commit fba822722e3f9d438fca8fd9541d7ddd447d7a48 Author: OGAWA Hirofumi Date: Tue Apr 18 09:44:06 2006 +0200 [PATCH 1/2] iosched: fix typo and barrier() On rmmod path, cfq/as waits to make sure all io-contexts was freed. However, it's using complete(), not wait_for_completion(). I think barrier() is not enough in here. To avoid the following case, this patch replaces barrier() with smb_wmb(). cpu0 visibility cpu1 [ioc_gnone=NULL,ioc_count=1] ioc_gnone = &all_gone NULL,ioc_count=1 atomic_read(&ioc_count) NULL,ioc_count=1 wait_for_completion() NULL,ioc_count=0 atomic_sub_and_test() NULL,ioc_count=0 if ( && ioc_gone) [ioc_gone==NULL, so doesn't call complete()] &all_gone,ioc_count=0 Signed-off-by: OGAWA Hirofumi Signed-off-by: Jens Axboe commit a9a5cd5d2a57fb76dbae2115450f777b69beccf7 Author: Alexey Kuznetsov Date: Mon Apr 17 15:39:23 2006 +0400 [PATCH] IPC: access to unmapped vmalloc area in grow_ary() grow_ary() should not copy struct ipc_id_ary (it copies new->p, not new). Due to this, memcpy() src pointer could hit unmapped vmalloc page when near page boundary. Found during OpenVZ stress testing Signed-off-by: Alexey Kuznetsov Signed-off-by: Kirill Korotaev Signed-off-by: Linus Torvalds commit 69cf0fac6052c5bd3fb3469a41d4216e926028f8 Author: Hugh Dickins Date: Mon Apr 17 22:46:32 2006 +0100 [PATCH] Fix MADV_REMOVE protection checking madvise_remove needs to respect file and mmap protections. Signed-off-by: Hugh Dickins [ Will the real CVE-2006-1524 stand up, please.. ] Signed-off-by: Linus Torvalds commit d2c962b8530b84f4e035df8ade7e35f353a57cbe Author: Stephen Hemminger Date: Mon Apr 17 17:27:11 2006 -0700 [IPV4]: ip_route_input panic fix This fixes http://bugzilla.kernel.org/show_bug.cgi?id=6388 The bug is caused by ip_route_input dereferencing skb->nh.protocol of the dummy skb passed dow from inet_rtm_getroute (Thanks Thomas for seeing it). It only happens if the route requested is for a multicast IP address. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit b78b6af66a5fbaf17d7e6bfc32384df5e34408c8 Author: Hugh Dickins Date: Wed Apr 12 14:34:27 2006 -0700 [PATCH] shmat: stop mprotect from giving write permission to a readonly attachment (CVE-2006-1524) I found that all of 2.4 and 2.6 have been letting mprotect give write permission to a readonly attachment of shared memory, whether or not IPC would give the caller that permission. SUS says "The behaviour of this function [mprotect] is unspecified if the mapping was not established by a call to mmap", but I don't think we can interpret that as allowing it to subvert IPC permissions. I haven't tried 2.2, but the 2.2.26 source looks like it gets it right; and the patch below reproduces that behaviour - mprotect cannot be used to add write permission to a shared memory segment attached readonly. This patch is simple, and I'm sure it's what we should have done in 2.4.0: if you want to go on to switch write permission on and off with mprotect, just don't attach the segment readonly in the first place. However, we could have accumulated apps which attach readonly (even though they would be permitted to attach read/write), and which subsequently use mprotect to switch write permission on and off: it's not unreasonable. I was going to add a second ipcperms check in do_shmat, to check for writable when readonly, and if not writable find_vma and clear VM_MAYWRITE. But security_ipc_permission might do auditing, and it seems wrong to report an attempt for write permission when there has been none. Or we could flag the vma as SHM, note the shmid or shp in vm_private_data, and then get mprotect to check. But the patch below is a lot simpler: I'd rather stick with it, if we can convince ourselves somehow that it'll be safe. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit ca1e0484d9fe8a9048ac32b0f9894545f43704e8 Author: Mike Miller Date: Mon Apr 10 15:38:07 2006 -0700 [PATCH] cciss: bug fix for crash when running hpacucli Fix a crash when running hpacucli with multiple logical volumes on a cciss controller. We were not properly initializing the disk->queue and causing a fault. Thanks to Hasso Tepper for reporting the problem. Thanks to Steve Cameron for root causing the problem. Most of the patch just moves things around. The fix is a one-liner. Signed-off-by: Mike Miller Signed-off-by: Stephen Cameron Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 75616cf9854b83eb83a968b1338ae0ee11c9673c Author: Ananiev, Leonid I Date: Mon Apr 10 22:54:38 2006 -0700 [PATCH] ext3: Fix missed mutex unlock Missed unlock_super()call is added in error condition code path. Signed-off-by: Leonid Ananiev Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 2436f039d26a91e5404974ee0cb789b17db46168 Author: Stephen Rothwell Date: Mon Apr 10 00:17:20 2006 -0700 [PATCH] Fix block device symlink name As noted further on the this file, some block devices have a / in their name, so fix the "block:..." symlink name the same as the /sys/block name. Signed-off-by: Stephen Rothwell Cc: Al Viro Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 66e0a9888b774af625ce544f7c6597c7506d07db Author: Randy Dunlap Date: Wed Apr 5 12:03:45 2006 -0700 [PATCH] isd200: limit to BLK_DEV_IDE Limit USB_STORAGE_ISD200 to whatever BLK_DEV_IDE and USB_STORAGE are set to (y, m) since isd200 calls ide_fix_driveid() in the BLK_DEV_IDE code. Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 5fdfd42e3a69e8a686fcfb6381616464945471e8 Author: David S. Miller Date: Mon Apr 17 13:34:44 2006 -0700 [SPARC64]: Export pcibios_resource_to_bus(). SYM2 driver uses it. Signed-off-by: David S. Miller commit 67ab7f596b6adbaef5abc539dbee822e298a36e1 Author: Russell King Date: Sat Apr 15 20:46:11 2006 +0100 [SERIAL] Update serial driver documentation Improve serial driver documentation: - Remove CVS id. - Update pointer to reference driver documentation. - Add comments about new uart_write_console function. - Add TIOCM_LOOP modem control bit description. - Add commentry about enable_ms method being called multiple times. - Add commentry about startup/shutdown method calling. - Mention that dereferencing port->info after shutdown is invalid. Signed-off-by: Russell King commit 463b158aab247b600e4e93614b7b8f42a66331c9 Author: Nicolas Pitre Date: Sat Apr 15 16:10:43 2006 +0100 [ARM] 3477/1: ARM EABI: undefine removed syscalls Patch from Nicolas Pitre Avoid confusion for libraries assuming that a given syscall is available when corresponding symbol is defined. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 2c5362007bc0a46461a9d94958cdd53bb027004c Author: David Brownell Date: Fri Apr 14 18:05:38 2006 -0700 Fix AT91RM9200 build breakage The at91_cf driver got out of sync with certain changes in the PCMCIA layer, notably getting rid of some duplication of data ... causing the version merged to kernel.org to fail compiling. This patch gives the at91_cf platform device a new iomem resource, using it so this new pcmcia scheme works. It also cleans up some whitepsace bugs that have accumulated over time (mostly too-long lines). Signed-off-by: David Brownell Signed-off-by: Linus Torvalds commit 64541d19702cfdb7ea946fdc20faee849f6874b1 Author: Eric W. Biederman Date: Fri Apr 14 12:43:15 2006 -0600 [PATCH] kill unushed __put_task_struct_cb Somehow in the midst of dotting i's and crossing t's during the merge up to rc1 we wound up keeping __put_task_struct_cb when it should have been killed as it no longer has any users. Sorry I probably should have caught this while it was still in the -mm tree. Having the old code there gets confusing when reading through the code and trying to understand what is happening. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit 1f60245479ca6d4d3f2cf4a47c7dd18caf5afdf2 Author: H. Peter Anvin Date: Fri Apr 14 17:25:30 2006 -0700 [efficeon-agp] Add missing memory mask Original patch by Benjamin Herrenschmidt after debugging by Brian Hinz. Cc: Benjamin Herrenschmidt Cc: Brian Hinz Signed-off-by: H. Peter Anvin Signed-off-by: Linus Torvalds commit 3d9dd7564d5d7c28eb87b14c13a23806484667f3 Author: Zach Brown Date: Fri Apr 14 16:04:18 2006 -0700 [PATCH] ip_output: account for fraggap when checking to add trailer_len During other work I noticed that ip_append_data() seemed to be forgetting to include the frag gap in its calculation of a fragment that consumes the rest of the payload. Herbert confirmed that this was a bug that snuck in during a previous rework. Signed-off-by: Zach Brown Signed-off-by: David S. Miller commit 08d099974a09faf4cb11ffc46da87073fa132fc0 Author: Linus Walleij Date: Fri Apr 14 16:03:33 2006 -0700 [IRDA]: smsc-ircc2, smcinit support for ALi ISA bridges From: Linus Walleij This patch enables support for ALi ISA bridges when we run the smcinit code. It is needed to properly configure some Toshiba laptops. Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit 269690ac164fc0a7c2de03e7e0d2f554104d1516 Author: Samuel Ortiz Date: Fri Apr 14 16:02:07 2006 -0700 [IRDA]: irda-usb, unregister netdev when patch upload fails In the STIR421x case, when the firmware upload fails, we need to unregister_netdev. Otherwise we hit a BUG on free_netdev(), if sysfs is enabled. Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit 4909e488f65fc729fc0f8d42bd1600c56a8bd83c Author: Stephen Hemminger Date: Fri Apr 14 16:01:26 2006 -0700 [ATM] clip: add module info Add module information Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 5ff765f3d0b9367319d29ab0c0f55349da2fd53e Author: Stephen Hemminger Date: Fri Apr 14 16:00:59 2006 -0700 [ATM] clip: notifier related cleanups Cleanup some code around notifier. Don't need (void) casts to ignore return values, and use C90 style initializer. Just ignore unused device events. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit dcdb02752ff13a64433c36f2937a58d93ae7a19e Author: Stephen Hemminger Date: Fri Apr 14 16:00:25 2006 -0700 [ATM] clip: get rid of PROC_FS ifdef Don't need the ifdef here since create_proc_entry() is stubbed to always return NULL. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit e49e76db031fdfaadb4907a319ea3a1dc9d2925f Author: Stephen Hemminger Date: Fri Apr 14 15:59:37 2006 -0700 [ATM] clip: run through Lindent Run CLIP driver through Lindent script to fix formatting. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 2d9073922bc73f8cb847ce354f0896205f6981a1 Author: Stephen Hemminger Date: Fri Apr 14 15:56:02 2006 -0700 [ATM]: Clip timer race. By inspection, the clip idle timer code is racy on SMP. Here is a safe version of timer management. Untested, I don't have ATM hardware. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 5ecdd0f67c624714ccd5358e1cc88324f86f0e10 Author: Sam Ravnborg Date: Fri Apr 14 23:54:13 2006 +0200 kbuild: fix false section mismatch warnings Darren Jenkins pointed out a number of false positives where we referenced variables from a _driver variable. Fix it by check for that pattern and ignore it. Randy.Dunlap pointed out a similar set of warnings for a number of scsi drivers. In scsi world they misname their variables *_template or *_sht so add these to list of variables that may have references to .init.text with no warning. Randy.Dunlap also pointed out a scsi driver with many references to .exit.text from .rodata. This is compiler generated references and we already ignore these for .init.text, so ignore them for .exit.text also. Signed-off-by: Sam Ravnborg commit 5fdef394953d8660c70cc27b27db421582c42bf9 Author: David S. Miller Date: Fri Apr 14 15:29:32 2006 -0700 [SPARC]: Hook up sys_tee() into syscall tables. Signed-off-by: David S. Miller commit f3a0592b37b83e56a7f47826f552b35a2c3b2fc9 Author: Stephen Hemminger Date: Fri Apr 14 15:07:27 2006 -0700 [ATM]: clip causes unregister hang If Classical IP over ATM module is loaded, its neighbor table gets populated when permanent neighbor entries are created; but these entries are not flushed when the device is removed. Since the entry never gets flushed the unregister of the network device never completes. This version of the patch also adds locking around the reference to the atm arp daemon to avoid races with events and daemon state changes. (Note: barrier() was never really safe) Bug-reference: http://bugzilla.kernel.org/show_bug.cgi?id=6295 Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit b8a99520f78e23e47f9efffeb0060c1385064ff6 Author: Jamal Hadi Salim Date: Fri Apr 14 15:05:16 2006 -0700 [XFRM]: Add documentation for async events. Documentation to describe asynchronous xfrm events to help people writting HA code in user space. Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 2717096ab41eacdbf07352dca6826b59470eb39a Author: Jamal Hadi Salim Date: Fri Apr 14 15:03:05 2006 -0700 [XFRM]: Fix aevent timer. Send aevent immediately if we have sent nothing since last timer and this is the first packet. Fixes a corner case when packet threshold is very high, the timer low and a very low packet rate input which is bursty. Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 6c97e72a162648eaf7c401cfc139493cefa6bed2 Author: Adrian Bunk Date: Wed Apr 12 13:57:59 2006 -0700 [IPV4]: Possible cleanups. This patch contains the following possible cleanups: - make the following needlessly global function static: - arp.c: arp_rcv() - remove the following unused EXPORT_SYMBOL's: - devinet.c: devinet_ioctl - fib_frontend.c: ip_rt_ioctl - inet_hashtables.c: inet_bind_bucket_create - inet_hashtables.c: inet_bind_hash - tcp_input.c: sysctl_tcp_abc - tcp_ipv4.c: sysctl_tcp_tw_reuse - tcp_output.c: sysctl_tcp_mtu_probing - tcp_output.c: sysctl_tcp_base_mss Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 7676f83aeb774e7a3abe6af06ec92b29488b5b79 Author: James Bottomley Date: Fri Apr 14 09:47:59 2006 -0500 [SCSI] scsi_transport_sas: don't scan a non-existent end device Any end device that can't support any of the scanning protocols shouldn't be scanned, so set its id to -1 to prevent scsi_scan_target() being called for it. Signed-off-by: James Bottomley commit 78a596b4490e17b9990d87b9d468ef5bb70daa10 Author: Adrian Bunk Date: Fri Mar 31 01:38:12 2006 -0800 [PATCH] remove kernel/power/pm.c:pm_unregister() Since the last user is removed in -mm, we can now remove this long deprecated function. Signed-off-by: Adrian Bunk Cc: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 21440d313358043b0ce5e43b00ff3c9b35a8616c Author: David Brownell Date: Sat Apr 1 10:21:52 2006 -0800 [PATCH] dma doc updates This updates the DMA API documentation to address a few issues: - The dma_map_sg() call results are used like pci_map_sg() results: using sg_dma_address() and sg_dma_len(). That's not wholly obvious to folk reading _only_ the "new" DMA-API.txt writeup. - Buffers allocated by dma_alloc_coherent() may not be completely free of coherency concerns ... some CPUs also have write buffers that may need to be flushed. - Cacheline coherence issues are now mentioned as being among issues which affect dma buffers, and complicate/prevent using of static and (especially) stack based buffers with the DMA calls. I don't think many drivers currently need to worry about flushing write buffers, but I did hit it with one SOC using external SDRAM for DMA descriptors: without explicit writebuffer flushing, the on-chip DMA controller accessed descriptors before the CPU completed the writes. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 2d1e1c754d641bb8a32f0ce909dcff32906830ef Author: Jean Delvare Date: Sat Apr 1 16:46:35 2006 +0200 [PATCH] PCI: Add PCI quirk for SMBus on the Asus A6VA notebook The Asus A6VA notebook was reported to need a PCI quirk to unhide the SMBus. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 40d8b89b06cd03c2856eafb94a1f11d5a113a9d4 Author: Grzegorz Janoszka Date: Tue Mar 21 11:57:19 2006 +0100 [PATCH] arch/i386/pci/irq.c - new VIA chipsets (fwd) I use 2.6.15.6 Linux kernel and found some problems. I have about 100 Linux boxes (all with the same (binary the same) kernel). Last time I have upgraded all those boxes from 2.4.32 to 2.6.15.6 (first 2.6.15.1, next .2, .4 and .6) and I have found some problems on VIA based PC's. Probably the reason of this is that some VIA chipsets are unrecognized by IRQ router. In line 586 there is: /* FIXME: add new ones for 8233/5 */ There were only a few of chipsets ID's there, some of my VIA chipsets were not present and kernel used default IRQ router. I have added three entries, so that the code looks like: case PCI_DEVICE_ID_VIA_82C596: case PCI_DEVICE_ID_VIA_82C686: case PCI_DEVICE_ID_VIA_8231: case PCI_DEVICE_ID_VIA_8233A: case PCI_DEVICE_ID_VIA_8235: case PCI_DEVICE_ID_VIA_8237: case PCI_DEVICE_ID_VIA_8237_SATA: /* FIXME: add new ones for 8233/5 */ r->name = "VIA"; r->get = pirq_via_get; r->set = pirq_via_set; return 1; } The kernel goes fine but I haven't testes it for weeks, I'm just a moment after reboot :) One thing is different (better?): Using previus kernel I had: PCI: Via IRQ fixup for 0000:00:0f.1, from 255 to 0 now I have: PCI: Via IRQ fixup for 0000:00:0f.1, from 255 to 11 Maybe it is good idea to add there some more VIA chipsets? The ones I have added seem to be OK. From: Grzegorz Janoszka Acked-by: Martin Mares Signed-off-by: Greg Kroah-Hartman commit e6ad00576f8896b8209ba7ff47b23661614be64c Author: John Rose Date: Thu Mar 23 14:21:14 2006 -0600 [PATCH] PCI: rpaphp: remove init error condition The init function for the RPA PCI Hotplug driver returns -ENODEV in the case that no hotplug-capable slots are detected in the system. This is bad, since hot-capable slots can be added after boot to a purely virtual POWER partition. This is also bad because DLPAR I/O operations depend on the rpaphp module. Change the rpaphp init module to return success for the case of partitions that own no hotplug-capable slots at boot. Such slots can be dynamically added after boot. Signed-off-by: John Rose Signed-off-by: Greg Kroah-Hartman commit e778272dd547d53dedf92240e8b3dbdee44b87b6 Author: Roland Dreier Date: Thu Mar 30 12:55:10 2006 -0800 [PATCH] PCI: fix sparse warning about pci_bus_flags Sparse warns about casting to a __bitwise type. However, it's correct to do when defining the enum for pci_bus_flags_t, so add a __force to quiet the warnings. This will fix getting include/linux/pci.h:100:26: warning: cast to restricted type from sparse all over the build. Signed-off-by: Roland Dreier Signed-off-by: Greg Kroah-Hartman commit 5da594b1c523dffa19ebe7630e1ca285f439bd03 Author: John W. Linville Date: Mon Mar 20 14:33:56 2006 -0500 [PATCH] pci_ids.h: correct naming of 1022:7450 (AMD 8131 Bridge) The naming of the constant defined for PCI ID 1022:7450 does not seem to match the information at http://pciids.sourceforge.net/: http://pci-ids.ucw.cz/iii/?i=1022 There 1022:7450 is listed as "AMD-8131 PCI-X Bridge" while 1022:7451 is listed as "AMD-8131 PCI-X IOAPIC". Yet, the current definition for 0x7450 is PCI_DEVICE_ID_AMD_8131_APIC. It seems to me like that name should map to 0x7451, while a name like PCI_DEVICE_ID_AMD_8131_BRIDGE should map to 0x7450. Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 41017f0cac925e4a6bcf3359b75e5538112d4216 Author: Shaohua Li Date: Wed Feb 8 17:11:38 2006 +0800 [PATCH] PCI: MSI(X) save/restore for suspend/resume Add MSI(X) configure sapce save/restore in generic PCI helper. Signed-off-by: Shaohua Li Signed-off-by: Greg Kroah-Hartman commit 4f705ae3e94ffaafe8d35f71ff4d5c499bb06814 Author: Bjorn Helgaas Date: Mon Apr 3 17:09:22 2006 -0700 [PATCH] DMI: move dmi_scan.c from arch/i386 to drivers/firmware/ dmi_scan.c is arch-independent and is used by i386, x86_64, and ia64. Currently all three arches compile it from arch/i386, which means that ia64 and x86_64 depend on things in arch/i386 that they wouldn't otherwise care about. This is simply "mv arch/i386/kernel/dmi_scan.c drivers/firmware/" (removing trailing whitespace) and the associated Makefile changes. All three architectures already set CONFIG_DMI in their top-level Kconfig files. Signed-off-by: Bjorn Helgaas Cc: Andi Kleen Cc: "Luck, Tony" Cc: Andrey Panin Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 026694920579590c73b5c56705d543568ed5ad41 Author: Andrew Morton Date: Thu Mar 23 01:38:34 2006 -0800 [PATCH] pm: print name of failed suspend function Print more diagnostic info to help identify the source of power management suspend failures. Example: usb_hcd_pci_suspend(): pci_set_power_state+0x0/0x1af() returns -22 pci_device_suspend(): usb_hcd_pci_suspend+0x0/0x11b() returns -22 suspend_device(): pci_device_suspend+0x0/0x34() returns -22 Work-in-progress. It needs lots more suspend_report_result() calls sprinkled everywhere. Cc: Patrick Mochel Cc: Pavel Machek Cc: Nigel Cunningham Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 372254018eb1b65ee69210d11686bfc65c8d84db Author: Ryan Wilson Date: Wed Mar 22 16:26:25 2006 -0500 [PATCH] driver core: driver_bind attribute returns incorrect value The manual driver <-> device binding attribute in sysfs doesn't return the correct value on failure or success of driver_probe_device. driver_probe_device returns 1 on success (the driver accepted the device) or 0 on probe failure (when the driver didn't accept the device but no real error occured). However, the attribute can't just return 0 or 1, it must return the number of bytes consumed from buf or an error value. Returning 0 indicates to userspace that nothing was written (even though the kernel has tried to do the bind/probe and failed). Returning 1 indicates that only one character was accepted in which case userspace will re-try the write with a partial string. A more correct version of driver_bind would return count (to indicate the entire string was consumed) when driver_probe_device returns 1 and -ENODEV when driver_probe_device returns 0. This patch makes that change. Signed-off-by: Ryan Wilson Signed-off-by: Greg Kroah-Hartman commit a14388904ca67197c9a531dba2358d8131697865 Author: Jayachandran C Date: Mon Apr 3 12:31:53 2006 -0700 [PATCH] driver core: fix unnecessary NULL check in drivers/base/class.c This patch tries to fix an issue in drivers/base/class.c, please review and apply if correct. Patch Description: "parent_class" is checked for NULL already, so removed the unnecessary check. Signed-off-by: Jayachandran C. Signed-off-by: Greg Kroah-Hartman commit d4d7e5dffc4844ef51fe11f497bd774c04413a00 Author: Kay Sievers Date: Fri Mar 24 20:45:35 2006 +0100 [PATCH] BLOCK: delay all uevents until partition table is scanned [BLOCK] delay all uevents until partition table is scanned Here we delay the annoucement of all block device events until the disk's partition table is scanned and all partition devices are already created and sysfs is populated. We have a bunch of old bugs for removable storage handling where we probe successfully for a filesystem on the raw disk, but at the same time the kernel recognizes a partition table and creates partition devices. Currently there is no sane way to tell if partitions will show up or not at the time the disk device is announced to userspace. With the delayed events we can simply skip any probe for a filesystem on the raw disk when we find already present partitions. Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 0f836ca4c122f4ef096110d652a6326fe34e6961 Author: Alan Stern Date: Fri Mar 31 11:52:25 2006 -0500 [PATCH] driver core: safely unbind drivers for devices not on a bus This patch (as667) changes the __device_release_driver() routine to prevent it from crashing when it runs across a device not on any bus. This seems logical, inasmuch as the corresponding bus_add_device() routine has an explicit check allowing it to accept such devices. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 4508a7a734b111b8b7e39986237d84acb1168dd0 Author: NeilBrown Date: Mon Mar 20 17:53:53 2006 +1100 [PATCH] sysfs: Allow sysfs attribute files to be pollable It works like this: Open the file Read all the contents. Call poll requesting POLLERR or POLLPRI (so select/exceptfds works) When poll returns, close the file and go to top of loop. or lseek to start of file and go back to the 'read'. Events are signaled by an object manager calling sysfs_notify(kobj, dir, attr); If the dir is non-NULL, it is used to find a subdirectory which contains the attribute (presumably created by sysfs_create_group). This has a cost of one int per attribute, one wait_queuehead per kobject, one int per open file. The name "sysfs_notify" may be confused with the inotify functionality. Maybe it would be nice to support inotify for sysfs attributes as well? This patch also uses sysfs_notify to allow /sys/block/md*/md/sync_action to be pollable Signed-off-by: Neil Brown Signed-off-by: Greg Kroah-Hartman commit e97b81ddbb8b8c72b85330ac4a454a4513dcba8a Author: Mark M. Hoffman Date: Thu Mar 23 16:50:25 2006 +0100 [PATCH] i2c-parport: Make type parameter mandatory This patch forces the user to specify what type of adapter is present when loading i2c-parport or i2c-parport-light. If none is specified, the driver init simply fails - instead of assuming adapter type 0. This alleviates the sometimes lengthy boot time delays which can be caused by accidentally building one of these into a kernel along with several i2c slave drivers that have lengthy probe routines (e.g. hwmon drivers). Kconfig and documentation updated accordingly. Signed-off-by: Mark M. Hoffman Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 3cb8e1a92ef7588d3acdecf493ddddd0dd71a709 Author: Mark M. Hoffman Date: Thu Mar 23 16:49:34 2006 +0100 [PATCH] i2c-sis96x: Remove an init-time log message This patch removes an init-time kernel log message. http://marc.theaimsgroup.com/?l=linux-kernel&m=114232987208628&w=3 Signed-off-by: Mark M. Hoffman Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit ac987c1f65cedd98d953e14ba219db2f8cc009d4 Author: Jean Delvare Date: Thu Mar 23 16:38:21 2006 +0100 [PATCH] w83792d: Be quiet on misdetection Make the w83792d driver keep quiet when misdetecting a chip. This can happen, and the user doesn't need to know. Also renumber the messages, and add one, for consistency. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 8c750c0bd2fa6f73cd3cd3f1a58d48f94de343b6 Author: Mark A. Greer Date: Fri Mar 31 23:06:03 2006 +0200 [PATCH] i2c: convert m41t00 to use a workqueue The m41t00 i2c/rtc driver currently uses a tasklet to schedule interrupt-level writes to the rtc. This patch causes the driver to use a workqueue instead. Signed-off-by: Mark A. Greer Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 524465df2accf54604cb89c04dbaab0c8aaa5bb4 Author: Jean Delvare Date: Fri Mar 31 23:05:01 2006 +0200 [PATCH] i2c: convert ds1374 to use a workqueue A tasklet is not suitable for what the ds1374 driver does: neither sleeping nor mutex operations are allowed in tasklets, and ds1374_set_tlet may do both. We can use a workqueue instead, where both sleeping and mutex operations are allowed. Signed-off-by: Jean Delvare Acked-by: Randy Vinson Signed-off-by: Greg Kroah-Hartman commit f9814802dfec8feaf51ba873d7eac1a05ee65842 Author: Greg Kroah-Hartman Date: Thu Apr 13 08:09:52 2006 -0700 [PATCH] USB: add driver for funsoft usb serial device Cc: David Clare Signed-off-by: Greg Kroah-Hartman commit 69a4bf7c9525e5c92c0ecda0db0373f30162b28f Author: Paul Fulghum Date: Wed Apr 12 23:41:59 2006 +0200 [PATCH] USB: remove __init from usb_console_setup This prevents an Oops if booted with "console=ttyUSB0" but without a USB-serial dongle, and plugged one in afterwards. Signed-off-by: Greg Kroah-Hartman commit e853bf4af372afdae732c48be04a6b154f2de3d4 Author: Tomasz Kazmierczak Date: Thu Apr 6 22:07:12 2006 +0200 [PATCH] USB: pl2303: added support for OTi's DKU-5 clone cable This patch adds support for a clone of Nokia DKU-5 cable made by Ours Technology Inc for Nokia phones with PopPort (Nokia 3100 and others). The cable uses PL2303 USB-to-serial converter from Prolific Technology Inc. Signed-off-by: Tomasz Kazmierczak Signed-off-by: Greg Kroah-Hartman commit 3799c40189570133f9bb3176be24f0edb0e823c6 Author: Ben Dooks Date: Sun Apr 2 01:45:00 2006 +0100 [PATCH] USB: S3C2410: use clk_enable() to ensure 48MHz to OHCI core Get the "usb-bus" clock and ensure it is enabled when the OHCI core is in use. It seems that a few bootloaders do not enable the UPLL at startup, which stops the OHCI core having a 48MHz bus clock. The improvements to the clock framework for the s3c24xx now allow the USB PLL to be started and stopped when being used. Signed-off-by: Ben Dooks Signed-off-by: Greg Kroah-Hartman commit bfb25849f00d0b8453191ee12125738b5f5c9146 Author: Jeffrey Vandenbroucke sign Date: Tue Mar 28 15:21:36 2006 -0800 [PATCH] hid-core.c: fix "input irq status -32 received" for Silvercrest USB Keyboard When not using this patch, the kernel will continuously return "input irq status -32 received", while making the keyboard unusable. This can be easely resolved using HID_QUIRK_NOGET. Vendor-ID and Device-ID should be applied to hid-core.c, and making an entry to make use of it. Signed-off-by: Jeffrey Vandenbroucke Cc: Alan Stern Cc: Greg KH Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 8e32640672bdcb01e0d83f087f09dd65fcbc3275 Author: Alan Stern Date: Tue Apr 4 14:47:44 2006 -0400 [PATCH] USB: UHCI: don't track suspended ports Someone recently posted a bug report where it turned out that uhci-hcd was disagreeing with the UHCI controller over whether or not a port was suspended: The driver thought it wasn't and the hardware thought it was. This patch (as665) fixes the problem and simplifies the driver by removing the internal state-tracking completely. Now the driver just asks the hardware whether a port is suspended. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 01e89506351b84ac6f39eb70f99c71483768ca60 Author: Michael Downey Date: Mon Apr 3 08:58:07 2006 -0600 [PATCH] USB: keyspan-remote bugfix Signed-off-by: Michael Downey Signed-off-by: Greg Kroah-Hartman commit 48b1be6ac080c3bb5ad3e529d8816953507790ab Author: David Hollis Date: Tue Mar 28 20:15:42 2006 -0500 [PATCH] USB: Rename ax8817x_func() to asix_func() and add utility functions to reduce bloat Now that the ASIX code is supporting more than just the AX88172 devices, make the utility function names more generic: ax8817x_func -> asix_func. Functions that are chip specific now indicate as such: ax88772_func. Additionally, pull some common routines used in initialization and such into simple functions to reduce the verbosity of certain functions such as the bind() routines and to make the error handling consistent across the board. Signed-off-by: David Hollis Signed-off-by: Greg Kroah-Hartman commit 9fc4831cc3e063019079581ff5062f9790d9b0c7 Author: Pete Zaitcev Date: Sun Apr 2 10:21:26 2006 -0800 [PATCH] USB: linux/usb/net2280.h common definitions Move common definitions for NET2280 to , so that I can use them in prism54usb (it is not merged yet, but I plan to do it soon). Signed-off-by: Pete Zaitcev Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit e1394b49ee70bd8686acaf969e4d61b57da1c263 Author: David Brownell Date: Sun Apr 2 10:20:43 2006 -0800 [PATCH] USB: g_ether, highspeed conformance fix Be sure to record the peripheral's ep0 maxpacket size BEFORE using that to initialize the (high speed) device qualifier; that helps a lot with USBCV testing. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 8b5249019352eecd49fb00004d583904e891e7b1 Author: David Brownell Date: Sun Apr 2 10:20:15 2006 -0800 [PATCH] USB: usbtest: scatterlist OUT data pattern testing Previously, scatterlist tests didn't write patterned data. Given how many corner cases are addresed by them, this was a significant gap in Linux-USB test coverage. Moreover, when peripherals checked for correct data patterns, false error reports would drown out the true ones. This adds the pattern on the way OUT from the host, so scatterlist tests can now be used to uncover bugs like host TX or peripheral RX paths failing for back-to-back short packets. It's easy enough to get an error there with at least one of the {DMA,PIO}{RX,TX} code paths, or run into hardware races that need to be defended against. Note this patch doesn't add checking for correct data patterns on the way IN from peripherals, just a FIXME for later. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 68ba61b89c10b3412c7ee05cd649303ba5a588d1 Author: David Brownell Date: Sun Apr 2 20:26:21 2006 -0800 [PATCH] USB: at91 usb driver supend/resume fixes AT91: the two USB drivers (OHCI, UDC) got out of sync with various usbcore and driver model PM updates; fix. Also minor fixes to ohci: whitespace/style, MODULE_ALIAS so coldplug works using /sys/.../modalias, and turn off _both_ clocks during suspend. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 35fcca442aca1a8d927b697e7e15d3f655958bd7 Author: David Brownell Date: Sun Apr 2 10:19:43 2006 -0800 [PATCH] USB: gadget zero poisons OUT buffers Fill OUT buffers with 0x55 before RX, so that controller driver bugs that mangle data can be more readily detected during testing. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 984163338a24198863116ccf3e7762fd1fc3c663 Author: David Brownell Date: Sun Apr 2 10:19:23 2006 -0800 [PATCH] USB: gadgetfs highspeed bugfix This catches up to a change in the Kconfig support for highspeed modes; the change predated 2.6.10, and anyone using gadgetfs on a highspeed device would see the kernel wrongly reject the alternate descriptors. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 51400f1d6ef7ca871b584117527f7c6b12bf182b Author: David Brownell Date: Sun Apr 2 10:19:08 2006 -0800 [PATCH] USB: rndis_host whitespace/comment updates This adds a "avoid proprietary protocols" warnoff, identifying several of the known deficiencies in Microsoft's excuse-for-specification, and fixes some whitespace bugs. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 68dcc688d1f042842a8fb523e4a584b3211181d1 Author: David Brownell Date: Sun Apr 2 10:18:53 2006 -0800 [PATCH] USB: net2280 short rx status fix Some patch broke short-OUT packet handling for net2280, making it report illegal status values. This updates the status code so it's correct. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 42795410c325108d59d0b1e750657197a7374c04 Author: David Brownell Date: Sun Apr 2 10:18:34 2006 -0800 [PATCH] USB: fix gadget_is_musbhdrc() I submitted the wrong version of the patch teaching about the driver for Mentor's Highspeed Dual Role Controller (HDRC), whoops! This uses the right name for that driver. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 89ccbdc91bc5a433fa256c0136fbe181d7c5d474 Author: David Brownell Date: Sun Apr 2 10:18:09 2006 -0800 [PATCH] USB: otg hub support is optional USB OTG devices are not required to support external hubs. This adds a configuration option to disable that support. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 4d45e21867bee51e3bb42e95bc2929231d7c8192 Author: matthieu castet Date: Sun Apr 2 18:45:46 2006 +0200 [PATCH] USB: UEAGLE : memory leack fix this patch fix leak of memory allocated to intr if allocation of sc->urb_int fails. Found by the Coverity checker. Signed-off-by: Duncan Sands Signed-off-by: Matthieu CASTET Signed-off-by: Greg Kroah-Hartman commit 584958c3d2985396bdb6f96ae632971b43f6f984 Author: matthieu castet Date: Sun Apr 2 18:44:48 2006 +0200 [PATCH] USB: UEAGLE : null pointer dereference fix this patch fix potential null pointer dereference. Found by the Coverity checker. Signed-off-by: Duncan Sands Signed-off-by: Matthieu CASTET Signed-off-by: Greg Kroah-Hartman commit 22fcceb546227a4c557d1844c1796c13a5086c9f Author: matthieu castet Date: Sun Apr 2 18:44:20 2006 +0200 [PATCH] USB: UEAGLE : support geode - increase ack timeout for slow system (geode 233MHz where HZ=100) - reset the cmv ack flag when rebooting Signed-off-by: Matthieu CASTET Signed-off-by: Greg Kroah-Hartman commit 2a99b50719d3bff0a090fa8daf56d519c338296c Author: matthieu castet Date: Sun Apr 2 18:43:53 2006 +0200 [PATCH] USB: UEAGLE : cosmetic - improve debug trace in order to make easy to solve user problems. - indent some code - increase version number Signed-off-by: Matthieu CASTET Signed-off-by: Greg Kroah-Hartman commit 87ed0aeba8d59fe5d68df8d10ba469d63b254914 Author: Adrian Bunk Date: Tue Apr 4 09:56:04 2006 +0200 [PATCH] USB: drivers/usb/core/: remove unused exports This patch removes the following unused EXPORT_SYMBOL's: - hub.c: usb_set_device_state - usb.c: usb_alloc_dev - usb.c: usb_disconnect Signed-off-by: Adrian Bunk Signed-off-by: Greg Kroah-Hartman commit 016534cffc5847e2a75b25d10f8c52edec6c8cb7 Author: Petko Manolov Date: Thu Mar 30 09:59:22 2006 +0300 [PATCH] USB: pegasus driver bugfix Attached is a patch that fixes nasty bug, which i am afraid was there for a long time. It was spotted by Andre Draszik . From: Petko Manolov Signed-off-by: Greg Kroah-Hartman commit 999a6a6a2a24cf2e9fafc9b47ee263835f59b4a1 Author: Ping Cheng Date: Wed Mar 29 16:34:16 2006 -0800 [PATCH] USB: add new wacom devices to usb hid-core list This patch adds support for DTF 521, Intuos3 12x12 and 12x19 Signed-off-by: Ping Cheng Acked-by: Vojtech Pavlik Signed-off-by: Greg Kroah-Hartman commit 7d3fe085f9cdd3d3eea0154ea02e2f6b4a8f3974 Author: Ping Cheng Date: Wed Mar 29 16:33:49 2006 -0800 [PATCH] USB: wacom tablet driver update This patch adds support for DTF 521, Intuos3 12x12, and 12x19; fixes minor data report bugs. Signed-off-by: Ping Cheng Acked-by: Vojtech Pavlik Signed-off-by: Greg Kroah-Hartman commit aafe5bd6ec341edfaf3233d272febbb8862a7251 Author: Alan Stern Date: Fri Mar 31 11:46:43 2006 -0500 [PATCH] USB: g_file_storage: use module_param_array_named macro Randy Dunlap pointed out that there now is a module_param_array_named macro available. This patch (as666) updates g_file_storage to make use of it. It also adds a comment listing the specifications documents used in the design of the driver's SCSI operation (at Pat LaVarre's request). Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 5e32b5767fca231e1c84b84e877a26766c27510f Author: Daniel Ritz Date: Sat Apr 1 18:19:28 2006 +0200 [PATCH] usb/input: remove Kconfig entries of old touchscreen drivers in favour of usbtouchscreen Signed-off-by: Daniel Ritz Signed-off-by: Greg Kroah-Hartman commit 1d3e20236d7a5678d44602171bbd153c57c8c4bc Author: Daniel Ritz Date: Wed Mar 29 22:41:07 2006 +0200 [PATCH] USB: usbtouchscreen: unified USB touchscreen driver A new single driver for various USB touchscreen devices. It currently supports: - eGalax TouchKit - PanJit TouchSet - 3M/Microtouch - ITM Touchscreens Support for the diffent devices can be enabled/disable when CONFIG_EMBEDDED is set. Sizes for comparision: text data bss dec hex filename 2942 724 4 3670 e56 touchkitusb.ko 2647 660 0 3307 ceb mtouchusb.ko 2448 628 0 3076 c04 itmtouch.ko 4145 1012 12 5169 1431 usbtouchscreen.ko Signed-off-by: Daniel Ritz Signed-off-by: Greg Kroah-Hartman commit 62a13db346bb6ef80c112d373733d3e873dad90b Author: Folkert van Heusden Date: Tue Mar 28 20:41:26 2006 +0900 [PATCH] USB: add support for Papouch TMU (USB thermometer) This patch adds support for new vendor (papouch) and one of their devices - TMU (a USB thermometer). More information: vendor homepage: http://www.papouch.com/en/ product homepage (Polish): http://www.papouch.com/shop/scripts/_detail.asp?katcislo=0188 This patch is based on the submission from Folkert van Heusden [1]. Then reviseted by Kalin KOZHUHAROV [2] and retested by Folkert. [1] http://article.gmane.org/gmane.linux.kernel/392970 [2] http://article.gmane.org/gmane.linux.kernel/393386 Signed-off-by: Folkert van Heusden Signed-off-by: Kalin KOZHUHAROV Signed-off-by: Greg Kroah-Hartman commit fb9ac9bda9aee5a42d44f4b503bdbd7c414ac201 Author: Adrian Bunk Date: Sat Mar 25 18:03:38 2006 +0100 [PATCH] USB: input/: proper prototypes This patch adds proper prototypes in a header file for some global functions. Signed-off-by: Adrian Bunk Signed-off-by: Greg Kroah-Hartman commit 75e2df603de69dba67dd64ab34a2313fdc52a4dd Author: Adrian Bunk Date: Sat Mar 25 18:01:53 2006 +0100 [PATCH] USB: pci-quirks.c: proper prototypes This patch adds a header file with proper prototypes for two functions in drivers/usb/host/pci-quirks.c. Signed-off-by: Adrian Bunk Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 1ce7dd26e0f0e34bb75ec56f7f546151af34fcf9 Author: Luiz Fernando Capitulino Date: Fri Mar 24 17:12:31 2006 -0300 [PATCH] USB serial: Converts port semaphore to mutexes. The usbserial's port semaphore used to synchronize serial_open() and serial_close() are strict mutexes, convert them to the mutex implementation. Signed-off-by: Luiz Capitulino Signed-off-by: Greg Kroah-Hartman commit 14cd5f8e85e90c9dead2393377b9a2c23131e0ce Author: Alan Stern Date: Thu Mar 23 15:07:25 2006 -0500 [PATCH] USB: g_file_storage: add comment about buffer allocation This patch (as664) adds a comment to file_storage.c, noting that the driver is slightly non-portable because it assumes that a buffer allocated for a bulk-in endpoint will also be useable for a bulk-out endpoint. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 70ffe6e14d7c5db84b92841471ce6fd0200010cd Author: Alan Stern Date: Thu Mar 23 15:05:16 2006 -0500 [PATCH] USB: g_file_storage: Set short_not_ok for bulk-out transfers I'm told that some UDC hardware may work better if it knows that receiving a short packet should always cause an error. Accordingly, this patch (as663) sets the short_not_ok flag for bulk-out transfers in g_file_storage. Oddly enough, there are no circumstances where that driver can legally receive a shorter-than-expected bulk-out packet. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 7e1c0b86aca9d42fa4de3fdad17c57bb462fe1e2 Author: Ian Abbott Date: Tue Mar 21 14:55:20 2006 +0000 [PATCH] USB: ftdi_sio: add support for Eclo COM to 1-Wire USB adapter This patch adds support for the Eclo COM to 1-Wire USB adapter to the ftdi_sio driver's device ID table. Details were provided by Martin Grill on the ftdi-sio-usb-devel mailing list and I (Ian Abbott) confirmed it matched the INF file in the Eclo's Windows driver package. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit f096e0434c717d7a2aa1614e0be0d1b7c64bec29 Author: Ben Dooks Date: Tue Mar 21 22:54:47 2006 +0000 [PATCH] USB: cleanups for ohci-s3c2410.c Fix compile errors due to functions not being defined static Signed-off-by: Ben Dooks Signed-off-by: Greg Kroah-Hartman commit 950ee4c8f094feecd3add994a2cf4fd335ca509b Author: Guennadi Liakhovetski Date: Sun Mar 19 20:49:14 2006 +0100 [PATCH] USB: net2282 and net2280 software compatibility Below is a patch to gadgets/net2280.[ch] which adds support for the net2282 controller. The original code was kindly provided by PLX Technology, I just merged it with the current net2280 driver in the kernel. Tested on 2.6.15.6, but only with 2282. I did the merge, so that the behaviour for the 2280 is unaffected (except for short delays for extra checks). Signed-off-by: G. Liakhovetski Signed-off-by: Greg Kroah-Hartman Support for net2282 in net2280 driver. commit f043ca43c1ae354346f72dc5826d820d5619f0b2 Author: Samuel Thibault Date: Wed Apr 12 02:21:25 2006 +0200 [PATCH] Enhancing accessibility of lxdialog For easily getting fairly good accessibility, the TTY cursor should always be left at the focus location. This patch fixes the checklist by just having the list refreshed after the dialog box (hence the cursor position remains in the list). Signed-off-by: Samuel Thibault Signed-off-by: Linus Torvalds commit e57a5059846e55d82b86d96dde40e988598601b3 Author: Roland McGrath Date: Wed Apr 12 16:30:20 2006 -0700 [PATCH] fix non-leader exec under ptrace This reverts most of commit 30e0fca6c1d7d26f3f2daa4dd2b12c51dadc778a. It broke the case of non-leader MT exec when ptraced. I think the bug it was intended to fix was already addressed by commit 788e05a67c343fa22f2ae1d3ca264e7f15c25eaf. Signed-off-by: Roland McGrath Acked-by: Oleg Nesterov Signed-off-by: Linus Torvalds commit c06511d12d720b23c8dffff23004f0a888698f20 Author: Eric W. Biederman Date: Fri Apr 14 04:05:55 2006 -0600 [PATCH] de_thread: Don't change our parents and ptrace flags. This is two distinct changes. - Not changing our real parents. - Not changing our ptrace parents. Not changing our real parents is trivially correct because both tasks have the same real parents as they are part of a thread group. Now that we demote the leader to a thread there is no longer any reason to change it's parentage. Not changing our ptrace parents is a user visible change if someone looks hard enough. I don't think user space applications will care or even notice. In the practical and I think common case a debugger will have attached to all of the threads using the same ptrace flags. From my quick skim of strace and gdb that appears to be the case. Which if true means debuggers will not notice a change. Before this point we have already generated a ptrace event in do_exit that reports the leaders pid has died so de_thread is visible to a debugger. Which means attempting to hide this case by copying flags around appears excessive. By not doing anything it avoids all of the weird locking issues between de_thread and ptrace attach, and removes one case from consideration for fixing the ptrace locking. This only addresses Oleg's first concern with ptrace_attach, that of the problems caused by reparenting. Oleg's second concern is essentially a race between ptrace_attach and release_task that causes an oops when we get to force_sig_specific. There is nothing special about de_thread with respect to that race. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit 3c0c25b97c7d020ef07f6366cf1d668a8e980c7c Author: Moore, Eric Date: Thu Apr 13 16:08:17 2006 -0600 [SCSI] mptfusion - fix panic in mptsas_slave_configure Driver panic when RAID logical volume was present when driver loaded, or when a RAID logical volume was created on the fly. This issue was created in due to recent scsi_transport_sas change, when sas_read_port_mode_page was added into the mptsas drivers slave_config entry point. This new API expects that all sdev's to be assocated to an rphy, however that is not the case for logical volumes, as they are created using scsi_add_device, instead of sas_rphy_add(). Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit ace1d816a13ff42d4f41989862552032f9c19853 Author: Robin Holt Date: Thu Apr 13 15:34:45 2006 -0700 [IA64] Make show_mem() skip holes in a pgdat This patch modifies ia64's show_mem() to walk the vmem_map page tables and rapidly skip forward across regions where the page tables are missing. This prevents the pfn_valid() check from causing numerous unnecessary page faults. Without this patch on a 512 node 512 cpu system where every node has four memory holes, the show_mem() call takes 1 hour 18 minutes. With this patch, it takes less than 3 seconds. Signed-off-by: Robin Holt Signed-off-by: Tony Luck commit 356a5c1c6fdfb8eed6dbb3979d90c7cc7060017a Author: Keith Owens Date: Tue Apr 11 14:59:41 2006 +1000 [IA64] ia64_wait_for_slaves() incorrectly reports MCA ia64_wait_for_slaves() was changed in 2.6.17-rc1 to report the slave state. It incorrectly assumes that all slaves are for MCA, but ia64_wait_for_slaves() is also called from the INIT monarch handler. The existing message is very misleading, so correct it. Signed-off-by: Keith Owens Signed-off-by: Tony Luck commit 20ac94378de59d61dc39f10ed5530485e4ac8c07 Author: Eric W. Biederman Date: Thu Apr 13 04:49:07 2006 -0600 [PATCH] do_SAK: Don't recursively take the tasklist_lock By calling send_sig do_SAK is recursively taking the tasklist_lock, which is silly. In addition I just audited the kernel and this was the only place where tasklist_lock is taken inside of task_lock. So this one line change is a general worthwhile cleanup and it increases our options on how to fix the ptrace_attach races. Signed-off-by: Linus Torvalds commit 1e08dcb39c6b95ec84fc8bad97d5bdce879b76c9 Author: adam radford Date: Tue Apr 11 11:25:09 2006 -0700 [SCSI] 3ware 9000 disable local irqs during kmap_atomic Equivalent of the same patch for the 3w-xxxx driver. Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit e36e0c80137af8f012528938dab2970c26d5ec4c Author: Tejun Heo Date: Tue Apr 11 17:27:53 2006 +0900 [SCSI] SCSI: fix scsi_kill_request() busy count handling scsi_kill_request() completes requests via normal SCSI completion path which decrements busy counts; however, requests which get passed to scsi_kill_request() aren't holding busy counts and scsi_kill_request() don't increment them before invoking completion path resulting in incorrect busy counts. Bump up busy counts before invoking completion path. Signed-off-by: Tejun Heo Signed-off-by: James Bottomley commit aedf349773e5877d716a89368d512b9baa3e8c7b Author: James Smart Date: Mon Apr 10 10:14:05 2006 -0400 [SCSI] FC transport: fixes for workq deadlocks As previously reported via Michael Reed, the FC transport took a hit in 2.6.15 (perhaps a little earlier) when we solved a recursion error. There are 2 deadlocks occurring: - With scan and the delete items sharing the same workq, flushing the workq for the delete code was getting it stalled behind a very long running scan code path. - There's a deadlock where scsi_remove_target() has to sit behind scsi_scan_target() due to contention over the scan_lock(). This patch resolves the 1st deadlock and significantly reduces the odds of the second. So far, we have only replicated the 2nd deadlock on a highly-parallel SMP system. More on the 2nd deadlock in a following email. This patch reworks the transport to: - Only use the scsi host workq for scanning - Use 2 other workq's internally. One for deletions, the other for scheduled deletions. Originally, we tried this with a single workq, but the occassional flushes of the scheduled queues was hitting the second deadlock with a slightly higher frequency. In the future, we'll look at the LLDD's and the transport to see if we can get rid of this extra overhead. - When moving to the other workq's we tightened up some object states and some lock handling. - Properly syncs adds/deletes - minor code cleanups - directly reference fc_host_attrs, rather than through attribute macros - flush the right workq on delayed work cancel failures. Large kudos to Michael Reed who has been working this issue for the last month. Signed-off-by: James Bottomley commit b0d2364887e94c880680f1e17943cd660bcf8979 Author: Hannes Reinecke Date: Fri Apr 7 13:47:03 2006 +0200 [SCSI] aic79xx: target hotplug fixes When a target is added aic79xx tries to be overly clever: it changes the command on the fly to TEST UNIT READY and tries to requeue the original command. Sadly this breaks SCSI compability and of course the midlayer is getting a bit confused by it. So we're just removing that bit of code and let the midlayer deal with it. It's clever enough by now. And the driver code is getting simpler. Signed-off-by: Hannes Reinecke Signed-off-by: James Bottomley commit 441f987ca4cdca9c72aaf32fdd0d0ca9ebf46e94 Author: FUJITA Tomonori Date: Sun Mar 26 10:19:10 2006 +0900 [SCSI] ibmvscsi: remove drivers/scsi/ibmvscsi/srp.h It's no longer needed after the convrsion to use the linux srp.h file. Signed-off-by: FUJITA Tomonori Signed-off-by: James Bottomley commit f41b5cec9bd6fec1b11b74500f5fb9c3e6e808b2 Author: Hannes Reinecke Date: Mon Apr 3 08:19:34 2006 +0200 [SCSI] aic79xx bus reset update As James B. correctly noted, ahd_reset_channel() in ahd_linux_bus_reset() should be protected by ahd_lock(). However, the main reason for not doing so was a deadlock with the interesting polling mechanism to detect the end a bus reset. This patch replaces the polling mechanism with a saner signalling via flags; it also gives us the benefit of detecting any multiple calls to ahd_reset_channel(). Signed-off-by: Hannes Reinecke Signed-off-by: James Bottomley commit 183b73ae7c9e4e19fa95d88e1778481899a65210 Author: Jordi Caubet Date: Wed Apr 12 17:44:27 2006 +0200 [PATCH] spufs: fix context-switch decrementer code We found that when the 'decrementer' is saved, the PPE saves the current time 'csa->suspend_time'. When restoring the 'decrementer', (Step 34) decrementer seems to be adjusted with the number of cycles th= at a spu thread has not been running. In that code it is missing a substract ('-') because 'delta_time' is assigned a not substracted(see bellow). Acked-by: Mark Nutter Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit f48b8296b3152bb45c07c544ce072eaa59dfbc7c Author: Olaf Hering Date: Tue Apr 11 20:42:08 2006 +0200 [PATCH] powerpc32: Set cpu explicitly in kernel compiles Compile the 32bit kernel with -mcpu=powerpc. This reduces the imagesize when a compiler is used that defaults to -mtune=power4. It inserts lots of nops to please the 64bit cpu instruction scheduling. But all these nops are not needed for 32bit kernels. Example with SLES10 gcc 4.1.0 and arch/powerpc/configs/pmac32_defconfig: vmlinux vmlinux.strip vmlinux.gz -O2 4980515 4187528 1846829 -Os 4618801 3827084 1673333 -O2 -mcpu=powerpc 4738851 3945868 1816253 -Os -mcpu=powerpc 4532785 3741068 1664688 Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit b055a9e10fd05c7fdd87904a50c1f413aea10ec4 Author: Linas Vepstas Date: Thu Apr 6 15:41:41 2006 -0500 [PATCH] powerpc/pseries: bugfix: balance calls to pci_device_put Repeated calls to eeh_remove_device() can result in multiple (and thus unbalanced) calls to pci_dev_put(). Make sure the pci_device_put() is called only once (since there was only one call to the matching pci_device_get()). Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras commit 6f806ceed53776ae5e04c8b334dc9daa0932ad1e Author: Michael Ellerman Date: Fri Apr 7 13:56:21 2006 +1000 [PATCH] powerpc: Fix machine detection in prom_init.c In e8222502ee6157e2713da9e0792c21f4ad458d50 the detection of machine types in prom_init broke for some machines. We should be checking /device_type instead of /model. This should make Power3 and Power4 boot again. Haven't been able to test this. We also need to relocate before comparing. Signed-off-by: Michael Ellerman Signed-off-by: Michael Neuling Signed-off-by: Paul Mackerras commit 132058f78a1bc8cce2c5a40245365938d51832fe Author: Vitaly Bordug Date: Mon Apr 3 15:26:32 2006 +0400 [PATCH] ppc32: Fix string comparing in platform_notify_map Fixed odd function behavior when dev->bus_id does not contain '.' - it compared that case 0 characters of the string and hereby reported success and executed callback. Now bus_id's are compared correctly, extra callback triggering eliminated. Signed-off-by: Vitaly Bordug Signed-off-by: Paul Mackerras commit 49c28e4e40be73019481f3c13a5966e0cc8f5a9d Author: Anton Blanchard Date: Sun Apr 2 20:18:32 2006 +1000 [PATCH] powerpc: Avoid __initcall warnings Fix __initcall return in proc_rtas_init and rtas_init. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit ddafddcfc78aab994cf95922befc54d98aaf371b Author: Anton Blanchard Date: Sun Apr 2 19:54:09 2006 +1000 [PATCH] powerpc: Ensure runlatch is off in the idle loop Since external and decrementer interrupts set the runlatch on, we need to ensure its set off again in the idle loop. At the moment we dont turn it off in the inner loop. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 4d7db04a7a69099accd84984a78c64d2178252f1 Author: James Bottomley Date: Fri Mar 31 20:07:45 2006 -0600 [SCSI] add SCSI_UNKNOWN and LUN transfer limit restrictions Original From: Ingo Flaschberger To support the RA4100 array from Compaq. This patch now correctly handles SCSI_UNKNOWN types with regard to BLIST_REPORTLUNS2 (allow it) and cdb[1] LUN inclusion (don't). It also allows a BLIST_MAX_512 flag to restrict the maximum transfer length to 512 blocks (apparently this is an RA4100 problem). Signed-off-by: James Bottomley commit d637c4543fdc86cbef5805c679d24bb665172a7d Author: Matthew Wilcox Date: Wed Mar 29 14:45:18 2006 -0700 [SCSI] sym2: Fix build when spinlock debugging is enabled When spinlock debugging is turned on, a struct completion grows beyond the size allowed for the scsi_pointer. So move the struct completion back onto the stack. The additional memory barriers are to keep us from completing a random piece of kernel stack if the command happens to complete after the error handling has finished. Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit 80286d478c2b0e07959e79cf34591a4061ff1797 Author: Brian King Date: Wed Mar 29 09:37:49 2006 -0600 [SCSI] ipr: Bump version Bump ipr driver version to 2.1.3 Signed-off-by: Brian King Signed-off-by: James Bottomley commit c65130967186dc53c0c66793cfe640521dcdada2 Author: Brian King Date: Wed Mar 29 09:37:43 2006 -0600 [SCSI] ipr: Reset device cleanup Encapsulate some more of the device reset processing in preparation for SATA support. Signed-off-by: Brian King Signed-off-by: James Bottomley commit fb3ed3cb4b8ba84e5b0899ef752495f213973843 Author: Brian King Date: Wed Mar 29 09:37:37 2006 -0600 [SCSI] ipr: printk macro cleanup/removal Remove some unused printk macros, make some more robust, and convert some to use standard printk macros when possible. Signed-off-by: Brian King Signed-off-by: James Bottomley commit fe964d0a4bfa7c25e75c53d81acbf53099777e9e Author: Brian King Date: Wed Mar 29 09:37:29 2006 -0600 [SCSI] ipr: Simplify status area dumping Simplify the dumping of the command status area by removing some device specific information that has proven to not be worthwhile. Signed-off-by: Brian King Signed-off-by: James Bottomley commit e4fbf44ed0618acce4a06010ed9fa9c02e06e36a Author: Brian King Date: Wed Mar 29 09:37:22 2006 -0600 [SCSI] ipr: Fixup device type check Fixup a check used by the ipr driver to determine if a given device is a SCSI disk. Due to the addition of support for attaching SATA devices, this check needs to be more robust. Signed-off-by: Brian King Signed-off-by: James Bottomley commit 1121b794a384bc317fe36e967b82308b0e2c3852 Author: Brian King Date: Wed Mar 29 09:37:16 2006 -0600 [SCSI] ipr: Disk remove path cleanup Instead of NULLing the resource entry pointer when a disk goes away to prevent any new commands being sent to it, set the adapter resource handle to an invalid value so new ops getting sent to it will fail with a selection timeout response. This patch is needed for future SATA patches. Signed-off-by: Brian King Signed-off-by: James Bottomley commit c06bb7f514567efa39062a781679120e51caa818 Author: Douglas Gilbert Date: Tue Mar 28 14:48:22 2006 -0500 [SCSI] sg: fix leak when dio setup fails when the sg driver is unable to setup direct IO, free that scatter gather list prior to falling back to indirect IO Further to this thread started by Bryan Holty: http://marc.theaimsgroup.com/?l=linux-scsi&m=114306885116728&w=2 Here is the reworked patch again. This time it has been tested with a program provided by Bryan. Signed-off-by: Douglas Gilbert Signed-off-by: James Bottomley commit d6159c17c2c76963a8067d1e1ac3c4c36c05e674 Author: James Bottomley Date: Mon Mar 27 16:45:34 2006 -0600 [SCSI] expose sas internal class for the domain transport necessary to make the domain class use the internal structures Signed-off-by: James Bottomley commit 530bba6fa898318fbf111d91402d49b1c538e3cd Author: KAMEZAWA Hiroyuki Date: Tue Mar 28 14:50:58 2006 -0800 [SCSI] for_each_possible_cpu: scsi for_each_cpu() actually iterates across all possible CPUs. We've had mistakes in the past where people were using for_each_cpu() where they should have been iterating across only online or present CPUs. This is inefficient and possibly buggy. We're renaming for_each_cpu() to for_each_possible_cpu() to avoid this in the future. This patch replaces for_each_cpu with for_each_possible_cpu. Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit ac05165179f45d47da6cb54fdedb33e9df87781d Author: Matthew Wilcox Date: Tue Mar 28 11:03:44 2006 -0500 [SCSI] Version 2.2.3 Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit 14ac8bf58d8ad46d8cd9e5db025beb9f8da24854 Author: Matthew Wilcox Date: Tue Mar 28 11:03:44 2006 -0500 [SCSI] Enable clustering and large transfers This patch enables clustering and sets max_sectors to 0xffff to enable reading and writing of large blocks with tapes (and large transfers with sg). This change is needed after the sg and st drivers started using chained bios through scsi_request_async() in 2.6.16. Signed-off-by: Kai Makisara Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit b4e93a739ed1352664defd41d5e4f82afa29b928 Author: Matthew Wilcox Date: Tue Mar 28 11:03:44 2006 -0500 [SCSI] Simplify error handling Use wait_for_completion_timeout() instead of using a timer (as Christoph Hellwig did for aic7xxx). That lets me eliminate the sym_eh_wait structure; the struct completion, the old_done pointer and the to_do flag can be folded into the sym_ucmd (which overrides the scsi_pointer in scsi_cmnd). The sym_eh_done() function becomes much simpler as the timeout handling is done in sym_eh_handler() directly. The host_lock can be unlocked earlier, and I cache the host in a local variable to make accesses to it quicker. Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit c2349df918cdfd47dfe6afaaeed9f504b83255d0 Author: Matthew Wilcox Date: Tue Mar 28 11:03:44 2006 -0500 [SCSI] Allow nvram settings to determine bus mode The PDC code can set the bus mode, but we were ignoring that setting. Also move the code that determines bus mode into its own function. Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit 92d578b94c3c6263777687d8f2653c2a63d922bf Author: Matthew Wilcox Date: Tue Mar 28 11:03:44 2006 -0500 [SCSI] Use SPI messages where possible Now sym2 is using spi_print_msg, we don't need to have our own messages for IGNORE WIDE RESIDUE and MODIFY DATA POINTER, so provide the option of passing NULL for the label. Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit 3bea15a76eecc03729bf74d6ab2a1f849c08423e Author: Matthew Wilcox Date: Tue Mar 28 11:03:44 2006 -0500 [SCSI] Disable sym2 driver queueing Undef SYM_OPT_HANDLE_DEVICE_QUEUEING. Call sym_put_start_queue instead of sym_start_next_ccbs. Turn asserts into checks that we can send the command to the adapter, and return busy from queuecommand if we can't. Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit 76789f01768bb4cef706f4c9e7e2f3f4eb8c1431 Author: Matthew Wilcox Date: Tue Mar 28 11:03:44 2006 -0500 [SCSI] Mark div_10M array const Patch below is one out of a large series to mark kernel data const when possible, goal is to use .rodata and avoid false sharing Signed-off-by: Arjan van de Ven Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit ab19d52bec6c1b266228417b58ae6f36f3ea097c Author: Matthew Wilcox Date: Tue Mar 28 11:03:44 2006 -0500 [SCSI] Simplify error handling a bit - to_do was never set to SYM_EH_DO_COMPLETE, so remove that code - move the spinlocks inside the common error handler code path Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit b6d105d7ee188040a6e5eb86101e7476d94b3076 Author: Matthew Wilcox Date: Tue Mar 28 11:03:44 2006 -0500 [SCSI] Use pcibios_resource_to_bus() We had our own code (pci_get_base_address()) to get the bus address of a BAR. We can get this using pcibios_resource_to_bus() instead. Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit 1f61d82490a26dbcde903b33e24f6d11b758b64c Author: Matthew Wilcox Date: Tue Mar 28 11:03:43 2006 -0500 [SCSI] Change Kconfig option from IOMAPPED to MMIO Most of the Kconfig options for switching between IO Port and MMIO operations use the opposite sense from sym2. Really, this option should be set at a chipset level rather than per-driver. Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit 92aab6464be735139f9ea38fd039c3b84c722630 Author: Mike Anderson Date: Mon Mar 27 09:37:28 2006 -0800 [SCSI] sas transport: ref count update Fix puts so that release functions will be called. Signed-off-by: Mike Anderson Signed-off-by: James Bottomley commit 9a72f976d29091e4f4dfa08ed404ef84a56b0d47 Author: Mark Haverkamp Date: Mon Mar 27 09:44:37 2006 -0800 [SCSI] aacraid: Driver version update Received from Mark Salyzyn Fix module param Update driver version. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 3d2f98a66571d1aa8d66aab1a97bad6ffff61b24 Author: Mark Haverkamp Date: Mon Mar 27 09:44:33 2006 -0800 [SCSI] aacraid: Fix parenthesis placement error Received from Mark Salyzyn On 64 bit machines, when a 32 bit application tries to acquire the AIF, they will always get and EFAULT error response from the driver. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit d1ad94ad773c34a5a3491f9dcc0a97e264f971f6 Author: Mark Haverkamp Date: Mon Mar 27 09:44:29 2006 -0800 [SCSI] aacraid: Show max channel and max id is sysfs Received from Mark Salyzyn Add max_channel and max_id sysfs parameters. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit dc4adbf41385486b0c73e7382ce73f0e8b873243 Author: Mark Haverkamp Date: Mon Mar 27 09:44:26 2006 -0800 [SCSI] aacraid: Re-start helper thread if it dies Received from Mark Salyzyn Since the helper thread for the driver can be killed unceremoniously by an application, we detect the loss of the helper and restart it. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 1241f3593a8857fab4259b6aa9d17f26e7de3a86 Author: Mark Haverkamp Date: Mon Mar 27 09:44:23 2006 -0800 [SCSI] aacraid: General driver cleanup Received from Mark Salyzyn Remove superfluous code, optimize code, harden code, cast code, correct some text, use msleep instead of schedule_timeout_interruptible. No bugs. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 53926274f24e5c852dbe8f89dea16b7822549472 Author: Mark Haverkamp Date: Mon Mar 27 09:44:19 2006 -0800 [SCSI] aacraid: Fix extra unregister_chrdev Received from Mark Salyzyn If there are no aacraid controllers, we do not create the raid controller chrdev, thus when the driver is unloaded it performs a superfluous deregistration. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 95433badf0ff8dbc2caf14bc69c984841539715f Author: Mark Haverkamp Date: Mon Mar 27 09:44:15 2006 -0800 [SCSI] aacraid: Fix error in max_channel field Received from Mark Salyzyn The max_channel field is set one too large. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit e61b17fd3ae270c0ca83d12c8276b73e50466db9 Author: Mark Haverkamp Date: Mon Mar 27 09:44:11 2006 -0800 [SCSI] aacraid: Error path cleanup Received from Mark Salyzyn Some of the error return paths during initialization resulted in a zero report to caller Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 31876f328f22435c21cfc27f0c871a4a4b22f9db Author: Mark Haverkamp Date: Mon Mar 27 09:43:55 2006 -0800 [SCSI] aacraid: Add timeout for events Received from Mark Salyzyn Plug and play actions resulting from event sequences shall time out if they take longer than 30 seconds to complete. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 77d644d4d70c9ad5df51792575f43a950525c9aa Author: Mark Haverkamp Date: Mon Mar 27 09:43:40 2006 -0800 [SCSI] aacraid: Track command ownership in driver Received from Mark Salyzyn The loss of the ownership flags, despite their flaws, in the scsi command were sorely missed and are reinstated more accurately in the aacraid driver to track commands and permit us to properly handle error recovery actions. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit e5718774f12234c7c9be8944001cfd109ba955e1 Author: Mark Haverkamp Date: Mon Mar 27 09:43:25 2006 -0800 [SCSI] aacraid: Use scmd_ functions Received from Mark Salyzyn Clean up the remaining scsi id access methods, drop ID_LUN_TO_CONTAINER macro. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit ef265673434680f2307ceafae4a2badc657e94cc Author: FUJITA Tomonori Date: Sun Mar 26 03:57:14 2006 +0900 [SCSI] ibmvscsi: convert the ibmvscsi driver to use include/scsi/srp.h Signed-off-by: FUJITA Tomonori Signed-off-by: James Bottomley commit 9b833e428ad24dc7cec2c0c7e6898caa91449c95 Author: Dave C Boutcher Date: Thu Mar 23 13:47:07 2006 -0600 [SCSI] ibmvscsi: prevent scsi commands being sent in invalid state There is a window where we can be re-enabling an adapter, but still allow SCSI commands to be sent to the target. This fix sets our window (request_limit) to -1 as soon as we know the adapter is being reenabled, and closes a very teeny tiny window where we could set the window back to 1 before we grab a lock. Signed-off-by: Dave Boutcher Signed-off-by: James Bottomley commit 18c49b8cd69c360735df2cc6eeeb2593c01a81e8 Author: Mike Christie Date: Wed Mar 22 16:04:38 2006 -0600 [SCSI] fix sg leak when scsi_execute_async fails Doug found a bug where if scsi_execute_async fails, we are leaking sg resources. scsi_do_req never failed so we did not have to handle that case before. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 21b2f0c803adaf00fce1b606c50b49ae8b106773 Author: Christoph Hellwig Date: Wed Mar 22 17:52:04 2006 +0100 [SCSI] unify SCSI_IOCTL_SEND_COMMAND implementations We currently have two implementations of this obsolete ioctl, one in the block layer and one in the scsi code. Both of them have drawbacks. This patch kills the scsi layer version after updating the block version with the missing bits: - argument checking - use scatterlist I/O - set number of retries based on the submitted command This is the last user of non-S/G I/O except for the gdth driver, so getting this in ASAP and through the scsi tree would be nie to kill the non-S/G I/O path. Jens, what do you think about adding a check for non-S/G I/O in the midlayer? Thanks to Or Gerlitz for testing this patch. Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit 765fcab23d0a79ed7aab8da79766f5873d936f1b Author: James Bottomley Date: Tue Mar 28 12:04:40 2006 -0600 [SCSI] remove qlogicfc All participants agree that qla2xxx can now successfully replace this. Signed-off-by: James Bottomley commit f6835543440c85f20c86c5b006e8404fe6a78109 Author: Ben Dooks Date: Thu Apr 13 09:57:15 2006 +0100 [ARM] 3475/1: S3C2410: fix spelling mistake in SMDK partition table Patch from Ben Dooks Fix bad spelling of partition Signed-off-by: Ben Dooks Signed-off-by: Russell King commit c91e468a48a2afd2a2b0c2e29a35d6b8c51ea682 Author: Andreas Schwab Date: Tue Mar 28 18:10:38 2006 +0200 [PATCH] Use pci_set_consistent_dma_mask in ixgb driver The ixgb driver is using pci_alloc_consistent, thus is should also use pci_set_consistent_dma_mask. This allows the driver to work on SGI systems. In case of an error during probing it should also disable the device again. Signed-off-by: Andreas Schwab Signed-off-by: Jeff Garzik commit 43f2f10444c008296cc8de68a72fd87b33b50452 Author: Stephen Hemminger Date: Wed Apr 5 17:47:15 2006 -0700 [PATCH] sky2: bad memory reference on dual port cards Sky2 driver will oops referencing bad memory if used on a dual port card. The problem is accessing past end of MIB counter space. Applies for both 2.6.17 and 2.6.16 (with fuzz) Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 94843566d7119e049a72618a3c939d5c2be022c7 Author: Dale Farnsworth Date: Tue Apr 11 18:24:26 2006 -0700 [PATCH] mv643xx_eth: Fix tx_timeout to only conditionally wake tx queue After resetting the hardware on a tx_timeout, call netif_wake_queue() only if we have free tx descriptors. Also, attempt to recover if mv643xx_eth_start_xmit() is called when there are fewer free tx descriptors than expected. The BUG_ON() call we are replacing was hit on a tx_timeout that called netif_wake_queue(), indirectly via netif_device_attach(), even though we did not have enough free tx descriptors. Signed-off-by: Dale Farnsworth Signed-off-by: Jeff Garzik commit 5c5374087707d7848cb13f15e7c175daf346301c Author: Brent Cook Date: Tue Apr 11 18:23:15 2006 -0700 [PATCH] mv643xx_eth: Always free completed tx descs on tx interrupt Fix the tx interrupt handler to free completed tx descriptors even when NAPI is enabled. Otherwise, the tx queue would fill up resulting in poor performance and "NETDEV WATCHDOG: : transmit timed out" messages. Signed-off-by: Brent Cook Signed-off-by: Dale Farnsworth Signed-off-by: Jeff Garzik commit e19360f2945f54eb44ae170ec9c33910d29834a2 Author: Randy Dunlap Date: Mon Apr 10 23:22:06 2006 -0700 [PATCH] net drivers: fix section attributes for gcc If CONFIG_HOTPLUG=n, gcc doesn't like some __initdata to be const (rodata) and other __initdata not const, so make the non-const __initdata const. gcc errors: drivers/net/bnx2.c:66: error: version causes a section type conflict drivers/net/starfire.c:338: error: version causes a section type conflict drivers/net/typhoon.c:137: error: version causes a section type conflict drivers/net/natsemi.c:241: error: version causes a section type conflict Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 037998d1e979e88a140ef32c5d28730f6ca8a96f Author: Adrian Bunk Date: Mon Apr 10 23:22:07 2006 -0700 [PATCH] remove drivers/net/hydra.h Remove drivers/net/hydra.h which is both unused and covered by a 4 clause BSD licence (not by the UCB). Signed-off-by: Adrian Bunk Acked-By: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 0761be4f5f9efb5f72a5f9771f2ed5845a974c46 Author: Adrian Bunk Date: Mon Apr 10 23:22:21 2006 -0700 [PATCH] drivers/net/via-rhine.c: make a function static Signed-off-by: Adrian Bunk Signed-off-by: Roger Luethi Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit d220c37e0a3c9a47ae00e87e044d963b3ea040bc Author: Dan Aloni Date: Mon Apr 10 23:20:22 2006 -0700 [PATCH] sata_mv: properly print HC registers Currently it crashes when trying to dump the registers. This is an obvious one-liner fix I suppose. Signed-off-by: Dan Aloni Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 10badc215493a435e2dbdc691386f2650a1778de Author: Jeff Garzik Date: Wed Apr 12 18:04:32 2006 -0400 [netdrvr b44] trim trailing whitespace commit 8056bfafb8a845f3035e7aae5ffe405df118bc12 Author: Gary Zambrano Date: Mon Apr 10 12:05:40 2006 -0700 [PATCH] b44: increase version to 1.00 Signed-off-by: Jeff Garzik commit 2b474cf53870abf1bbad631c3368b9efc9b5ba9d Author: Gary Zambrano Date: Mon Apr 10 12:02:21 2006 -0700 [PATCH] b44: disable default tx pause Disable default tx pause frame support. The b44 controller has a bug that generates excessive tx pause frames. Signed-off-by: Gary Zambrano Signed-off-by: Jeff Garzik commit 4be5de25259de21894df5e2fecc30da8252dee8c Author: Roger Luethi Date: Tue Apr 4 20:49:16 2006 +0200 [PATCH] via-rhine: execute bounce buffers code on Rhine-I only Patch suggested by Yang Wu (pin xue ). Signed-off-by: Roger Luethi Signed-off-by: Jeff Garzik commit ff768cd7139ab368bc2b97e7bd6fa592f20e1950 Author: Komuro Date: Sun Apr 9 11:21:10 2006 +0900 [PATCH] network: axnet_cs.c: add missing 'PRIV' in ei_rx_overrun Signed-off-by: komurojun-mbn@nifty.com Signed-off-by: Jeff Garzik commit 5636f72794b42d31b2660064ef2c17f90816b3b1 Author: Stephen Hemminger Date: Tue Apr 11 10:28:21 2006 -0700 [PATCH] dlink pci cards using wrong driver This patch fixes the problem of some Dlink cards picking the wrong driver. It looks like these cards use Yukon 1 chipset, not Yukon 2. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 59fef3b1e96217c6e736372ff8cc95cbcca1b6aa Author: Jack Morgenstein Date: Tue Apr 11 18:16:27 2006 +0300 IB/mthca: Fix max_srq_sge returned by ib_query_device for Tavor devices The driver allocates SRQ WQEs size with a power of 2 size both for Tavor and for memfree. For Tavor, however, the hardware only requires the WQE size to be a multiple of 16, not a power of 2, and the max number of scatter-gather allowed is reported accordingly by the firmware (and this is the value currently returned by ib_query_device() and ibv_query_device()). If the max number of scatter/gather entries reported by the FW is used when creating an SRQ, the creation will fail for Tavor, since the required WQE size will be increased to the next power of 2, which turns out to be larger than the device permitted max WQE size (which is not a power of 2). This patch reduces the reported SRQ max wqe size so that it can be used successfully in creating an SRQ on Tavor HCAs. Signed-off-by: Jack Morgenstein Signed-off-by: Roland Dreier commit dcccdd938ef0c5d96145957217b814b14bd46cdc Author: Rene Herman Date: Tue Apr 11 14:09:37 2006 +0200 [ALSA] unregister platform device again if probe was unsuccessful Unregister the platform device again if the probe was unsuccessful. This restores the behaviour of not loading the driver on probe() failure. Signed-off-by: Rene Herman Signed-off-by: Takashi Iwai commit d0ac642d76c79c5cc673c4cdfe43e926379784e1 Author: Rene Herman Date: Tue Apr 11 14:08:33 2006 +0200 [ALSA] continue on IS_ERR from platform device registration Continue with the next one on error from device registration. This would seem the correct thing to do, even if it's not the probe() error that we're getting. Signed-off-by: Rene Herman Signed-off-by: Takashi Iwai commit 12831c15f35dcc9f55fa63d50fd4892c7c6a0a1c Author: Adrian Bunk Date: Tue Apr 11 11:12:46 2006 +0200 [ALSA] sound/core/pcm.c: make snd_pcm_format_name() static Modules: PCM Midlevel This patch makes the needlessly global snd_pcm_format_name() static. Signed-off-by: Adrian Bunk Signed-off-by: Takashi Iwai commit 73864fc634932bc827f852557f637fade0227381 Author: Takashi Iwai Date: Mon Apr 10 19:41:16 2006 +0200 [ALSA] ac97 - Add entry for VIA VT1618 codec Modules: AC97 Codec Added the missing entry for VIA VT1618 codec. No particular patch is needed, though. Signed-off-by: Takashi Iwai commit e09222831336a6ae53ea09076d113a58931950cf Author: Takashi Iwai Date: Mon Apr 10 19:09:01 2006 +0200 [ALSA] hda-codec - Add support of ASUS U5A with AD1986A codec Modules: HDA Codec driver Add the model entry to support of ASUS U5A with AD1986A codec. Signed-off-by: Takashi Iwai commit 2462321bfe59b9c22ca1ec4ba8665a1aeac6bab5 Author: Eric Sesterhenn Date: Mon Apr 10 14:42:00 2006 +0200 [ALSA] Overrun in sound/pci/au88x0/au88x0_pcm.c Modules: au88x0 driver since idx is used as an index for vortex_pcm_prettyname[VORTEX_PCM_LAST], it should not be equal to VORTEX_PCM_LAST. This fixes coverity bug id #572 Signed-off-by: Eric Sesterhenn Signed-off-by: Takashi Iwai commit 99e80e4d0c7755d688e9db205016a0608fa989b4 Author: Dale Sedivec Date: Mon Apr 10 11:34:44 2006 +0200 [ALSA] au88x0 - clean up __devinit/__devexit Modules: au88x0 driver Removed all use of __devinit/__devexit and init.h from headers. Any attributes given in the prototype but not in the function definition have been moved to the definition. An exception is vortex_eq_free: I removed the __devexit attribute because vortex_eq_free is called from vortex_core_shutdown, and vortex_core_shutdown may be called from __devinit snd_vortex_create. Compile tested with allyesconfig and allmodconfig. Signed-off-by: Dale Sedivec Signed-off-by: Takashi Iwai commit a29b6c8895edbd9921837b592bcd125cee64fc84 Author: Ashley Clark Date: Mon Apr 10 11:31:03 2006 +0200 [ALSA] hda-codec - Adds HDA support for Intel D945Pvs board with subdevice id 0x0707 Modules: HDA Codec driver This patch adds the entry for the 5-stack pin-config for the STAC chip on the Intel D945Pvs board with subdevice id 0x0707. With this patch against 1.0.11rc4 in the linux kernel 2.6.17-rc1, I'm able to successfully output over the optical port and analog ports. Signed-off-by: Ashley Clark Signed-off-by: Takashi Iwai commit be28e7ccd34efff2160ab7d6712d248053c36461 Author: Coywolf Qi Hunt Date: Mon Apr 10 10:47:11 2006 +0200 [ALSA] hda-codec - support HP Compaq Presario B2800 laptop with AD1986A codec Modules: HDA Codec driver This adds the support for HP Compaq Presario B2800 laptop with AD1986A codec. Signed-off-by: Coywolf Qi Hunt Signed-off-by: Takashi Iwai commit 5b0e498537cbaeca06b4a1935be1ea2c93d4e05b Author: James Courtier-Dutton Date: Sun Apr 9 22:45:58 2006 +0200 [ALSA] emu10k1: Add some descriptive text. Modules: EMU10K1/EMU10K2 driver Signed-off-by: James Courtier-Dutton commit a26e9d9dc710dd157beca914bb56d2fed8a29d60 Author: Takashi Iwai Date: Thu Apr 6 19:59:21 2006 +0200 [ALSA] via82xx - Add a dxs entry for ECS K8T890-A Modules: VIA82xx driver Added a dxs_support entry for ECS K8T890-A board. Signed-off-by: Takashi Iwai commit f556e6f6ef55d343727372e4ab35adb716c2bb4e Author: Takashi Iwai Date: Thu Apr 6 19:58:43 2006 +0200 [ALSA] hda-codec - Add another HP laptop with AD1981HD Modules: HDA Codec driver Added the SSID of another HP laptop for the model 'hp' with AD1981HD. Signed-off-by: Takashi Iwai commit 1576274d30286dd048967176dc8e75e192051ff5 Author: Takashi Iwai Date: Thu Apr 6 19:47:42 2006 +0200 [ALSA] Fix Oops of PCM OSS emulation Modules: PCM Midlevel,ALSA<-OSS emulation Fix Oops of PCM OSS emulation occuring when multiple playback is used. Signed-off-by: Takashi Iwai commit bbdc1b7dbe41578da7c9a6266cf450abe97e4ca7 Author: OGAWA Hirofumi Date: Thu Apr 6 19:42:40 2006 +0200 [ALSA] pcm_oss: fix snd_pcm_oss_release() oops Modules: ALSA<-OSS emulation Fix Oops due to a typo in snd_pcm_oss.c. Signed-off-by: OGAWA Hirofumi Signed-off-by: Takashi Iwai commit 052bb88e180d010f7da7186e6f21eea3be82a903 Author: Eric Sesterhenn Date: Tue Apr 11 17:29:17 2006 -0700 [ISDN]: Static overruns in drivers/isdn/i4l/isdn_ppp.c Coverity found some static overruns in isdn_ppp.c (bug id #519) At several places slot is compared <0 and > ISDN_MAX_CHANNELS and then used to index ippp_table[ISDN_MAX_CHANNELS] A value of slot = ISDN_MAX_CHANNELS would run over the end of the array. Signed-off-by: Eric Sesterhenn Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 8db60bcf3021921e2d10d158641792d640e52fe8 Author: Adrian Bunk Date: Tue Apr 11 17:28:33 2006 -0700 [WAN]: Remove broken and unmaintained Sangoma drivers. The in-kernel Sangoma drivers are both not compiling and marked as BROKEN since at least kernel 2.6.0. Sangoma offers out-of-tree drivers, and David Mandelstam told me Sangoma does no longer maintain the in-kernel drivers and prefers to provide them as a separate installation package. This patch therefore removes these drivers. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 7ad4d2f6901437ba4717a26d395a73ea362d25c6 Author: Jayachandran C Date: Tue Apr 11 17:25:38 2006 -0700 [BRIDGE] ebtables: fix allocation in net/bridge/netfilter/ebtables.c Allocate an array of 'struct ebt_chainstack *', the current code allocates array of 'struct ebt_chainstack'. akpm: converted to use the foo = alloc(sizeof(*foo)) form. Which would have prevented this from happening in the first place. akpm: also removed unneeded typecast. akpm: what on earth is this code doing anyway? cpu_possible_map can be sparse.. Signed-off-by: Jayachandran C. Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit b8282dcf0417bbc8a0786c129fdff9cc768f8f3c Author: Eric Sesterhenn Date: Mon Apr 10 16:43:03 2006 -0700 [DCCP]: Fix leak in net/dccp/ipv4.c we dont free req if we cant parse the options. This fixes coverity bug id #1046 Signed-off-by: Eric Sesterhenn Signed-off-by: David S. Miller commit b7595b4955b5178e28906838cc3e8efa62d8caee Author: Stephen Hemminger Date: Mon Apr 10 16:38:47 2006 -0700 [BRIDGE]: receive link-local on disabled ports. This change allows link local packets (like 802.3ad and Spanning Tree Protocol) to be processed even when the bridge is not using the port. It fixes the chicken-egg problem for bridging a bonded device, and may also fix problems with spanning tree failover. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit f6596f9d2b4f0255f6cd68c76b85fe4cec6352af Author: Zach Brown Date: Mon Apr 10 16:05:34 2006 -0700 [IPv6] reassembly: Always compute hash under the fragment lock. This closes a race where an ipq6hashfn() caller could get a hash value and race with the cycling of the random seed. By the time they got to the read_lock they'd have a stale hash value and might not find previous fragments of their datagram. This matches the previous patch to IPv4. Signed-off-by: Zach Brown Signed-off-by: David S. Miller commit 56cf34ff0795692327234963dcdcc2cdeec2bb3d Author: Miklos Szeredi Date: Tue Apr 11 21:16:51 2006 +0200 [fuse] Direct I/O should not use fuse_reset_request It's cleaner to allocate a new request, otherwise the uid/gid/pid fields of the request won't be filled in. Signed-off-by: Miklos Szeredi commit 4858cae4f0904681eab58a16891c22397618a2a2 Author: Miklos Szeredi Date: Tue Apr 11 21:16:38 2006 +0200 [fuse] Don't init request twice Request is already initialized in fuse_request_alloc() so no need to do it again in fuse_get_req(). Signed-off-by: Miklos Szeredi commit 9bc5dddad1294955e70eeb87325ba1505fb5fe2e Author: Miklos Szeredi Date: Tue Apr 11 21:16:09 2006 +0200 [fuse] Fix accounting the number of waiting requests Properly accounting the number of waiting requests was forgotten in "clean up request accounting" patch. Signed-off-by: Miklos Szeredi commit 73ce8355c243a434524a34c05cc417dd0467996e Author: Miklos Szeredi Date: Tue Apr 11 21:14:26 2006 +0200 [fuse] fix deadlock between fuse_put_super() and request_end() A deadlock was possible, when the last reference to the superblock was held due to a background request containing a file reference. Releasing the file would release the vfsmount which in turn would release the superblock. Since sbput_sem is held during the fput() and fuse_put_super() tries to acquire this same semaphore, a deadlock results. The chosen soltuion is to get rid of sbput_sem, and instead use the spinlock to ensure the referenced inodes/file are released only once. Since the actual release may sleep, defer these outside the locked region, but using local variables instead of the structure members. This is a much more rubust solution. Signed-off-by: Miklos Szeredi commit 0f6e439c12646c4631d543d9b49092a396a949c5 Author: Ben Dooks Date: Tue Apr 11 18:20:06 2006 +0100 [ARM] 3474/1: S3C2440: USB rate writes wrong var to CLKDIVN Patch from Ben Dooks The wrong variable is written back to CLKDIVN register if the USB PLL speed is above 94MHz Signed-off-by: Ben Dooks Signed-off-by: Russell King commit a145410dccdb44f81d3b56763ef9b6f721f4e47c Author: Oleg Nesterov Date: Tue Apr 11 22:18:58 2006 +0400 [PATCH] __group_complete_signal: remove bogus BUG_ON Commit e56d090310d7625ecb43a1eeebd479f04affb48b [PATCH] RCU signal handling made this BUG_ON() unsafe. This code runs under ->siglock, while switch_exec_pids() takes tasklist_lock. Signed-off-by: Oleg Nesterov Signed-off-by: Linus Torvalds commit 70524490ee2ea1bbf6cee6c106597b3ac25a3fc2 Author: Jens Axboe Date: Tue Apr 11 15:51:17 2006 +0200 [PATCH] splice: add support for sys_tee() Basically an in-kernel implementation of tee, which uses splice and the pipe buffers as an intelligent way to pass data around by reference. Where the user space tee consumes the input and produces a stdout and file output, this syscall merely duplicates the data inside a pipe to another pipe. No data is copied, the output just grabs a reference to the input pipe data. Signed-off-by: Jens Axboe commit cbb7e577e732f576b9f399bc2600bdc0626c68dc Author: Jens Axboe Date: Tue Apr 11 14:57:50 2006 +0200 [PATCH] splice: pass offset around for ->splice_read() and ->splice_write() We need not use ->f_pos as the offset for the file input/output. If the user passed an offset pointer in through sys_splice(), just use that and leave ->f_pos alone. Signed-off-by: Jens Axboe commit cde227afe6b997dce08bcfc2aa6e373fb56857b0 Author: mao, bibo Date: Tue Apr 11 12:54:54 2006 +0200 [PATCH] x86_64: inline function prefix with __always_inline in vsyscall In vsyscall function do_vgettimeofday(), some functions are declared as inlined, which is a hint for gcc to compile the function inlined but it not forced. Sometimes compiler does not compile the function as inlined, so here inline is replaced by __always_inline prefix. It does not happen in gcc compiler actually, but it possibly happens. Signed-off-by: bibo mao Signed-off-by: Linus Torvalds commit 44b940c299dfaaf25b7aad683ff55cb213502ddd Author: Andi Kleen Date: Tue Apr 11 12:54:51 2006 +0200 [PATCH] x86_64: Fix embarassing typo in mmconfig bus check Surprising that it still worked at all with this - yes it was tested. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit ecc16ba96fd5b1a1c1988f0a2b05ff954bdff728 Author: Andi Kleen Date: Tue Apr 11 12:54:48 2006 +0200 [PATCH] i386/x86-64: Remove checks for value == NULL in PCI config space access Nobody should pass NULL here. Could in theory make it a BUG, but the NULL pointer oops will do as well. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 3d8a4d795cc1ffa6be5371629ca6c3431af4c2d5 Author: Andi Kleen Date: Tue Apr 11 12:54:45 2006 +0200 [PATCH] i386: Remove bogus special case code from AMD core parsing It's not actually needed and would break non power of two number of cores. Follows similar earlier x86-64 patch. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e4cff6ac78e9c3bbb90c0e01b20418eeae0c6b52 Author: Siddha, Suresh B Date: Tue Apr 11 12:54:42 2006 +0200 [PATCH] x86_64: fix sync before RDTSC on Intel cpus Commit c818a18146997d1356a4840b0c01f1168c16c8a4 didn't do the expected thing. This fix will remove the additional sync(cpuid) before RDTSC on Intel platforms.. Signed-off-by: Suresh Siddha Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 97a4d00388db4f0bfa37425b31d7d9751ea649db Author: Andi Kleen Date: Tue Apr 11 12:54:39 2006 +0200 [PATCH] x86_64: Remove check for canonical RIP As pointed out by Linus it is useless now because entry.S should handle it correctly in all cases. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 0fcd270901f731342df64816f277ae7adbd67130 Author: Andi Kleen Date: Tue Apr 11 12:54:36 2006 +0200 [PATCH] x86-64/i386: Don't process APICs/IO-APICs in ACPI when APIC is disabled. When nolapic was passed or the local APIC was disabled for another reason ACPI would still parse the IO-APICs until these were explicitely disabled with noapic. Usually this resulted in a non booting configuration unless "nolapic noapic" was used. I also disabled the local APIC parsing in this case, although that's only cosmetic (suppresses a few printks) This hopefully makes nolapic work in all cases. Cc: Len Brown Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 6dde432553551ae036aae12c2b940677d36c9a5b Author: Matthias Urlichs Date: Tue Apr 11 05:01:44 2006 +0200 [PATCH] Overrun in option-card USB driver Since the arrays are declared as in_urbs[N_IN_URB] and out_urbs[N_OUT_URB], both for loops go one over the end of the array. This fixes coverity id #555. Signed-off-by: Eric Sesterhenn Signed-Off-By: Matthias Urlichs Signed-Off-By: Linus Torvalds commit 397eeab321e87d8c1ef928b58f256513e6f481dc Author: Antonino A. Daplas Date: Mon Apr 10 22:55:49 2006 -0700 [PATCH] fbdev: Use logo with depth of 4 or less for static pseudocolor Since the visual STATIC_PSEUDOCOLOR has a read-only colormap, use logos with 16 colors only since these logos use the console palette. This has a higher likelihood that the logo will display correctly. Signed-of-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 89ec4c238e7a3d7e660291f3f1a8181381baad77 Author: Antonino A. Daplas Date: Mon Apr 10 22:55:48 2006 -0700 [PATCH] vesafb: Fix incorrect logo colors in x86_64 Bugzilla Bug 6299: A pixel size of 8 bits produces wrong logo colors in x86_64. The driver has 2 methods for setting the color map, using the protected mode interface provided by the video BIOS and directly writing to the VGA registers. The former is not supported in x86_64 and the latter is enabled only in i386. Fix by enabling the latter method in x86_64 only if supported by the BIOS. If both methods are unsupported, change the visual of vesafb to STATIC_PSEUDOCOLOR. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac50ab3e45436900b5d73edd0c6b0744af560535 Author: Andrew Morton Date: Mon Apr 10 22:55:47 2006 -0700 [PATCH] sparc32 vga support sparc32 lacks vga.h, so lots of fbdev drivers won't compile. There are no sparc32 systems with PCI slots, so it's a bit moot. The patch gives sparc32 a copy of the sparc64 vga.h. It fixes sparc32 allmodconfig without mucking up fbdev Kconfig and gives us wider compile coverage. Cc: "Antonino A. Daplas" Acked-by: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2e782efb0876214c77a48e8e67248125f1607c1 Author: Andrew Morton Date: Mon Apr 10 22:55:45 2006 -0700 [PATCH] atyfb is bust on sparc32 Heaps of build errors - disable it to keep sparc32 allmodconfig happy. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ec85c03d045d5ec24d6f15649a68646aefe88ba Author: Adrian Bunk Date: Mon Apr 10 22:55:45 2006 -0700 [PATCH] video/aty/atyfb_base.c: fix an off-by-one error Fix an obvious of-by-one error spotted by the Coverity checker. Signed-off-by: Adrian Bunk Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 358dd55aa3a77fbbae482b83d96733d9ad441d05 Author: NeilBrown Date: Mon Apr 10 22:55:42 2006 -0700 [PATCH] knfsd: nfsd4: grant delegations more frequently Keep unused openowners around for at least one lease period, to avoid the need for as many open confirmations and to allow handing out more delegations. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ef0f3390ebedac78bff1936bbb26606bca83e891 Author: NeilBrown Date: Mon Apr 10 22:55:41 2006 -0700 [PATCH] knfsd: nfsd4: limit number of delegations handed out. It's very easy for the server to DOS itself by just giving out too many delegations. For now we just solve the problem with a dumb hard limit. Eventually we'll want a smarter policy. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4e2fd495b520b51e4ba83340f13520b7f07e3743 Author: NeilBrown Date: Mon Apr 10 22:55:39 2006 -0700 [PATCH] knfsd: nfsd4: add missing rpciod_down() We should be shutting down rpciod for the callback channel when we shut down the server. Also note that we do rpciod_up() and create the callback client *before* setting cb_set--the cb_set only determines whether the initial null was succesful. So cb_set is not a reliable determiner of whether we need to clean up, only cb_client is. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 541e0e09814594e907e18fb8d9fc9b746aa4b18a Author: NeilBrown Date: Mon Apr 10 22:55:38 2006 -0700 [PATCH] knfsd: nfsd4: nfsd4_probe_callback cleanup Some obvious cleanup. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e8d5c29482dc56de5971ddc99c6e7f69e4d16f6 Author: NeilBrown Date: Mon Apr 10 22:55:37 2006 -0700 [PATCH] knfsd: nfsd4: fix laundromat shutdown race We need to make sure the laundromat work doesn't reschedule itself just when we try to cancel it. Also, we shouldn't be waiting for it to finish running while holding the state lock, as that's a potential deadlock. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6f54e2d0d3a904e55c9c50b78542072f6c42080e Author: J. Bruce Fields Date: Mon Apr 10 22:55:36 2006 -0700 [PATCH] knfsd: svcrpc: WARN() instead of returning an error from svc_take_page Every caller of svc_take_page ignores its return value and assumes it succeeded. So just WARN() instead of returning an ignored error. This would have saved some time debugging a recent nfsd4 problem. If there are still failure cases here, then the result is probably that we overwrite an earlier part of the reply while xdr-encoding. While the corrupted reply is a nasty bug, it would be worse to panic here and create the possibility of a remote DOS; hence WARN() instead of BUG(). Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Cc: Ingo Oeser Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dfee55f06213a23b250ea63ba41caa461cdd5e72 Author: NeilBrown Date: Mon Apr 10 22:55:34 2006 -0700 [PATCH] knfsd: svcrpc: gss: don't call svc_take_page unnecessarily We're using svc_take_page here to get another page for the tail in case one wasn't already allocated. But there isn't always guaranteed to be another page available. Also fix a typo that made us check the tail buffer for space when we meant to be checking the head buffer. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bb6e8a9f4005237401a45f1ea43db060ea5f9725 Author: NeilBrown Date: Mon Apr 10 22:55:33 2006 -0700 [PATCH] knfsd: nfsd4: fix corruption on readdir encoding with 64k pages Fix corruption on readdir encoding with 64k pages. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ed6decccf544970664757464cfb67e081775e6a Author: NeilBrown Date: Mon Apr 10 22:55:32 2006 -0700 [PATCH] knfsd: nfsd4: fix corruption of returned data when using 64k pages In v4 we grab an extra page just for the padding of returned data. The formula that the rpc server uses to allocate pages for the response doesn't take into account this extra page. Instead of adjusting those formulae, we adopt the same solution as v2 and v3, and put the "tail" data in the same page as the "head" data. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f0e2993e9e73e8f38b05a89c98b9db94fec2199d Author: NeilBrown Date: Mon Apr 10 22:55:31 2006 -0700 [PATCH] knfsd: nfsd4: remove nfsd_setuser from putrootfh Since nfsd_setuser() is already called from any operation that uses the current filehandle (because it's called from fh_verify), there's no reason to call it from putrootfh. Signed-off-by: Andy Adamson Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 54cceebb679a8d10fa382422aa2035cdc65fe7ce Author: NeilBrown Date: Mon Apr 10 22:55:30 2006 -0700 [PATCH] knfsd: nfsd: nfsd_setuser doesn't really need to modify rqstp->rq_cred. In addition to setting the processes filesystem id's, nfsd_setuser also modifies the value of the rq_cred which stores the id's that originally came from the rpc call, for example to reflect root squashing. There's no real reason to do that--the only case where rqstp->rq_cred is actually used later on is in the NFSv4 SETCLIENTID/SETCLIENTID_CONFIRM operations, and there the results are the opposite of what we want--those two operations don't deal with the filesystem at all, they only record the credentials used with the rpc call for later reference (so that we may require the same credentials be used on later operations), and the credentials shouldn't vary just because there was or wasn't a previous operation in the compound that referred to some export This fixes a bug which caused mounts from Solaris clients to fail. Signed-off-by: Andy Adamson Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd15654963cf7e4dd938a403de3ec5bcd09f8350 Author: NeilBrown Date: Mon Apr 10 22:55:27 2006 -0700 [PATCH] knfsd: nfsd: oops exporting nonexistent directory Export a directory that does not exist: exportfs -orw,fsid=0,insecure,no_subtree_check client:/home/NFS4 Try to mount from client with nfs4. Mount hangs (I'm not sure why - that's another issue). While client is hung, back on server mkdir /home/NFS4 The server panics in dput. I traced the problem back to svc_export_parse() calling path_release() even though path_lookup() failed (it happens to fill in the nameidata structure with a negative dentry - so the test after out: succeeds). After patching, an recreating the problem, the client mount still takes some time before finally exiting with a message "couldn't read superblock". Here is a simple patch to resolve this issue: Signed-off-by: Frank Filz Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b5872b0dcc0501035d5ae53c60f8cbbb3798da8a Author: NeilBrown Date: Mon Apr 10 22:55:26 2006 -0700 [PATCH] knfsd: nfsd4: fix acl xattr length return We should be using the length from the second vfs_getxattr, in case it changed. (Note: there's still a small race here; we could end up returning -ENOMEM if the length increased between the first and second call. I don't know whether it's worth spending a lot of effort to fix that.) This makes XFS ACLs usable on NFS exports, which they currently aren't, since XFS appears to be returning a too-large value for vfs_getxattr() when it's passed a NULL buffer. So there's probably an XFS bug here too, though since getxattr with a NULL buffer is usually used to decide how much memory to allocate, it may be a fairly harmless bug in most cases. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b905b7b0a054d2ab3e0c9304def998546c93f6b5 Author: NeilBrown Date: Mon Apr 10 22:55:25 2006 -0700 [PATCH] knfsd: nfsd4: better nfs4acl errors We're returning -1 in a few places in the NFSv4<->POSIX acl translation code where we could return a reasonable error. Also allows some minor simplification elsewhere. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 249920527f9e6e5c305538bbf1ea882ee7dc1c06 Author: NeilBrown Date: Mon Apr 10 22:55:24 2006 -0700 [PATCH] knfsd: nfsd4: Wrong error handling in nfs4acl this fixes coverity id #3. Coverity detected dead code, since the == -1 comparison only returns 0 or 1 to error. Therefore the if ( error < 0 ) statement was always false. Seems that this was an if( error = nfs4... ) statement some time ago, which got broken during cleanup. Signed-off-by: Eric Sesterhenn Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e465a77f943f51df1a169426df879340bd0db3f3 Author: Adrian Bunk Date: Mon Apr 10 22:55:23 2006 -0700 [PATCH] fs/nfsd/nfs4state.c: make a struct static Signed-off-by: Adrian Bunk Cc: Marc Eshel Cc: Andy Adamson Cc: J. Bruce Fields Cc: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d5b9026a670fdb404e6e2e2e0a1b447e9ea9c1f6 Author: NeilBrown Date: Mon Apr 10 22:55:22 2006 -0700 [PATCH] knfsd: locks: flag NFSv4-owned locks Use the fl_lmops field to identify which locks are ours, instead of trying to look them up in our private hash. This is safer and more efficient. Earlier versions of this patch used a lock flag instead, but Trond pointed out that adding a new flag for each lock manager wasn't going to scale well, and suggested this approach instead; a separate patch converts lockd to using fl_lmops in the same way. In the NFSv4 case this looks like a bit of a hack, since the NFSv4 server isn't currently actually defining a lock_manager_operations struct, so we end up defining one *just* to serve as a cookie to identify our locks. But it works, and we actually do expect to start using the lock_manager_operations at some point anyway. Signed-off-by: Marc Eshel Signed-off-by: Andy Adamson Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7775f4c85dcbd1175f21b2fbb7221c79ec70b722 Author: NeilBrown Date: Mon Apr 10 22:55:20 2006 -0700 [PATCH] knfsd: Correct reserved reply space for read requests. NFSd makes sure there is enough space to hold the maximum possible reply before accepting a request. The units for this maximum is (4byte) words. However in three places, particularly for read request, the number given is a number of bytes. This means too much space is reserved which is slightly wasteful. This is the sort of patch that could uncover a deeper bug, and it is not critical, so it would be best for it to spend a while in -mm before going in to mainline. (akpm: target 2.6.17-rc2, 2.6.16.3 (approx)) Discovered-by: "Eivind Sarto" Signed-off-by: Neil Brown Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit df2487cff5e5be2877594f269b014652536d68bb Author: Adrian Bunk Date: Mon Apr 10 22:55:19 2006 -0700 [PATCH] ISDN_DRV_GIGASET should select, not depend on CRC_CCITT CRC_CCITT is an internal helper function that should be select'ed. Signed-off-by: Adrian Bunk Acked-by: Tilman Schmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f4675c7016484220a62069d87958a2873d92f159 Author: Adrian Bunk Date: Mon Apr 10 22:55:19 2006 -0700 [PATCH] isdn/gigaset/common.c: fix a memory leak Fix a memory leak spotted by the Coverity checker if (!try_module_get(owner)). Signed-off-by: Adrian Bunk Acked-by: Tilman Schmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8ca445df3a3291c2bdd95b91142c079700a688be Author: Adrian Bunk Date: Mon Apr 10 22:55:18 2006 -0700 [PATCH] drivers/isdn/gigaset/common.c: small cleanups - make the needlessly global gigaset_get_cs_by_tty() static - remove the unused EXPORT_SYMBOL_GPL(gigaset_debugdrivers) Signed-off-by: Adrian Bunk Acked-by: Tilman Schmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 69049cc87dccb1e6fb54aa25c63033efac805dbd Author: Tilman Schmidt Date: Mon Apr 10 22:55:16 2006 -0700 [PATCH] isdn4linux: Siemens Gigaset drivers: make some variables non-atomic With Hansjoerg Lipp Replace some atomic_t variables in the Gigaset drivers by non-atomic ones, using spinlocks instead to assure atomicity, as proposed in discussions on the linux-kernel mailing list. Signed-off-by: Hansjoerg Lipp Signed-off-by: Tilman Schmidt Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 27d1ac2ef7d0b9250ca9fd2ef506e12866ce8fdf Author: Tilman Schmidt Date: Mon Apr 10 22:55:15 2006 -0700 [PATCH] isdn4linux: Siemens Gigaset drivers: add README With Hansjoerg Lipp Add a README file for the Siemens Gigaset drivers to the Documentation/isdn directory. Signed-off-by: Hansjoerg Lipp Signed-off-by: Tilman Schmidt Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 70440cf24ce6841fc5a01c38e2a732cf0bc2792a Author: Tilman Schmidt Date: Mon Apr 10 22:55:14 2006 -0700 [PATCH] isdn4linux: Siemens Gigaset drivers: remove forward references With Hansjoerg Lipp Remove four unnecessary forward function declarations and an obsolete E-mail address from the Siemens Gigaset drivers. Signed-off-by: Hansjoerg Lipp Signed-off-by: Tilman Schmidt Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 443e1f45ac1fee498e3ff053c61fcc54024ee6ee Author: Tilman Schmidt Date: Mon Apr 10 22:55:13 2006 -0700 [PATCH] isdn4linux: Siemens Gigaset drivers: remove private version of __skb_put() With Hansjoerg Lipp Remove the private version of __skb_put() from the Siemens Gigaset drivers. Signed-off-by: Hansjoerg Lipp Signed-off-by: Tilman Schmidt Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit abfd1dc7c18e4be89715071a524324c7b2515565 Author: Tilman Schmidt Date: Mon Apr 10 22:55:12 2006 -0700 [PATCH] isdn4linux: Siemens Gigaset drivers: mutex conversion With Hansjoerg Lipp Convert the semaphores used by the Gigaset drivers to mutexes. Signed-off-by: Hansjoerg Lipp Signed-off-by: Tilman Schmidt Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 01371500b245ae63f542d74140a3d8ccb74d0318 Author: Tilman Schmidt Date: Mon Apr 10 22:55:11 2006 -0700 [PATCH] isdn4linux: Siemens Gigaset drivers: eliminate from_user argument With Hansjoerg Lipp Eliminate the from_user argument from a debugging function, thus easing the job of sparse. Signed-off-by: Hansjoerg Lipp Signed-off-by: Tilman Schmidt Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 714e8236e5ea9d39169761c546274ceb7eeb765f Author: Tilman Schmidt Date: Mon Apr 10 22:55:09 2006 -0700 [PATCH] isdn4linux: Siemens Gigaset drivers: uninline With Hansjoerg Lipp Uninline a function which was slightly too big to warrant inlining. Signed-off-by: Hansjoerg Lipp Signed-off-by: Tilman Schmidt Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d48c77841a71ba552ef4e6a862642073652f4473 Author: Tilman Schmidt Date: Mon Apr 10 22:55:08 2006 -0700 [PATCH] isdn4linux: Siemens Gigaset drivers: remove IFNULL macros With Hansjoerg Lipp Remove the IFNULL debugging macros from the Gigaset drivers. Signed-off-by: Hansjoerg Lipp Signed-off-by: Tilman Schmidt Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b1d47464c947f08125dc4ac4a2321ced9e2fed29 Author: Tilman Schmidt Date: Mon Apr 10 22:55:07 2006 -0700 [PATCH] isdn4linux: Siemens Gigaset drivers: sysfs usage With Hansjoerg Lipp Correct the way the Gigaset drivers create their sysfs entries. Signed-off-by: Hansjoerg Lipp Signed-off-by: Tilman Schmidt Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 784d5858aac58c06608def862d73ae9a32f5ee23 Author: Tilman Schmidt Date: Mon Apr 10 22:55:04 2006 -0700 [PATCH] isdn4linux: Siemens Gigaset drivers: logging usage With Hansjoerg Lipp Improve error reporting of the Gigaset drivers, by using the dev_err/dev_warn/dev_info macros from device.h instead of err/warn/info from usb.h whereever possible. Also rename the private dbg macro to gig_dbg in order to avoid confusion with the macro of the same name in usb.h. Signed-off-by: Hansjoerg Lipp Signed-off-by: Tilman Schmidt Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ec81b5e6294088dc4738d0e8c2316c0dc081215c Author: Tilman Schmidt Date: Mon Apr 10 22:55:03 2006 -0700 [PATCH] isdn4linux: Siemens Gigaset drivers: timer usage With Hansjoerg Lipp Correct timer usage in the Gigaset drivers to take advantage of the existing setup_timer() function, and use milliseconds as unit. Signed-off-by: Hansjoerg Lipp Signed-off-by: Tilman Schmidt Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd0d6ef944f992c584152dbfca99188107bf2f8d Author: Tilman Schmidt Date: Mon Apr 10 22:55:02 2006 -0700 [PATCH] isdn4linux: Siemens Gigaset drivers: Kconfig correction With Hansjoerg Lipp Remove the restriction to build the Gigaset drivers as modules only. Signed-off-by: Hansjoerg Lipp Signed-off-by: Tilman Schmidt Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 917f5085ddb3498033551e711fb22f48ddeb8378 Author: Tilman Schmidt Date: Mon Apr 10 22:55:00 2006 -0700 [PATCH] isdn4linux: Siemens Gigaset drivers: code cleanup With Hansjoerg Lipp Source code formatting cleanups for the Siemens Gigaset drivers, such as line length, comments, removal of unused declarations, and typo corrections. It does not introduce any functional changes. Signed-off-by: Hansjoerg Lipp Signed-off-by: Tilman Schmidt Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 08a53cdce62d37d918530bbbf726cc01b21dc3d1 Author: Miklos Szeredi Date: Mon Apr 10 22:54:59 2006 -0700 [PATCH] fuse: account background requests The previous patch removed limiting the number of outstanding requests. This patch adds a much simpler limiting, that is also compatible with file locking operations. A task may have at most one synchronous request allocated. So these requests need not be otherwise limited. However the number of background requests (release, forget, asynchronous reads, interrupted requests) can grow indefinitely. This can be used by a malicous user to cause FUSE to allocate arbitrary amounts of unswappable kernel memory, denying service. For this reason add a limit for the number of background requests, and block allocations of new requests until the number goes bellow the limit. Also use this mechanism to block all requests until the INIT reply is received. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ce1d5a491f0ee50560416a73faa5e4ddbab074bd Author: Miklos Szeredi Date: Mon Apr 10 22:54:58 2006 -0700 [PATCH] fuse: clean up request accounting FUSE allocated most requests from a fixed size pool filled at mount time. However in some cases (release/forget) non-pool requests were used. File locking operations aren't well served by the request pool, since they may block indefinetly thus exhausting the pool. This patch removes the request pool and always allocates requests on demand. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a87046d822f2d982d25b24c4a644d34f22d4888a Author: Miklos Szeredi Date: Mon Apr 10 22:54:56 2006 -0700 [PATCH] fuse: consolidate device errors Return consistent error values for the case when the opened device file has no mount associated yet. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d713311464bcca73c990d1a1b5c9467eae87f5b4 Author: Miklos Szeredi Date: Mon Apr 10 22:54:55 2006 -0700 [PATCH] fuse: use a per-mount spinlock Remove the global spinlock in favor of a per-mount one. This patch is basically find & replace. The difficult part has already been done by the previous patch. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0720b315976447cba3f0c3e211223b8cb82b0f93 Author: Miklos Szeredi Date: Mon Apr 10 22:54:55 2006 -0700 [PATCH] fuse: simplify locking This is in preparation for removing the global spinlock in favor of a per-mount one. The only critical part is the interaction between fuse_dev_release() and fuse_fill_super(): fuse_dev_release() must see the assignment to file->private_data, otherwise it will leak the reference to fuse_conn. This is ensured by the fput() operation, which will synchronize the assignment with other CPU's that may do a final fput() soon after this. Also redundant locking is removed from fuse_fill_super(), where exclusion is already ensured by the BKL held for this function by the VFS. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5ac1d1e70a8c19a65a959d73650203df7a2e168 Author: Jeff Dike Date: Mon Apr 10 22:54:53 2006 -0700 [PATCH] fuse: add O_NONBLOCK support to FUSE device I don't like duplicating the connected and list_empty tests in fuse_dev_readv, but this seemed cleaner than adding the f_flags test to request_wait. Signed-off-by: Jeff Dike Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 385a17bfc3cb035333c8a91eddc78a6e04c4625e Author: Jeff Dike Date: Mon Apr 10 22:54:52 2006 -0700 [PATCH] fuse: add O_ASYNC support to FUSE device This adds asynchronous notification to FUSE - a FUSE server can request O_ASYNC on a /dev/fuse file descriptor and receive SIGIO when there is input available. One subtlety - fuse_dev_fasync, which is called when O_ASYNC is requested, does no locking, unlink the other methods. I think it's unnecessary, as the fuse_conn.fasync list is manipulated only by fasync_helper and kill_fasync, which provide their own locking. It would also be wrong to use the fuse_lock, as it's a spin lock and fasync_helper can sleep. My one concern with this is the fuse_conn going away underneath fuse_dev_fasync - sys_fcntl takes a reference on the file struct, so this seems not to be a problem. Signed-off-by: Jeff Dike Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7025d9ad10a38dadef8b286e0092731c2d3cdc53 Author: Miklos Szeredi Date: Mon Apr 10 22:54:50 2006 -0700 [PATCH] fuse: fix fuse_dev_poll() return value fuse_dev_poll() returned an error value instead of a poll mask. Luckily (or unluckily) -ENODEV does contain the POLLERR bit. There's also a race if filesystem is unmounted between fuse_get_conn() and spin_lock(), in which case this event will be missed by poll(). Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d3406ffa4af8af1d7c14cff06e003eb0a557d4ad Author: Miklos Szeredi Date: Mon Apr 10 22:54:49 2006 -0700 [PATCH] fuse: fix oops in fuse_send_readpages() During heavy parallel filesystem activity it was possible to Oops the kernel. The reason is that read_cache_pages() could skip pages which have already been inserted into the cache by another task. Occasionally this may result in zero pages actually being sent, while fuse_send_readpages() relies on at least one page being in the request. So check this corner case and just free the request instead of trying to send it. Reported and tested by Konstantin Isakov. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e16f6afb267c0256416d481862ce8019c33417d Author: Alessandro Zummo Date: Mon Apr 10 22:54:48 2006 -0700 [PATCH] RTC subsystem: VR41XX cleanup Clean up kconfig entry for the rtc-vr41xx. Signed-off-by: Alessandro Zummo Cc: Yoichi Yuasa Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8417eb7a168eee8b9baa744ee5c591868e85529a Author: Yoichi Yuasa Date: Mon Apr 10 22:54:47 2006 -0700 [PATCH] RTC subsystem: VR41XX driver This patch updates VR4100 series RTC driver. * This driver supports new RTC subsystem. * Simple set time/read time test worked fine. Signed-off-by: Yoichi Yuasa Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2260a25c93cb356e834f1ab08b419f9897c977b7 Author: Alessandro Zummo Date: Mon Apr 10 22:54:46 2006 -0700 [PATCH] RTC subsystem: SA1100 cleanup - convert printks to dev_xxx - remove messages in excess Signed-off-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d1d65b7712016ca5ff2e44470eb13e772999de94 Author: Alessandro Zummo Date: Mon Apr 10 22:54:45 2006 -0700 [PATCH] RTC subsystem: compact error messages Move registration error message from drivers to core. Signed-off-by: Alessandro Zummo Cc: Lennert Buytenhek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8289607249ad25ecfc9a3742873fcd8f319d5b09 Author: Alessandro Zummo Date: Mon Apr 10 22:54:44 2006 -0700 [PATCH] RTC subsystem: RS5C372 sysfs fix Fix sysfs show() return code Signed-off-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit adfb4341259f2f89baac2316a8a3660b63c1103b Author: Alessandro Zummo Date: Mon Apr 10 22:54:43 2006 -0700 [PATCH] RTC subsystem: fix proc output Move the "24hr: yes" proc output from drivers to rtc proc code. This is required because the time value in the proc output is always in 24hr mode regardless of the driver. Signed-off-by: Alessandro Zummo Cc: Lennert Buytenhek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f90a65060e6a71a818abc3584ac64f986b838fba Author: Alessandro Zummo Date: Mon Apr 10 22:54:42 2006 -0700 [PATCH] RTC subsystem: whitespaces and error messages cleanup - fix whitespace - remove some debugging in excess Signed-off-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 015aefbb87f9e6bd5d3c82ece97f7a7ba8f9b66c Author: Alessandro Zummo Date: Mon Apr 10 22:54:42 2006 -0700 [PATCH] RTC subsystem: X1205 sysfs cleanup Fix sysfs show() return code Signed-off-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3903586ab0eeaf363bd33633f0ae4846f03e2db5 Author: Alessandro Zummo Date: Mon Apr 10 22:54:41 2006 -0700 [PATCH] RTC subsystem: DS1672 cleanup - removed a duplicate error message - bumped driver version - removed some debugging messages in excess - refined the formatting - adjusted copyright notice Signed-off-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8a95b252d194ea57c3d2c16ec2a25b1b70e36cad Author: Kumar Gala Date: Mon Apr 10 22:54:39 2006 -0700 [PATCH] RTC subsystem: DS1672 oscillator handling * Always enable the oscillator when we set the time * If the oscillator is disable when we probe the RTC report back a warning to the user * Added sysfs attribute to represent the state of the oscillator Signed-off-by: Kumar Gala Signed-off-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 389ed39b9711bbe5210d5e118e1f1af36ca88b7c Author: Ananiev, Leonid I Date: Mon Apr 10 22:54:38 2006 -0700 [PATCH] ext3: Fix missed mutex unlock Missed unlock_super()call is added in error condition code path. Signed-off-by: Leonid Ananiev Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d93c2efc93f61c95808e303982f12fe6f5987270 Author: Eric Sesterhenn Date: Mon Apr 10 22:54:37 2006 -0700 [PATCH] Overrun in cdrom/aztcd.c This fixes coverity bug id #473. After the for loop i==16 if we didn't find a cdrom. So we should check for i==16 first before checking the array element. Signed-off-by: Eric Sesterhenn Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e60b6e2f747e94358fed9a23afd6abd738de4bf7 Author: Eric Sesterhenn Date: Mon Apr 10 22:54:36 2006 -0700 [PATCH] Wrong out of range check in drivers/char/applicom.c This fixes coverity bug id #469. The out of range check didnt work as intended, as seen by the printk(), which states that boardno has to be 1 <= boardno <= MAX_BOARD. Signed-off-by: Eric Sesterhenn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fd5403c79bc21819f6e0c40ba098cea8b6a418bd Author: Coywolf Qi Hunt Date: Mon Apr 10 22:54:35 2006 -0700 [PATCH] page-writeback comment fixes Signed-off-by: Coywolf Qi Hunt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7551d9a20b3cfbac9f8a28b7d909c4b15a94924f Author: Andrew Morton Date: Mon Apr 10 22:54:34 2006 -0700 [PATCH] 3ware: kmap_atomic() fix We must disable local IRQs while holding KM_IRQ0 or KM_IRQ1. Otherwise, an IRQ handler could use those kmap slots while this code is using them, resulting in memory corruption. Thanks to Nick Orlov for reporting. Cc: Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b3f28a9a26d9e8a02119cc8d1604fdb891c23697 Author: Andrew Morton Date: Mon Apr 10 22:54:32 2006 -0700 [PATCH] hdaps: use ENODEV Use ENODEV when the hdaps hardware isn't there, not ENXIO. Cc: Jean Delvare Cc: Robert Love Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4791c03d2c3b9b6822784f6d7c8e5bbadb1f35ae Author: Corey Minyard Date: Mon Apr 10 22:54:31 2006 -0700 [PATCH] ipmi: fix event queue limit The event handler mechanism in the IPMI driver had a limit on the number of received events, but the counts were not being updated. Update the counts to impose a limit. This is not a critical fix, as this function (the sending of the events) has to be turned on by the user, anyway. This avoids problems if they forget to turn it back off. Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 091e881d0e55496d8887b61446ae1c598b0995b6 Author: Arnd Bergmann Date: Mon Apr 10 22:54:31 2006 -0700 [PATCH] inotify: check for NULL inode in inotify_d_instantiate The spufs file system creates files in a directory before instantiating the directory itself, which causes a NULL pointer access in inotify_d_instantiate since c32ccd87bfd1414b0aabfcd8dbc7539ad23bcbaa. I'd like to keep this behavior since it means that the user will not have access to files in the directory before I know that I succeed in creating everything in it. This patch adds a simple check for the inode to keep that working. Signed-off-by: Arnd Bergmann Acked-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 68250ba5df4c9d00d3064a0ba9a894035436916b Author: Vivek Goyal Date: Mon Apr 10 22:54:30 2006 -0700 [PATCH] kdump: enable CONFIG_PROC_VMCORE by default Everybody seems to be using /proc/vmcore as a method to access the kernel crash dump. Hence probably it makes sense to enable CONFIG_PROC_VMCORE by default if CONFIG_CRASH_DUMP is selected. This makes kdump configuration further easier for a user. Signed-off-by: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ac90c9f78953b1a2ac937cc5a2f90c3521a710e Author: Paolo 'Blaisorblade' Giarrusso Date: Mon Apr 10 22:54:28 2006 -0700 [PATCH] module support: record in vermagic ability to unload a module An UML user reported (against 2.6.13.3/UML) he got kernel Oopses when trying to rmmod (on a kernel with module unloading enabled) a module compiled with module unloading disabled. As crashing is a very correct thing to do in that case, a solution is altering the vermagic string to include this too. Possibly, however, the code should not crash in this case, even if the module didn't support unloading - it should simply abort the module removal. In this case, fixing that bug would be a better solution. I've not investigated though. (akpm: a bit marginal - root screwed up and shot himself in the foot). Cc: Hayim Shaul Cc: Rusty Russell Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ad04b0d0ebed1844522dd83cca0ef838d1ac673 Author: Martin Michlmayr Date: Mon Apr 10 22:54:27 2006 -0700 [PATCH] parport: remove duplicate entry for NETMOS_9835 Remove a duplicated entry from parport_serial_pci_tbl. Signed-off-by: Martin Michlmayr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d45aebbfa4d0682ec9b15c3687835ac1f5f01f50 Author: Randy Dunlap Date: Mon Apr 10 22:54:26 2006 -0700 [PATCH] kexec: update MAINTAINERS Eric is the kexec maintainer. Signed-off-by: Randy Dunlap Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a26feb9622f1b1bc5e4f5f60f65557b73c38cbf Author: David Howells Date: Mon Apr 10 22:54:26 2006 -0700 [PATCH] Keys: Improve usage of memory barriers and remove IRQ disablement Remove an unnecessary memory barrier (implicit in rcu_dereference()) from install_session_keyring(). install_session_keyring() is also rearranged a little to make it slightly more efficient. As install_*_keyring() may schedule (in synchronize_rcu() or keyring_alloc()), they may not be entered with interrupts disabled - and so there's no point saving the interrupt disablement state over the critical section. exec_keys() will also be invoked with interrupts enabled, and so that doesn't need to save the interrupt state either. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 25a80759c5c237f0ecf57eb11fdd4efb21079c88 Author: Geert Uytterhoeven Date: Mon Apr 10 22:54:25 2006 -0700 [PATCH] Update contact info for Geert Uytterhoeven Update contact info for Geert Uytterhoeven Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c14038c39ddd9c14225907a05a6ac4d91d645ef1 Author: David Howells Date: Mon Apr 10 22:54:24 2006 -0700 [PATCH] Improve data-dependency memory barrier example in documentation In the memory barrier document, improve the example of the data dependency barrier situation by: (1) showing the initial values of the variables involved; and (2) repeating the instruction sequence description, this time with the data dependency barrier actually shown to make it clear what the revised sequence actually is. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dbc8700e27a94621de9d22c506c67913e0121501 Author: David Howells Date: Mon Apr 10 22:54:23 2006 -0700 [PATCH] Fix memory barrier docs wrt atomic ops Fix the memory barrier documentation to attempt to describe atomic ops correctly. atomic_t ops that return a value _do_ imply smp_mb() either side, and so don't actually require smp_mb__*_atomic_*() special barriers. Also explains why special barriers exist in addition to normal barriers. Further fix the memory barrier documents to portray bitwise operation memory barrier effects correctly following Nick Piggin's comments. It makes the point that any atomic op that both modifies some state in memory and returns information on that state implies memory barriers on both sides. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 235963b2edc080b577000031b9ad75804dd83c88 Author: Randy Dunlap Date: Mon Apr 10 22:54:22 2006 -0700 [PATCH] Doc: fix mtrr userspace programs to build cleanly Fix mtrr-add.c and mtrr-show.c in Doc/mtrr.txt to build cleanly. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c37bea1a0506f45111c64bac4325173e066b22d Author: Randy Dunlap Date: Mon Apr 10 22:54:21 2006 -0700 [PATCH] docs: laptop-mode.txt source file build Fix C source file in Doc/laptop-mode.txt to compile. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 56b146d36db933844011d5026c6f55593037c7b8 Author: Tobias Klauser Date: Mon Apr 10 22:54:21 2006 -0700 [PATCH] Last DMA_xBIT_MASK cleanups These are the last conversions of pci_set_dma_mask(), pci_set_consistent_dma_mask() and pci_dma_supported() to use DMA_xBIT_MASK constants from linux/dma-mapping.h Signed-off-by: Tobias Klauser Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 31cc48bfeef7a021d6e29f3454a4505edcfd6daa Author: Mark Bellon Date: Mon Apr 10 22:54:20 2006 -0700 [PATCH] MPBL0010 driver sysfs permissions wide open The MPBL0010 Telco clock driver (drivers/char/tlclk.c) uses 0222 (anyone can write) permissions on its writable sysfs entries. Alter the permissions to 0220 (owner and group can write). The use case for this driver is to configure the fail over behavior of the clock hardware. That should be done by the more privileged users. Signed-off-by: Mark Bellon Acked-by: "Gross, Mark" Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 14a6283eb5c1c70e6deee985c85dcce884150737 Author: Paul Fulghum Date: Mon Apr 10 22:54:19 2006 -0700 [PATCH] tty release_dev(): remove dead code Remove dead code from tty_io.c release_dev() Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9453a5adaf32aa0b31d1491819a083d403f645c1 Author: Paul Fulghum Date: Mon Apr 10 22:54:18 2006 -0700 [PATCH] ptmx: fix duplicate idr_remove Remove duplicate call to idr_remove() in ptmx_open. Error during open can result in call to release_dev() followed by call to idr_remove(). release_dev already calls idr_remove so the second call can cause a stack dump in idr_remove()->sub_remove() flagging an attempt to release an already released entry. I reproduces this on a machine with a misconfigured X server (attempting to restart multiple times rapidly) getting the same error as the 1st link below. This also seems to be related to: http://marc.theaimsgroup.com/?l=selinux&m=110536513426735&w=2 http://marc.theaimsgroup.com/?l=selinux&m=110596994916785&w=2 The stack dump can occur on close (as well as open) as shown in the 1st instance above, possible from something like: process A - open (index=0), open fail to out1, release_dev calls idr_remove (index 0), down(sem) sleeps process B - open (index=0), open OK (idr allocated) process A - wake and call idr_remove on index 0 ... process B - close, release_dev, stack dump on idr_remove (index=0) because entry already removed Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit acc8dadc0b3f007e6e60da77feb2efe2a19c5cda Author: Joern Engel Date: Mon Apr 10 22:54:17 2006 -0700 [PATCH] Remove blkmtd Remove the blkmtd driver. - An alternative exists (block2mtd) that hasn't had bug report for > 1 year. - Most embedded people tend to use ancient kernels with custom patches from mtd cvs and elsewhere, so the 1 year warning period neither helps nor hurts them too much. - It's in the way of klibc. The problems caused by pulling blkmtd support are fairly low, while the problems caused by delaying klibc can be fairly substantial. At best, this would be a severe burden on hpa's time. Signed-off-by: Joern Engel Acked-by: Thomas Gleixner Cc: "H. Peter Anvin" Cc: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f5e902817fee1589badca1284f49eecc0ef0c200 Author: Roland McGrath Date: Mon Apr 10 22:54:16 2006 -0700 [PATCH] process accounting: take original leader's start_time in non-leader exec The only record we have of the real-time age of a process, regardless of execs it's done, is start_time. When a non-leader thread exec, the original start_time of the process is lost. Things looking at the real-time age of the process are fooled, for example the process accounting record when the process finally dies. This change makes the oldest start_time stick around with the process after a non-leader exec. This way the association between PID and start_time is kept constant, which seems correct to me. Signed-off-by: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 491d4bed8051c655c7664b85446e13901463eb63 Author: Andrew Morton Date: Mon Apr 10 22:54:14 2006 -0700 [PATCH] sys_kexec_load() naming fixups __NR_sys_kexec_load should be __NR_kexec_load. Mainly affects users of the _syscallN() macros, and glibc is already checking for __NR_kexec_load. Cc: Ulrich Drepper Cc: "Eric W. Biederman" Cc: Mikael Starvik Cc: David Howells Cc: Yoshinori Sato Cc: Hirokazu Takata Cc: Paul Mundt Cc: Kazumoto Kojima Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ef37b196467bf2f9d41e5579dd388c08b800f7c Author: Joe Korty Date: Mon Apr 10 22:54:13 2006 -0700 [PATCH] add cpu_relax to hrtimer_cancel Add a cpu_relax() to the hand-coded spinwait in hrtimer_cancel(). Signed-off-by: Joe Korty Acked-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2395140ee2bffe38b1c8a59318f62882b797f5e6 Author: Davide Libenzi Date: Mon Apr 10 22:54:12 2006 -0700 [PATCH] uniform POLLRDHUP handling between epoll and poll/select As reported by Michael Kerrisk, POLLRDHUP handling was not consistent between epoll and poll/select, since in epoll it was unmaskeable. This patch brings uniformity in POLLRDHUP handling. Signed-off-by: Davide Libenzi Cc: Michael Kerrisk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f6c840d774d669baf4727c0499ab0674826429f Author: Robert Love Date: Mon Apr 10 22:54:11 2006 -0700 [PATCH] hdaps: support new Lenovo machines Add support for forthcoming Lenovo-branded machines to the HDAPS driver. Signed-off-by: Robert Love Cc: Jean Delvare Cc: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 80e8ff634169be3fc2ac48f258cc7638e898cd46 Author: Vivek Goyal Date: Mon Apr 10 22:54:10 2006 -0700 [PATCH] kdump proc vmcore size oveflow fix A couple of /proc/vmcore data structures overflow with 32bit systems having memory more than 4G. This patch fixes those. Signed-off-by: Ken'ichi Ohmichi Signed-off-by: Vivek Goyal Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c416ab71164dc8d3f800a942fb18c4e67f67897 Author: Jan-Benedict Glaw Date: Mon Apr 10 22:54:09 2006 -0700 [PATCH] Silence a const vs non-const warning lib/string.c: In function 'memcpy': lib/string.c:470: warning: initialization discards qualifiers from pointer = target type Signed-off-by: Jan-Benedict Glaw Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b04eb6aa08ecc3e24df2f78ebc486011ebd74feb Author: Mitchell Blank Jr Date: Mon Apr 10 22:54:08 2006 -0700 [PATCH] select: don't overflow if (SELECT_STACK_ALLOC % sizeof(long) != 0) If SELECT_STACK_ALLOC is not a multiple of sizeof(long) then stack_fds[] would be shorter than SELECT_STACK_ALLOC bytes and could overflow later in the function. Fixed by simply rearranging the test later to work on sizeof(stack_fds) Currently SELECT_STACK_ALLOC is 256 so this doesn't happen, but it's nasty to have things like this hidden in the code. What if later someone decides to change SELECT_STACK_ALLOC to 300? Signed-off-by: Mitchell Blank Jr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a9cdf410ca8f59b52bc7061a6751050010c7cc5b Author: Keith Owens Date: Mon Apr 10 22:54:07 2006 -0700 [PATCH] Reinstate const in next_thread() Before commit 47e65328a7b1cdfc4e3102e50d60faf94ebba7d3, next_thread() took a const task_t. Reinstate the const qualifier, getting the next thread never changes the current thread. Signed-off-by: Keith Owens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 49b6e2ad00435209503863932d03470f825e0a1a Author: Dave Jones Date: Mon Apr 10 22:54:06 2006 -0700 [PATCH] Remove extraneous \n in doubletalk init printk. Doubletalk printk's an extraneous \n Signed-off-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 00fbc6dfe7c4487f812829bff79c3121c8fd3bca Author: Eric Van Hensbergen Date: Mon Apr 10 22:54:06 2006 -0700 [PATCH] 9p: handle sget() failure Handle a failing sget() in v9fs_get_sb(). Signed-off-by: Christoph Hellwig Signed-off-by: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e1a2509023785bd3199ac068ab80155aeba01265 Author: Andrew Morton Date: Mon Apr 10 22:54:05 2006 -0700 [PATCH] make tty_insert_flip_string_flags() a non gpl export We changed the wrong symbol. It's tty_insert_flip_string_flags() which is called from the previously-non-GPL'ed now-inlined tty_insert_flip_char(). Fix that up, and uninline tty_schedule_flip() while we're there. Cc: Tobias Powalowski Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d824e66a9a427faf69c58f98dd7e1c3d1bb51c61 Author: Christoph Hellwig Date: Mon Apr 10 22:54:04 2006 -0700 [PATCH] build kernel/irq/migration.c only if CONFIG_GENERIC_PENDING_IRQ is set Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f6422f17d3a480f21917a3895e2a46b968f56a08 Author: Herbert Poetzl Date: Mon Apr 10 22:54:03 2006 -0700 [PATCH] vfs: propagate mnt_flags into do_loopback/vfsmount The mnt_flags are propagated into do_loopback(), so that they can be stored with the vfsmount Signed-off-by: Herbert Poetzl Acked-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fb5035dbbea8826cdbeb5c43d7605255eb6f0baa Author: Ben Dooks Date: Mon Apr 10 22:54:02 2006 -0700 [PATCH] leds: re-layout include/linux/leds.h Lay out the structure definitions in include/linux/leds.h to be aligned as much as possible. Also minor updates to the comments to make them more concise. Signed-off-by: Ben Dooks Acked-by: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 24f51e81745861c70da2255ce30c7078aed2d20e Author: Ben Dooks Date: Mon Apr 10 22:54:01 2006 -0700 [PATCH] leds: reorganise Kconfig Reorganise the drivers/leds Kconfig file to have the LED trigger enable with the triggers themselves. Also add comments to divide up the sections into the drivers and triggers Signed-off-by: Ben Dooks Acked-by: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit baa351eaf3a309f5ff50a77c63d234d93bce3f62 Author: Ben Dooks Date: Mon Apr 10 22:54:01 2006 -0700 [PATCH] leds: fix IDE disk trigger name The IDE Disk LED trigger has the same name as the timer trigger. Signed-off-by: Ben Dooks Acked-by: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 54bdc470100b9d8ffd349a3ebe23013c25affddf Author: Ben Dooks Date: Mon Apr 10 22:54:00 2006 -0700 [PATCH] S3C24XX GPIO LED support GPIO LED support for Samsung S3C24XX SoC series processors. Signed-off-by: Ben Dooks Acked-by: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aa7271076ae6547d7f370ad7e91ef86fdb318f17 Author: Adrian Bunk Date: Mon Apr 10 22:53:59 2006 -0700 [PATCH] the scheduled unexport of panic_timeout Implement the scheduled unexport of panic_timeout. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba6edfcd1708da2e665f14eee76e87f39448ec40 Author: Andrew Morton Date: Mon Apr 10 22:53:58 2006 -0700 [PATCH] timer initialisation fix We need the boot CPU's tvec_bases[] entry to be initialised super-early in boot, for early_serial_setup(). That runs within setup_arch(), before even per-cpu areas are initialised. The patch changes tvec_bases to use compile-time initialisation, and adds a separate array `tvec_base_done' to keep track of which CPU has had its tvec_bases[] entry initialised (because we can no longer use the zeroness of that tvec_bases[] entry to determine whether it has been initialised). Thanks to Eugene Surovegin for diagnosing this. Cc: Eugene Surovegin Cc: Jan Beulich Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5246d0503130fa58904c8beb987fcf93b96d8ab6 Author: Andrew Morton Date: Mon Apr 10 22:53:57 2006 -0700 [PATCH] sync_file_range(): use unsigned for flags Ulrich suggested that the `flags' arg to sync_file_range() become unsigned. Cc: Ulrich Drepper Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8833d328caf009f8da58337e17a2cf5d52993a7c Author: Kyle McMartin Date: Mon Apr 10 22:53:57 2006 -0700 [PATCH] Clean up arch-overrides in linux/string.h Some string functions were safely overrideable in lib/string.c, but their corresponding declarations in linux/string.h were not. Correct this, and make strcspn overrideable. Odds of someone wanting to do optimized assembly of these are small, but for the sake of cleanliness, might as well bring them into line with the rest of the file. Signed-off-by: Kyle McMartin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 894b5779ceeabdce139068310e58bcf51ed9bb22 Author: Kyle McMartin Date: Mon Apr 10 22:53:56 2006 -0700 [PATCH] No arch-specific strpbrk implementations While cleaning up parisc_ksyms.c earlier, I noticed that strpbrk wasn't being exported from lib/string.c. Investigating further, I noticed a changeset that removed its export and added it to _ksyms.c on a few more architectures. The justification was that "other arches do it." I think this is wrong, since no architecture currently defines __HAVE_ARCH_STRPBRK, there's no reason for any of them to be exporting it themselves. Therefore, consolidate the export to lib/string.c. Signed-off-by: Kyle McMartin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c80d79d746cc48bd94b0ce4f6d4f3c90cd403aaf Author: Yasunori Goto Date: Mon Apr 10 22:53:53 2006 -0700 [PATCH] Configurable NODES_SHIFT Current implementations define NODES_SHIFT in include/asm-xxx/numnodes.h for each arch. Its definition is sometimes configurable. Indeed, ia64 defines 5 NODES_SHIFT values in the current git tree. But it looks a bit messy. SGI-SN2(ia64) system requires 1024 nodes, and the number of nodes already has been changeable by config. Suitable node's number may be changed in the future even if it is other architecture. So, I wrote configurable node's number. This patch set defines just default value for each arch which needs multi nodes except ia64. But, it is easy to change to configurable if necessary. On ia64 the number of nodes can be already configured in generic ia64 and SN2 config. But, NODES_SHIFT is defined for DIG64 and HP'S machine too. So, I changed it so that all platforms can be configured via CONFIG_NODES_SHIFT. It would be simpler. See also: http://marc.theaimsgroup.com/?l=linux-kernel&m=114358010523896&w=2 Signed-off-by: Yasunori Goto Cc: Hirokazu Takata Cc: "Luck, Tony" Cc: Andi Kleen Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: Ivan Kokshaysky Cc: Richard Henderson Cc: Kyle McMartin Cc: Russell King Cc: Ralf Baechle Cc: Jack Steiner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 653edba1a8b2ed018bdfb078131324dfbfe1dd6a Author: Frank Gevaerts Date: Mon Apr 10 22:53:51 2006 -0700 [PATCH] hdaps: add support for Thinkpad R52 This adds support for my Thinkpad R52, which for some reason is not matched by the "ThinkPad R52" line. Signed-off-by: Frank Gevaerts Cc: Robert Love Cc: Dmitry Torokhov Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5bd1db65ec3d21db6d34e96679c7443c18e135c5 Author: Dave Jones Date: Mon Apr 10 22:53:51 2006 -0700 [PATCH] S390: fix implicit declaration of (un)likely. include/asm/atomic.h:94: warning: implicit declaration of function 'unlikely' include/asm/atomic.h:97: warning: implicit declaration of function 'likely' Signed-off-by: Dave Jones Cc: Martin Schwidefsky Cc: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b068b43ba4a2aa576f8c0db3dc59ba529d8a6cdd Author: Adrian Bunk Date: Mon Apr 10 22:53:50 2006 -0700 [PATCH] arch/s390/Makefile: remove -finline-limit=10000 -finline-limit might have been required for older compilers, but nowadays it does no longer make sense. Signed-off-by: Adrian Bunk Cc: Martin Schwidefsky Cc: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f976069a3a4f9f79ef816223cccb1efa5c4f51ed Author: Peter Oberparleiter Date: Mon Apr 10 22:53:49 2006 -0700 [PATCH] s390: minor tape fixes Cleanup of minor bugs found by a source code checker. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7220fe8b7915af4ffcd42d73c285c5898734d087 Author: Horst Hummel Date: Mon Apr 10 22:53:48 2006 -0700 [PATCH] s390: dasd proc entries The proc_mkdir calls in the dasd driver are not check for NULL pointers. Add code to check the pointers and bail out if one of the proc entries could not be created. Signed-off-by: Horst Hummel Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 25ee4cf831fcc2855927c175d246a25e5ebe5902 Author: Peter Oberparleiter Date: Mon Apr 10 22:53:47 2006 -0700 [PATCH] s390: fail-fast requests on quiesced devices Using the fail-fast flag in i/o requests on a dasd disk which has been quiesced leads to kernel panics. Modify the request start function to only work on requests in a valid state. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dafd87aaef7d95a6ad3ff92e0d512e5b166c0716 Author: Horst Hummel Date: Mon Apr 10 22:53:47 2006 -0700 [PATCH] s390: dasd device offline messages The dasd driver sometimes print the misleading message "Can't offline dasd device with open count = 0". The reason why it can't offline the device in this case is that the device is still in the startup phase. Print a more meaningful message. Signed-off-by: Horst Hummel Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 06fbcb104ad16c22eb5718ae598b306c777be8af Author: Peter Oberparleiter Date: Mon Apr 10 22:53:46 2006 -0700 [PATCH] s390: increase cio_trace debug event size Debugging events in cio_trace/hex_ascii are truncated for some trace entries. Increase trace event size to 16 bytes to cover longer text events, make CIO_HEX_EVENT an inline function that loops to cover bigger hex events. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a7fbf6bba7f1f0616b0223a8b1cba91fffe607f5 Author: Cornelia Huck Date: Mon Apr 10 22:53:45 2006 -0700 [PATCH] s390: wrong return codes in cio_ignore_proc_init() cio_ignore_proc_init() returns 1 in case of success and 0 in case of failure. The caller tests for != 0, so better return 0 in case of success and -ENOENT in case of failure. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da074d0ac8ccae1068dc227ef9893c2510d23bd8 Author: Peter Oberparleiter Date: Mon Apr 10 22:53:44 2006 -0700 [PATCH] s390: invalid check after kzalloc() Typo. After the call to kzalloc() for kdb->key_maps the test for NULL checks the wrong variable. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0664299743d213e59ea70b2cf2e4a81ee367e80b Author: Peter Oberparleiter Date: Mon Apr 10 22:53:43 2006 -0700 [PATCH] s390: ebdic to ascii conversion tables Make the length of ebcdic<->ascii conversion arrays known. This avoid warnings with source code checking tools. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bdc7f159096856dac570e2659d6381841e0aaa78 Author: Martin Schwidefsky Date: Mon Apr 10 22:53:42 2006 -0700 [PATCH] s390: update default configuration Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52c7378236103ce5fbfb7b3e6ac46aa9de9f970d Author: Paolo 'Blaisorblade' Giarrusso Date: Mon Apr 10 22:53:41 2006 -0700 [PATCH] uml: avoid warnings for diffent names for an unsigned quadword Since on some 64-bit systems __u64 is rightfully defined to unsigned long and GCC recognizes anyway unsigned long and unsigned long long as different, fix some types back to being unsigned long long to avoid warnings and errors (for prototype mismatch) on those systems. Thanks to the report by Wesley Emeneker wesleyemeneker (at) google (dot) com Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 40dbb8676ed0d4c7a40596c7ef8c1c7acde9d972 Author: Paolo 'Blaisorblade' Giarrusso Date: Mon Apr 10 22:53:40 2006 -0700 [PATCH] uml: fix parallel make early failure on clean tree Parallel make failed once for me - fix this by adding the appropriate command (mkdir before creating a link in that dir). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Sam Ravnborg Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dbdb4c06b73599dc162b2cad1af304b498baa107 Author: Paolo 'Blaisorblade' Giarrusso Date: Mon Apr 10 22:53:39 2006 -0700 [PATCH] uml: local_irq_save, not local_save_flags The call to local_save_flags seems bogus since it is followed by local_irq_restore, and it's intended to lock the list from concurrent mconsole_interrupt invocations. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 87276f721a9407a4a152b09265dc079f37674672 Author: Paolo 'Blaisorblade' Giarrusso Date: Mon Apr 10 22:53:39 2006 -0700 [PATCH] uml: fix big stack user Switch this proc from storing 4k of data (a whole path) on the stack to keeping it on the heap. Maybe it's not called in process context but only in early boot context (where in UML you have a normal process stack on the host) but just to be safe, fix it. While at it some little readability simplifications. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d84a19ce52a7b01dc7318ea3a8223dfe44cccb6f Author: Paolo 'Blaisorblade' Giarrusso Date: Mon Apr 10 22:53:38 2006 -0700 [PATCH] uml: fix failure path after conversion Little fix for error paths in this code. - Some bug come from conversion to os-Linux (open() doesn't follow the kernel -errno return convention, while the old code called os_open_file() which followed it). This caused the wrong return code to be printed. - Then be more precise about what happened and do some whitespace fixes. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b1c332c9e813cbee6ca77c3a66ee4d312eb96770 Author: Paolo 'Blaisorblade' Giarrusso Date: Mon Apr 10 22:53:37 2006 -0700 [PATCH] uml: fix hang on run_helper() failure on uml_net Fix an hang on a pipe when run_helper() fails when called by change_tramp() (i.e. when calling uml_net) - reproduced the bug and verified this fixes it. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e6fb54abb8a36703f54b7e27a756a3df6667c37b Author: Paolo 'Blaisorblade' Giarrusso Date: Mon Apr 10 22:53:36 2006 -0700 [PATCH] uml: move outside spinlock call not needing it Move a call to kfree on a local variable out of a spinlock - there's no need to have it in. Done on a just merged patch. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ccea15f45eb0ab12d658f88b5d4be005cb2bb1a7 Author: Paolo 'Blaisorblade' Giarrusso Date: Mon Apr 10 22:53:35 2006 -0700 [PATCH] uml: support sparse for userspace files Make sparse checker work for userspace files - it normally gets -nostdinc separately, so avoid having it for userspace files. Also, add -D$(SUBARCH) for multiarch hosts (i.e. AMD64 with compatibility headers). It works, the only problem is a bit of bogus warnings for system headers, but they're not too many. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f53389d8af6a73034e40eace6034622c03ed707b Author: Paolo 'Blaisorblade' Giarrusso Date: Mon Apr 10 22:53:34 2006 -0700 [PATCH] uml: fix critical typo for TT mode Noticed this for a compilation-time warning, so I'm fixing it even for TT mode - this is not put_user, but copy_to_user, so we need a pointer to sp, not sp itself (we're trying to write the word pointed to by the "sp" var.). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5b0e94787f1b8fdcd370fc6303579d171b941080 Author: Paolo 'Blaisorblade' Giarrusso Date: Mon Apr 10 22:53:34 2006 -0700 [PATCH] uml: fix "extern-vs-static" proto conflict in TLS code Move the prototype from arch-generic to arch-specific includes because on x86_64 these functions are two static inlines. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7c45ad16f0b64f5fdc64cb0e86aa548d7f4d60c1 Author: Paolo 'Blaisorblade' Giarrusso Date: Mon Apr 10 22:53:33 2006 -0700 [PATCH] uml: fix some double export warnings Some functions are exported twice in current code - remove the excess export. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 802e307795c9cf57e91389d65cb87bfe6d03a89e Author: Paolo 'Blaisorblade' Giarrusso Date: Mon Apr 10 22:53:32 2006 -0700 [PATCH] uml: fix format errors Now that GCC warns about format errors, fix them. Nothing able to cause a crash, however. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9cf85b3af2dbef8d4af4604d5eaf8ca090475b7a Author: Paolo 'Blaisorblade' Giarrusso Date: Mon Apr 10 22:53:31 2006 -0700 [PATCH] uml: request format warnings to GCC for appropriate functions Add the format attribute to prototypes so GCC warns about improper usage. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6dad2d3faac21d487ffd1d15268b1802feeb3e72 Author: Paolo 'Blaisorblade' Giarrusso Date: Mon Apr 10 22:53:31 2006 -0700 [PATCH] uml: fix 2 harmless cast warnings for 64-bit Fix two harmless warnings in 64-bit compilation (the 2nd doesn't trigger for now because of a missing __attribute((format)) for cow_printf, but next patches fix that). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2ea394082c5d1682e6a131c5981085b8752c6e9 Author: Paolo 'Blaisorblade' Giarrusso Date: Mon Apr 10 22:53:30 2006 -0700 [PATCH] uml: safe migration path to the correct V3 COW format - Correct the layout of all header versions - make all them well-specified for any external event. As we don't have 1-byte or 2-byte wide fields, the 32-bit layout (historical one) has no extra padding, so we can safely add __attribute__((packed)). - Add detection and reading of the broken 64-bit COW format which has been around for a while - to allow safe migration to the correct 32-bit format. Safe detection is possible, thanks to some luck with the existing format, and it works in practice. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cda402b283c34a24b091f78eee116963e9494762 Author: Paolo 'Blaisorblade' Giarrusso Date: Mon Apr 10 22:53:29 2006 -0700 [PATCH] uml: make 64-bit COW files compatible with 32-bit ones This is the minimal fix to make 64-bit UML binaries create 32-bit compatible COW files and read them. I've indeed tested that current code doesn't do this - the code gets SIGFPE for a division by a value read at the wrong place, where 0 is found. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 60baa1583959e8b15e2823ef9e1cc00fd7ea929c Author: Jeff Dike Date: Mon Apr 10 22:53:28 2006 -0700 [PATCH] uml: memory hotplug cleanups Change memory hotplug to use GFP_NOWAIT instead of GFP_ATOMIC, so that it will grab memory without sleeping, but doesn't try to use the emergency pools. A small list initialization suggested by Daniel Phillips - don't initialize lists which are just about to be list_add-ed. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7b04d7170e9af805cac19f97b28fff10db897893 Author: Jeff Dike Date: Mon Apr 10 22:53:27 2006 -0700 [PATCH] Add GFP_NOWAIT Introduce GFP_NOWAIT, as an alias for GFP_ATOMIC & ~__GFP_HIGH. This also changes XFS, which is the only in-tree user of this idiom that I could find. The XFS piece is compile-tested only. Signed-off-by: Jeff Dike Acked-by: Nathan Scott Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a5d2f46a97cf8e23f5da17dec50a972642ac409f Author: Jeff Dike Date: Mon Apr 10 22:53:26 2006 -0700 [PATCH] UML: TLS fixlets Two small TLS fixes - arch/um/os-Linux/sys-i386/tls.c uses errno and -E* so it should include errno.h __setup_host_supports_tls returns 1, but as an initcall, it should return 0 Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 73830056f56afe4b7d418debbf9ecb64e3d9b0ae Author: Hirokazu Takata Date: Mon Apr 10 22:53:25 2006 -0700 [PATCH] m32r: Remove symbols exported twice Remove multi-exported symbols from arch/m32r/kernel/m32r_ksyms.c. WARNING: vmlinux: 'enable_irq' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'disable_irq' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'disable_irq_nosync' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'synchronize_irq' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'memchr' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strstr' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'memscan' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'memcmp' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'memmove' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strnlen' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strchr' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strncmp' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strcmp' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strncat' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strcat' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strncpy' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strcpy' exported twice. Previous export was in vmlinux Signed-off-by: Hirokazu Takata Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bad7af550e90ab82e74024357438d77b561e1b5f Author: Hirokazu Takata Date: Mon Apr 10 22:53:23 2006 -0700 [PATCH] Remove unused prepare_to_switch macro Remove unused prepare_to_switch() macros. Signed-off-by: Hirokazu Takata Cc: Mikael Starvik Cc: David Howells Cc: Yoshinori Sato Cc: Miles Bader Cc: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 04dfd0de4ec04aaf7d9d42439c972c642a15a75c Author: Hirokazu Takata Date: Mon Apr 10 22:53:20 2006 -0700 [PATCH] m32r: security fix of {get,put}_user macros Update {get,put}_user macros for m32r kernel. - Modify get_user to use __get_user_asm macro, instead of __get_user_x macro. - Remove arch/m32r/lib/{get,put}user.S. - Some cosmetic updates. I would like to thank NIIBE Yutaka for his reporting about the m32r kernel's security problem in {get,put}_user macros. There were no address checking for user space access in {get,put}_user macros. ;-) Signed-off-by: Hirokazu Takata Cc: NIIBE Yutaka Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7c1c4e541888947947bc46a18a9a5543a259ed62 Author: Hirokazu Takata Date: Mon Apr 10 22:53:18 2006 -0700 [PATCH] m32r: Fix cpu_possible_map and cpu_present_map initialization for SMP kernel This patch fixes a boot problem of the m32r SMP kernel 2.6.16-rc1-mm3 or later. In this patch, cpu_possible_map is statically initialized, and cpu_present_map is also copied from cpu_possible_map in smp_prepare_cpus(), because the m32r architecture has not supported CPU hotplug yet. Signed-off-by: Hayato Fujiwara Signed-off-by: Hirokazu Takata Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 917b1f78a9871a1985004df09ed1eb2e0dc3bf4f Author: Brian Uhrain says Date: Mon Apr 10 22:53:16 2006 -0700 [PATCH] alpha: SMP boot fixes I've encountered two problems with 2.6.16 and newer kernels on my API CS20 (dual 833MHz Alpha 21264b processors). The first is the kernel OOPSing because of a NULL pointer dereference while trying to populate SysFS with the CPU information. The other is that only one processor was being brought up. I've included a small Alpha-specific patch that fixes both problems. The first problem was caused by the CPUs never being properly registered using register_cpu(), the way it's done on other architectures. The second problem has to do with the removal of hwrpb_cpu_present_mask in arch/alpha/kernel/smp.c. In setup_smp() in the 2.6.15 kernel sources, hwrpb_cpu_present_mask has a bit set for each processor that is probed, and afterwards cpu_present_mask is set to the cpumask for the boot CPU. In the same function of the same file in the 2.6.16 sources, instead of hwrpb_cpu_present_mask being set, cpu_possible_map is updated for each probed CPU. cpu_present_mask is still set to the cpumask of the boot CPU afterwards. The problem lies in include/asm-alpha/smp.h, where cpu_possible_map is #define'd to be cpu_present_mask. Cleanups from: Ivan Kokshaysky - cpu_present_mask and cpu_possible_map are essentially the same thing on alpha, as it doesn't support CPU hotplug; - allocate "struct cpu" only for present CPUs, like sparc64 does. Static array of "struct cpu" is just a waste of memory. Signed-off-by: Brian Uhrain Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1c08ca89b07eeca241fcf1ec297d3ef173a999a9 Author: Jordan Crouse Date: Mon Apr 10 22:53:15 2006 -0700 [PATCH] Enable TSC for AMD Geode GX/LX Geode GX/LX should enable X86_TSC. Pointed out by Adrian Bunk. Signed-off-by: Jordan Crouse Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit edd711f3810f46787593fb79eda9a9fbb82cbb62 Author: Adrian Bunk Date: Mon Apr 10 22:53:14 2006 -0700 [PATCH] i386: move SMP option above subarch selection Since several subarchs depend on SMP, the SMP option should be above the subarch selection. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc8cbaed57f773a2b3cee40c15ec4f1e17b08046 Author: Randy Dunlap Date: Mon Apr 10 22:53:14 2006 -0700 [PATCH] mptspec: remove duplicate #include Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c0ec31ad334fb83e53f2130eacbb44a639f77967 Author: Randy Dunlap Date: Mon Apr 10 22:53:13 2006 -0700 [PATCH] mpparse: prevent table index out-of-bounds John Z. Bohach found this bug: If the board has more than 32 PCI busses on it, the mptable bus array will overwrite its bounds for the PCI busses, and stomp on anything that's after it. Prevent possible table overflow and unknown data corruption. Code is in an __init section so it will be discarded after init. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e39632faa0efbddc3aed4f8658f2fa0a8afa2717 Author: Randy Dunlap Date: Mon Apr 10 22:53:12 2006 -0700 [PATCH] menu: relocate DOUBLEFAULT option Move the DOUBLEFAULT option from the top-level menu to the EMBEDDED menu. Only applicable to X86_32. Signed-off-by: Randy Dunlap Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7bee5c0fd2b25d185650cbfa049823e03f648c09 Author: Randy Dunlap Date: Mon Apr 10 22:53:11 2006 -0700 [PATCH] i386: print EIP/ESP last Print summary registers (EIP and SS:ESP only) as last death info. This makes this important data visible in case it had scrolled off the top of the display. Similar to what x86_64 does. Suggested by Andi Kleen. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6cf272acd59e4e7a17b969adcdf413e15754bfe4 Author: Ashok Raj Date: Mon Apr 10 22:53:07 2006 -0700 [PATCH] swsusp: don't require bigsmp Switching to automatic bigsmp causes a misleading error message, that more then 8 cpus are detected, and user needs to select either X86_GENERICARCH or X86_BIGSMP to handle. Reason is we switched to bigsmp to avoid IP race when new cpu is comming up. [bigsmp is nothing but using physical flat mode that can work for 1 .. 255 cpus] [default is X86_PC, that uses logical flat mode up to 8 CPUs max] Current x86_64 code uses bigsmp as default when hotplug is enabled. It would be preferable to make bigsmp as default, and work the dependencies of other related code like SMP_SUSPEND, and some related to memory hotplug code for i386. Current logical flat mode doesnt use shortcuts that cause the race by using the send_IPI_mask() instead of shortcuts when HOTPLUG_CPU is enabled. In the meantime this patch is the path of lease resistance. We will switch to bigsmp default sometime soon, when we get to work it again. Signed-off-by: Ashok Raj Cc: Pavel Machek Cc: "Rafael J. Wysocki" Cc: Nigel Cunningham Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3016b421534e2fa8a5eede1c12a3eba6164822f4 Author: Hyok S. Choi Date: Mon Apr 10 22:53:06 2006 -0700 [PATCH] frv: define MMU mode specific syscalls as 'cond_syscall' and clean up unneeded macros For some architectures, a few syscalls are not linked in noMMU mode. In that case, the MMU depending syscalls are needed to be defined as 'cond_syscall'. For example, ARM architecture selectively links sys_mlock by the mode configuration. In case of FRV, it has been managed by #ifdef CONFIG_MMU macro in arch/frv/kernel/entry.S. However these conditional macros are just duplicates if they were defined as cond_syscall. Compilation test is done with FRV toolchains for both of MMU and noMMU mode. Signed-off-by: Hyok S. Choi Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 21a26d49d1ab3163b589bf913dd9176e921eb1d7 Author: Randy Dunlap Date: Mon Apr 10 22:53:04 2006 -0700 [PATCH] hugetlbfs doc. update Fix typos, spelling, etc., in Doc/vm/hugetlbpage.txt. Signed-off-by: Randy Dunlap Cc: David Gibson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 64a3ca5f7ec2606b03be4a65736164a5373732ed Author: Adrian Bunk Date: Mon Apr 10 22:53:03 2006 -0700 [PATCH] mm/migrate.c: don't export a static function EXPORT_SYMBOL'ing of a static function is not a good idea. Signed-off-by: Adrian Bunk Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 91fc8ab3c6312931d64c72845ee2f93a0f87f1a5 Author: Andy Whitcroft Date: Mon Apr 10 22:53:01 2006 -0700 [PATCH] page flags: add commentry regarding field reservation Add some documentation regarding the utilisation of the flags field in struct page. This field is overloaded for per page bits and to hold node, zone and SPARSEMEM information. Make it clear which areas are used for what and how many bits are in each area. Signed-off-by: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d5ddc79bcaab6975e7671805c3578407dc33b764 Author: Hideo AOKI Date: Mon Apr 10 22:53:01 2006 -0700 [PATCH] overcommit: use totalreserve_pages for nommu This patch is an enhancement of OVERCOMMIT_GUESS algorithm in __vm_enough_memory() in mm/nommu.c. When the OVERCOMMIT_GUESS algorithm calculates the number of free pages, the algorithm subtracts the number of reserved pages from the result nr_free_pages(). Signed-off-by: Hideo Aoki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6d9f78396583244258080f3369889644c06c37c8 Author: Hideo AOKI Date: Mon Apr 10 22:53:00 2006 -0700 [PATCH] overcommit: use totalreserve_pages This patch is an enhancement of OVERCOMMIT_GUESS algorithm in __vm_enough_memory() in mm/mmap.c. When the OVERCOMMIT_GUESS algorithm calculates the number of free pages, the algorithm subtracts the number of reserved pages from the result nr_free_pages(). Signed-off-by: Hideo Aoki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cb45b0e966cbe747b6189c15b108901cc7d6c97c Author: Hideo AOKI Date: Mon Apr 10 22:52:59 2006 -0700 [PATCH] overcommit: add calculate_totalreserve_pages() These patches are an enhancement of OVERCOMMIT_GUESS algorithm in __vm_enough_memory(). - why the kernel needed patching When the kernel can't allocate anonymous pages in practice, currnet OVERCOMMIT_GUESS could return success. This implementation might be the cause of oom kill in memory pressure situation. If the Linux runs with page reservation features like /proc/sys/vm/lowmem_reserve_ratio and without swap region, I think the oom kill occurs easily. - the overall design approach in the patch When the OVERCOMMET_GUESS algorithm calculates number of free pages, the reserved free pages are regarded as non-free pages. This change helps to avoid the pitfall that the number of free pages become less than the number which the kernel tries to keep free. - testing results I tested the patches using my test kernel module. If the patches aren't applied to the kernel, __vm_enough_memory() returns success in the situation but autual page allocation is failed. On the other hand, if the patches are applied to the kernel, memory allocation failure is avoided since __vm_enough_memory() returns failure in the situation. I checked that on i386 SMP 16GB memory machine. I haven't tested on nommu environment currently. This patch adds totalreserve_pages for __vm_enough_memory(). Calculate_totalreserve_pages() checks maximum lowmem_reserve pages and pages_high in each zone. Finally, the function stores the sum of each zone to totalreserve_pages. The totalreserve_pages is calculated when the VM is initilized. And the variable is updated when /proc/sys/vm/lowmem_reserve_raito or /proc/sys/vm/min_free_kbytes are changed. Signed-off-by: Hideo Aoki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e23ca00bf1b1c6c0f04702cb4d29e275ab8dc330 Author: Christoph Lameter Date: Mon Apr 10 22:52:57 2006 -0700 [PATCH] Some page migration fixups - Remove sparse comment - Remove duplicated include - Return the correct error condition in migrate_page_remove_references(). Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e624196f43c3a62122959e15c5f03572cdadb5d Author: Ram Gupta Date: Mon Apr 10 22:52:57 2006 -0700 [PATCH] mm: fix bug in brk() The code checks for newbrk with oldbrk which are page aligned before making a check for the memory limit set of data segment. If the memory limit is not page aligned in that case it bypasses the test for the limit if the memory allocation is still for the same page. Signed-off-by: Ram Gupta Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6fef9da19b7acd46e04b7dbbba726b3febeca94 Author: Luke Yang Date: Mon Apr 10 22:52:56 2006 -0700 [PATCH] nommu: use compound page in slab allocator The earlier patch to consolidate mmu and nommu page allocation and refcounting by using compound pages for nommu allocations had a bug: kmalloc slabs who's pages were initially allocated by a non-__GFP_COMP allocator could be passed into mm/nommu.c kmalloc allocations which really wanted __GFP_COMP underlying pages. Fix that by having nommu pass __GFP_COMP to all higher order slab allocations. Signed-off-by: Luke Yang Acked-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fb7faf3313d527bf68ba2e7ff3a2b6ebf201af73 Author: Ravikiran G Thirumalai Date: Mon Apr 10 22:52:54 2006 -0700 [PATCH] slab: add statistics for alien cache overflows Add a statistics counter which is incremented everytime the alien cache overflows. alien_cache limit is hardcoded to 12 right now. We can use this statistics to tune alien cache if needed in the future. Signed-off-by: Alok N Kataria Signed-off-by: Ravikiran Thirumalai Signed-off-by: Shai Fultheim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5b74ada7eea1b0064d2b72384827853f349d803a Author: Ravikiran G Thirumalai Date: Mon Apr 10 22:52:53 2006 -0700 [PATCH] slab: allocate node local memory for off-slab slabmanagement Allocate off-slab slab descriptors from node local memory. Signed-off-by: Alok N Kataria Signed-off-by: Ravikiran Thirumalai Signed-off-by: Shai Fultheim Acked-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a283a52520569195c2d26d75455cddab758f530b Author: KAMEZAWA Hiroyuki Date: Mon Apr 10 22:52:52 2006 -0700 [PATCH] for_each_possible_cpu: sparc64 for_each_cpu() actually iterates across all possible CPUs. We've had mistakes in the past where people were using for_each_cpu() where they should have been iterating across only online or present CPUs. This is inefficient and possibly buggy. We're renaming for_each_cpu() to for_each_possible_cpu() to avoid this in the future. This patch replaces for_each_cpu with for_each_possible_cpu. for sparc64. Signed-off-by: KAMEZAWA Hiroyuki Acked-by: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fff8efe7b71efd88829782be64dc42c25c70ad53 Author: KAMEZAWA Hiroyuki Date: Mon Apr 10 22:52:51 2006 -0700 [PATCH] for_each_possible_cpu: sparc for_each_cpu() actually iterates across all possible CPUs. We've had mistakes in the past where people were using for_each_cpu() where they should have been iterating across only online or present CPUs. This is inefficient and possibly buggy. We're renaming for_each_cpu() to for_each_possible_cpu() to avoid this in the future. This patch replaces for_each_cpu with for_each_possible_cpu. Signed-off-by: KAMEZAWA Hiroyuki Acked-by: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6f912042256c12b0927438122594f5379b364f5d Author: KAMEZAWA Hiroyuki Date: Mon Apr 10 22:52:50 2006 -0700 [PATCH] for_each_possible_cpu: network codes for_each_cpu() actually iterates across all possible CPUs. We've had mistakes in the past where people were using for_each_cpu() where they should have been iterating across only online or present CPUs. This is inefficient and possibly buggy. We're renaming for_each_cpu() to for_each_possible_cpu() to avoid this in the future. This patch replaces for_each_cpu with for_each_possible_cpu under /net Signed-off-by: KAMEZAWA Hiroyuki Acked-by: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd7ba3b8b15f9c65366986d723ae83254d8d78b7 Author: Adrian Bunk Date: Mon Apr 10 22:52:49 2006 -0700 [PATCH] arch/i386/mach-voyager/voyager_cat.c: named initializers This patch switches arch/i386/mach-voyager/voyager_cat.c to using named initializers for struct resource. Besides a fixing compile error in Greg's tree, it makes the code more readable. Signed-off-by: Adrian Bunk Cc: James Bottomley Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6f91fe88e4e28b40b4f08d99e0ea6d17b70e9567 Author: NeilBrown Date: Mon Apr 10 22:52:48 2006 -0700 [PATCH] md: make sure 64bit fields in version-1 metadata are 64-bit aligned reshape_position is a 64bit field that was not 64bit aligned. So swap with new_level. NOTE: this is a user-visible change. However: - The bad code has not appeared in a released kernel - This code is still marked 'experimental' - This only affects version-1 superblock, which are not in wide use - These field are only used (rather than simply reported) by user-space tools in extemely rare circumstances : after a reshape crashes in the first second of the reshape process. So I believe that, at this stage, the change is safe. Especially if people heed the 'help' message on use mdadm-2.4.1. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 54404e72cd3758e465fb6362f6d71e22b705c589 Author: Christoph Lameter Date: Mon Apr 10 22:52:47 2006 -0700 [PATCH] Fix NULL pointer dereference in node_read_numastat() zone_pcp() only returns valid values if the processor is online. Change node_read_numastat() to only scan online processors. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 29ff2db55196717e2e67e0f04adc833ee7edd491 Author: Andrew Morton Date: Mon Apr 10 22:52:46 2006 -0700 [PATCH] select() warning fixes fs/select.c: In function `core_sys_select': fs/select.c:339: warning: assignment from incompatible pointer type fs/select.c:376: warning: comparison of distinct pointer types lacks a cast By using a void* we can remove lots of casts rather than adding more. Cc: Jes Sorensen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8a5bc075b8d8cf7a87b3f08fad2fba0f5d13295e Author: Mike Galbraith Date: Mon Apr 10 22:52:45 2006 -0700 [PATCH] sched: don't awaken RT tasks on expired array RT tasks are being awakened on the expired array when expired_starving() is true, whereas they really should be excluded. Fix. Signed-off-by: Mike Galbraith Acked-by: Ingo Molnar Cc: Con Kolivas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ce74abe788a26698876e66b9c9ce7e7acc25413 Author: Mike Galbraith Date: Mon Apr 10 22:52:44 2006 -0700 [PATCH] sched: fix interactive task starvation Fix a starvation problem that occurs when a stream of highly interactive tasks delay an array switch for extended periods despite EXPIRED_STARVING(rq) being true. AFAIKT, the only choice is to enqueue awakening tasks on the expired array in this case. Without this patch, it can be nearly impossible to remotely login to a busy server, and interactive shell commands can starve for minutes. Also, convert the EXPIRED_STARVING macro into an inline function which humans can understand. Signed-off-by: Mike Galbraith Acked-by: Ingo Molnar Cc: Nick Piggin Acked-by: Con Kolivas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d1195c516a9acd767cb541f914be2c6ddcafcfc1 Author: Pekka J Enberg Date: Tue Apr 11 14:21:59 2006 +0200 [PATCH] vfs: add splice_write and splice_read to documentation This patch adds the new splice_write and splice_read file operations to Documentation/filesystems/vfs.txt. Signed-off-by: Pekka Enberg Signed-off-by: Jens Axboe commit 7519fdc90fe577cb966ab1ce2bf51ac639f05a0e Author: OGAWA Hirofumi Date: Tue Apr 11 14:00:04 2006 +0200 [PATCH] Remove sys_ prefix of new syscalls from __NR_sys_* On i386, we don't use sys_ prefix for __NR_*. This patch removes it [FWIW, _syscall*() macros will generate foo() instead of sys_foo().] Signed-off-by: OGAWA Hirofumi Signed-off-by: Jens Axboe commit 88e6faefaeed40a162041d85689e94595756d4c3 Author: Andrew Morton Date: Tue Apr 11 13:59:36 2006 +0200 [PATCH] splice: warning fix From: Andrew Morton net/socket.c:148: warning: initialization from incompatible pointer type extern declarations in .c files! Bad boy. Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Jens Axboe commit 341b446bc5aa36d1d5b8159c1e66716b5d89024d Author: Ingo Molnar Date: Tue Apr 11 13:57:45 2006 +0200 [PATCH] another round of fs/pipe.c cleanups make pipe.c a bit more readable and hackable. Signed-off-by: Ingo Molnar Signed-off-by: Jens Axboe commit 73d62d83ec3627782ba6f55defc76f3ffbef46ee Author: Ingo Molnar Date: Tue Apr 11 13:57:21 2006 +0200 [PATCH] splice: comment styles - capitalize consistently - end sentences in one way or another - update comment text to match the implementation Signed-off-by: Ingo Molnar Signed-off-by: Jens Axboe commit c2058e0611c2fb4a00e63db61ef3a638cf760a98 Author: Jens Axboe Date: Tue Apr 11 13:56:34 2006 +0200 [PATCH] splice: add Ingo as addition copyright holder The comment is also somewhat out of date, correct that as well. Signed-off-by: Jens Axboe commit 49570e9b29a3d78950b5eba6b73bdcca955f0877 Author: Jens Axboe Date: Tue Apr 11 13:56:09 2006 +0200 [PATCH] splice: unlikely() optimizations Also corrects a few comments. Patch mainly from Ingo, changes by me. Signed-off-by: Ingo Molnar Signed-off-by: Jens Axboe commit 6f767b0425f5902e4817648632230b512e81c963 Author: Jens Axboe Date: Tue Apr 11 13:53:56 2006 +0200 [PATCH] splice: speedups and optimizations - Kill the local variables that cache ->nrbufs, they just take up space. - Only set do_wakeup for a real pipe. This is a big win for direct splicing. - Kill i_mutex lock around ->f_pos update, regular io paths don't do this either. Signed-off-by: Jens Axboe commit 923f4f23940d2361e8d5c4245982163a8e9d1c91 Author: Ingo Molnar Date: Tue Apr 11 13:53:33 2006 +0200 [PATCH] pipe.c/fifo.c code cleanups more code cleanups after the macro conversion: - standardize on 'struct pipe_inode_info *pipe' variable names - introduce 'pipe' temporaries to reduce mass inode->i_pipe dereferencing Signed-off-by: Ingo Molnar Signed-off-by: Jens Axboe commit 9aeedfc4712ed58d9f7ae41596185c72b8dc97e8 Author: Ingo Molnar Date: Tue Apr 11 13:53:10 2006 +0200 [PATCH] get rid of the PIPE_*() macros get rid of the PIPE_*() macros. Scripted transformation. Signed-off-by: Ingo Molnar Signed-off-by: Jens Axboe commit 7480a90435673b4c717b6caf1350ec577d5f1adf Author: Jens Axboe Date: Tue Apr 11 13:52:47 2006 +0200 [PATCH] splice: speedup __generic_file_splice_read Using find_get_page() is a lot faster than find_or_create_page(). This gets splice a lot closer to sendfile() for fd -> socket transfers. Signed-off-by: Jens Axboe commit b92ce55893745e011edae70830b8bc863be881f9 Author: Jens Axboe Date: Tue Apr 11 13:52:07 2006 +0200 [PATCH] splice: add direct fd <-> fd splicing support It's more efficient for sendfile() emulation. Basically we cache an internal private pipe and just use that as the intermediate area for pages. Direct splicing is not available from sys_splice(), it is only meant to be used for sendfile() emulation. Additional patch from Ingo Molnar to avoid the PIPE_BUFFERS loop at exit for the normal fast path. Signed-off-by: Jens Axboe commit b5ac4817de3032796c558b0a32062e7392b5ea60 Author: Roman Zippel Date: Sun Apr 9 17:27:28 2006 +0200 kconfig: fix typo in change count initialization Configuration needs saving when either of these conditions is true. Signed-off-by: Roman Zippel Signed-off-by: Sam Ravnborg commit 94f2505be3b6afaf50129e949b1840bc4dd0b3e8 Author: Roman Zippel Date: Sun Apr 9 17:27:14 2006 +0200 kconfig: recenter menuconfig Move the menuconfig output more into the centre again, it's using a fixed position depending on the window width using the fact that the menu output has to work in a 80 chars terminal. Signed-off-by: Roman Zippel Signed-off-by: Sam Ravnborg commit 59c6a3f4d745584f2f78cdf1f5e221a19518926c Author: Roman Zippel Date: Sun Apr 9 17:26:50 2006 +0200 kconfig: revert conf behaviour change After the last patch fixed the real problem, revert this needless behaviour change of conf, which only hid the real problem. Signed-off-by: Roman Zippel Signed-off-by: Sam Ravnborg commit 40aee729b350672c2550640622416a855e27938f Author: Roman Zippel Date: Sun Apr 9 17:26:39 2006 +0200 kconfig: fix default value for choice input The wrong default value can cause conf to end up in endless loop for choice questions. Signed-off-by: Roman Zippel Signed-off-by: Sam Ravnborg commit eaaae38c1ac4ccbec6d2de7255b0538f38fb29d6 Author: Eric Sesterhenn Date: Tue Apr 11 00:54:16 2006 +0200 kbuild: fix NULL dereference in scripts/mod/modpost.c before is NULL in this case, concluding from the surrounding code it seems that after is the right one to use. Signed-off-by: Eric Sesterhenn Signed-off-by: Sam Ravnborg commit 71378be91f5473e89c8be170c6e49edda3bdbb67 Author: Paolo 'Blaisorblade' Giarrusso Date: Fri Apr 7 16:16:40 2006 +0200 kbuild: fix mode of checkstack.pl and other files. Make it executable like it should be. Do the same for other files intended to be executed by the user - the ones called by the build process needn't be executable as they already work (as argument to their interpreter). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Sam Ravnborg commit d39a206bc35d46a3b2eb98cd4f34e340d5e56a50 Author: Sam Ravnborg Date: Tue Apr 11 13:24:32 2006 +0200 kbuild: rebuild initramfs if content of initramfs changes initramfs.cpio.gz being build in usr/ and included in the kernel was not rebuild when the included files changed. To fix this the following was done: - let gen_initramfs.sh generate a list of files and directories included in the initramfs - gen_initramfs generate the gzipped cpio archive so we could simplify the kbuild file (Makefile) - utilising the kbuild infrastructure so when uid/gid root mapping changes the initramfs will be rebuild With this change we have a much more robust initramfs generation. Signed-off-by: Sam Ravnborg commit 019ff2d57b0bbe77d1eca19f5b634e5e7ff2a0b8 Author: Nathan Scott Date: Tue Apr 11 15:45:05 2006 +1000 [XFS] Fix a problem in aligning inode allocations to stripe unit boundaries. SGI-PV: 951862 SGI-Modid: xfs-linux-melb:xfs-kern:25726a Signed-off-by: Nathan Scott commit 8c0b5113a55c698f3190ec85925815640f1c2049 Author: Nathan Scott Date: Tue Apr 11 15:12:45 2006 +1000 [XFS] Fix utime(2) in the case that no times parameter was passed in. SGI-PV: 949858 SGI-Modid: xfs-linux-melb:xfs-kern:25717a Signed-off-by: Jes Sorensen Signed-off-by: Nathan Scott commit 58829e490ee805f1c8b3009abc90e2a1a7a0d278 Author: David Chinner Date: Tue Apr 11 15:11:20 2006 +1000 [XFS] Fix an inode use-after-free durin an unpin. When reclaiming inodes that have been unlinked, we may need to execute transactions during reclaim. By the time the transaction has hit the disk, the linux inode and xfs vnode may already have been freed so we can't reference them safely. Use the known xfs inode state to determine if it is safe to reference the vnode and linux inode during the unpin operation. SGI-PV: 946321 SGI-Modid: xfs-linux-melb:xfs-kern:25687a Signed-off-by: David Chinner Signed-off-by: Nathan Scott commit 1fc5d959d88a5f77aa7e4435f6c9d0e2d2236704 Author: David Chinner Date: Tue Apr 11 15:11:12 2006 +1000 [XFS] Fix inode reclaim scalability regression. When a filesystem has millions of inodes cached and has sparse cluster population, removing inodes from the cluster hash consumes excessive amounts of CPU time. Reduce the CPU cost by making removal O(1) via use of a double linked list for the hash chains. SGI-PV: 951551 SGI-Modid: xfs-linux-melb:xfs-kern:25683a Signed-off-by: David Chinner Signed-off-by: Nathan Scott commit 8272145c05c6d01a34f5114357c5e8093fb66472 Author: Nathan Scott Date: Tue Apr 11 15:10:55 2006 +1000 [XFS] Fix a writepage regression where we accidentally stopped honouring nonblock mode with the new IO path code (since 2.6.16). SGI-PV: 951662 SGI-Modid: xfs-linux-melb:xfs-kern:25676a Signed-off-by: Nathan Scott commit e50bd16fe49689bc5fb54fca5ed8b568dfba65c6 Author: Nathan Scott Date: Tue Apr 11 15:10:45 2006 +1000 [XFS] Fix superblock validation regression for the zero imaxpct case. Thanks to kjamieson for noticing. SGI-PV: 951661 SGI-Modid: xfs-linux-melb:xfs-kern:25675a Signed-off-by: Nathan Scott commit de12a7878c11f3b282d640888aa635e0711d0b5e Author: Eric W. Biederman Date: Mon Apr 10 17:16:49 2006 -0600 [PATCH] de_thread: Don't confuse users do_each_thread. Oleg Nesterov spotted two interesting bugs with the current de_thread code. The simplest is a long standing double decrement of __get_cpu_var(process_counts) in __unhash_process. Caused by two processes exiting when only one was created. The other is that since we no longer detach from the thread_group list it is possible for do_each_thread when run under the tasklist_lock to see the same task_struct twice. Once on the task list as a thread_group_leader, and once on the thread list of another thread. The double appearance in do_each_thread can cause a double increment of mm_core_waiters in zap_threads resulting in problems later on in coredump_wait. To remedy those two problems this patch takes the simple approach of changing the old thread group leader into a child thread. The only routine in release_task that cares is __unhash_process, and it can be trivially seen that we handle cleaning up a thread group leader properly. Since de_thread doesn't change the pid of the exiting leader process and instead shares it with the new leader process. I change thread_group_leader to recognize group leadership based on the group_leader field and not based on pids. This should also be slightly cheaper then the existing thread_group_leader macro. I performed a quick audit and I couldn't see any user of thread_group_leader that cared about the difference. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit 530515a06f90c0831732709efee4a99497bd2b7c Author: jacob.shin@amd.com Date: Fri Apr 7 19:49:51 2006 +0200 [CPUFREQ] x86_64: Proper null pointer check in powernow_k8_get This prevents crashes on dual core system when enough ticks are lost. Replaces earlier patch by me. (Duplicate null data check in powernowk8_get() removed -- davej) arch/i386/kernel/cpu/cpufreq/powernow-k8.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) Signed-off-by: Thomas Renninger Signed-off-by: Andi Kleen Signed-off-by: Dave Jones commit b40fc4923ee3352c44ac2c0bd5f4d6018d6c4ad7 Author: Andi Kleen Date: Fri Apr 7 19:49:48 2006 +0200 [CPUFREQ] x86_64: Revert earlier powernow-k8 change (Better fix to be applied in next patch) Signed-off-by: Andi Kleen Signed-off-by: Dave Jones commit 1356c1948da967bc1d4c663762bfe21dfcec4b2f Author: Catalin Marinas Date: Mon Apr 10 21:32:46 2006 +0100 [ARM] 3473/1: Use numbers 0-15 for the VFP double registers Patch from Catalin Marinas This patch changes the double registers numbering to 0-15 from even 0-30, in preparation for future VFP extensions. It also fixes the VFP_REG_ZERO bug (value 16 actually represents the 8th double register with the original numbering). The original mcrr/mrrc on CP10 were generating FMRRS/FMSRR instead of FMRRD/FMDRR. The patch changes to CP11 for the correct instructions. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit bb54a335ae6d282a4f177c7b35cd149aa9b0b9be Author: Catalin Marinas Date: Mon Apr 10 21:32:42 2006 +0100 [ARM] 3472/1: Use the D variants of FLDMIA/FSTMIA on ARMv6 Patch from Catalin Marinas The X variants are deprecated starting with ARMv6. Using the D variants, the fpmx_state in vfp_hard_struct is no longer needed. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 1320a80d1d2587545f39bc0d2dc3adaf390250ef Author: Catalin Marinas Date: Mon Apr 10 21:32:39 2006 +0100 [ARM] 3471/1: FTOSI functions should return 0 for NaN Patch from Catalin Marinas The NaN case was dealed with by the "exponent >= ... + 32" condition but it was not setting the value "d" to 0. Signed-off-by: Ken'ichi Kuromusha Signed-off-by: Russell King commit adeff42236aec0601ec979d1a41cd6d9cf5a8c05 Author: Catalin Marinas Date: Mon Apr 10 21:32:35 2006 +0100 [ARM] 3470/1: Clear the HWCAP bits for the disabled kernel features Patch from Catalin Marinas Glibc interprets the HWCAP bits and decides on what features to use. However, even if the features are present in the hardware, they are not always supported by the kernel and hence the corresponding bits have to be cleared from the elf_hwcap variable. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit ce684df05a531904ea055d01aeee75321fa0db1e Author: Michael S. Tsirkin Date: Mon Apr 10 13:17:43 2006 -0700 IB/cache: Use correct pointer to calculate size When allocating gid_cache, use kmalloc(sizeof *gid_cache, ...) rather than kmalloc(sizeof *pkey_cache, ...). It doesn't really matter which one is used, since the size ends up the same either way, but it's much better to say what we mean. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 1b72373491a061be6d456d219a4e2d054ac2aaad Author: Jeff Garzik Date: Mon Apr 10 14:56:39 2006 -0400 [libata] sata_mv: fix can_queue line accidentally removed in scsi-eh patch commit 65714b918415e06c92426f6544b2296dae694590 Author: Adrian Bunk Date: Sun Mar 26 14:25:52 2006 +0200 [PATCH] CONFIGFS_FS must depend on SYSFS This patch fixes the a compile error with CONFIG_SYSFS=n Configfs is creating, as a matter of policy, the /sys/kernel/config mountpoint. This means it requires CONFIG_SYSFS. Signed-off-by: Adrian Bunk Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit cbca692c246874a3cc1b5a9b694add4c39e8bc18 Author: Eric Sesterhenn Date: Thu Mar 23 00:36:54 2006 +0100 [PATCH] Bogus NULL pointer check in fs/configfs/dir.c We check the "group" pointer after we dereference it. This check is bogus, as it cannot be NULL coming in. Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit 9227c33de80ac01f269ed33624990ce84358e419 Author: Christoph Hellwig Date: Sat Apr 1 19:21:04 2006 +0200 [PATCH] move ->eh_strategy_handler to the transport class Overriding the whole EH code is a per-transport, not per-host thing. Move ->eh_strategy_handler to the transport class, same as ->eh_timed_out. Downside is that scsi_host_alloc can't check for the total lack of EH anymore, but the transition period from old EH where we needed it is long gone already. Signed-off-by: Christoph Hellwig Signed-off-by: Jeff Garzik commit 676165a8af7167f488abdcce6851a9bc36e83254 Author: Nick Piggin Date: Mon Apr 10 11:21:48 2006 +1000 [PATCH] Fix buddy list race that could lead to page lru list corruptions Rohit found an obscure bug causing buddy list corruption. page_is_buddy is using a non-atomic test (PagePrivate && page_count == 0) to determine whether or not a free page's buddy is itself free and in the buddy lists. Each of the conjuncts may be true at different times due to unrelated conditions, so the non-atomic page_is_buddy test may find each conjunct to be true even if they were not both true at the same time (ie. the page was not on the buddy lists). Signed-off-by: Martin Bligh Signed-off-by: Rohit Seth Signed-off-by: Nick Piggin Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Linus Torvalds commit f697f74a6b189702474b2fd457e1f9365fa213e3 Author: Roland Dreier Date: Mon Apr 10 09:43:59 2006 -0700 IPoIB: Use spin_lock_irq() instead of spin_lock_irqsave() We know ipoib_flush_paths() is called from plain process context with interrupts enabled, since it does wait_for_completion(). So there's no need to use spin_lock_irqsave() -- spin_lock_irq() is fine. Signed-off-by: Roland Dreier commit a30bb96c6f5aca6513e4dbd94962da03d14b20a9 Author: Eli Cohen Date: Wed Apr 5 15:59:34 2006 +0300 IPoIB: Close race in ipoib_flush_paths() ib_sa_cancel_query() must be called with priv->lock held since a completion might arrive and set path->query to NULL. Signed-off-by: Eli Cohen Signed-off-by: Roland Dreier commit abf45dbb5b256dab439ca3b6b71191ecfddf9cb6 Author: Michael S. Tsirkin Date: Wed Apr 5 15:47:16 2006 +0300 IB/mthca: Disable tuning PCI read burst size The PCI spec recommends against drivers playing with a device's PCI read burst size, and says that systems software should configure it. And we actually have users that report that changing it from the default set by BIOS hurts performance and/or stability for them. On the other hand, the Mellanox Programmer's Reference Manual recommends turning it up all the way to the maximum value. Some tests conducted here in the lab do not show performance improvement from this tuning, but this might be just me. As a work-around, make this tuning an option, off by default (safe value), with an eye towards removing it completely one day if no one complains. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 0f4852513fb07405ce88da40d8c497060561246e Author: Shirley Ma Date: Mon Apr 10 09:43:58 2006 -0700 IPoIB: Make send and receive queue sizes tunable Make IPoIB's send and receive queue sizes tunable via module parameters ("send_queue_size" and "recv_queue_size"). This allows the queue sizes to be enlarged to fix disastrously bad performance on some platforms and workloads, without bloating memory usage when large queues aren't needed. Signed-off-by: Shirley Ma Signed-off-by: Roland Dreier commit f2de3b06126ddb07d0e4617225d74dce0855add3 Author: Eli Cohen Date: Wed Apr 5 14:59:40 2006 +0300 IPoIB: Wait for join to finish before freeing mcast struct ipoib_mcast_restart_task() might free an mcast object while a join request is still outstanding, leading to an oops when the query completes. Fix this by waiting for query to complete, similar to what ipoib_stop_thread() is doing. The wait for mcast completion code is consolidated in wait_for_mcast_join(). Signed-off-by: Eli Cohen Signed-off-by: Roland Dreier commit bf6a9e31cfa768ce0a8e18474b3ca808641d9243 Author: Jack Morgenstein Date: Mon Apr 10 09:43:47 2006 -0700 IB: simplify static rate encoding Push translation of static rate to HCA format into low-level drivers, where it belongs. For static rate encoding, use encoding of rate field from IB standard PathRecord, with addition of value 0, for backwards compatibility with current usage. The changes are: - Add enum ib_rate to midlayer includes. - Get rid of static rate translation in IPoIB; just use static rate directly from Path and MulticastGroup records. - Update mthca driver to translate absolute static rate into the format used by hardware. This also fixes mthca's static rate handling for HCAs that are capable of 4X DDR. Signed-off-by: Jack Morgenstein Signed-off-by: Roland Dreier commit c3a9d6541f84ac3ff566982d08389b87c1c36b4e Author: David Howells Date: Mon Apr 10 15:15:21 2006 +0100 [Security] Keys: Fix oops when adding key to non-keyring This fixes the problem of an oops occuring when a user attempts to add a key to a non-keyring key [CVE-2006-1522]. The problem is that __keyring_search_one() doesn't check that the keyring it's been given is actually a keyring. I've fixed this problem by: (1) declaring that caller of __keyring_search_one() must guarantee that the keyring is a keyring; and (2) making key_create_or_update() check that the keyring is a keyring, and return -ENOTDIR if it isn't. This can be tested by: keyctl add user b b `keyctl add user a a @s` Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 529565dcb1581c9a1e3f6df1c1763ca3e0f0d512 Author: Ingo Molnar Date: Mon Apr 10 15:18:58 2006 +0200 [PATCH] splice: add optional input and output offsets add optional input and output offsets to sys_splice(), for seekable file descriptors: asmlinkage long sys_splice(int fd_in, loff_t __user *off_in, int fd_out, loff_t __user *off_out, size_t len, unsigned int flags); semantics are straightforward: f_pos will be updated with the offset provided by user-space, before the splice transfer is about to begin. Providing a NULL offset pointer means the existing f_pos will be used (and updated in situ). Providing an offset for a pipe results in -ESPIPE. Providing an invalid offset pointer results in -EFAULT. Signed-off-by: Ingo Molnar Signed-off-by: Jens Axboe commit 3a326a2ce88e71d00ac0d133e314a3342a7709f8 Author: Ingo Molnar Date: Mon Apr 10 15:18:35 2006 +0200 [PATCH] introduce a "kernel-internal pipe object" abstraction separate out the 'internal pipe object' abstraction, and make it usable to splice. This cleans up and fixes several aspects of the internal splice APIs and the pipe code: - pipes: the allocation and freeing of pipe_inode_info is now more symmetric and more streamlined with existing kernel practices. - splice: small micro-optimization: less pointer dereferencing in splice methods Signed-off-by: Ingo Molnar Update XFS for the ->splice_read/->splice_write changes. Signed-off-by: Jens Axboe commit 0b749ce3802428007a37870eb51ba3c0bdf90857 Author: Jens Axboe Date: Mon Apr 10 09:05:04 2006 +0200 [PATCH] splice: be smarter about calling do_page_cache_readahead() We don't want to call into the read-ahead logic unless we are at the start of a page, _or_ we have multiple pages to read. Signed-off-by: Jens Axboe commit 49d0b21be21efc07526d637e0ae935019667e532 Author: Jens Axboe Date: Mon Apr 10 09:04:41 2006 +0200 [PATCH] splice: optimize the splice buffer mapping We don't really need to lock down the pages, just make sure they are uptodate. Signed-off-by: Jens Axboe commit 16c523ddabcce5d3d817f4a2491d628f84dfaaa1 Author: Jens Axboe Date: Mon Apr 10 09:03:58 2006 +0200 [PATCH] splice: cleanup __generic_file_splice_read() The whole shadow/pages logic got overly complex, and this simpler approach is actually faster in testing. Signed-off-by: Jens Axboe commit c0bd1f650bd06a43435808d44f1e9520ea806206 Author: Jens Axboe Date: Mon Apr 10 09:03:32 2006 +0200 [PATCH] splice: only call wake_up_interruptible() when we really have to __wake_up_common() is pretty heavy in the kernel profiles, this brings it down to a more acceptable level. Signed-off-by: Jens Axboe commit 9aefe431f5a000884db7ae74ac208de814fe5913 Author: Dave Jones Date: Mon Apr 10 09:02:40 2006 +0200 [PATCH] splice: potential !page dereference We can get to out: with a NULL page, which we probably don't want to be calling page_cache_release() on. Signed-off-by: Dave Jones Signed-off-by: Jens Axboe commit c7f21e4f5a3d4e378e4d453b2be209dcfd1bb964 Author: Jens Axboe Date: Mon Apr 10 09:01:01 2006 +0200 [PATCH] splice: mark the io page as accessed We should do that, since we do the LRU manipulation ourselves now. Suggested by Nick Piggin. Signed-off-by: Jens Axboe commit 68491d5892defca59ad4f604cace2b1e30889c14 Author: David S. Miller Date: Thu Apr 6 20:28:11 2006 -0700 [SPARC64]: Set ARCH_SELECT_MEMORY_MODEL Otherwise the build breaks with EXPERIMENTAL disabled because SPARSEMEM will not get selected properly. See mm/Kconfig for how that works. Signed-off-by: David S. Miller commit aa1d1a0af6022f02fb601508d3feaabafd405299 Author: David S. Miller Date: Thu Apr 6 16:54:33 2006 -0700 [SPARC64]: smp_call_function() fixups... 1) Take doc-book function comment from i386 implementation. 2) cacheline align call_lock, taken from powerpc 3) Need memory barrier after setting call_data 4) Remove timeout Signed-off-by: David S. Miller commit 731bbe431f7dbbcbdc5293cfb187a916c375e83b Author: David S. Miller Date: Tue Apr 4 16:54:40 2006 -0700 [SPARC64]: Translate PTRACE_GETEVENTMSG for 32-bit tasks. Signed-off-by: David S. Miller commit 1608a96e7998bffd10fcb2440e8175cfb703fd95 Author: David S. Miller Date: Sun Apr 2 19:31:30 2006 -0700 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller commit 955c054f7905e0a9ee4483b03f866f61e6929bec Author: David S. Miller Date: Sat Apr 1 23:29:56 2006 -0800 [SPARC64]: Print out return PC in cheetah_log_errors(). This makes debugging things a little bit easier. Signed-off-by: David S. Miller commit 1759e58ed2684b7a01cbb96864f23d18884f42ba Author: David S. Miller Date: Sat Apr 1 23:28:10 2006 -0800 [SPARC64]: Add dummy PTRACE_PEEKUSR for gdb. GDB uses a PTRACE_PEEKUSR call with offset 0 to see if a thread is alive, so provide a success return for this particular special case. Signed-off-by: David S. Miller commit b1a7ffcb7a047e99ab02424e651e0492f36095f7 Author: Denis Vlasenko Date: Sun Apr 9 22:48:59 2006 -0700 [IPV6]: Deinline few large functions in inet6 code Deinline a few functions which produce 200+ bytes of code. Size Uses Wasted Name and definition ===== ==== ====== ================================================ 429 3 818 __inet6_lookup include/net/inet6_hashtables.h 404 2 384 __inet6_lookup_established include/net/inet6_hashtables.h 206 3 372 __inet6_hash include/net/inet6_hashtables.h Signed-off-by: Denis Vlasenko Signed-off-by: David S. Miller commit 55c0022e53452360064ea264c41410c70565d9f8 Author: David S. Miller Date: Sun Apr 9 22:43:55 2006 -0700 [IPV4] ip_fragment: Always compute hash with ipfrag_lock held. Otherwise we could compute an inaccurate hash due to the random seed changing. Noticed by Zach Brown and patch is based upon some feedback from Herbert Xu. Signed-off-by: David S. Miller commit 19910d1aec0b2b96ff4b4a93e2aed0d32643e850 Author: Patrick McHardy Date: Sun Apr 9 22:38:29 2006 -0700 [NETFILTER]: Fix DNAT in LOCAL_OUT Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 9b591cbd4e0fc2911d105d88d354124467b2cc08 Author: David S. Miller Date: Sun Apr 9 22:37:18 2006 -0700 [X25]: Restore skb->dev setting in x25_type_trans(). Noticed by Pascal Schlafer. Signed-off-by: David S. Miller commit 9469d458b90bfb9117cbb488cfa645d94c3921b1 Author: Sergey Vlasov Date: Sun Apr 9 22:32:48 2006 -0700 [NET]: Fix hotplug race during device registration. From: Thomas de Grenier de Latour On Sun, 9 Apr 2006 21:56:59 +0400, Sergey Vlasov wrote: > However, show_address() does not output anything unless > dev->reg_state == NETREG_REGISTERED - and this state is set by > netdev_run_todo() only after netdev_register_sysfs() returns, so in > the meantime (while netdev_register_sysfs() is busy adding the > "statistics" attribute group) some process may see an empty "address" > attribute. I've tried the attached patch, suggested by Sergey Vlasov on hotplug-devel@, and as far as i can test it works just fine. Signed-off-by: David S. Miller commit 30aaa154fc21ad1ee4400e28009732a04a80862f Author: Adrian Bunk Date: Sun Apr 9 22:29:17 2006 -0700 [IPV6]: Unexport secure_ipv6_port_ephemeral This patch removes the unused EXPORT_SYMBOL(secure_ipv6_port_ephemeral). Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 503e4faad18baa62bb818537b920ad939749823e Author: Brian Haley Date: Fri Apr 7 15:00:06 2006 -0700 [NETFILTER]: Fix build with CONFIG_NETFILTER=y/m on IA64 Can't build with CONFIG_NETFILTER=y/m on IA64, there's a missing #include in net/ipv6/netfilter.c net/ipv6/netfilter.c: In function `nf_ip6_checksum': net/ipv6/netfilter.c:92: warning: implicit declaration of function `csum_ipv6_magic' Signed-off-by: Brian Haley Signed-off-by: David S. Miller commit 77d04bd957ddca9d48a664e28b40f33993f4550e Author: Andrew Morton Date: Fri Apr 7 14:52:59 2006 -0700 [NET]: More kzalloc conversions. Signed-off-by: David S. Miller commit 31380de95cc3183bbb379339e67f83d69e56fbd6 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Apr 6 22:38:28 2006 -0700 [NET] kzalloc: use in alloc_netdev Noticed this use, fixed it. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: David S. Miller commit 83b950c89c8cc0dcc1b079c638be25915c9945f1 Author: Jamal Hadi Salim Date: Thu Apr 6 22:24:22 2006 -0700 [PKT_SCHED] act_police: Rename methods. Rename policer specific _generic_ methods to be specific to _act_police_ Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit bbadf503d7c7e6efe0a4cd731f8855ba08276215 Author: Michael Chan Date: Thu Apr 6 21:46:34 2006 -0700 [TG3]: Speed up SRAM access (2nd version) Speed up SRAM read and write functions if possible by using MMIO instead of config. cycles. With this change, the post reset signature done at the end of D3 power change must now be moved before the D3 power change. IBM reported a problem on powerpc blades during ethtool self test that was caused by the memory test taking excessively long. Config. cycles are very slow on powerpc and the memory test can take more than 10 seconds to complete using config. cycles. David Miller informed me that an earlier version of the patch caused problems on sparc64 systems with built-in tg3 chips. This version fixes the problem by excluding all SUN built-in tg3 chips from doing MMIO SRAM access. TG3_FLAG_EEPROM_WRITE_PROT is also set unconditionally when TG3_FLG2_SUN_570X is set. This should be sane as all SUN chips are built-in and do not require Vaux switching. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit d2d746f83b74022a50d28f7f0f496842c9cde330 Author: Michael Chan Date: Thu Apr 6 21:45:39 2006 -0700 [TG3]: Kill some less useful flags Kill the TG3_FLAG_NO_{TX|RX}_PSEUDO_CSUM flags because they are not very useful. This will free up some bits for new flags. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 7a43c9955178f1cc88374abe1186c0f2ef21e040 Author: Patrick McHardy Date: Thu Apr 6 16:16:51 2006 -0700 [NETFILTER]: H.323 helper: remove changelog Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 96f6bf82ea3abc77d255d5d554df5f349651f6de Author: Patrick McHardy Date: Thu Apr 6 14:19:24 2006 -0700 [NETFILTER]: Convert conntrack/ipt_REJECT to new checksumming functions Besides removing lots of duplicate code, all converted users benefit from improved HW checksum error handling. Tested with and without HW checksums in almost all combinations. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 422c346fad806e2abaeffac686860ebc98dfe33e Author: Patrick McHardy Date: Thu Apr 6 14:18:43 2006 -0700 [NETFILTER]: Add address family specific checksum helpers Add checksum operation which takes care of verifying the checksum and dealing with HW checksum errors and avoids multiple checksum operations by setting ip_summed to CHECKSUM_UNNECESSARY after successful verification. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit bce8032ef3cc58170ab3550e9e271dba7b4c4764 Author: Patrick McHardy Date: Thu Apr 6 14:18:09 2006 -0700 [NETFILTER]: Introduce infrastructure for address family specific operations Change the queue rerouter intrastructure to a generic usable infrastructure for address family specific operations as a base for some cleanups. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit a0aed49bdb2bbb4234789f241cffb607fd2e213d Author: Patrick McHardy Date: Thu Apr 6 14:17:27 2006 -0700 [NETFILTER]: Fix IP_NF_CONNTRACK_NETLINK dependency When NAT is built as a module, ip_conntrack_netlink can not be linked statically. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit a0b7db5e86d30f470dc1849f4fa44ff77a813091 Author: Jing Min Zhao Date: Thu Apr 6 14:15:33 2006 -0700 [NETFILTER]: H.323 helper: add parameter 'default_rrq_ttl' default_rrq_ttl is used when no TTL is included in the RRQ. Signed-off-by: Jing Min Zhao Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 51d42f5e4ee43fc98aa0c7a2a104808bb602276f Author: Jing Min Zhao Date: Thu Apr 6 14:14:59 2006 -0700 [NETFILTER]: H.323 helper: make get_h245_addr() static Signed-off-by: Jing Min Zhao Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 0f249685fde399c01e51a63f2bdfe4a667db083c Author: Jing Min Zhao Date: Thu Apr 6 14:14:11 2006 -0700 [NETFILTER]: H.323 helper: change EXPORT_SYMBOL to EXPORT_SYMBOL_GPL Signed-off-by: Jing Min Zhao Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 48bfee5fad0e46f4f18d46285efceba39e897482 Author: Jing Min Zhao Date: Thu Apr 6 14:13:42 2006 -0700 [NETFILTER]: H.323 helper: move some function prototypes to ip_conntrack_h323.h Move prototypes of NAT callbacks to ip_conntrack_h323.h. Because the use of typedefs as arguments, some header files need to be moved as well. Signed-off-by: Jing Min Zhao Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 32292a7ff1d9306841a8da6ea286847b1070cc6a Author: Patrick McHardy Date: Thu Apr 6 14:11:30 2006 -0700 [NETFILTER]: Fix section mismatch warnings Fix section mismatch warnings caused by netfilter's init_or_cleanup functions used in many places by splitting the init from the cleanup parts. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 964ddaa10de8f3aeed12bc2a30726514ff309e64 Author: Patrick McHardy Date: Thu Apr 6 14:09:49 2006 -0700 [NETFILTER]: Clean up hook registration Clean up hook registration by makeing use of the new mass registration and unregistration helpers. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 972d1cb1427946f4980240363aac4e73fb375290 Author: Patrick McHardy Date: Thu Apr 6 14:09:12 2006 -0700 [NETFILTER]: Add helper functions for mass hook registration/unregistration Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 137dc0233fba0bfa19679bdd96eb104f0e659c5a Author: Samuel Ortiz Date: Wed Apr 5 22:39:14 2006 -0700 [IRDA]: Support for Sigmatel STIR421x chip This patch enables support for the Sigmatel's STIR421x IrDA chip. Once patched with Sigmatel's firmware, this chip "almost" follows the USB-IrDA spec. Thus this patch is against irda-usb.[ch]. The code has been tested by Nick Fedchik on an STIR4210 chipset based dongle. Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit c1e14a6ea2ae34993f431d2eb9a0f228ac3574eb Author: Linus Walleij Date: Wed Apr 5 22:33:59 2006 -0700 [IRDA]: smcinit merged into smsc-ircc driver This patch integrates the smcinit code into the smsc-ircc driver. Some laptops have their smsc-ircc chip not properly configured by the BIOS and needs some preconfiguration. Currently, this can be done from userspace with smcinit, a utility that comes with the irda-utils package. It messes with ioports and PCI settings, from userspace. Now with this patch, if we happen to be on one of the known to be faulty laptops, we preconfigure the chip from the driver. Patch from Linus Walleij Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit 45af08be6d120690d379cb8421ebaf9d9f86ba52 Author: Herbert Xu Date: Wed Apr 5 22:31:19 2006 -0700 [INET]: Use port unreachable instead of proto for tunnels This patch changes GRE and SIT to generate port unreachable instead of protocol unreachable errors when we can't find a matching tunnel for a packet. This removes the ambiguity as to whether the error is caused by no tunnel being found or by the lack of support for the given tunnel type. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit cdee5751bf91d02616aaf30a5affef56105e3b79 Author: Eric Sesterhenn Date: Wed Apr 5 22:28:14 2006 -0700 [BLUETOOTH] sco: Possible double free. this fixes coverity bug id #1068. hci_send_sco() frees skb if (skb->len > hdev->sco_mtu). Since it returns a negative error value only in this case, we can directly return here. Signed-off-by: Eric Sesterhenn Signed-off-by: David S. Miller commit ad96b485b4224785bcca478cfba02d06c46ee575 Author: Adrian Bunk Date: Wed Apr 5 22:21:04 2006 -0700 [TG3]: Fix a memory leak. This patch fixes a memory leak (buf wasn't freed) spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit e3a5cd9edff9a7a20de3c88c9d479704da98fb85 Author: Adrian Bunk Date: Wed Apr 5 22:19:47 2006 -0700 [NET]: Fix an off-by-21-or-49 error. This patch fixes an off-by-21-or-49 error ;-) spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit d938ab44c0c5418bb74a97b422a070e2cdccce22 Author: Randy Dunlap Date: Tue Apr 4 20:11:56 2006 -0700 [NET] netconsole: set .name in struct console Set .name in netconsole's struct console to identify the struct's owner. Signed-off-by: Randy Dunlap Acked-by: Matt Mackall Signed-off-by: David S. Miller commit 50fba2aa7cefa6b0e1768cb350c9e69042320c03 Author: Herbert Xu Date: Tue Apr 4 13:50:45 2006 -0700 [INET]: Move no-tunnel ICMP error to tunnel4/tunnel6 This patch moves the sending of ICMP messages when there are no IPv4/IPv6 tunnels present to tunnel4/tunnel6 respectively. Please note that for now if xfrm4_tunnel/xfrm6_tunnel is loaded then no ICMP messages will ever be sent. This is similar to how we handle AH/ESP/IPCOMP. This move fixes the bug where we always send an ICMP message when there is no ip6_tunnel device present for a given packet even if it is later handled by IPsec. It also causes ICMP messages to be sent when no IPIP tunnel is present. I've decided to use the "port unreachable" ICMP message over the current value of "address unreachable" (and "protocol unreachable" by GRE) because it is not ambiguous unlike the other ones which can be triggered by other conditions. There seems to be no standard specifying what value must be used so this change should be OK. In fact we should change GRE to use this value as well. Incidentally, this patch also fixes a fairly serious bug in xfrm6_tunnel where we don't check whether the embedded IPv6 header is present before dereferencing it for the inside source address. This patch is inspired by a previous patch by Hugo Santos . Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 2e2f7aefa8a8ba4adb6ecee8cbb43fbe9ca4cc89 Author: Patrick McHardy Date: Tue Apr 4 13:42:35 2006 -0700 [NETFILTER]: Fix fragmentation issues with bridge netfilter The conntrack code doesn't do re-fragmentation of defragmented packets anymore but relies on fragmentation in the IP layer. Purely bridged packets don't pass through the IP layer, so the bridge netfilter code needs to take care of fragmentation itself. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 550e29bc96e6f1ced2bca82dace197b009434367 Author: Robert Olsson Date: Tue Apr 4 12:53:35 2006 -0700 [FIB_TRIE]: Fix leaf freeing. Seems like leaf (end-nodes) has been freed by __tnode_free_rcu and not by __leaf_free_rcu. This fixes the problem. Only tnode_free is now used which checks for appropriate node type. free_leaf can be removed. Signed-off-by: Robert Olsson Signed-off-by: David S. Miller commit 8bf4b8a1083694d5aac292f92705ddd3aec29be6 Author: Herbert Xu Date: Tue Apr 4 12:51:05 2006 -0700 [IPSEC]: Check x->encap before dereferencing it We need to dereference x->encap before dereferencing it for encap_type. If it's absent then the encap_type is zero. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 7359036d5cdb86d14cfeb06d0e5a1d68f85cf8b7 Author: Ben Dooks Date: Sun Apr 9 22:21:10 2006 +0100 [ARM] 3469/1: S3C24XX: clkout missing hclk selector Patch from Ben Dooks The clkout0/1 output parent code is missing the HCLK option, and does not set clk->parent field after updating the clock field Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 13011d08346d9d649119cc6ef519209c6f33f1e8 Author: Ben Dooks Date: Sun Apr 9 22:21:09 2006 +0100 [ARM] 3468/1: S3C2410: SMDK common include fix Patch from Ben Dooks common-smdk.c does not include its own header file defining the exported prototypes. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 67d4d8352b5a78df422a956657d9be4b860680ab Author: Tony Lindgren Date: Sun Apr 9 22:21:05 2006 +0100 [ARM] 3461/1: ARM: OMAP: Fix clk_get() when using id and name Patch from Tony Lindgren Recent change to use both id and name when available was not necessarily returning the right clock as it also searched for clock name afterwards. This caused MMC to break on H2 and H3 boards. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 50e5629aa956c8c82015c90554a9a3fbf54cb404 Author: Tony Lindgren Date: Sun Apr 9 22:21:02 2006 +0100 [ARM] 3460/1: ARM: OMAP: Remove unnecessary nop_release() Patch from Tony Lindgren Remove unnecessary omap_nop_release() as noted by RMK. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 932355797530f5bd4e1355a2c384e9f3ccc3dcbc Author: Lennert Buytenhek Date: Sun Apr 9 22:20:57 2006 +0100 [ARM] 3459/1: ixp23xx: fix debug serial macros for big-endian operation Patch from Lennert Buytenhek The debug-8250 macros do byte accesses, which means that if we're in big-endian mode, we need to logically OR the UART address with 3, as the LSB byte lane (where UART data and status is transferred) has the highest byte address in the word when we are in big-endian mode. It's unclear why this problem didn't surface earlier. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 67644726317a8274be4a3d0ef85b9ccebaa90304 Author: Dave Jones Date: Sun Apr 2 23:34:19 2006 -0700 [SELINUX] Fix build after ipsec decap state changes. security/selinux/xfrm.c: In function 'selinux_socket_getpeer_dgram': security/selinux/xfrm.c:284: error: 'struct sec_path' has no member named 'x' security/selinux/xfrm.c: In function 'selinux_xfrm_sock_rcv_skb': security/selinux/xfrm.c:317: error: 'struct sec_path' has no member named 'x' Signed-off-by: Dave Jones Signed-off-by: David S. Miller Signed-off-by: Linus Torvalds commit 66004a6ca23f2a2408b32cbe27fda0389fb8f9dc Author: Linus Torvalds Date: Sun Apr 9 12:14:02 2006 -0700 Move request_standard_resources() back to before PCI probing This effectively undoes the PCI resource allocation changes done in commit b408cbc704352eccee301e1103b23203ba1c3a0e, but leaves the cleanups of that commit in place. We're going back to marking the resources reported by e820 busy _before_ doing PCI probing, so that any PCI resource that clashes with the BIOS- reported memory map will be reloacted to a non-clashing area. The reason? Larry Finger reports that his laptop has the cardbus controller set up by the BIOS so that it conflicts with the e820 memory map, and needs to be relocated. See http://bugzilla.kernel.org/show_bug.cgi?id=6337 for more details. We'll have to work out how to handle the fbcon problem that caused that commit in the first place in some other way. Cc: Ivan Kokshaysky Cc: Greg Kroah-Hartman Cc: Antonino A. Daplas Cc: Tested-by: Larry Finger Signed-off-by: Linus Torvalds commit b8feb47f992d314c956add15c1118430120635bb Author: Andi Kleen Date: Fri Apr 7 19:50:34 2006 +0200 [PATCH] x86_64: Update 32-bit system call table Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 67d53ea5a3d42aadeb1584e757ca4660c0e8a810 Author: Andi Kleen Date: Fri Apr 7 19:50:31 2006 +0200 [PATCH] x86_64: Eliminate IA32_NR_syscalls define Or rather compute it based on the table length automatically. This also has the intended side effect of not warning for new system calls anymore. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit bbd3aff89d4b34ef17a748e4c001ecc5b43e3e55 Author: Sam Ravnborg Date: Fri Apr 7 19:50:28 2006 +0200 [PATCH] x86_64: fix CONFIG_REORDER Fix CONFIG_REORDER. The value of cflags-y was assined to CFLAGS before cflags-y was assigned the value used for CONFIG_REORDER. Use cflags-y for all CFLAGS options in the Makefile to avoid this happening again. Signed-off-by: Sam Ravnborg Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 97c2803c9c694cafbd9f5e43a25903e0abf25188 Author: John Blackwood Date: Fri Apr 7 19:50:25 2006 +0200 [PATCH] x86_64: Plug GS leak in arch_prctl() In linux-2.6.16, we have noticed a problem where the gs base value returned from an arch_prtcl(ARCH_GET_GS, ...) call will be incorrect if: - the current/calling task has NOT set its own gs base yet to a non-zero value, - some other task that ran on the same processor previously set their own gs base to a non-zero value. In this situation, the ARCH_GET_GS code will read and return the MSR_KERNEL_GS_BASE msr register. However, since the __switch_to() code does NOT load/zero the MSR_KERNEL_GS_BASE register when the task that is switched IN has a zero next->gs value, the caller of arch_prctl(ARCH_GET_GS, ...) will get back the value of some previous tasks's gs base value instead of 0. Change the arch_prctl() ARCH_GET_GS code to only read and return the MSR_KERNEL_GS_BASE msr register if the 'gs' register of the calling task is non-zero. Side note: Since in addition to using arch_prctl(ARCH_SET_GS, ...), a task can also setup a gs base value by using modify_ldt() and write an index value into 'gs' from user space, the patch below reads 'gs' instead of using thread.gs, since in the modify_ldt() case, the thread.gs value will be 0, and incorrect value would be returned (the task->thread.gs value). When the user has not set its own gs base value and the 'gs' register is zero, then the MSR_KERNEL_GS_BASE register will not be read and a value of zero will be returned by reading and returning 'task->thread.gs'. The first patch shown below is an attempt at implementing this approach. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e48c4729d23a026f3711d5e36add5cce894b4913 Author: Andi Kleen Date: Fri Apr 7 19:50:21 2006 +0200 [PATCH] i386: Remove printk about reboot fixups at reboot Printk doesn't have any value Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit b20367a6c2a0cd937cb1f0a8cf848f1402fef99c Author: Jordan Hargrave Date: Fri Apr 7 19:50:18 2006 +0200 [PATCH] x86_64: Fix drift with HPET timer enabled If the HPET timer is enabled, the clock can drift by ~3 seconds a day. This is due to the HPET timer not being initialized with the correct setting (still using PIT count). If HZ changes, this drift can become even more pronounced. HPET patch initializes tick_nsec with correct tick_nsec settings for HPET timer. Vojtech comments: "It's not entirely correct (it assumes the HPET ticks totally exactly), but it's significantly better than assuming the PIT error there." Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 49c93e84d8b2d602a07c302c7e3cd4fa09095fbb Author: Andi Kleen Date: Fri Apr 7 19:50:15 2006 +0200 [PATCH] i386/x86-64: Return defined error value for bad PCI config space accesses Mostly to get better handling when a extended config space access has to fallback to Type1. Cc: gregkh@suse.de Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 8c30b1a74aed4041f183e183a149b7dfbdc6c20e Author: Andi Kleen Date: Fri Apr 7 19:50:12 2006 +0200 [PATCH] i386/x86_64: Check if MCFG works for the first 16 busses Previously only the first bus would be checked against Type 1. Why 16? Checking all would need too much memory and we can assume that systems with more than 16 busses have better than average quality BIOS. This is an additional defense against bad MCFG tables. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e405d067298b2b960bf20318e91ed842157c65bc Author: Ravikiran G Thirumalai Date: Fri Apr 7 19:50:09 2006 +0200 [PATCH] x86_64: Fixup read_mostly section on internode cache line size for vSMP Fixup the read mostly section to start at internode cacheline boundary. Signed-off-by: Ravikiran Thirumalai Signed-off-by: Shai Fultheim Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 3d34ee6891e274dfb6a22930546d37738cdbe9c4 Author: Andi Kleen Date: Fri Apr 7 19:50:06 2006 +0200 [PATCH] x86_64: Don't return error for HPET initialization in initcall Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit ac04dcaf6f567307fbeef9c3c1fff35280e53f02 Author: Andi Kleen Date: Fri Apr 7 19:50:03 2006 +0200 [PATCH] x86_64: Don't export strlen twice Fix WARNING: vmlinux: 'strlen' exported twice. Previous export was in vmlinux Reported by Mats Johannesson Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 7bf36bbc5e0c09271f9efe22162f8cc3f8ebd3d2 Author: Andi Kleen Date: Fri Apr 7 19:50:00 2006 +0200 [PATCH] x86_64: When user could have changed RIP always force IRET Intel EM64T CPUs handle uncanonical return addresses differently from AMD CPUs. The exception is reported in the SYSRET, not the next instruction. This leads to the kernel exception handler running on the user stack with the wrong GS because the kernel didn't expect exceptions on this instruction. This version of the patch has the teething problems that plagued an earlier version fixed. This is CVE-2006-0744 Thanks to Ernie Petrides and Asit B. Mallick for analysis and initial patches. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 553f265fe883a23502ee351845f09334790f18b8 Author: Andi Kleen Date: Fri Apr 7 19:49:57 2006 +0200 [PATCH] x86_64: Don't run NMI watchdog during machine checks Machine checks can stall the machine for a long time and it's not good to trigger the nmi watchdog during that. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit be56db6186999a8571ae480cf2b929578f6dfd68 Author: Dave Hansen Date: Fri Apr 7 19:49:54 2006 +0200 [PATCH] x86_64: extra NODES_SHIFT definition The generic linux/numa.h file defines NODES_SHIFT to 0 in case the architecture did not. Every architecture which has a NUMA config option defines NODES_SHIFT in its asm-$ARCH headers, but only if NUMA is enabled, except for x86_64. This should make it like all the rest. Signed-off-by: Dave Hansen Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 4211a30349e8d2b724cfb4ce2584604f5e59c299 Author: Jacob Shin Date: Fri Apr 7 19:49:51 2006 +0200 [PATCH] x86_64: Proper null pointer check in powernow_k8_get This prevents crashes on dual core system when enough ticks are lost. Replaces earlier patch by me. Cc: Dave Jones Signed-off-by: Thomas Renninger Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d7fa706ce2c29cb751c15ca00f3aa7b223e3c9f0 Author: Andi Kleen Date: Fri Apr 7 19:49:48 2006 +0200 [PATCH] x86_64: Revert earlier powernow-k8 change Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 95d769aaf47abfc77b600631403ff5af6c990cff Author: Andi Kleen Date: Fri Apr 7 19:49:45 2006 +0200 [PATCH] i386: Consolidate modern APIC handling AMD systems have a modern APIC that supports 8 bit IDs, but don't have a XAPIC version number. Add a new "modern_apic" subfunction that handles this correctly and use it (nearly) everywhere where XAPIC is tested for. I removed one wart: the code specified that external APICs would use an 8bit APIC ID. But I checked a real 82093 data sheet and it says clearly that they only use 4bit. So I removed this special case since it would a bit awkward to implement now. I removed the valid APIC tests in mptable parsing completely. On any modern system they only check against the full field width (8bit) anyways and are no-ops. This also fixes them doing the wrong thing on >8 core Opterons. This makes i386 boot again on 16 core Opterons. Cc: Ingo Molnar Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d1530d82e02fd96d4634a6d6f6538c8b778c43af Author: Andi Kleen Date: Fri Apr 7 19:49:42 2006 +0200 [PATCH] x86_64: Clear APIC feature bit when local APIC is disabled Needed for other checks later in ACPI. Pointed out by Len Brown Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d3b6a349d233aecf2c52f7f4c150ca09f684f2d8 Author: Andi Kleen Date: Fri Apr 7 19:49:39 2006 +0200 [PATCH] x86-64/i386: Don't process APICs/IO-APICs in ACPI when APIC is disabled. When nolapic was passed or the local APIC was disabled for another reason ACPI would still parse the IO-APICs until these were explicitely disabled with noapic. Usually this resulted in a non booting configuration unless "nolapic noapic" was used. I also disabled the local APIC parsing in this case, although that's only cosmetic (suppresses a few printks) This hopefully makes nolapic work in all cases. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit ec0f08eeea6ac1d8c925f47e3677e4c985fd8f63 Author: Andi Kleen Date: Fri Apr 7 19:49:36 2006 +0200 [PATCH] x86_64: Don't sanity check Type 1 PCI bus access on newer systems Horus systems don't have anything on bus 0 which makes the Type 1 sanity checks fail. Use the DMI BIOS year to check for newer systems and always assume Type 1 works on them. I used 2001 as an pretty arbitary cutoff year. Cc: gregkh@suse.de Cc: Navin Boppuri Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit fa47dd0ba303599f8adf8d8336ed2fb74efc47c5 Author: Andi Kleen Date: Fri Apr 7 19:49:33 2006 +0200 [PATCH] x86_64: Fix compilation with CONFIG_PCI=n / allnoconfig Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 946f2ee5c7312e8acac4f3ab6629e7e2d36a3646 Author: Arjan van de Ven Date: Fri Apr 7 19:49:30 2006 +0200 [PATCH] i386/x86-64: Check that MCFG points to an e820 reserved area This patch introduces a user for the e820_all_mapped function: There have been several machines that don't have a working MMCONFIG, often because of a buggy MCFG table in the ACPI bios. This patch adds a simple sanity check that detects a whole bunch of these cases, and when it detects it, linux now boots rather than crash-and-burns. The accuracy of this detection can in principle be improved if there was a "is this entire range in e820 with THIS attribute", but no such function exist and the complexity needed for this is not really worth it; this simple check already catches most cases anyway. Signed-off-by: Arjan van de Ven Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 952223683ec989e86328c24808fdb962c4dbeb0a Author: Arjan van de Ven Date: Fri Apr 7 19:49:27 2006 +0200 [PATCH] x86_64: Introduce e820_all_mapped Introduce a e820_all_mapped() function which checks if the entire range is mapped with type. This is done by moving the local start variable to the end of each known-good region; if at the end of the function the start address is still before end, there must be a part that's not of the correct type; otherwise it's a good region. Signed-off-by: Arjan van de Ven Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit eee5a9fa63c97366cdea6ab3aa2ed9e3601812d0 Author: Arjan van de Ven Date: Fri Apr 7 19:49:24 2006 +0200 [PATCH] x86_64: Rename e820_mapped to e820_any_mapped Rename e820_mapped to e820_any_mapped since it tests if any part of the range is mapped according to the type. Later steps will introduce e820_all_mapped which will check if the entire range is mapped with the type. Both have their merit. Signed-off-by: Arjan van de Ven Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit a8062231d80239cf3405982858c02aea21a6066a Author: Andi Kleen Date: Fri Apr 7 19:49:21 2006 +0200 [PATCH] x86_64: Handle empty PXMs that only contain hotplug memory The node setup code would try to allocate the node metadata in the node itself, but that fails if there is no memory in there. This can happen with memory hotplug when the hotplug area defines an so far empty node. Now use bootmem to try to allocate the mem_map in other nodes. And if it fails don't panic, but just ignore the node. To make this work I added a new __alloc_bootmem_nopanic function that does what its name implies. TBD should try to use nearby nodes here. Currently we just use any. It's hard to do it better because bootmem doesn't have proper fallback lists yet. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 68a3a7feb08f960095072f28ec20f7900793c506 Author: Andi Kleen Date: Fri Apr 7 19:49:18 2006 +0200 [PATCH] x86_64: Reserve SRAT hotadd memory on x86-64 From: Keith Mannthey, Andi Kleen Implement memory hotadd without sparsemem. The memory in the SRAT hotadd area is just preserved instead and can be activated later. There are a few restrictions: - Only one continuous hotadd area allowed per node The main problem is dealing with the many buggy SRAT tables that are out there. The strategy here is to reject anything suspicious. Originally from Keith Mannthey, with several hacks and changes by AK and also contributions from Andrew Morton [ TBD: Problems pointed out by KAMEZAWA Hiroyuki : 1) Goto's rebuild_zonelist patch will not work if CONFIG_MEMORY_HOTPLUG=n. Rebuilding zonelist is necessary when the system has just memory < 4G at boot, and hot add memory > 4G. because x86_64 has DMA32, ZONE_NORAML is not included into zonelist at boot time if system doesn't have memory >4G at boot. [AK: should just force the higher zones at boot time when SRAT tells us] 2) zone and node's spanned_pages and present_pages are not incremented. They should be. For example, our server (ia64/Fujitsu PrimeQuest) can equip memory from 4G to 1T(maybe 2T in future), and SRAT will *always* say we have possible 1T +memory. (Microsoft requires "write all possible memory in SRAT") When we reserve memmap for possible 1T memory, Linux will not work well in +minimum 4G configuraion ;) [AK: needs limiting to 5-10% of max memory] ] Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 9d99aaa31f5994d1923c3713ce9144c4c42332e1 Author: Andi Kleen Date: Fri Apr 7 19:49:15 2006 +0200 [PATCH] x86_64: Support memory hotadd without sparsemem Memory hotadd doesn't need SPARSEMEM, but can be handled by just preallocating mem_maps. This only needs some untangling of ifdefs to enable the necessary code even without SPARSEMEM. Originally from Keith Mannthey, hacked by AK. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 805e8c03c9ea9bdb402a36341e02ec24825d5417 Author: Andi Kleen Date: Fri Apr 7 19:49:12 2006 +0200 [PATCH] x86_64: Clean up execve path Just call IRET always, no need for any special cases. Needed for the next bug fix. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 903fcc608e9f531749024172277dc2fd15d5a587 Author: Andi Kleen Date: Fri Apr 7 19:49:09 2006 +0200 [PATCH] x86_64: Update defconfig Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit c5b8ef62b5df9530c573f00f4106742661425392 Author: Russell King Date: Sun Apr 9 19:08:42 2006 +0100 [ARM] Allow decompressor to be built with -ffunction-sections Arrange for all the text ends up in the right place when -ffunction-sections is used. Signed-off-by: Russell King commit 0ffe984917b9cd6ecc19ffbc06f35869d8c18df8 Author: Christoph Lameter Date: Tue Mar 28 22:54:38 2006 -0800 [IA64] Prefetch mmap_sem in ia64_do_page_fault() Take a hint from an x86_64 optimization by Arjan van de Ven and use it for ia64. See a9ba9a3b3897561d01e04cd21433746df46548c0 Prefetch the mmap_sem, which is critical for the performance of the page fault handler. Note: mm may be NULL but I guess that is safe. See 458f935527372499b714bf4f8e646a68bb0f52e3 Signed-off-by: Christoph Lameter Signed-off-by: Tony Luck commit 8cab7ccccbdd9fe3cf6b3400d5a88ecb683a5b1b Author: Keith Owens Date: Fri Apr 7 16:34:34 2006 +1000 [IA64] Failure to resume after INIT in user space The OS INIT handler is loading incorrect values into cr.ifa on exit. This shows up as a hang when resuming after an INIT that is delivered while a cpu is in user space. Correct the value loaded into cr.ifa. Signed-off-by: Keith Owens Signed-off-by: Tony Luck commit 958b166c00b39ff0b28ad2bbb32624b9f305a4e1 Author: Keith Owens Date: Mon Apr 3 15:26:12 2006 +1000 [IA64] Pass more data to the MCA/INIT notify_die hooks The MCA/INIT handlers maintain important state in the SAL to OS (sos) area and in the monarch_cpu flag. Kernel debuggers (such as KDB) need this data, and may need to adjust the monarch_cpu field so make the data available to the notify_die hooks. Define two more events for calling the functions on the notify_die chain. Signed-off-by: Keith Owens Signed-off-by: Tony Luck commit 2db8d99ffdbed7d2beb1bbdefdcd086dda9dee98 Author: Bjorn Helgaas Date: Fri Apr 7 22:47:12 2006 -0700 [IA64] always map VGA framebuffer UC, even if it supports WB EFI on some machines, e.g., Intel Tiger, reports that the VGA framebuffer supports WB access. ioremap() prefers WB when possible, so it can work when mapping main memory. But it doesn't make sense to map a framebuffer WB, because the driver doesn't flush explicitly, so updates won't make it to the device immediately. This is due to Zou Nan hai . More extensive fix that adds a "size" argument coming soon. Signed-off-by: Bjorn Helgaas Cc: "Antonino A. Daplas" Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Tony Luck commit cfab9d0e1da8e08a39759d0fc3bf5e40f0ac2d55 Author: Chen, Kenneth W Date: Fri Apr 7 17:12:54 2006 -0700 [IA64] fix bug in ia64 __mutex_fastpath_trylock The parenthesis around "likely" used in ia64 __mutex_fastpath_trylock is incorrect, and it leads to broken mutex_trylock. Here is the patch that fixed the bug. I removed the likely altogether because there is no branch and gcc does a reasonable job at predicating the return value. Signed-off-by: Ken Chen Signed-off-by: Tony Luck commit a9e2ae39170d01937725e1fff2e606baaa71346c Author: Mark Fasheh Date: Fri Mar 24 14:20:17 2006 -0800 ocfs2: Better I/O error handling in heartbeat Propagate errors received in o2hb_bio_end_io() back to the heartbeat thread so it can skip re-arming the timer. Signed-off-by: Mark Fasheh commit 2cd9888590c52ac7592e3607d0a3174ccd57ef86 Author: Mark Fasheh Date: Wed Mar 29 16:49:13 2006 -0800 ocfs2: test and set teardown flag early in user_dlm_destroy_lock() Signed-off-by: Mark Fasheh commit f43e6918c0e3906fd4483316f6a1a07bba615908 Author: Mark Fasheh Date: Wed Mar 29 18:24:12 2006 -0800 ocfs2: Handle the DLM_CANCELGRANT case in user_unlock_ast() Remove the code which attempted to catch it via dlmunlock() return status - this never happens there. Signed-off-by: Mark Fasheh commit cc6eb725955efb026007e1d7da8fe5383981afd2 Author: Mark Fasheh Date: Wed Mar 29 10:34:21 2006 -0800 ocfs2: catch an invalid ast case in dlmfs Signed-off-by: Mark Fasheh commit 1f7bc828e30fe3e23ea0968b9595ad20e2785978 Author: Mark Fasheh Date: Wed Mar 29 10:33:35 2006 -0800 ocfs2: remove an overly aggressive BUG() in dlmfs Don't BUG() user_dlm_unblock_lock() on the absence of the USER_LOCK_BLOCKED flag - this turns out to be a valid case. Make some of the related BUG() statements print more useful information. Signed-off-by: Mark Fasheh commit ab0920ce7ebb6d60063c793f227ae198a492251b Author: Mark Fasheh Date: Thu Mar 16 15:06:37 2006 -0800 ocfs2: multi node truncate fix Fix ocfs2_truncate_file() so that it forces a truncate_inode_pages() on all interested nodes in all cases of a truncate(), not just allocation change. Signed-off-by: Mark Fasheh commit 95f3df6bcb89d370c57b7165f55c5a409d011c8e Author: Russell King Date: Fri Apr 7 13:17:15 2006 +0100 [ARM] Fix SA110/SA1100 cache flushing We had two implementations for flushing the cache, which meant StrongARM caches weren't being correctly flushed. Fix this by always using the v4wb_flush_kern_cache_all method, rather than duplicating it. Signed-off-by: Russell King commit f1dc24d53e9e91cf795f05751eeb7e220c7c15e1 Author: Russell King Date: Fri Apr 7 11:04:54 2006 +0100 [ARM] ebsa110: Fix incorrect serial port address Signed-off-by: Russell King commit 6e29ebad0f252b085a3bb0188637f315efda0a48 Author: Russell King Date: Fri Apr 7 10:16:55 2006 +0100 [ARM] Fix ebsa110 debug macros Was including debug-8250.h rather than debug-8250.S Signed-off-by: Russell King commit 74d02fb9543ec85b04319b5b50926c78e7f07f3e Author: Russell King Date: Tue Apr 4 21:47:43 2006 +0100 [ARM] Move FLUSH_BASE macros to asm/arch/memory.h FLUSH_BASE must be visible to arch/arm/mm/init.c in order for the memory region to be setup. Move these definitions from asm-arm/arch-*/hardware.h into asm-arm/arch-*/memory.h where mm stuff can see them. Signed-off-by: Russell King commit 31f64bd101ea256f9fc4a7f1f1706d6417d5550a Author: Dave Airlie Date: Fri Apr 7 16:55:43 2006 +1000 drm: deline a few large inlines in DRM code This patch moves a few large functions from drm_memory.h to drm_memory.c, with the following effect: text data bss dec hex filename 46305 1304 20 47629 ba0d new/drm.ko 46367 1304 20 47691 ba4b org/drm.ko 12969 1372 0 14341 3805 new/i810.ko 14712 1372 0 16084 3ed4 org/i810.ko 16447 1364 0 17811 4593 new/i830.ko 18198 1364 0 19562 4c6a org/i830.ko 11875 1324 0 13199 338f new/i915.ko 13025 1324 0 14349 380d org/i915.ko 23936 29288 0 53224 cfe8 new/mga.ko 27280 29288 0 56568 dcf8 org/mga.ko Please apply. Signed-off-by: Denis Vlasenko Signed-off-by: Dave Airlie commit d9df92e22aca939857c5bc9ecb130ef22307ccc1 Author: Sam Ravnborg Date: Fri Apr 7 08:36:49 2006 +0200 kbuild: properly pass options to hostcc when doing make O=.. This fix a longstanding bug where proper options was not passed to hostcc in case of a make O=.. build. This bug showed up in (not yet merged) klibc, and is not known to have any counterpart in-kernel. Fixed by moving the flags macro to Kbuild.include so it can be used by both Makefile.lib and Makefile.host. Signed-off-by: Sam Ravnborg commit 0681226661754a99de711cda2c2bd12ff9cd2c3b Author: KAMEZAWA Hiroyuki Date: Tue Mar 28 14:50:09 2006 -0800 [IA64] for_each_possible_cpu: ia64 for_each_cpu() actually iterates across all possible CPUs. We've had mistakes in the past where people were using for_each_cpu() where they should have been iterating across only online or present CPUs. This is inefficient and possibly buggy. We're renaming for_each_cpu() to for_each_possible_cpu() to avoid this in the future. This patch replaces for_each_cpu with for_each_possible_cpu under arch/ia64/kernel/. Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Tony Luck commit 03fbaca36a85a8c923e30abfb1a9a630bf1c5a1d Author: Bjorn Helgaas Date: Tue Mar 28 14:06:20 2006 -0800 [IA64] update HP CSR space discovery via ACPI Get rid of the manual search of _CRS, in favor of acpi_get_vendor_resource() which is now provided by the ACPI CA. And fall back to searching for a consumer-only address space descriptor if no vendor-defined resource is found. Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Tony Luck commit b8cd2af862c3cbd428600e1c4f0d3f97c0da54cc Author: Tony Luck Date: Thu Apr 6 14:20:16 2006 -0700 [IA64] Wire up new syscalls {set,get}_robust_list Join the dots to enable Ingo's robut futex syscalls. Signed-off-by: Tony Luck commit 7d2d8fe0cb88914d26219db51341d780a032b198 Author: Andreas Gruenbacher Date: Wed Apr 5 23:33:50 2006 +0200 kbuild: modules_install for external modules must not remove existing modules When installing external modules with `make modules_install', the first thing that happens is a rm -rf of the target directory. This works only once, and breaks when installing more than one (set of) external module(s). With following fix we have the functionality: - for a in-kernel modules_install the $(MODLIB)/kernel directory will be deleted before module installation - for external modules the existing modules will be left as is assuming one may be building and installign several external modules Signed-off-by: Andreas Gruenbacher Signed-off-by: Sam Ravnborg commit aa360879ed38fbe88057cc43f720881ab9e6a63a Author: Sam Ravnborg Date: Thu Apr 6 08:25:31 2006 +0200 kbuild: fix make dir/ kbuild added an extra '/' after the directory - resulting in all files being rebuild in a subdirectory. Signed-off-by: Sam Ravnborg commit ea88df9bf895720289331e41ed73cdcb04059900 Author: Alexey Dobriyan Date: Wed Sep 21 21:37:24 2005 +0400 ver_linux: don't print reiser4progs version if none found Sam: did the same for reiserprogs Signed-off-by: Alexey Dobriyan Signed-off-by: Sam Ravnborg commit 0947640f4388de50a39f762748b08e586a482527 Author: Atsushi Nemoto Date: Tue Mar 28 00:18:54 2006 +0900 kbuild: mips: fix sed regexp to generate asm-offset.h Changes to Makefile.kbuild ("kbuild: add -fverbose-asm to i386 Makefile") breaks asm-offset.h file on MIPS. Other archs possibly suffer this change too but I'm not sure. Here is a fix just for MIPS. Signed-off-by: Atsushi Nemoto Signed-off-by: Sam Ravnborg commit bc2546a67975a7bddc72f8c48b0bb2081b56f853 Author: Sam Ravnborg Date: Wed Apr 5 12:57:21 2006 +0200 kbuild: fix building single targets with make O=.. single-target This fixes single targets build so it now works relaiably in following cases: - build with mixed kernel source and output files (make single-target) - build with separate output directory (make O=.. single-target) - external module with mixed kernel source and output files (make M='pwd' single-target) - external module with separate kernel source and output files (make O=.. M='pwd' single-target) Signed-off-by: Sam Ravnborg commit 11bab7d2c86fe486e3581ac3dcdb349478ffb899 Author: Dave Airlie Date: Wed Apr 5 18:13:13 2006 +1000 drm: remove master setting from add/remove context Clients can do this in the miniglx setups. Signed-off-by: Dave Airlie commit 195b3a2d57b81d30e3129575ef6c8a95b2c936b7 Author: Dave Airlie Date: Wed Apr 5 18:12:18 2006 +1000 drm: drm_pci needs dma-mapping.h On alpha: WARNING: "dma_free_coherent" [drivers/char/drm/drm.ko] undefined! WARNING: "dma_alloc_coherent" [drivers/char/drm/drm.ko] undefined! Signed-off-by: Andrew Morton Signed-off-by: Dave Airlie commit 86678dfddba55a7b9e2ea084d59be6500fec2256 Author: Dave Airlie Date: Wed Apr 5 18:10:11 2006 +1000 [PATCH] drm: Fix issue reported by Coverity in drivers/char/drm/via_irq.c This patch tries to fix an issue reported in drivers/char/drm/via_irq.c by Coverity, please review and apply if correct. Error reported: CID: 3444 Checker: REVERSE_INULL (help) File: /export2/p4-coverity/mc2/linux26/drivers/char/drm/via_irq.c Function: via_driver_irq_wait Description: Pointer "dev_priv" dereferenced before NULL check Patch Description: Move de-referencing dev_priv to after the NULL check. Signed-off-by: Jayachandran C. Signed-off-by: Dave Airlie commit b86756ae76dc5e7ecff3ca52a5842155e6d457de Author: Paul Mackerras Date: Mon Apr 3 16:37:23 2006 +1000 powerpc: Fix CHRP booting - needs a define_machine call The patch removing _machine and converting platforms over to use define_machine wasn't complete as far as CHRP was concerned. This adds the define_machine call for CHRP and gets it booting again. Signed-off-by: Paul Mackerras commit d2e0655ede1d91c3a586455d03a4a2d57e659830 Author: Michael S. Tsirkin Date: Tue Apr 4 19:59:40 2006 +0300 IPoIB: Consolidate private neighbour data handling Consolidate IPoIB's private neighbour data handling into ipoib_neigh_alloc() and ipoib_neigh_free(). This will make it easier to keep track of the neighbour structures that IPoIB is handling, and is a nice cleanup of the code: add/remove: 2/1 grow/shrink: 1/8 up/down: 100/-178 (-78) function old new delta ipoib_neigh_alloc - 61 +61 ipoib_neigh_free - 36 +36 ipoib_mcast_join_finish 1288 1291 +3 path_rec_completion 575 573 -2 ipoib_mcast_join_task 664 660 -4 ipoib_neigh_destructor 101 92 -9 ipoib_neigh_setup_dev 14 3 -11 ipoib_neigh_setup 17 - -17 path_free 238 215 -23 ipoib_mcast_free 329 306 -23 ipoib_mcast_send 718 684 -34 neigh_add_path 705 650 -55 Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 27f4aa3db090ff5bc0e6c192aae6d99b21563b21 Author: Tony Luck Date: Tue Apr 4 14:11:49 2006 -0700 [IA64] 'msg' may be used uninitialized in xpc_initiate_allocate() Found by gcc4.1 and reported by Dean Nelson. Signed-off-by: Tony Luck commit d905b00b3bc9484d92dd6e9bd9fd8cf66580dc8a Author: Tony Luck Date: Tue Apr 4 14:08:11 2006 -0700 [IA64] Wire up new syscall sync_file_range() Also reserve syscall numbers for {set,get}_robust_list Signed-off-by: Tony Luck commit 7d12963757b9170f162f317b7461353c5fb574e8 Author: Russell King Date: Tue Apr 4 16:25:47 2006 +0100 [ARM] Remove unnecessary extra parens in include/asm-arm/memory.h Signed-off-by: Russell King commit 0da323505fc7dd6b01d35e6181cb3d45f992726a Author: KAMEZAWA Hiroyuki Date: Tue Apr 4 16:06:00 2006 +0100 [ARM] arm's arch_local_page_offset() fix against 2.6.17-rc1 This patch fixes arch_local_page_offset(pfn,nid) in arm. This new one (added by unify_pfn_to_page patches) is obviously buggy. This macro calculate page offset in a node. Note: about LOCAL_MAP_NR() comment in arm's sub-archs says... /* * Given a kaddr, LOCAL_MAP_NR finds the owning node of the memory * and returns the index corresponding to the appropriate page in the * node's mem_map. */ but LOCAL_MAP_NR() is designed to be able to take both paddr and kaddr. In this case, paddr is better. Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Russell King commit b46da0567d3baa6783106e7463801292cdc79ddd Author: Sam Ravnborg Date: Tue Apr 4 16:56:10 2006 +0200 kbuild: use relative path to -I Using a relative path has the advantage that when the kernel source tree is moved the relevant .o files will not be rebuild just because the path to the kernel src has changed. This also got rid of a user of TOPDIR - which has been deprecated for a long time now. Signed-off-by: Sam Ravnborg commit 1417ae0869472f4f3768779c51c3979faca20b2e Author: Carl-Daniel Hailfinger Date: Tue Apr 4 01:02:30 2006 +0200 kbuild: fix unneeded rebuilds in drivers/net/chelsio after moving source tree This fixes some uneeded rebuilds under drivers/net/chelsio after moving the source tree. The makefiles used $(TOPDIR) for include paths, which is unnecessary. Changed to use relative paths. Compile tested, produces byte-identical code to the previous makefiles. Signed-off-by: Carl-Daniel Hailfinger Signed-off-by: Sam Ravnborg commit 8036dc6bdca0faa981be01377728678a6f6f3fde Author: Carl-Daniel Hailfinger Date: Tue Apr 4 00:35:36 2006 +0200 kbuild: fix unneeded rebuilds in drivers/media/video after moving source tree This fixes some uneeded rebuilds under drivers/media/video after moving the source tree. The makefiles used $(src) and $(srctree) for include paths, which is unnecessary. Changed to use relative paths. Compile tested, produces byte-identical code to the previous makefiles. Signed-off-by: Carl-Daniel Hailfinger Signed-off-by: Sam Ravnborg commit a7d7cb3cd6c97cbbe21d528c014e5f592006457d Author: Brian Gerst Date: Sat Mar 25 14:48:37 2006 -0500 kbuild: fix garbled text in modules.txt Signed-off-by: Brian Gerst Signed-off-by: Sam Ravnborg commit 7d01c880856bae31502095bc68784c1518a680cb Author: Stephen Rothwell Date: Tue Apr 4 14:49:48 2006 +1000 powerpc: iSeries has only 256 IRQs The iSeries Hypervisor only allows us to specify IRQ numbers up to 255 (it has a u8 field to pass it in). This patch allows platforms to specify a maximum to the virtual IRQ numbers we will use and has iSeries set that to 255. If not set, the maximum is NR_IRQS - 1 (as before). Signed-off-by: Stephen Rothwell commit ce1823f0323be9f38bbe0df229a5bba025404923 Author: Roland Dreier Date: Mon Apr 3 09:31:04 2006 -0700 IB/srp: Fix memory leak in options parsing Fix memory leak if parsing destination GID fails. Coverity bug 1042 Signed-off-by: Roland Dreier commit 4c41251e31982002bca0ce7e903c0cc66218c1ec Author: Erik Mouw Date: Mon Apr 3 14:21:00 2006 +0200 [CPUFREQ] Update LART site URL Update LART site URL. The LART website moved to http://www.lartmaker.nl/. This patch updates the URL in CpuFreq specific files. Signed-off-by: Erik Mouw Signed-off-by: Dave Jones commit 6246b6128bbe34d0752f119cf7c5111c85fe481d Author: Linus Torvalds Date: Sun Apr 2 20:22:10 2006 -0700 Linux v2.6.17-rc1 Close of the merge window.. commit 227c939b00cf786b5e2e95fc904518206f478421 Author: Roland Dreier Date: Sun Apr 2 14:39:20 2006 -0700 IB/mthca: Always build debugging code unless CONFIG_EMBEDDED=y Change the mthca debugging trace output code so that it can enabled and disabled at runtime with the debug_level module parameter in sysfs. Also, don't allow CONFIG_INFINIBAND_MTHCA_DEBUG to be disabled unless CONFIG_EMBEDDED is selected. We want users (and especially distros) to have this turned on unless they really need to save space, because by the time we want debugging output, it's usually too late to rebuild a kernel. Signed-off-by: Roland Dreier commit f5545d24b8aa9fccd8071203e83bc9f4b26e17a6 Author: Roland Dreier Date: Sun Apr 2 14:39:19 2006 -0700 IPoIB: Always build debugging code unless CONFIG_EMBEDDED=y Don't allow CONFIG_INFINIBAND_IPOIB_DEBUG to be disabled unless CONFIG_EMBEDDED is selected. We want users (and especially distros) to have this turned on unless they really need to save space, because by the time we want debugging output, it's usually too late to rebuild a kernel. The debugging output can be controlled at runtime via the debug_level module parameter in sysfs. Signed-off-by: Roland Dreier commit 37289efe3ee0c0a00b5d8302df9a2b007e65c187 Author: Michael S. Tsirkin Date: Thu Mar 30 15:52:54 2006 +0200 IB/mad: fix oops in cancel_mads We have seen the following OOPs in cancel_mads, when restarting opensm multiple times: Call Trace: [] show_stack+0x9b/0xb0 [] show_registers+0x11c/0x190 [] die+0xed/0x160 [] do_page_fault+0x3f6/0x5d0 [] error_code+0x4f/0x60 [] cancel_mads+0x128/0x150 [ib_mad] [] unregister_mad_agent+0x11/0x130 [ib_mad] [] ib_unregister_mad_agent+0x12/0x20 [ib_mad] [] ib_umad_close+0xf3/0x130 [ib_umad] [] __fput+0x187/0x1c0 [] fput+0x19/0x20 [] filp_close+0x3a/0x60 [] put_files_struct+0x68/0xa0 [] do_signal+0x47/0x100 [] do_notify_resume+0x3d/0x40 [] work_notifysig+0x13/0x25 We traced this back to local_completions unlocking mad_agent_priv->lock while still keeping a pointer into local_list. A later call to list_del(&local->completion_list) would then corrupt the list. To fix this, remove the entry from local_list after looking it up but before releasing mad_agent_priv->lock, to prevent cancel_mads from finding and freeing it. Signed-off-by: Jack Morgenstein Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit b82fbe6c4232365272bde6f2c3f8fd9dd4dcd73a Author: Dave Jones Date: Sat Apr 1 22:07:07 2006 -0500 [CPUFREQ] Remove pointless check in conservative governor. < 0 checks on unsigned variables are pointless. Signed-off-by: Dave Jones commit 87c32271380e630955de365656f67b0a54b75b19 Author: Dave Jones Date: Wed Mar 29 01:48:37 2006 -0500 [CPUFREQ] trailing whitespace removal de-jour. Signed-off-by: Dave Jones commit 1f8b2c9d38c132e79e18cc726cf7a40ebdcb56d9 Author: Dave Jones Date: Wed Mar 29 01:40:04 2006 -0500 [CPUFREQ] extra debugging in cpufreq_add_dev() Snipped from an otherwise rejected patch by Jan Beulich Signed-off-by: Dave Jones