commit 88026842b0a760145aa71d69e74fbc9ec118ca44 Author: Linus Torvalds Date: Mon Jan 2 19:21:10 2006 -0800 Linux v2.6.15 Hey, it's fifteen years today since I bought the machine that got Linux started. January 2nd is a good date. commit 8f493d797bc1fe470377adc9d8775845427e240e Author: Andi Kleen Date: Tue Jan 3 00:07:28 2006 +0100 [PATCH] Make sure interleave masks have at least one node set Otherwise a bad mem policy system call can confuse the interleaving code into referencing undefined nodes. Originally reported by Doug Chapman I was told it's CVE-2005-3358 (one has to love these security people - they make everything sound important) Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit abe842eb98c45e2b77c5868ef106616ca828a3e4 Author: Dag-Erling Smřrgrav Date: Mon Jan 2 15:57:06 2006 +0100 [PATCH] Avoid namespace pollution in In commit 3D59121003721a8fad11ee72e646fd9d3076b5679c, the x86 and x86-64 was changed to include for the configurable timer frequency. However, asm/param.h is sometimes used in userland (it is included indirectly from ), so your commit pollutes the userland namespace with tons of CONFIG_FOO macros. This greatly confuses software packages (such as BusyBox) which use CONFIG_FOO macros themselves to control the inclusion of optional features. After a short exchange, Christoph approved this patch Signed-off-by: Linus Torvalds commit f12f4d90308a22396ac87f6c3a7b2620589614c3 Author: Benjamin Herrenschmidt Date: Mon Jan 2 13:04:44 2006 +1100 [PATCH] powerpc: more g5 overtemp problem fix Some G5s still occasionally experience shutdowns due to overtemp conditions despite the recent fix. After analyzing logs from such machines, it appears that the overtemp code is a bit too quick at shutting the machine down when reaching the critical temperature (tmax + 8) and doesn't leave the fan enough time to actually cool it down. This happens if the temperature of a CPU suddenly rises too high in a very short period of time, or occasionally on boot (that is the CPUs are already overtemp by the time the driver loads). This patches makes the code a bit more relaxed, leaving a few seconds to the fans to do their job before kicking the machine shutown. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 557962a926c62a9c4bd79d6b36df873d4f8c51ef Author: Stas Sergeev Date: Sun Jan 1 04:18:52 2006 +0300 [PATCH] x86: teach dump_task_regs() about the -8 offset. This should fix multi-threaded core-files Signed-off-by: stsp@aknet.ru Signed-off-by: Linus Torvalds commit de9e007d9105bf8fa613a89810feff32a43add03 Author: Linus Torvalds Date: Sat Dec 31 17:00:29 2005 -0800 sysctl: make sure to terminate strings with a NUL This is a slightly more complete fix for the previous minimal sysctl string fix. It always terminates the returned string with a NUL, even if the full result wouldn't fit in the user-supplied buffer. The returned length is the full untruncated length, so that you can tell when truncation has occurred. Signed-off-by: Linus Torvalds commit 82c9df820112c6286a8e8fbe482e94b65b49062c Author: Yi Yang Date: Fri Dec 30 16:37:10 2005 +0800 [PATCH] Fix false old value return of sysctl For the sysctl syscall, if the user wants to get the old value of a sysctl entry and set a new value for it in the same syscall, the old value is always overwritten by the new value if the sysctl entry is of string type and if the user sets its strategy to sysctl_string. This issue lies in the strategy being run twice if the strategy is set to sysctl_string, the general strategy sysctl_string always returns 0 if success. Such strategy routines as sysctl_jiffies and sysctl_jiffies_ms return 1 because they do read and write for the sysctl entry. The strategy routine sysctl_string return 0 although it actually read and write the sysctl entry. According to my analysis, if a strategy routine do read and write, it should return 1, if it just does some necessary check but not read and write, it should return 0, for example sysctl_intvec. Signed-off-by: Yi Yang Signed-off-by: Linus Torvalds commit 8febdd85adaa41fa1fc1cb31286210fc2cd3ed0c Author: Linus Torvalds Date: Fri Dec 30 17:18:53 2005 -0800 sysctl: don't overflow the user-supplied buffer with '\0' If the string was too long to fit in the user-supplied buffer, the sysctl layer would zero-terminate it by writing past the end of the buffer. Don't do that. Noticed by Yi Yang Signed-off-by: Linus Torvalds commit 8b90db0df7187a01fb7177f1f812123138f562cf Author: Linus Torvalds Date: Fri Dec 30 08:39:10 2005 -0800 Insanity avoidance in /proc The old /proc interfaces were never updated to use loff_t, and are just generally broken. Now, we should be using the seq_file interface for all of the proc files, but converting the legacy functions is more work than most people care for and has little upside.. But at least we can make the non-LFS rules explicit, rather than just insanely wrapping the offset or something. Signed-off-by: Linus Torvalds commit 40c37213a081990b1d3778f57630f97df75a7ec1 Author: Denny Priebe Date: Thu Dec 29 22:19:09 2005 -0500 [PATCH] Input: wacom - fix X axis setup This patch fixes a typo introduced by conversion to dynamic input_dev allocation. Signed-off-by: Dmitry Torokhov Signed-off-by: Linus Torvalds commit ae5536d6f7f9b51f7a0451421eade1988cfd7126 Author: Dmitry Torokhov Date: Thu Dec 29 22:19:08 2005 -0500 [PATCH] Input: warrior - fix HAT0Y axis setup This patch fixes a typo introduced by conversion to dynamic input_dev allocation. Signed-off-by: Dmitry Torokhov Signed-off-by: Linus Torvalds commit 1994754412536d4ab902a81530b49bcaf496a59c Author: Dmitry Torokhov Date: Thu Dec 29 22:19:07 2005 -0500 [PATCH] Input: kbtab - fix Y axis setup This patch fixes a typo introduced by conversion to dynamic input_dev allocation. Signed-off-by: Dmitry Torokhov Signed-off-by: Linus Torvalds commit f02aa3f9a3dea4375759ae1d87bebf2467719b72 Author: Erik Hovland Date: Fri Dec 30 15:57:35 2005 +0000 [ARM] 3216/1: indent and typo in drivers/serial/pxa.c Patch from Erik Hovland This patch provides two changes. An indent is supplied for an if/else clause so that it is more readable. An acronym is incorrectly typed as UER when it should be IER. Signed-off-by: Erik Hovland Signed-off-by: Russell King commit 9e625ff8a37aefcc177b19614ffcffb5bc6eeea1 Author: Jean Delvare Date: Thu Dec 29 22:07:30 2005 +0100 [PATCH] Simplify the VIDEO_SAA7134_OSS Kconfig dependency line Thanks to Roman Zippel for the suggestion. Signed-off-by: Jean Delvare [ Short explanation: Kconfig uses ternary math: n/m/y, and !m is m ] Signed-off-by: Linus Torvalds commit 392c14beaca2ee85a98d0c6b453501be67423a20 Author: Linus Torvalds Date: Thu Dec 29 13:01:54 2005 -0800 Revert radeon AGP aperture offset changes This reverts the series of commits 67dbb4ea33731415fe09c62149a34f472719ac1d 281ab031a8c9e5b593142eb4ec59a87faae8676a 47807ce381acc34a7ffee2b42e35e96c0f322e52 that changed the GART VM start offset. It fixed some machines, but seems to continually interact badly with some X versions. Quoth Ben Herrenschmidt: "So I think at this point, the best is that we keep the old bogus code that at least is consistent with the bug in the server. I'm working on a big patch to X that reworks the memory map stuff completely and fixes those issues on the server side, I'll do a DRM patch matching this X fix as well so that the memory map is only ever set in one place and with what I hope is a correct algorithm..." Signed-off-by: Linus Torvalds commit 80c72579f74fcfcd63e27c5e317091cb35bb1f12 Author: Jean Delvare Date: Wed Dec 28 21:02:57 2005 +0100 [PATCH] Fix recursive config dependency for SAA7134 Fix the cyclic dependency issue between CONFIG_SAA7134_ALSA and CONFIG_SAA7134_OSS (credits to Mauro Carvalho Chehab.) Signed-off-by: Jean Delvare Acked-by: Mauro Carvalho Chehab Signed-off-by: Linus Torvalds commit e597cb32e95a6c38e9ead981b169ef2974ccfec0 Author: Anton Blanchard Date: Thu Dec 29 10:46:29 2005 +1100 [PATCH] ppc64: htab_initialize_secondary cannot be marked __init Sonny has noticed hotplug CPU on ppc64 is broken in 2.6.15-*. One of the problems is that htab_initialize_secondary is called when a cpu is being brought up, but it is marked __init. Signed-off-by: Anton Blanchard Acked-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 576fc0978b6b3673fce6d4b405f36449e508826c Author: Ravikiran G Thirumalai Date: Thu Dec 29 13:06:11 2005 +0100 [PATCH] x86_64: Fix incorrect node_present_pages on NUMA Currently, we do not pass the correct start_pfn to e820_hole_size, to calculate holes. Following patch fixes that. The bug results in incorrect number of node_present_pages for each pgdat and causes ugly output in /sys and probably VM inbalances. Signed-off-by: Alok N Kataria Signed-off-by: Ravikiran Thirumalai Signed-off-by: Andi Kleen Sighed-off-by: Shair Fultheim Sighed-off-by: Linus Torvalds commit f873e3e88d52774633968826c5b7fa7bf9697999 Author: Riccardo Magliocchetti Date: Wed Dec 28 20:44:48 2005 -0500 [PATCH] Input: aiptek - fix Y axis setup This patch fixes a typo introduced by conversion to dynamic input_dev allocation. Signed-off-by: Dmitry Torokhov Signed-off-by: Linus Torvalds commit ee025949586f80effa634ff273c2444795472780 Author: Dave Jones Date: Wed Dec 28 20:01:04 2005 -0500 [PATCH] fix ia64 compile failure with gcc4.1 __get_unaligned creates a typeof the var its passed, and writes to it, which on gcc4.1, spits out the following error: drivers/char/vc_screen.c: In function 'vcs_write': drivers/char/vc_screen.c:422: error: assignment of read-only variable 'val' Signed-off-by: Dave Jones [ The "right" fix would be to try to fix but that's hard to do with the tools gcc gives us. So this simpler patch is preferable -- Linus ] Signed-off-by: Linus Torvalds commit 63b44442416a243f05881b0dd094b621a46ab4b3 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Dec 29 17:40:02 2005 +0100 [PATCH] uml: fix compilation with CONFIG_MODE_TT disabled Fix UML compilation when SKAS mode is disabled. Indeed, we were compiling SKAS-only object files, which failed due to some SKAS-only headers being excluded from the search path. Thanks to the bug report from Pekka J Enberg. Acked-by: Pekka J Enberg Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 74433c0fe105f47e78c1f2267312693870c9ebc3 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Dec 29 17:39:59 2005 +0100 [PATCH] Hostfs: update for new glibc - add missing symbol exports Today, when compiling UML, I got warnings for two used unexported symbols: readdir64 and truncate64. Indeed, my glibc headers are aliasing readdir to readdir64 and truncate to truncate64 (and so on). I'm then adding additional exports. Since I've no idea if the symbols where always provided in the supported glibc's, I've added weak definitions too. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 30f04a4efa73dc80bf3f59f3f19ad5a24ac5ac0a Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Dec 29 17:39:57 2005 +0100 [PATCH] uml: hostfs - fix possible PAGE_CACHE_SHIFT overflows Prevent page->index << PAGE_CACHE_SHIFT from overflowing. There is a casting there, but was added without care, so it's at the wrong place. Note the extra parens around the shift - "+" is higher precedence than "<<", leading to a GCC warning which saved all us. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 3d0a07e3310c947c048bd01d8d0efa0e4fae5ba9 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Dec 29 17:39:54 2005 +0100 [PATCH] Hostfs: remove unused var Trivial removal of unused variable from this file - doesn't even change the generated assembly code, in fact (gcc should trigger a warning for unused value here). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 516949480d3700cbde4272228a102c84721d6007 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Dec 29 17:39:51 2005 +0100 [PATCH] uml: fix random segfaults at bootup Don't use printk() where "current_thread_info()" is crap. Until when we switch to running on init_stack, current_thread_info() evaluates to crap. Printk uses "current" at times (in detail, ¤t is evaluated with CONFIG_DEBUG_SPINLOCK to check the spinlock owner task). And this leads to random segmentation faults. Exactly, what happens is that ¤t = *(current_thread_info()), i.e. round down $esp and dereference the value. I.e. access the stack below $esp, which causes SIGSEGV on a VM_GROWSDOWN vma (see arch/i386/mm/fault.c). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 68ca243dd1dc90bd42bae3945e804c1042584920 Author: David S. Miller Date: Wed Dec 28 13:27:04 2005 -0800 [SERMOUSE]: Sun mice speak 5-byte protocol too. Noticed by Christophe Zimmerman, this explains the slow mouse movement with 2.6.x kernels. And checking the 2.4.x drivers/sbus/char/sunmouse.c driver shows we always used a 5-byte protocol with Sun mice in the past. I have no idea how the 3-byte thing got into the 2.6.x driver, but it's surely wrong. Signed-off-by: David S. Miller commit d5784b57d2e08a632b971baae23266121004ef3b Author: David S. Miller Date: Wed Dec 28 13:22:54 2005 -0800 [SPARC]: Use STABS_DEBUG and DWARF_DEBUG macros in vmlinux.lds.S Signed-off-by: David S. Miller commit a8b554e75b0c14d5e12a11eaea604e536f49da29 Author: David S. Miller Date: Wed Dec 28 13:05:41 2005 -0800 [TG3]: Update driver version and reldate. Signed-off-by: David S. Miller commit 091465d7514893a55dcf63e420698b21159c39a7 Author: Chris Elmquist Date: Tue Dec 20 13:25:19 2005 -0800 [TG3]: ethtool -d hangs PCIe systems Resubmitting after recommendation to use GET_REG32_1() instead of GET_REG32_LOOP(..., 1). Retested. Problem remains fixed. Prevent tg3_get_regs() from reading reserved and undocumented registers at RX_CPU_BASE and TX_CPU_BASE offsets which caused hostile behavior on PCIe platforms. Acked-by: Michael Chan Signed-off-by: David S. Miller commit 67dbb4ea33731415fe09c62149a34f472719ac1d Author: Benjamin Herrenschmidt Date: Tue Dec 27 12:49:33 2005 +1100 [PATCH] Fix more radeon GART start calculation cases As reported by Jules Villard and some others, the recent GART aperture start reconfiguration causes problems on some setups. What I _think_ might be happening is that the X server is also trying to muck around with the card memory map and is forcing it back into a wrong setting that also happens to no longer match what the DRM wants to do and blows up. There are bugs all over the place in that code (and still some bugs in the DRM as well anyway). This patch attempts to avoid that by using the largest of the 2 values, which I think will cause it to behave as it used to for you and will still fix the problem with machines that have an aperture size smaller than the video memory. Acked-by: Jules Villard Signed-off-by: Linus Torvalds commit 5ab4a6c81eb3dbe32361791d1535f9153f79b0ed Author: David L Stevens Date: Tue Dec 27 14:03:00 2005 -0800 [IPV6] mcast: Fix multiple issues in MLDv2 reports. The below "jumbo" patch fixes the following problems in MLDv2. 1) Add necessary "ntohs" to recent "pskb_may_pull" check [breaks all nonzero source queries on little-endian (!)] 2) Add locking to source filter list [resend of prior patch] 3) fix "mld_marksources()" to a) send nothing when all queried sources are excluded b) send full exclude report when source queried sources are not excluded c) don't schedule a timer when there's nothing to report NOTE: RFC 3810 specifies the source list should be saved and each source reported individually as an IS_IN. This is an obvious DOS path, requiring the host to store and then multicast as many sources as are queried (e.g., millions...). This alternative sends a full, relevant report that's limited to number of sources present on the machine. 4) fix "add_grec()" to send empty-source records when it should The original check doesn't account for a non-empty source list with all sources inactive; the new code keeps that short-circuit case, and also generates the group header with an empty list if needed. 5) fix mca_crcount decrement to be after add_grec(), which needs its original value These issues (other than item #1 ;-) ) were all found by Yan Zheng, much thanks! Signed-off-by: David L Stevens Signed-off-by: David S. Miller commit 1b93ae64cabe5e28dd5a1f35f96f938ca4f6ae20 Author: David S. Miller Date: Tue Dec 27 13:57:59 2005 -0800 [NET]: Validate socket filters against BPF_MAXINSNS in one spot. Currently the checks are scattered all over and this leads to inconsistencies and even cases where the check is not made. Based upon a patch from Kris Katterjohn. Signed-off-by: David S. Miller commit 6732badee0dad467fcc9dd0168af8677b2b1bc2f Author: YOSHIFUJI Hideaki Date: Tue Dec 27 13:35:15 2005 -0800 [IPV6]: Fix addrconf dead lock. We need to release idev->lcok before we call addrconf_dad_stop(). It calls ipv6_addr_del(), which will hold idev->lock. Bug spotted by Yasuyuki KOZAKAI . Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit a710ce08585e920740ffc84c7f3c82f4081169cf Author: Russell King Date: Tue Dec 27 11:10:34 2005 +0000 [SERIAL] Fix AMBA PL011 sysrq character handling We only want the received character without the status bits for sysrq handling. Signed-off-by: Russell King commit 79cac2a221ce18642550a13bed0f0203514923ea Author: David Kimdon Date: Mon Dec 26 17:27:10 2005 -0800 [BR_NETFILTER]: Fix leak if skb traverses > 1 bridge Call nf_bridge_put() before allocating a new nf_bridge structure and potentially overwriting the pointer to a previously allocated one. This fixes a memory leak which can occur when the bridge topology allows for an skb to traverse more than one bridge. Signed-off-by: David Kimdon Signed-off-by: David S. Miller commit 6f4353d891b5e477528cd0b996e0263fecdf5d5f Author: David L Stevens Date: Mon Dec 26 17:03:46 2005 -0800 [IPV6]: Increase default MLD_MAX_MSF to 64. The existing default of 10 is just way too low. Signed-off-by: David L Stevens Signed-off-by: David S. Miller commit 04333393b930370db0cc29fdf0dbbd08ecd43337 Author: James Bottomley Date: Mon Dec 26 09:58:49 2005 -0600 [PATCH] Fix Fibre Channel boot oops The oops is characteristic of the underlying device being removed from visibility before the class device, and sure enough we do device_del() before transport_unregister() in the scsi_target_reap() routines. I've no idea why this is suddenly showing up, since the code has been in there since that function was first invented. However, I've confirmed this fixes Andrew Vasquez's boot oops. Signed-off-by: James Bottomley Signed-off-by: Linus Torvalds commit f89f5948fc10bb973cd452d2e334da207828e228 Author: Linus Torvalds Date: Sat Dec 24 15:47:48 2005 -0800 Linux v2.6.15-rc7 Ho ho ho. commit 01e33b5a2a153eec74dd87522e264948030b88c1 Author: Kurt Huwig Date: Sun Dec 25 00:13:08 2005 +0100 [PATCH] n_r3964: fixed usage of HZ; removed bad include Fix n_r3964 timeouts (hardcoded for 100Hz) Also the include of in 'n_r3964.h' is unnecessary and prevents using the header file in any application that has to include due to duplicate definition of 'struct termio'. Signed-off-by: Linus Torvalds commit e5c34a57c8b3a94b8d2b329936f8b1cbcc765307 Author: Ben Collins Date: Fri Dec 23 09:10:03 2005 -0500 [PATCH] Fix typo in x86_64 __build_write_lock_const assembly Based on __build_read_lock_const, this looked like a bug. [ Indeed. Maybe nobody uses this version? Worth fixing up anyway ] Signed-off-by: Linus Torvalds commit c660439ba90aaaa056f68a5b0fc79f6b9e0506f5 Author: Ravikiran G Thirumalai Date: Thu Dec 22 14:21:34 2005 -0800 [PATCH] x86_64/ia64 : Fix compilation error for node_to_first_cpu Fixes a compiler error in node_to_first_cpu, __ffs expects unsigned long as a parameter; instead cpumask_t was being passed. The macro node_to_first_cpu was not yet used in x86_64 and ia64 arches, and so we never hit this. This patch replaces __ffs with first_cpu macro, similar to other arches. Signed-off-by: Alok N Kataria Signed-off-by: Ravikiran G Thirumalai Signed-off-by: Shai Fultheim Signed-off-by: Linus Torvalds commit 1224b375ed7982128602a3fa1da53eeeac1750b4 Author: Linus Torvalds Date: Sat Dec 24 12:19:38 2005 -0800 Fix silly typo ("smb" vs "smp") Introduced by commit 6003a93e7bf6c02f33c02976ff364785d4273295 commit 8e31108b9f41069d55cb9b019ac8262c55fd2616 Author: Andrew Morton Date: Fri Dec 23 19:54:46 2005 -0800 [PATCH] Fix memory ordering problem in wake_futex() Fix a memory ordering problem that occurs on IA64. The "store" to q->lock_ptr in wake_futex() can become visible before wake_up_all() clears the lock in the futex_q. Signed-off-by: Jack Steiner Acked-by: Ingo Molnar Signed-off-by: Linus Torvalds commit 6003a93e7bf6c02f33c02976ff364785d4273295 Author: Manfred Spraul Date: Fri Dec 23 23:57:41 2005 +0100 [PATCH] add missing memory barriers to ipc/sem.c Two smp_wmb() statements are missing in the sysv sem code: This could cause stack corruptions. The attached patch adds them. Signed-Off-By: Manfred Spraul Signed-off-by: Linus Torvalds commit e445ee65cbefaa19131c972ae7fe221c95cf4cc4 Author: David S. Miller Date: Sat Dec 24 12:06:10 2005 -0800 [VIDEO] sbuslib: Disallow private mmaps. The COW semantics just do not make any sense especially with the physically discontiguous I/O mappings possible here. Signed-off-by: David S. Miller commit 1836098f97d22c81652aeeec64d1819dc2177bdb Author: Manfred Spraul Date: Sat Dec 24 14:19:24 2005 +0100 [PATCH] forcedeth: fix random memory scribbling bug Two critical bugs were found in forcedeth 0.47: - TSO doesn't work. - pci_map_single() for the rx buffers is called with size==0. This bug is critical, it causes random memory corruptions on systems with an iommu. Below is a minimal fix for both bugs, for 2.6.15. TSO will be fixed properly in the next version. Tested on x86-64. Signed-Off-By: Manfred Spraul Signed-off-by: Linus Torvalds commit 3df3cc6d18b6dcd38c33c198fb8adf1f1fa5f4a7 Author: Frank Pavlic Date: Tue Dec 13 08:23:26 2005 +0100 [PATCH] s390: remove redundant and useless code in qeth [patch 3/3] s390: remove redundant and useless code in qeth From: Frank Pavlic - remove redundant and useless code in qeth for procfs operations. - update Revision numbers Signed-off-by: Frank Pavlic diffstat: qeth_main.c | 6 - qeth_mpc.c | 2 qeth_mpc.h | 2 qeth_proc.c | 250 ++++++------------------------------------------------------ qeth_sys.c | 4 qeth_tso.h | 4 6 files changed, 38 insertions(+), 230 deletions(-) Signed-off-by: Jeff Garzik commit 4965e97fd36041d19483843c66286b9800a57c15 Author: Frank Pavlic Date: Tue Dec 13 08:22:30 2005 +0100 [PATCH] s390: minor qeth network driver fixes [patch 2/3] s390: minor qeth network driver fixes From: Frank Pavlic - use netif_carrier_on/off calls to tell network stack link carrier state - fix possible kfree on NULL - PDU_LEN2 is at offset 0x29 otherwise OSN chpid won't initialize Signed-off-by: Frank Pavlic diffstat: qeth_eddp.c | 3 ++- qeth_main.c | 17 +++++++---------- qeth_mpc.h | 2 +- 3 files changed, 10 insertions(+), 12 deletions(-) Signed-off-by: Jeff Garzik commit 6c6b3e7c4f93d330b920e6531b579b1f6bae5ac1 Author: Frank Pavlic Date: Tue Dec 13 08:21:47 2005 +0100 [PATCH] s390: some minor qeth driver fixes [patch 1/3] s390: some minor qeth driver fixes From: Frank Pavlic - let's have just one function for both ,input and output queue to check qdio errors - add /proc/s390dbf/qeth_qerr entries for outbound processing - check removed for layer2 device in qeth_add_multicast_ipv6 - NULL pointer dereference with bonding and VLAN device fixed - minimum length check for portname fixed Signed-off-by: Frank Pavlic diffstat: qeth_main.c | 42 +++++++++++++++++++++--------------------- qeth_sys.c | 6 +++--- 2 files changed, 24 insertions(+), 24 deletions(-) Signed-off-by: Jeff Garzik commit afcceaa3c7b7fbf7e2b95c5f0dd43547b03292d2 Author: Olaf Hering Date: Wed Dec 14 00:33:49 2005 +0100 [PATCH] missing license for libphy.ko Andy, libphy has no license tag. Something like the attached (untested!) patch is needed. Hopefully such a change finds its way into 2.6.15. filename: /lib/modules/2.6.15-rc5-3-ppc64/kernel/drivers/net/phy/libphy.ko vermagic: 2.6.15-rc5-3-ppc64 SMP gcc-4.1 depends: srcversion: ACC921B5E82701BE1E6F603 drivers/net/phy/phy_device.c | 4 ++++ 1 files changed, 4 insertions(+) Signed-off-by: Jeff Garzik commit d495657200bd3ce10f9cb52401056804bf365811 Author: Pavel Roskin Date: Fri Dec 16 18:57:10 2005 -0500 [PATCH] orinoco_nortel: Add Symbol LA-4123 ID Add ID for Symbol LA-4123. Reported by Tomas Novak Signed-off-by: Pavel Roskin Signed-off-by: Jeff Garzik commit c8cb00f6ac9aa13b0575726163b165fd2276ff25 Author: Pavel Roskin Date: Fri Dec 16 18:49:53 2005 -0500 [PATCH] orinoco_nortel: Fix incorrect PCI resource use orinoco_nortel was broken during conversion to iomem API. Wrong PCI BAR is used for chipset registers. Reported by Tomas Novak Signed-off-by: Pavel Roskin Signed-off-by: Jeff Garzik commit fd71da468dd8897fe3f565dfd3743a87d8678e3a Author: Tony Battersby Date: Wed Dec 21 16:35:44 2005 -0500 [PATCH] fix libata inquiry VPD for ATAPI devices The following patch prevents libata from incorrectly modifying inquiry VPD pages and command support data from ATAPI devices. I have tested the patch with a SATA ATAPI tape drive on an AHCI controller. Patch is against kernel 2.4.32 with 2.4.32-libata1.patch applied. Anthony J. Battersby Cybernetics Signed-off-by: Jeff Garzik commit 291d809ba5c8d4d6d8812e3f185bdf57d539f594 Author: Hiroyuki YAMAMORI Date: Fri Dec 23 11:24:05 2005 -0800 [IPV6]: Fix Temporary Address Generation From: Hiroyuki YAMAMORI Since regen_count is stored in the public address, we need to reset it when we start renewing temporary address. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 3dd3bf83574e38578fc9741c0e23e4fa7f7ff96e Author: YOSHIFUJI Hideaki Date: Fri Dec 23 11:23:21 2005 -0800 [IPV6]: Fix dead lock. We need to relesae ifp->lock before we call addrconf_dad_stop(), which will hold ifp->lock. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 597d1f0622d21ffe54aceef8da9682e776f51cc2 Author: David S. Miller Date: Thu Dec 22 23:04:39 2005 -0800 [SPARC]: Kill CHILD_MAX. It's definition is wrong (-1 means "no limit" not 999), only the Sparc SunOS/Solaris compat code uses it, so let's just kill it off completely from limits.h and all referencing code. Noticed by Ulrich Drepper. Signed-off-by: David S. Miller commit 0b57ee9e55373a27e45549e82b0c43621480a71b Author: Adrian Bunk Date: Thu Dec 22 21:03:47 2005 -0800 [SPARC]: introduce a SPARC Kconfig symbol Introduce a Kconfig symbol SPARC that is defined on both the sparc and sparc64 architectures. This symbol makes some dependencies more readable. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 14904398e5b573d13f8c8dbd43a452ff34c0efc2 Author: Adrian Bunk Date: Wed Dec 21 18:50:12 2005 -0800 [SUNGEM]: Fix link error with CONFIG_HOTPLUG disabled. gem_remove_one() is called from the __devinit gem_init_one(). Therefore, gem_remove_one() mustn't be __devexit. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 9d6be4bed65a3bd36ab2de12923bff4f4530bd86 Author: Len Brown Date: Thu Dec 22 22:23:06 2005 -0500 [ACPI] fix build warning from owner_id patch Signed-off-by: Len Brown commit 75b245b3259133360845bc6de3aecb8a6bd6ab59 Author: Thomas Renninger Date: Wed Dec 21 01:29:00 2005 -0500 [ACPI] fix passive cooling regression Return logic was inverted. Going for changing the return value to not return zero as it is makes more sense regarding the naming of the function (cpu_has_cpufreq()). http://bugzilla.kernel.org/show_bug.cgi?id=3410 Signed-off-by: Thomas Renninger Signed-off-by: Len Brown commit d2b18394259ef621fd2a6322aa9934198fd87a6a Author: Russell King Date: Thu Dec 22 23:21:38 2005 +0000 [MMC] Set correct capacity for 1024-byte block cards We were passing set_capacity() the capacity we calculated in terms of the number of blocks on the card, which happened to be the right units for 512-byte block cards. However, with 1024-byte block cards, we end up setting the capacity to half the number of blocks. Fix this by shifting by the appropriate amount. Thanks to Todd Blumer for pointing this out. Use get_capacity() to report the card capacity, rather than recalculating it from the CSD information. Finally, use our chosen IO block size for the SET_BLOCKLEN command rather than the CSD read block size. Currently these are equivalent, but will not be in the future. Signed-off-by: Russell King commit 0800c5f7a499a8961c3868e95cc4cf1715166457 Author: ASANO Masahiro Date: Thu Dec 22 13:24:54 2005 +0900 [PATCH] fix posix lock on NFS NFS client prevents mandatory lock, but there is a flaw on it; Locks are possibly left if the mode is changed while locking. This permits unlocking even if the mandatory lock bits are set. Signed-off-by: ASANO Masahiro Signed-off-by: Linus Torvalds commit d6f029130fb83b36fb709a187275b0494035d689 Author: Nicolas Pitre Date: Wed Dec 21 12:26:25 2005 -0500 [PATCH] fix race with preempt_enable() Currently a simple void foo(void) { preempt_enable(); } produces the following code on ARM: foo: bic r3, sp, #8128 bic r3, r3, #63 ldr r2, [r3, #4] ldr r1, [r3, #0] sub r2, r2, #1 tst r1, #4 str r2, [r3, #4] blne preempt_schedule mov pc, lr The problem is that the TIF_NEED_RESCHED flag is loaded _before_ the preemption count is stored back, hence any interrupt coming within that 3 instruction window causing TIF_NEED_RESCHED to be set won't be seen and scheduling won't happen as it should. Nothing currently prevents gcc from performing that reordering. There is already a barrier() before the decrement of the preemption count, but another one is needed between this and the TIF_NEED_RESCHED flag test for proper code ordering. Signed-off-by: Nicolas Pitre Acked-by: Nick Piggin Signed-off-by: Linus Torvalds commit 9b78a82c1cf19aa813bdaa184fa840a3ba811750 Author: David S. Miller Date: Thu Dec 22 07:39:48 2005 -0800 [IPSEC]: Fix policy updates missed by sockets The problem is that when new policies are inserted, sockets do not see the update (but all new route lookups do). This bug is related to the SA insertion stale route issue solved recently, and this policy visibility problem can be fixed in a similar way. The fix is to flush out the bundles of all policies deeper than the policy being inserted. Consider beginning state of "outgoing" direction policy list: policy A --> policy B --> policy C --> policy D First, realize that inserting a policy into a list only potentially changes IPSEC routes for that direction. Therefore we need not bother considering the policies for other directions. We need only consider the existing policies in the list we are doing the inserting. Consider new policy "B'", inserted after B. policy A --> policy B --> policy B' --> policy C --> policy D Two rules: 1) If policy A or policy B matched before the insertion, they appear before B' and thus would still match after inserting B' 2) Policy C and D, now "shadowed" and after policy B', potentially contain stale routes because policy B' might be selected instead of them. Therefore we only need flush routes assosciated with policies appearing after a newly inserted policy, if any. Signed-off-by: David S. Miller commit 8b1af56b29b9b81538b4d0d4fd9515618618ead1 Author: Paul Mackerras Date: Thu Dec 22 21:55:37 2005 +1100 powerpc: Fix i8259 cascade on pSeries with XICS interrupt controller It turns out that commit f9bd170a87948a9e077149b70fb192c563770fdf broke the cascade from XICS to i8259 on pSeries machines; specifically we ended up not ever doing the EOI on the XICS for the cascade. The result was that interrupts from the serial ports (and presumably any other devices using ISA interrupts) didn't get through. This fixes it and also simplifies the code, by doing the EOI on the XICS in the xics_get_irq routine after reading and acking the interrupt on the i8259. Signed-off-by: Paul Mackerras commit 515432aa7ae75ea493099f38adc14a99436fa1ac Author: Hans Verkuil Date: Tue Dec 20 09:48:29 2005 -0200 V4L/DVB (3191): Fix CC output - CC data was swapped the wrong way around. - Enabling CC disabled XDS and vice versa: these two should be independent from one another. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 7bb9529602f8bb41a92275825b808a42ed33e5be Author: Ricardo Cerqueira Date: Tue Dec 20 18:26:26 2005 -0200 V4L/DVB (3200): Fix saa7134 ALSA/OSS collisions - When ALSA or OSS are loaded, check if the other is present Fixed hotplug notifiers cleanup on module removal - The saa7134 DMA sound modules now have their own Kconfig entries, and if built statically enforce exclusivity - SND_PCM_OSS isn't necessary for the OSS driver Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab commit 4c7e6895027362889422e5dc437dc3238b6b4745 Author: Ian McDonald Date: Wed Dec 21 19:02:39 2005 -0800 [DCCP]: Comment typo I hope to actually change this behaviour shortly but this will help anybody grepping code at present. Signed-off-by: Ian McDonald Signed-off-by: David S. Miller commit 1d1428045c54ef3d172d480806e2066dde0b4b76 Author: Kristian Slavov Date: Wed Dec 21 18:47:24 2005 -0800 [IPV6]: Fix address deletion If you add more than one IPv6 address belonging to the same prefix and delete the address that was last added, routing table entry for that prefix is also deleted. Tested on 2.6.14.4 To reproduce: ip addr add 3ffe::1/64 dev eth0 ip addr add 3ffe::2/64 dev eth0 /* wait DAD */ sleep 1 ip addr del 3ffe::2/64 dev eth0 ip -6 route (route to 3ffe::/64 should be gone) In ipv6_del_addr(), if ifa == ifp, we set ifa->if_next to NULL, and later assign ifap = &ifa->if_next, effectively terminating the for-loop. This prevents us from checking if there are other addresses using the same prefix that are valid, and thus resulting in deletion of the prefix. This applies only if the first entry in idev->addr_list is the address to be deleted. Signed-off-by: Kristian Slavov Acked-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 7eb1b3d372a53fe9220b9e3b579886db0fe2f897 Author: Mika Kukkonen Date: Wed Dec 21 18:39:49 2005 -0800 [VLAN]: Add two missing checks to vlan_ioctl_handler() In vlan_ioctl_handler() the code misses couple checks for error return values. Signed-off-by: Mika Kukkonen Signed-off-by: David S. Miller commit 0d77d59f6293438f25e0560172699c0d3e4ef5ac Author: Mika Kukkonen Date: Wed Dec 21 18:38:26 2005 -0800 [NETROM]: Fix three if-statements in nr_state1_machine() I found these while compiling with extra gcc warnings; considering the indenting surely they are not intentional? Signed-off-by: Mika Kukkonen Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit c7ac6b42ffba28c350cbcd48268f46689f6eb1cc Author: Linus Torvalds Date: Wed Dec 21 14:52:32 2005 -0800 Initialize drivers/media/video/saa7134 late When compiled-in, make sure the sound system has initialized before these drivers do. Reported by Adrian Bunk (The right fix would be to make the sound core use "subsys_initcall()" and thus initialize before all normal drivers, but this is the quick and limited safe fix for 2.6.15). Signed-off-by: Linus Torvalds commit 5a9191ff683ce4ebfd2c6a15e2989f5b1f420321 Author: Alan Stern Date: Wed Dec 21 14:28:11 2005 -0800 [PATCH] usbcore: allow suspend/resume even if drivers don't support it This patch (as618) changes usbcore to prevent derailing the suspend/resume sequence when a USB driver doesn't include support for it. This is a workaround rather than a true fix; the core needs to be changed so that URB submissions from suspended drivers can be refused and outstanding URBs cancelled. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 28120be5d6830cd7c7777d8bf570bdb20abef58a Author: Paul Walmsley Date: Wed Dec 21 14:28:06 2005 -0800 [PATCH] USB Storage: Force starget->scsi_level in usb-storage scsiglue.c When the usb-storage module forces sdev->scsi_level to SCSI_2, it should also force starget->scsi_level to the same value. Otherwise, the SCSI layer may attempt to issue SCSI-3 commands to the device, such as REPORT LUNS, which it cannot handle. This can prevent the device from working with Linux. The AMS Venus DS3 DS2316SU2S SATA-to-SATA+USB enclosure, based on the Oxford Semiconductor OXU921S chip, requires this patch to function correctly on Linux. The enclosure reports a SCSI-3 SPC-2 command set level, but does not correctly handle the REPORT LUNS SCSI command - probably due to a bug in its firmware. It seems likely that other USB storage enclosures with similar bugs will also benefit from this patch. Tony Lindgren collaborated in the development of this patch. Signed-off-by: Paul Walmsley Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 23f9b317e0ba4fbc5fc9524275d0105fa87e2027 Author: Adrian Bunk Date: Wed Dec 21 02:27:50 2005 +0100 [PATCH] include/linux/irq.h: #include Jan's crosscompile page [1] shows, that one regression in 2.6.15-rc is that the v850 defconfig does no longer compile. The compile error is: <-- snip --> ... CC arch/v850/kernel/setup.o In file included from /usr/src/ctest/rc/kernel/arch/v850/kernel/setup.c:17: /usr/src/ctest/rc/kernel/include/linux/irq.h:13:43: asm/smp.h: No such file or directory make[2]: *** [arch/v850/kernel/setup.o] Error 1 <-- snip --> The #include in irq.h was intruduced in 2.6.15-rc. Since include/linux/irq.h needs code from asm/smp.h only in the CONFIG_SMP=y case and linux/smp.h #include's asm/smp.h only in the CONFIG_SMP=y case, I'm suggesting this patch to #include in irq.h. I've tested the compilation with both CONFIG_SMP=y and CONFIG_SMP=n on i386. Signed-off-by: Adrian Bunk Acked-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6b3ae80a63e47f6e97d68a1ddd520e3509e62821 Author: YOSHIFUJI Hideaki Date: Wed Dec 21 22:58:01 2005 +0900 [IPV6]: Don't select a tentative address as a source address. A tentative address is not considered "assigned to an interface" in the traditional sense (RFC2462 Section 4). Don't try to select such an address for the source address. Signed-off-by: YOSHIFUJI Hideaki commit c5e33bddd3c798f681f8f3027270127be6b61a3b Author: YOSHIFUJI Hideaki Date: Wed Dec 21 22:57:44 2005 +0900 [IPV6]: Run DAD when the link becomes ready. If the link was not available when the interface was created, run DAD for pending tentative addresses when the link becomes ready. Signed-off-by: YOSHIFUJI Hideaki commit 3c21edbd113788b110116141c8078623a0900b6a Author: YOSHIFUJI Hideaki Date: Wed Dec 21 22:57:24 2005 +0900 [IPV6]: Defer IPv6 device initialization until the link becomes ready. NETDEV_UP might be sent even if the link attached to the interface was not ready. DAD does not make sense in such case, so we won't do so. After interface Signed-off-by: YOSHIFUJI Hideaki commit 8de3351e6e0a1081fbf6864ae37839e327699a08 Author: YOSHIFUJI Hideaki Date: Wed Dec 21 22:57:06 2005 +0900 [IPV6]: Try not to send icmp to anycast address. Signed-off-by: YOSHIFUJI Hideaki commit 58c4fb86eabcbc385d954843a635b7f4327be6b0 Author: YOSHIFUJI Hideaki Date: Wed Dec 21 22:56:42 2005 +0900 [IPV6]: Flag RTF_ANYCAST for anycast routes. Signed-off-by: YOSHIFUJI Hideaki commit 05465fd5622202d65634b3a9a8bcc9cbb384a82a Author: Alex Williamson Date: Thu Dec 8 15:37:00 2005 -0500 [ACPI] increase owner_id limit to 64 from 32 This is an interim patch until changes in an updated ACPICA core increase the limit to 255. Signed-off-by: Alex Williamson Signed-off-by: Len Brown commit fd30fc3256824f03c2ff9317269d66f72f7042ca Author: Tom Zanussi Date: Tue Dec 20 13:10:22 2005 -0600 [PATCH] relayfs: remove warning printk() in relay_switch_subbuf() There's currently a diagnostic printk in relay_switch_subbuf() meant as a warning if you accidentally try to log an event larger than the sub-buffer size. The problem is if this happens while logging from somewhere it's not safe to be doing printks, such as in the scheduler, you can end up with a deadlock. This patch removes the warning from relay_switch_subbuf() and instead prints some diagnostic info when the channel is closed. Thanks to Mathieu Desnoyers for pointing out the problem and suggesting a fix. Signed-off-by: Tom Zanussi Signed-off-by: Linus Torvalds commit a9c9dff1bc64750c81ee99779164d304c35d2ff3 Author: David S. Miller Date: Tue Dec 20 14:53:05 2005 -0800 [SPARC64]: Stop putting -finline-limit=XXX into CFLAGS It was a stupid workaround for the "static inline" vs. "extern inline" issues of long ago, and it is what causes schedule() to be inlined like crazy into kernel/sched.c when -Os is specified. MIPS and S390 should probably do the same. Now CC_OPTIMIZE_FOR_SIZE can be safely used on sparc64 once more. Signed-off-by: David S. Miller commit bb44f116a14c4c932f15c79acfafd46bcb43ca9a Author: Ingo Molnar Date: Tue Dec 20 11:54:17 2005 +0100 [PATCH] fix spinlock-debugging smp_processor_id() usage When a spinlock debugging check hits, we print the CPU number as an informational thing - but there is no guarantee that preemption is off at that point - hence we should use raw_smp_processor_id(). Otherwise DEBUG_PREEMPT will print a warning. With this fix the warning goes away and only the spinlock-debugging info is printed. Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds commit 391eadeec836463a4e6e3843953bbe40f6522593 Author: Andi Kleen Date: Tue Dec 20 07:23:47 2005 +0100 [PATCH] Fix build with CONFIG_PCI_MMCONFIG Now needs to include the type 1 functions ("direct") too. Reported by Pavel Roskin Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit b7964c3d88668cef57e1a99861477168eeff4743 Author: Andreas Gruenbacher Date: Tue Dec 20 16:29:05 2005 +0100 [PATCH] nfsd: check for read-only exports before setting acls We must check for MAY_SATTR before setting acls, which includes checking for read-only exports: the lower-level setxattr operation that eventually sets the acl cannot check export-level restrictions. Bug reported by Martin Walter . Signed-off-by: Andreas Gruenbacher Acked-by: Trond Myklebust Signed-off-by: Linus Torvalds commit 9e28393998d3d0733097306762f6d1c083fc92c6 Author: Jason Wessel Date: Tue Dec 20 15:21:24 2005 +0100 [PATCH] kernel/params.c: fix sysfs access with CONFIG_MODULES=n All the work was done to setup the file and maintain the file handles but the access functions were zeroed out due to the #ifdef. Removing the #ifdef allows full access to all the parameters when CONFIG_MODULES=n. akpm: put it back again, but use CONFIG_SYSFS instead. Signed-off-by: Jason Wessel Signed-off-by: Andrew Morton Signed-off-by: Adrian Bunk Signed-off-by: Linus Torvalds commit 7e8702334841b6da4b8f564dc1771ca17c59a621 Author: Andi Kleen Date: Tue Dec 20 14:45:19 2005 +0100 [PATCH] Fix swiotlb pci_map_sg error handling The overflow checking condition in lib/swiotlb.c was wrong. It would first run a NULL pointer through virt_to_phys before testing it. Since pci_map_sg overflow is not that uncommon and causes data corruption (including broken file systems) when not properly detected I think it's better to fix it in 2.6.15. This affects x86-64 and IA64. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 7ca0b3bf695632003a2a0f98b9fc1451b0483346 Author: Knut Petersen Date: Tue Dec 20 08:18:09 2005 +0100 [PATCH] Fix framebuffer console upside-down ywrap scrolling Whenever ywrap scrolling is selected together with 180 degree screen rotation, 2.6.15-rc6 and earlier versions are broken. fb_pan_display() expects non-negative yoffsets, but ud_update_start() calls it with yoffsets down to -(yres - font height). This patch transforms yoffset to the correct range 0 ... vyres-1. Some obviously unneeded parentheses are removed, too. Verified with cyblafb, should be applied before 2.6.15-final because it does fix the framebuffer rotation code introduced early in the 2.6.15 release cycle. Signed-off-by: Knut Petersen Acked-by: Antonino Daplas Signed-off-by: Linus Torvalds commit 33c37c06f8066342764bd1568c9f3524efe889a5 Author: Antonino A. Daplas Date: Mon Dec 19 15:11:49 2005 +0800 [PATCH] intelfb: Fix oops when changing video mode Reported by: janis huang (Bugzilla Bug 5747) Fix on oops in intelfb. Not sure what's happening, looks like dinfo->name pointer is invalidated after initialization. Remove intelfb_get_fix, it's not needed and move the majority of the code to the initialization routine. Signed-off-by: Antonino Daplas Signed-off-by: Linus Torvalds commit 4b3760ce3d448d4af3036cd6c650d651a16ee02d Author: Antonino A. Daplas Date: Mon Dec 19 15:11:40 2005 +0800 [PATCH] intelfb: Fix freeing of nonexistent resource Fix intelfb trying to free a non-existent resource in its error path. Signed-off-by: Antonino Daplas Signed-off-by: Linus Torvalds commit 6ee7fb7e363aa8828b3920422416707c79f39007 Author: Benjamin Herrenschmidt Date: Mon Dec 19 11:24:53 2005 +1100 [PATCH] powerpc: g5 thermal overtemp bug The g5 thermal control for liquid cooled machines has a small bug, when the temperatures gets too high, it boosts all fans to the max, but incorrectly sets the liquids pump to the min instead of the max speed, thus causing the overtemp condition not to clear and the machine to shut down after a while. This fixes it to set the pumps to max speed instead. This problem might explain some of the reports of random shutdowns that some g5 users have been reporting in the past. Many thanks to Marcus Rothe for spending a lot of time trying various patches & sending log logs before I found out that typo. Note that overtemp handling is still not perfect and the machine might still shutdown, that patch should reduce if not eliminate such occcurences in "normal" conditions with high load. I'll implement a better handling with proper slowing down of the CPUs later. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 5a1244e9ddb77eafb1de69a1be14e06ca04e733a Author: Paul Mackerras Date: Tue Dec 20 16:00:17 2005 +1100 powerpc: update defconfigs Signed-off-by: Paul Mackerras commit b273ed266a353ee6b238856e1ae705660dafdd70 Author: Edson Seabra Date: Mon Dec 19 09:16:50 2005 -0600 [PATCH] powerpc: CPM2 interrupt handler failure after 100,000 interrupts The CPM2 interrupt handler does not return success to the IRQ subsystem, which causes it to kill the IRQ line after 100,000 interrupts. Signed-off-by: Edson Seabra Signed-off-by: Marcelo Tosatti Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras commit 3eb6f26bcd0d2ce53498deda988e68d663e1c9c2 Author: Paul Mackerras Date: Tue Dec 20 15:38:47 2005 +1100 powerpc: correct register usage in 64-bit syscall exit path Since we don't restore the volatile registers in the syscall exit path, we need to make sure we don't leak any potentially interesting values from the kernel to userspace. This was already the case for all except r11. This makes it use r11 for an MSR value, so r11 will have an (uninteresting) MSR value in it on return to userspace. Signed-off-by: Paul Mackerras commit 9b5b1f5bf9dcdb6f23abf65977a675eb4deba3c0 Author: Trond Myklebust Date: Mon Dec 19 17:11:25 2005 -0500 NLM: Fix Oops in nlmclnt_mark_reclaim() When mixing -olock and -onolock mounts on the same client, we have to check that fl->fl_u.nfs_fl.owner is set before dereferencing it. Signed-off-by: Trond Myklebust commit 48e49187753ec3b4fa84a7165c9b7a59f3875b56 Author: Trond Myklebust Date: Mon Dec 19 17:11:22 2005 -0500 SUNRPC: Fix "EPIPE" error on mount of rpcsec_gss-protected partitions gss_create_upcall() should not error just because rpc.gssd closed the pipe on its end. Instead, it should requeue the pending requests and then retry. Signed-off-by: Trond Myklebust commit 29884df0d89c1df0dec3449405bc41569bb44800 Author: Trond Myklebust Date: Tue Dec 13 16:13:54 2005 -0500 NFS: Fix another O_DIRECT race Ensure we call unmap_mapping_range() and sync dirty pages to disk before doing an NFS direct write. Signed-off-by: Trond Myklebust commit b079fa7baa86b47579f3f60f86d03d21c76159b8 Author: Trond Myklebust Date: Tue Dec 13 16:13:52 2005 -0500 RPC: Do not block on skb allocation If we get something like the following, [ 125.300636] [] schedule_timeout+0x54/0xa5 [ 125.305931] [] io_schedule_timeout+0x29/0x33 [ 125.311495] [] blk_congestion_wait+0x70/0x85 [ 125.317058] [] throttle_vm_writeout+0x69/0x7d [ 125.322720] [] shrink_zone+0xe0/0xfa [ 125.327560] [] shrink_caches+0x6d/0x6f [ 125.332581] [] try_to_free_pages+0xd0/0x1b5 [ 125.338056] [] __alloc_pages+0x135/0x2e8 [ 125.343258] [] tcp_sendmsg+0xaa0/0xb78 [ 125.348281] [] inet_sendmsg+0x48/0x53 [ 125.353212] [] sock_sendmsg+0xb8/0xd3 [ 125.358147] [] kernel_sendmsg+0x42/0x4f [ 125.363259] [] sock_no_sendpage+0x5e/0x77 [ 125.368556] [] xs_tcp_send_request+0x2af/0x375 then the socket is blocked until memory is reclaimed, and no progress can ever be made. Try to access the emergency pools by using GFP_ATOMIC. Signed-off-by: Trond Myklebust commit bcb97940f31ded5ac551da8bfc849583203fc6f2 Author: Neil Brown Date: Tue Dec 20 11:07:00 2005 +1100 [PATCH] md: Change case of raid level reported in sys/mdX/md/level I had thought that keeping the reported tail level clearly different from the module name was a good idea, but I've changed my mind. 'raid5' is better and probably less confusing than 'RAID-5'. Signed-off-by: Neil Brown Signed-off-by: Linus Torvalds commit f98d2dfd02183e016a6295f72140c60d691c9188 Author: Ben Collins Date: Mon Dec 19 11:49:24 2005 -0800 [PATCH] block: Cleanup CDROMEJECT ioctl This is just a basic cleanup. No change in functionality. Signed-off-by: Ben Collins Signed-off-by: Linus Torvalds commit 38690194bc897dd60a61a71b15e861e13b5d8bdd Author: Michael Chan Date: Mon Dec 19 16:27:28 2005 -0800 [TG3]: Fix ethtool memory test Skip the memory 0xb50 to 0x1000 during "ethtool -t" memory test. Overwriting memory in this region can cause ASF problems. Update version and release date. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit b401e9e2ec44a5fc1d8053546276bff584b7118e Author: Michael Chan Date: Mon Dec 19 16:27:04 2005 -0800 [TG3]: Add tw32_wait_f() for some sensitive registers The tw32_f() function (register write with immediate read flush) can hang when used on some registers to switch clock frequencies and power. A new tw32_wait_f() is added for such registers with the delay before the read and after the read. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit dc56b7d46dd2b303a844166ef931270b882bf08c Author: Michael Chan Date: Mon Dec 19 16:26:28 2005 -0800 [TG3]: Some low power fixes Add some missing workarounds in tg3_set_power_state(): 1. Workaround to prevent overdrawing current on 5714. 2. Do not power down 5700's PHY because of hw limitation. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 8c2dc7e1e7213c55f1b97eba09de6c0cee9ad12f Author: Michael Chan Date: Mon Dec 19 16:26:02 2005 -0800 [TG3]: Fix peer device handling Locate the pdev_peer for dual port 5714 NIC devices in addition to 5704 devices. The name is also changed to tg3_find_peer() from tg3_find_5704_peer(). It is also necessary to call netdev_priv() to get to the peer's private tg3 structure. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit ce37e5f90366cb90320a285edd2113fd807f3ab6 Author: Adrian Bunk Date: Mon Dec 19 14:52:24 2005 -0800 [SPARC]: Fix RTC build failure. On sparc and sparc64, the rtc driver doesn't compile with PCI support disabled. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 9bffc4ace1ed875667dbe5b29065d96bec558c62 Author: Neil Horman Date: Mon Dec 19 14:24:40 2005 -0800 [SCTP]: Fix sctp to not return erroneous POLLOUT events. Make sctp_writeable() use sk_wmem_alloc rather than sk_wmem_queued to determine the sndbuf space available. It also removes all the modifications to sk_wmem_queued as it is not currently used in SCTP. Signed-off-by: Neil Horman Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 399c180ac5f0cb66ef9479358e0b8b6bafcbeafe Author: David S. Miller Date: Mon Dec 19 14:23:23 2005 -0800 [IPSEC]: Perform SA switchover immediately. When we insert a new xfrm_state which potentially subsumes an existing one, make sure all cached bundles are flushed so that the new SA is used immediately. Signed-off-by: David S. Miller commit 7c612bfd4ed3064fd48a4877a114c8186547367b Author: Nicolas Pitre Date: Mon Dec 19 22:20:51 2005 +0000 [ARM] 3210/1: add missing memory barrier helper for NPTL support Patch from Nicolas Pitre Strictly speaking, the NPTL kernel helpers are required for pre ARMv6 only. They are available on ARMv6+ as well for obvious compatibility reasons. However there are cases where extra memory barriers are needed when using an SMP ARMv6 machine but not on pre-ARMv6. This patch adds a memory barrier kernel helper that glibc can use as needed for pre-ARMv6 binaries to be forward compatible with an SMP kernel on ARMv6, as well as the necessary dmb instructions to the cmpxchg helper. Signed-off-by: Nicolas Pitre Acked-by: Daniel Jacobowitz Signed-off-by: Russell King commit 9e999993c71e1506378d26d81f842277aff8a250 Author: Patrick McHardy Date: Mon Dec 19 14:03:46 2005 -0800 [XFRM]: Handle DCCP in xfrm{4,6}_decode_session Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 3dd4bc68fac5df16b6d3ed6ed3c29cf05f29a47e Author: YOSHIFUJI Hideaki Date: Mon Dec 19 14:02:45 2005 -0800 [IPV6]: Fix route lifetime. The route expiration time is stored in rt6i_expires in jiffies. The argument of rt6_route_add() for adding a route is not the expiration time in jiffies nor in clock_t, but the lifetime (or time left before expiration) in clock_t. Because of the confusion, we sometimes saw several strange errors (FAILs) in TAHI IPv6 Ready Logo Phase-2 Self Test. The symptoms were analyzed by Mitsuru Chinen . Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit b03664869aa6f84c3c98a06ac9d6905b195909bc Author: Bart De Schuymer Date: Mon Dec 19 14:00:08 2005 -0800 [BRIDGE-NF]: Fix bridge-nf ipv6 length check A typo caused some bridged IPv6 packets to get dropped randomly, as reported by Sebastien Chaumontet. The patch below fixes this (using skb->nh.raw instead of raw) and also makes the jumbo packet length checking up-to-date with the code in net/ipv6/exthdrs.c::ipv6_hop_jumbo. Signed-off-by: Bart De Schuymer Signed-off-by: David S. Miller commit 6b80ebedbee87c5b2213fc3635bf0bd7450bce30 Author: Kristian Slavov Date: Mon Dec 19 13:54:44 2005 -0800 [RTNETLINK]: Fix RTNLGRP definitions in rtnetlink.h I reported a problem and gave hints to the solution, but nobody seemed to react. So I prepared a patch against 2.6.14.4. Tested on 2.6.14.4 with "ip monitor addr" and with the program attached, while adding and removing IPv6 address. Both programs didn't receive any messages. Tested 2.6.14.4 + this patch, and both programs received add and remove messages. Signed-off-by: Kristian Slavov Acked-by: Jamal Hadi salim ACKed-by: Patrick McHardy Signed-off-by: David S. Miller commit 31cb5bd4dc89ba14e6347b094e15a2f6778a01fc Author: Patrick McHardy Date: Mon Dec 19 13:53:26 2005 -0800 [NETFILTER]: Fix incorrect dependency for IP6_NF_TARGET_NFQUEUE IP6_NF_TARGET_NFQUEUE depends on IP6_NF_IPTABLES, not IP_NF_IPTABLES. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 0476f171affa6eca62021fca2ae9f5140acc3713 Author: Patrick McHardy Date: Mon Dec 19 13:53:09 2005 -0800 [NETFILTER]: Fix NAT init order As noticed by Phil Oester, the GRE NAT protocol helper is initialized before the NAT core, which makes registration fail. Change the linking order to make NAT be initialized first. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit ecfa4fdca15c089e372095325d9e78264224aeb3 Author: Mauro Carvalho Chehab Date: Mon Dec 19 09:15:13 2005 -0200 [PATCH] V4L/DVB SCM Maintainers Update - This patch updates MAINTAINERS file by replacing quilt to git SCM Signed-off-by: Mauro Carvalho Chehab commit 468a0a54aabdac72e9c7bbd4f8372f1df2d9f0ae Author: Mauro Carvalho Chehab Date: Mon Dec 19 08:54:11 2005 -0200 [PATCH] V4L/DVB (3189): Fix a broken logic that didn't cover all standards. - Fix a broken logic that didn't cover all standards. - Fix compilation failure with gcc 2.95.3. Signed-off-by: Mauro Carvalho Chehab commit 60edb13759096097b7208843dc9b7582a7d14c61 Author: Oliver Endriss Date: Mon Dec 19 08:54:11 2005 -0200 [PATCH] V4L/DVB (3181): Enable SPDIF output for DVB-S rev 2.3 - Enable SPDIF output for DVB-S rev 2.3. Firmware 2623 or higher required. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 3338761e6c52a8dee631dcc69129c625801ab132 Author: Ricardo Cerqueira Date: Mon Dec 19 08:54:11 2005 -0200 [PATCH] V4L/DVB (3180): Fix tuner 100 definition for hauppauge eeprom - Tuner 100 is the TUNER_PHILIPS_FMD1216ME_MK3, not TUNER_ABSENT. This was causing the tuner module to be skipped, and rendered boards with this value in the eeprom (like the HVR1100) unable to tune Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab commit f85c657ff1f712abd5207a95fba8a5fcc282ab04 Author: Jean Delvare Date: Mon Dec 19 08:53:59 2005 -0200 [PATCH] V4L/DVB (3188): Fix compilation failure with gcc 2.95.3. - Fix compilation failure with gcc 2.95.3. Signed-off-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit df7addbb45874f0f992266003155de5a22e1872f Author: Linus Torvalds Date: Sun Dec 18 16:36:54 2005 -0800 Linux v2.6.15-rc6 Also renamed in honor of Portland being snowed in and everybody sliding around on the highways like greased pumpkins. Signed-off-by: Linus Torvalds commit 27f4e0834746196f219e3e030ca71ffd3b176483 Author: Kyungmin Park Date: Fri Dec 16 11:17:29 2005 +0900 [PATCH] mtd onenand driver: use platform_device.h instead device.h Signed-off-by: Linus Torvalds commit 532a37cf8d05dd1aa5631be836036204b0d2b4a1 Author: Kyungmin Park Date: Fri Dec 16 11:17:29 2005 +0900 [PATCH] mtd onenand driver: reduce stack usage Signed-off-by: Linus Torvalds commit 20ba89a3614bbc5d111fd74375e14c577859b2a3 Author: Kyungmin Park Date: Fri Dec 16 11:17:29 2005 +0900 [PATCH] mtd onenand driver: fix unlock problem in DDP commit 37b1cc3910f7976369fc0ed55068a686e92555e6 Author: Kyungmin Park Date: Fri Dec 16 11:17:29 2005 +0900 [PATCH] mtd onenand driver: check correct manufacturer This (and the three subsequent patches) is working well on OMAP H4 with 2.6.15-rc4 kernel and passes the LTP fs test. Signed-off-by: Linus Torvalds commit ee219e5e7c12b742243a080e2d8d288a48a32e44 Author: Jean Delvare Date: Sat Dec 17 23:20:55 2005 +0100 [PATCH] radeon drm: fix compilation breakage with gcc 2.95.3 Fix a typo which breaks radeon drm compilation with gcc 2.95.3. The offending line was added back in 2.6.11-rc3, but was harmless back then. A recent addition nearby changed it into a compilation breaker: commit 281ab031a8c9e5b593142eb4ec59a87faae8676a. The doubled semi-colon ends up being an empty instruction, and the variable declaration thus ends up being in the middle of "code". Signed-off-by: Jean Delvare Cc: Benjamin Herrenschmidt Cc: Mark M. Hoffman Cc: Paul Mackerras Signed-off-by: Linus Torvalds commit ff60dde9e46b87757d5e83bd58be0688fca8e816 Author: Dmitry Torokhov Date: Sat Dec 17 11:42:54 2005 -0500 [PATCH] Input: fix an OOPS in HID driver This patch fixes an OOPS in HID driver when connecting simulation devices generating unknown simulation events. Signed-off-by: Dmitry Torokhov Acked-by: Vojtech Pavlik Signed-off-by: Linus Torvalds commit 5b7b15afee89d6940482259b54d0864b7b2302b0 Author: Jeff Dike Date: Sun Dec 18 17:50:39 2005 +0100 [PATCH] uml skas0: stop gcc's insanity With Paolo 'Blaisorblade' Giarrusso UML skas0 stub has been miscompiling for many people (incidentally not the authors), depending on the used GCC versions. I think (and testing on some GCC versions shows) this patch avoids the fundamental issue which is behind this, namely gcc using the stack when we have just replaced it, behind gcc's back. The remapping and storage of the return value is hidden in a blob of asm, hopefully giving gcc no room for creativity. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 76c842d8f8096e2c98ff9ebe1db861363ff254e5 Author: Paolo 'Blaisorblade' Giarrusso Date: Sun Dec 18 17:50:37 2005 +0100 [PATCH] uml - fix some funkiness in Kconfig So you may have seen the miniconfig stuff wander by, which means that my build script exits if there's a .config error, and we have this: fs/Kconfig:1749:warning: 'select' used by config symbol 'CIFS_UPCALL' refer to undefined symbol 'CONNECTOR' This makes it shut up. Signed-off-by: Rob Landley [ Verified it makes sense. ] Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 53c0b59dcdb7c68c3cfd4b9a0bd17373b785f2eb Author: Rob Landley Date: Sun Dec 18 17:50:35 2005 +0100 [PATCH] uml: fix dynamic linking on some 64-bit distros With Paolo 'Blaisorblade' Giarrusso The current UML build assumes that on x86-64 systems, /lib is a symlink to /lib64, but in some distributions (like PLD and CentOS) they are separate directories, so the 64 bit library loader isn't found. This patch inserts /lib64 at the start of the rpath on x86-64 UML builds. Signed-off-by: Rob Landley Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 9ce7677cfd7cd871adb457c80bea3b581b839641 Author: Paolo 'Blaisorblade' Giarrusso Date: Sun Dec 18 17:50:32 2005 +0100 [PATCH] uml: arch/um/scripts/Makefile.rules - remove duplicated code Duplicated code - the patch adding it was probably applied twice without enough care. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit e5508c13ac25b07585229b144a45cf64a990171e Author: Salyzyn, Mark Date: Sat Dec 17 19:26:30 2005 -0800 [PATCH] dpt_i2o fix for deadlock condition Miquel van Smoorenburg forwarded me this fix to resolve a deadlock condition that occurs due to the API change in 2.6.13+ kernels dropping the host locking when entering the error handling. They all end up calling adpt_i2o_post_wait(), which if you call it unlocked, might return with host_lock locked anyway and that causes a deadlock. Signed-off-by: Mark Salyzyn Cc: James Bottomley Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 87d47d0547631e059c308b392cd2423fe9248c93 Author: Ben Collins Date: Sat Dec 17 18:39:23 2005 -0800 [PATCH] i2o: Do not disable pci device when it's in use When dpt_i2o is loaded first, i2o being loaded would cause it to call pci_device_disable, thus breaking dpt_i2o's use of the device. Based on similar usage of pci_disable_device in other drivers. Signed-off-by: Ben Collins Signed-off-by: Linus Torvalds commit 863a930a40eb7f2d18534c2c166b22582f5c6cfd Author: James Bottomley Date: Thu Dec 15 20:01:43 2005 -0800 [SCSI] fix scsi_reap_target() device_del from atomic context scsi_reap_target() was desgined to be called from any context. However it must do a device_del() of the target device, which may only be called from user context. Thus we have to reimplement scsi_reap_target() via a workqueue. Signed-off-by: James Bottomley commit 567bd98017d9c9f2ac1c148ddc78c062e8abd398 Author: Russell King Date: Sat Dec 17 15:25:42 2005 +0000 [ARM] Fix sys_sendto and sys_recvfrom 6-arg syscalls Rather than providing more wrappers for 6-arg syscalls, arrange for them to be supported as standard. This just means that we always store the 6th argument on the stack, rather than in the wrappers. This means we eliminate the wrappers for: * sys_futex * sys_arm_fadvise64_64 * sys_mbind * sys_ipc Signed-off-by: Russell King commit 7c3dbbe982ac85837f1da150ea9539a9e9a12557 Author: Al Viro Date: Fri Dec 16 22:35:23 2005 +0000 [PATCH] ppc: ppc4xx_dma DMA_MODE_{READ,WRITE} fix DMA_MODE_{READ,WRITE} are declared in asm-powerpc/dma.h and their declarations there match the definitions. Old declarations in ppc4xx_dma.h are not right anymore (wrong type, to start with). Killed them, added include of asm/dma.h where needed. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a78719c387cc25ed97304a235a20c24f0f89399b Author: Al Viro Date: Fri Dec 16 22:35:28 2005 +0000 [PATCH] ppc: booke_wdt compile fix booke_wdt.c had been missed in cpu_specs[] removal sweep Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 42245e65f356ed54fdf7a1f9a0095e0bc40f73a3 Author: Alan Stern Date: Fri Dec 16 11:09:01 2005 -0800 [PATCH] UHCI: add missing memory barriers This patch (as617) adds a couple of memory barriers that Ben H. forgot in his recent suspend/resume fix. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 42f3ab42875a52af7e711803bfb8d8d7cca84c1c Author: Andi Kleen Date: Fri Dec 16 11:08:55 2005 -0800 [PATCH] PCI: Fix dumb bug in mmconfig fix Use correct address when referencing mmconfig aperture while checking for broken MCFG. This was a typo when porting the code from 64bit to 32bit. It caused oopses at boot on some ThinkPads. Should definitely go into 2.6.15. Signed-off-by: Andi Kleen Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 52f975ea21e28871a371c2d941e13d64c9f8cd66 Author: Milton Miller Date: Fri Dec 16 11:08:48 2005 -0800 [PATCH] PCI express must be initialized before PCI hotplug PCI express hotplug uses the pcieportbus driver so pcie must be initialized before hotplug/. This patch changes the link order. Signed-Off-By: Milton Miller Acked-by: Anton Blanchard Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit dfded4ae71080b53798c7bbf4628a9b22d1e3e8b Author: Mark A. Greer Date: Fri Dec 16 11:08:43 2005 -0800 [PATCH] i2c: Fix i2c-mv64xxx compilation error The busses/i2c-mv64xxx.c driver doesn't currently compile because of an incorrect argument to dev_err(). This patch fixes that. Signed-off-by: Mark A. Greer Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit dc86e88c2bb8a7603ee175fbb6a9e92cf3293dd8 Author: Christoph Lameter Date: Mon Dec 12 09:34:32 2005 -0800 [IA64] Add __read_mostly support for IA64 sparc64, i386 and x86_64 have support for a special data section dedicated to rarely updated data that is frequently read. The section was created to avoid false sharing of those rarely read data with frequently written kernel data. This patch creates such a data section for ia64 and will group rarely written data into this section. Signed-off-by: Christoph Lameter Signed-off-by: Tony Luck commit d5bf3165b6fbb879a4658f9da9ca2fe002b75f08 Author: hawkes@sgi.com Date: Tue Dec 13 13:45:44 2005 -0800 [IA64-SGI] change default_sn2 to NR_CPUS==1024 Change the NR_CPUS default for ia64/sn up to 1024. Signed-off-by: John Hawkes Signed-off-by: John Hesterberg Signed-off-by: Tony Luck commit d74700e604db717eef7a3112176e6350fb00d0e3 Author: Jack Steiner Date: Thu Dec 15 12:41:22 2005 -0600 [IA64-SGI] Missed TLB flush I see why the problem exists only on SN. SN uses a different hardware mechanism to purge TLB entries across nodes. It looks like there is a bug in the SN TLB flushing code. During context switch, kernel threads inherit the mm of the task that was previously running on the cpu. This confuses the code in sn2_global_tlb_purge(). The result is a missed TLB purge for the task that owns the "borrowed" mm. (I hit the problem running heavy stress where kswapd was purging code pages of a user task that woke kswapd. The user task took a SIGILL fault trying to execute code in the page that had been ripped out from underneath it). Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 3bd7f01713f30e7c616ab975ebb84ab7eb58a60a Author: Jes Sorensen Date: Fri Dec 16 11:00:03 2005 -0500 [IA64] uncached ref count leak Use raw_smp_processor_id() instead of get_cpu() as we don't need the extra features of get_cpu(). Signed-off-by: Jes Sorensen Signed-off-by: Tony Luck commit 4d7672b46244abffea1953e55688c0ea143dd617 Author: Linus Torvalds Date: Fri Dec 16 10:21:23 2005 -0800 Make sure we copy pages inserted with "vm_insert_page()" on fork The logic that decides that a fork() might be able to avoid copying a VM area when it can be re-created by page faults didn't know about the new vm_insert_page() case. Also make some things a bit more anal wrt VM_PFNMAP. Pointed out by Hugh Dickins Signed-off-by: Linus Torvalds commit f5899b5d4fa806403f547dc41312d017d94ec273 Author: John Hawkes Date: Fri Dec 16 10:00:24 2005 -0800 [IA64] disable preemption in udelay() The udelay() inline for ia64 uses the ITC. If CONFIG_PREEMPT is enabled and the platform has unsynchronized ITCs and the calling task migrates to another CPU while doing the udelay loop, then the effective delay may be too short or very, very long. This patch disables preemption around 100 usec chunks of the overall desired udelay time. This minimizes preemption-holdoffs. udelay() is now too big to be inline, move it out of line and export it. Signed-off-by: John Hawkes Signed-off-by: Tony Luck commit 281ab031a8c9e5b593142eb4ec59a87faae8676a Author: Benjamin Herrenschmidt Date: Fri Dec 16 16:52:22 2005 +1100 [PATCH] radeon drm: fix agp aperture map offset This finally fixes the radeon memory mapping bug that was incorrectly fixed by the previous patch. This time, we use the actual vram size as the size to calculate how far to move the AGP aperture from the framebuffer in card's memory space. If there are still issues with this patch, they are due to bugs in the X driver that I'm working on fixing too. Signed-off-by: Benjamin Herrenschmidt Cc: Mark M. Hoffman Cc: Paul Mackerras Signed-off-by: Linus Torvalds commit 42e33148df38c60b99d984b76b302c64397ebe4c Author: James.Smart@Emulex.Com Date: Thu Dec 15 09:56:22 2005 -0500 [SCSI] fix for fc transport recursion problem. In the scenario that a link was broken, the devloss timer for each rport was expire at roughly the same time, causing lots of "delete" workqueue items being queued. Depth is dependent upon the number of rports that were on the link. The rport target remove calls were calling flush_scheduled_work(), which would interrupt the stream, and start the next workqueue item, which did the same thing, and so on until recursion depth was large. This fix stops the recursion in the initial delete path, and pushes it off to a host-level work item that reaps the dead rports. Signed-off-by: James Bottomley commit 7b6666530e2736f190a2629c8abe34275054449f Author: Sergei Shtylylov Date: Thu Dec 15 12:34:30 2005 -0800 [PATCH] Au1550 AC'97 OSS driver spinlock fixes We have found some issues with Au1550 AC'97 OSS driver in 2.6 (sound/oss/au1550_ac97.c), though it also should concern 2.4 driver (drivers/sound/au1550_psc.c). start_dac() grabs a spinlock already held by its caller, au1550_write(). This doesn't show up with the standard UP spinlock impelmentation but when the different one (mutex based) is in use, a lockup happens. And the interrupt handlers also didn't grab the spinlock -- that's OK in the usual kernel but not when the IRQ handlers are threaded. So, they're grabbing the spinlock now (as every correct interrupt handler should do). Signed-off-by: Konstantin Baidarov Signed-off-by: Sergei Shtylyov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2f40fb72a2121da44c35f2588ee9abce1dffa2a9 Author: Adrian Bunk Date: Thu Dec 15 12:34:29 2005 -0800 [PATCH] drivers/base/memory.c: unexport the static (sic) memory_sysdev_class We can't export a static struct to modules. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7767e126ca0f32cd0438455fdd9650f909d2eeb3 Author: Paolo Galtieri Date: Thu Dec 15 12:34:28 2005 -0800 [PATCH] IPMI oops fix While doing some testing I discovered that if the BIOS on a board does not properly setup the DMI information it leads to a panic in the IPMI code. The panic is due to dereferencing a pointer which is not initialized. The pointer is initialized in port_setup() and/or mem_setup() and used in init_one_smi() and cleanup_one_si(), however if either port_setup() or mem_setup() return ENODEV the pointer does not get initialized. Signed-off-by: Paolo Galtieri Acked-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ebbd1bce79b3b4778d9e1914a22c42fcfa869cd9 Author: Al Viro Date: Thu Dec 15 09:19:10 2005 +0000 [PATCH] arch/powerpc/kernel/syscalls.c __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 81f0a91e8f58a7784afe39cda9ac47e9231412a4 Author: Al Viro Date: Thu Dec 15 09:19:05 2005 +0000 [PATCH] drivers/input/misc/wistron_btns.c NULL noise removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 833882b452046d3d5028f6293a0a6d6d3c1eee3c Author: Al Viro Date: Thu Dec 15 09:19:00 2005 +0000 [PATCH] mwave: missing __user in ioctl struct declaration Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 7877327d9c360ac91f22e4c7f98bcb10c0180969 Author: Al Viro Date: Thu Dec 15 09:18:55 2005 +0000 [PATCH] drivers/atm/adummy.c NULL noise removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit e17f008bbeabcd1302d6cf4b5b9659be6d80f1db Author: Al Viro Date: Thu Dec 15 09:18:50 2005 +0000 [PATCH] arch/alpha/kernel/machvec_impl.h: C99 struct initializer Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 94299171dd269aab0c97f6254cedb381f10e6348 Author: Al Viro Date: Thu Dec 15 09:18:45 2005 +0000 [PATCH] dst_ca __user annotations, portability fixes Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit b3e5b5b2277f9c047082dcb309f665fe8b5706c1 Author: Al Viro Date: Thu Dec 15 09:18:40 2005 +0000 [PATCH] ia64 sn __iomem annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit d3a880e1ff6713b4c846e4d2526a8c7e6ad8469c Author: Al Viro Date: Thu Dec 15 09:18:30 2005 +0000 [PATCH] Address of void __user * is void __user * *, not void * __user * Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 78d9955bb06493e7bd78e43dfdc17fb5f1dc59b6 Author: Al Viro Date: Thu Dec 15 09:18:25 2005 +0000 [PATCH] missing prototype (mm/page_alloc.c) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 538bacf8a4802d209f955726b66891b8a921dabf Author: Al Viro Date: Thu Dec 15 09:18:20 2005 +0000 [PATCH] __user annotations (booke_wdt.c) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit d22043940eb8d660df9a94e8e439ab4d3d16edab Author: Al Viro Date: Thu Dec 15 09:18:15 2005 +0000 [PATCH] arcfb __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit cd0306656c15f355e0e533cc0f08691bb98ca912 Author: Al Viro Date: Thu Dec 15 09:18:10 2005 +0000 [PATCH] cyber2000fb.c __iomem annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit e896fd9861181140617aa9ff3a54dac25e46351d Author: Al Viro Date: Thu Dec 15 09:18:05 2005 +0000 [PATCH] wdrtas.c: fix __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 5ad9201be7f7d52d712fe3c3e841fdc19216ede1 Author: Al Viro Date: Thu Dec 15 09:18:00 2005 +0000 [PATCH] dell_rbu: NULL noise removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit c4aa02eb3939c5004782454434e4d50de471b53d Author: Al Viro Date: Thu Dec 15 09:17:55 2005 +0000 [PATCH] cm4000_cs: __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit b16b88e55d808a6324d5ff02d8c686f7884870f8 Author: Al Viro Date: Thu Dec 15 09:17:50 2005 +0000 [PATCH] i386,amd64: ioremap.c __iomem annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 8b8a4e33e4a320735f353a092013b314f142493d Author: Al Viro Date: Thu Dec 15 09:17:44 2005 +0000 [PATCH] i386,amd64: mmconfig __iomem annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 8bcc247617deaf229962e9d663c69e65523519ab Author: Al Viro Date: Thu Dec 15 09:17:39 2005 +0000 [PATCH] em28xx: %zd for size_t Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 53b3de1ea2f81de7050f247cd7fc63863887e8d7 Author: Al Viro Date: Thu Dec 15 09:17:34 2005 +0000 [PATCH] auerswald.c: %zd for size_t Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 37eb47ed445f4ca1247f3c7b600c0885c2ca8c31 Author: Al Viro Date: Thu Dec 15 09:17:29 2005 +0000 [PATCH] s2io: __iomem annotations for recent changes Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 51bfb75b0b2652f60ab1200627e9041f4624c819 Author: Al Viro Date: Thu Dec 15 09:17:24 2005 +0000 [PATCH] xfs: missing gfp_t annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit b53cb2a4ab276796ad299597d6e7e2317b514ca8 Author: Al Viro Date: Thu Dec 15 09:17:19 2005 +0000 [PATCH] iscsi gfp_t annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 80ce8baf5da730c87194e2e38a4cfca0254f9599 Author: Al Viro Date: Tue Dec 6 06:04:55 2005 -0500 [PATCH] arch/sparc/kernel/led.c __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a32972965e23471f0762a1136f80990ebf72406a Author: Al Viro Date: Tue Dec 6 05:56:39 2005 -0500 [PATCH] sun4c_memerr_reg __iomem annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit e4fe342f932346a306f98f5401ad510b890c0a15 Author: Al Viro Date: Sun Dec 4 18:48:45 2005 -0500 [PATCH] sparc: NULL noise removal (ebus.c) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit c316ef0494eec2d08df2f083fc06fc06a6fd48c6 Author: Al Viro Date: Tue Dec 6 05:55:44 2005 -0500 [PATCH] sparc/kernel/time: __iomem annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit fec607fff973b1d7805c1bbce5834690857e7801 Author: Al Viro Date: Tue Dec 6 05:54:54 2005 -0500 [PATCH] sbus/char/uctrl: missing prototypes and NULL noise removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit bc05d83bbf20a32eb24624726d1027aa960a573c Author: Al Viro Date: Tue Dec 6 05:51:43 2005 -0500 [PATCH] sparc: jsflash __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit b7c690b52f424574f7ac8c607e71e9f5c283a557 Author: Al Viro Date: Tue Dec 6 05:50:56 2005 -0500 [PATCH] sparc: vfc __iomem annotations and fixes Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit f8ad23a401d41f90cb377035d206b41de0699a0b Author: Al Viro Date: Tue Dec 6 05:44:18 2005 -0500 [PATCH] fix iomem annotations in sparc32 pcic code Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 2499604960fff307fe99ff4d4363c50eaa69235a Author: Jeff Mahoney Date: Wed Dec 14 14:38:05 2005 -0500 [PATCH] reiserfs: close open transactions on error path The following patch fixes a bug where if the journal is aborted, it can leave a transaction open. The result will be a BUG when another code path attempts to start a transaction and will get a "nesting into different fs" error, since current->journal_info will be left non-NULL. Original fix against SUSE kernel by Chris Mason Signed-off-by: Jeff Mahoney Signed-off-by: Linus Torvalds commit 5d5e815618c4a8b53806845268c951201d14af6e Author: Jeff Mahoney Date: Wed Dec 14 14:38:36 2005 -0500 [PATCH] reiserfs: skip commit on io error This should have been part of the original io error patch, but got dropped somewhere along the way. It's extremely important when handling the i/o error in the journal to not commit the transaction with corrupt data. This patch adds that code back in. Signed-off-by: Jeff Mahoney Signed-off-by: Linus Torvalds commit ea54c96c04cfd9fec881e403d8f7931b47f7b2a6 Author: Vojtech Pavlik Date: Wed Dec 14 21:47:00 2005 -0500 [PATCH] Input: ALPS - correctly report button presses on Fujitsu Siemens S6010 Without this patch Forward and Backward buttons on the touchpad do not generate any events. Signed-off-by: Dmitry Torokhov Signed-off-by: Linus Torvalds commit c45b4f1f1e149c023762ac4be166ead1818cefef Author: Linus Torvalds Date: Wed Dec 14 18:52:21 2005 -0800 Move size optimization option outside of EMBEDDED menu, mark it EXPERIMENTAL Also, disable on sparc64 - a number of people report breakage. Probably a compiler bug, but it's quite possible that it tickles some latent kernel problem too. It still defaults to 'y' everywhere else (when enabled through EXPERIMENTAL), and Dave Jones points out that Fedora (and RHEL4) has been building with size optimizations for a long time on x86, x86-64, ia64, s390, s390x, ppc32 and ppc64. So it is really only moderately experimental, but the sparc64 breakage certainly shows that it can trigger "issues". Signed-off-by: Linus Torvalds commit 0afaa4fc4abc773ce129f41009a50eeecf3aa50c Author: Bartlomiej Zolnierkiewicz Date: Thu Dec 15 02:20:49 2005 +0100 [PATCH] ide-cd: remove write-only cmd field from struct cdrom_info commit 7b4df9ece9b4c4a754bd1f5603cdabff26b987e5 Author: Bartlomiej Zolnierkiewicz Date: Thu Dec 15 02:20:15 2005 +0100 [PATCH] ide: cleanup ide_driver_t Remove unused fields: ioctl, ata[pi]_prebuilder. commit 517bd1d5eac739a7f398058a9524386667fff032 Author: Bartlomiej Zolnierkiewicz Date: Thu Dec 15 02:19:57 2005 +0100 [PATCH] ide: cleanup ide.h Remove: * stale comment * unused HOST() macro * unused ata_{error,control}_t types * unused atapi_select_t type * ide_init_subdrivers() prototype commit d36fef6f5aa4a6a1f44490455393a5b22137a6cd Author: Bartlomiej Zolnierkiewicz Date: Thu Dec 15 02:19:20 2005 +0100 [PATCH] ide-disk: flush cache after calling del_gendisk() commit 8f29e650bffc1e22ed6b2d0b321bc77627f3bb7a Author: Jordan Crouse Date: Thu Dec 15 02:17:46 2005 +0100 [PATCH] ide: AU1200 IDE update Changes here include removing all of CONFIG_PM while it is being repeatedly smacked with a lead pipe, moving the BURSTMODE param to a #define (it should be defined almost always anyway), fixing the rqsize stuff, pulling ide_ioreg_t, and general cleanups and whatnot. Signed-off-by: Jordan Crouse commit 65e5f2e3b457b6b20a5c4481312189d141a33d24 Author: Jordan Crouse Date: Thu Dec 15 02:16:18 2005 +0100 [PATCH] ide: core modifications for AU1200 bart: slightly modified by me Signed-off-by: Jordan Crouse commit 38f9d412be1ed29ee3b41782f22fd85b1c95fbed Author: Marcelo Tosatti Date: Thu Dec 15 02:12:53 2005 +0100 [PATCH] ide: MPC8xx IDE depends on IDE=y && BLK_DEV_IDE=y The following patch adds a dependancy on IDE=y && BLK_DEV_IDE=y for the MPC8xx IDE driver. The code is not modular at the moment (init called from platform setup code). Signed-off-by: Marcelo Tosatti commit ceef833bae05e393859f1946a9802fb61f0febdf Author: Daniel Drake Date: Thu Dec 15 02:11:55 2005 +0100 [PATCH] via82cxxx IDE: Add VT8251 ISA bridge Some motherboards (such as the Asus P5V800-MX) ship a PCI_DEVICE_ID_VIA_82C586_1 IDE controller alongside a VT8251 southbridge. This southbridge is currently unrecognised in the via82cxxx IDE driver, preventing those users from getting DMA access to disks. Signed-off-by: Daniel Drake commit deb5e5c0c68e59b1bf9ede66da9e6a89f6557595 Author: Jeremy Higdon Date: Thu Dec 15 02:10:35 2005 +0100 [PATCH] sgiioc4: check for no hwifs available Add a check to the sgiioc4 driver for the case where all available ide_hwifs structures are in use. Signed-off-by: Jeremy Higdon commit a388442c3798a345d131ff8b9d6dea0bfda3fefc Author: Stephen Hemminger Date: Wed Dec 14 16:23:16 2005 -0800 [VLAN]: Fix hardware rx csum errors Receiving VLAN packets over a device (without VLAN assist) that is doing hardware checksumming (CHECKSUM_HW), causes errors because the VLAN code forgets to adjust the hardware checksum. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit c2e2611425a956d25d2948c5d95d3848c4db1257 Author: Daniel Jacobowitz Date: Wed Dec 14 22:04:22 2005 +0000 [ARM] 3205/1: Handle new EABI relocations when loading kernel modules. Patch from Daniel Jacobowitz Handle new EABI relocations when loading kernel modules. This is necessary for CONFIG_AEABI kernels, and also for some broken (since fixed) old ABI toolchains. Signed-off-by: Daniel Jacobowitz Signed-off-by: Russell King commit 1542272a60ab9c0655a13ead8b7d7a661365f9fb Author: Herbert Xu Date: Wed Dec 14 12:55:24 2005 -0800 [GRE]: Fix hardware checksum modification The skb_postpull_rcsum introduced a bug to the checksum modification. Although the length pulled is offset bytes, the origin of the pulling is the GRE header, not the IP header. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 27af4cfd11883073359bd5acab1962b0fa96a3bf Author: Robin Holt Date: Wed Dec 14 06:58:05 2005 -0600 [IA64] fix for SET_PERSONALITY when CONFIG_IA32_SUPPORT is not set. Missed this when fixing the SET_PERSONALITY change. Signed-off-by: Robin Holt Signed-off-by: Tony Luck commit 45f8245b972e360c19aec9032e2a2033b8ac3719 Author: Russell King Date: Wed Dec 14 14:57:35 2005 +0000 [MMC] Explain the internals of mmc_power_up() It seems that people get confused about what is happening in mmc_power_up(). Add a comment to make it clear why we have a two stage process. Signed-off-by: Russell King commit 2edc2689f8183dd21c45621a01580b340ac420ba Author: David S. Miller Date: Tue Dec 13 22:59:50 2005 -0800 [PKT_SCHED]: Disable debug tracing logs by default in packet action API. Noticed by Andi Kleen. Signed-off-by: David S. Miller commit a1493d9cd1aaed06860d128a37df1bdfbc61f7c8 Author: David S. Miller Date: Tue Dec 13 22:59:36 2005 -0800 [IPV6] addrconf: Do not print device pointer in privacy log message. Noticed by Andi Kleen, it is pointless to emit the device structure pointer in the kernel logs like this. Signed-off-by: David S. Miller commit c9526497cf03ee775c3a6f8ba62335735f98de7a Author: James Bottomley Date: Fri Dec 9 17:45:22 2005 -0500 [SCSI] Consolidate REQ_BLOCK_PC handling path (fix ipod panic) This follows on from Jens' patch and consolidates all of the ULD separate handlers for REQ_BLOCK_PC into a single call which has his fix for our direction bug. Signed-off-by: James Bottomley commit cd6104572bca9e4afe0dcdb8ecd65ef90b01297b Author: Adam Kropelin Date: Tue Dec 13 17:03:39 2005 -0800 [PATCH] hid-core: Zero-pad truncated reports When it detects a truncated report, hid-core emits a warning and then processes the report as usual. This is good because it allows buggy devices to still get data thru to userspace. However, the missing bytes of the report should be cleared before processing, otherwise userspace will be handed partially-uninitialized data. This fixes Debian tracker bug #330487. Signed-off-by: Adam Kropelin Cc: Vojtech Pavlik Acked-by: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fb79ffa4ddbe3f6f30fdb8429b5bad84d25ae6ef Author: Ole Reinhardt Date: Tue Dec 13 17:03:38 2005 -0800 [PATCH] fbdev: make pxafb more robust to errors with CONFIG_FB_PXA_PARAMETERS pxafb.c runs into an oops if CONFIG_FB_PXA_PARAMETERS is enabled and no parameters are set in command line. The following patch avoids this problem. Signed-off-by: Nicolas Pitre Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 118c71bcacce82a4317c9bd99c6a15af14020aee Author: Yasunori Goto Date: Tue Dec 13 17:03:37 2005 -0800 [PATCH] Fix calculation of grow_pgdat_span() in mm/memory_hotplug.c The calculation for node_spanned_pages at grow_pgdat_span() is clearly wrong. This is patch for it. (Please see grow_zone_span() to compare. It is correct.) Signed-off-by: Yasunori Goto Acked-by: Dave Hansen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 664d22ab954de54e52e0f71103a89c7a78738adc Author: Vojtech Pavlik Date: Tue Dec 13 17:03:36 2005 -0800 [PATCH] Dmitry Torokhov is input subsystem maintainer I haven't been very actively maintaining the input layer in past months, mostly because of my lack of time to concentrate on that. For that reason, I've decided to pass the maintainership of the Linux Input Layer to Dmitry Torokhov, whom I trust to do the job very well. Signed-off-by: Vojtech Pavlik Cc: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6921d201f77e14848df2eaa597e26525f468abea Author: Michael Chan Date: Tue Dec 13 21:15:53 2005 -0800 [TG3]: Fix low power state Fix the following bugs in tg3_set_power_state(): 1. Both WOL and ASF flags require switching to aux power. 2. Add a missing handshake with firmware to enable WOL. 3. Turn off the PHY if both WOL and ASF are disabled. 4. Add nvram arbitration before halting the firmware. 5. Fix tg3_setup_copper_phy() to switch to 100Mbps when changing to low power state. Update revision and date. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 16fe9d74f14ed74af778c5db7f9129e29916f4a7 Author: Michael Chan Date: Tue Dec 13 21:09:54 2005 -0800 [TG3]: Fix 5704 single-port mode If the dual-port 5704 is configured as a single-port device with only one PCI function, it would trigger a BUG() condition in tg3_find_5704_peer(). This fixes the problem by returning its own pdev if the peer cannot be found. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 6a9eba15f51c56da637e45ea1316eaa2a848986a Author: Michael Chan Date: Tue Dec 13 21:08:58 2005 -0800 [TG3]: Fix suspend and resume Fix tg3_suspend() and tg3_resume() by clearing and setting the TG3_FLAG_INIT_COMPLETE flag when appropriate. tg3_set_power_state() looks at TG3_FLAG_INIT_COMPLETE on the peer device to determine when to appropriately switch to aux power. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 381291b7d3e17ac966498312dc571dcca1b93efc Author: Michael Chan Date: Tue Dec 13 21:08:21 2005 -0800 [TG3]: Fix nvram arbitration bugs. The nvram arbitration rules were not strictly followed in a few places and this could lead to reading corrupted values from the nvram. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 322e079f1b606e46b79bb8b8e6cf6110b5f2aa3f Author: Matthew Wilcox Date: Tue Nov 29 23:08:40 2005 -0500 [SCSI] Negotiate correctly with async-only devices When we got a device only capable of async, we would zero out goal->period which would cause us to try PPR negotiations. Leave goal->period alone, and check goal->offset before doing PPR. Kudos to Daniel Forsgren for figuring this out. Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit 0910b444bcd7ea7f437a3ff48e0e3d2495ead22e Author: Linus Torvalds Date: Tue Dec 13 11:39:05 2005 -0800 Expose "Optimize for size" option for everybody Let's put my money where my mouth is. Smaller code is almost always faster, if only because a single I$ miss ends up leaving a lot of cycles to make up for. And system software - kernels in particular - are known for taking more cache misses than most other kinds. On my random config, this made the kernel about 10% smaller, and lmbench seems to say that it's pretty uniformly faster too. Your milage may vary. Signed-off-by: Linus Torvalds commit eed66cfcbbea851c97e287440d940286fce3f829 Author: Tony Luck Date: Tue Dec 13 10:41:49 2005 -0800 [IA64] Split 16-bit severity field in sal_log_record_header ERR_SEVERITY item is defined as a 8 bits item in SAL documentation ($B.2.1 rev december 2003), but as an u16 in sal.h. This has the side effect that current code in mca.c may not call ia64_sal_clear_state_info() upon receiving corrected platform errors if there are bits set in the validation byte. Reported by Xavier Bru. Signed-off-by: Tony Luck commit 83bab9a4bbf91af93f45233dc288c4d26308e281 Author: Adrian Bunk Date: Tue Dec 13 02:58:07 2005 +0100 [PATCH] allow KOBJECT_UEVENT=n only if EMBEDDED KOBJECT_UEVENT=n seems to be a common pitfall for udev users in 2.6.14 . -mm already contains a bigger patch removing this option that is IMHO too big for being applied now to 2.6.15-rc. This patch simply allows KOBJECT_UEVENT=n only if EMBEDDED. Signed-off-by: Adrian Bunk Signed-off-by: Linus Torvalds commit 98684a9d91bceff829b6dc7adf0f662d59cfa6e3 Author: Jeff Garzik Date: Tue Dec 13 11:35:22 2005 -0500 [netdrvr skge] fix build commit 50630195bbdfe1ca775d94cd68a5f18bc1b717e4 Author: Jeff Garzik Date: Tue Dec 13 02:29:45 2005 -0500 [libata] mark certain hardware (or drivers) with a no-atapi flag Some hardware does not support the PACKET command at all. Other hardware supports ATAPI, but the driver does something nasty such as calling BUG() when an ATAPI command is issued. For these such cases, we mark them with a new flag, ATA_FLAG_NO_ATAPI. Initial version contributed by Ben Collins. commit be0d9b6c7aeaad1683059c00131cabd4c894c17c Author: Antonino A. Daplas Date: Mon Dec 12 22:17:21 2005 -0800 [PATCH] fbdev: Fix incorrect unaligned access in little-endian machines The drawing function cfbfillrect does not work correctly when access is not unsigned-long aligned. It manifests as extra lines of pixels that are not complete drawn. Reversing the shift operator solves the problem, so I would presume that this bug would manifest only on little endian machines. The function cfbcopyarea may also have this bug. Aligned access should present no problems. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7275b4b6bc2f783c135c3f0eeecc4fdc6e788aa8 Author: Antonino A. Daplas Date: Mon Dec 12 22:17:20 2005 -0800 [PATCH] fbdev: Shift pixel value before entering loop in cfbimageblit In slow imageblit, the pixel value is shifted by a certain amount (dependent on the bpp and endianness) for each iteration. This is inefficient. Better do the shifting once before going into the loop. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39942fd8ff57c8623451bbfaffe8a184cc8b463a Author: Knut Petersen Date: Mon Dec 12 22:17:19 2005 -0800 [PATCH] fbdev: fix switch to KD_TEXT, enhanced version Every framebuffer driver relies on the assumption that the set_par() function of the driver is called before drawing functions and other functions dependent on the hardware state are executed. Whenever you switch from X to a framebuffer console for the very first time, there is a chance that a broken X system has _not_ set the mode to KD_GRAPHICS, thus the vt and framebuffer code executes a screen redraw and several other functions before a set_par() is executed. This is believed to be not a bug of linux but a bug of X/xdm. At least some X releases used by SuSE and Debian show this behaviour. There was a 2nd case, but that has been fixed by Antonino Daplas on 10-dec-2005. This patch allows drivers to set a flag to inform fbcon_switch() that they prefer a set_par() call on every console switch, working around the problems caused by the broken X releases. The flag will be used by the next release of cyblafb and might help other drivers that assume a hardware state different to the one used by X. As the default behaviour does not change, this patch should be acceptable to everybody. Signed-off-by: Knut Petersen Acked-by: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4e1567d3aad9bae0ecc5bb047179cd026bfb035c Author: Antonino A. Daplas Date: Mon Dec 12 22:17:18 2005 -0800 [PATCH] fbcon: Avoid illegal display panning Avoid calls to fb_pan_display when driver is suspended or not in text mode. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1207069f6f8f3d1b71641fdaa6cc04fca6fff9f5 Author: Antonino A. Daplas Date: Mon Dec 12 22:17:17 2005 -0800 [PATCH] fbdev: Pan display fixes - Fix fb_pan_display rejecting yoffsets that are valid if panning mode is ywrap. - Add more robust error checking in fb_pan_display specially since this function is accessible by userland apps. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4743484718e1d710321f24f8ef7d0124a48291b3 Author: Antonino A. Daplas Date: Mon Dec 12 22:17:16 2005 -0800 [PATCH] fbcon: Add ability to save/restore graphics state Add hooks to save and restore the graphics state. These hooks are called in fbcon_blank() when entering/leaving KD_GRAPHICS mode. This is needed by savagefb at least so it can cooperate with savage_dri and by cyblafb. State save/restoration can be full or partial. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 56f0d64de80733bda54d1cfa7ac0c736ab2de33b Author: Antonino A. Daplas Date: Mon Dec 12 22:17:15 2005 -0800 [PATCH] fbcon: fix complement_mask() with 512 character map There is a bug in the complement_mask when you have a 512-character map. Linux boots to a default 256-character map and most probably your login profile is loading a 512-character map which results in a bad gpm cursor. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2f6331faf58a4727a9f1138cd6db30d05b124220 Author: Mike Miller Date: Mon Dec 12 22:17:14 2005 -0800 [PATCH] cciss: fix for deregister_disk This patch adds setting our drv->queue = NULL back in deregister_disk. The drv->queue is part of our controller struct. blk_cleanup_queue works only on the queue in the gendisk struct. Signed-off-by: Mike Miller Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8309cf66fd90ccba9894adde2f3a8d7e1507e4d2 Author: Eric Dumazet Date: Mon Dec 12 22:17:14 2005 -0800 [PATCH] x86_64: Bug correction in populate_memnodemap() As reported by Keith Mannthey, there are problems in populate_memnodemap() The bug was that the compute_hash_shift() was returning 31, with incorrect initialization of memnodemap[] To correct the bug, we must use (1UL << shift) instead of (1 << shift) to avoid an integer overflow, and we must check that shift < 64 to avoid an infinite loop. Signed-off-by: Eric Dumazet Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fd4954714e8e7db9f6eb5878fa6111c46445ca81 Author: john stultz Date: Mon Dec 12 22:17:13 2005 -0800 [PATCH] x86_64: Fix collision between pmtimer and pit/hpet On systems that do not support the HPET legacy functions (basically the IBM x460, but there could be others), in time_init() we accidentally fall into a PM timer conditional and set the vxtime_hz value to the PM timer's frequency. We then use this value with the HPET for timekeeping. This patch (which mimics the behavior in time_init_gtod) corrects the collision. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit df818a52fb5e64c72b21029fb9ba80583106932c Author: Andi Kleen Date: Mon Dec 12 22:17:12 2005 -0800 [PATCH] x86_64: Fix 32bit thread coredumps When a register set is passed in don't try to fix up the pointer. Noticed by Al Viro Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6ece5491ae71ded1237f59def88bcd1b19b6f60 Author: Andi Kleen Date: Mon Dec 12 22:17:11 2005 -0800 [PATCH] i386/x86-64 Correct for broken MCFG tables on K8 systems They report all busses as MMCONFIG capable, but it never works for the internal devices in the CPU's builtin northbridge. It just probes all func 0 devices on bus 0 (the internal northbridge is currently always on bus 0) and if they are not accessible using MCFG they are put into a special fallback bitmap. On systems where it isn't we assume the BIOS vendor supplied correct MCFG. Requires the earlier patch for mmconfig type1 fallback Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 928cf8c62763349efc550a12f6518e52c3390906 Author: Andi Kleen Date: Mon Dec 12 22:17:10 2005 -0800 [PATCH] i386/x86-64 Fall back to type 1 access when no entry found When there is no entry for a bus in MCFG fall back to type1. This is especially important on K8 systems where always some devices can't be accessed using mmconfig (in particular the builtin northbridge doesn't support it for its own devices) Cc: Cc: Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bf5421c309bb89e5106452bc840983b1b4754d61 Author: Andi Kleen Date: Mon Dec 12 22:17:09 2005 -0800 [PATCH] i386/x86-64: Don't call change_page_attr with a spinlock held It's illegal because it can sleep. Use a two step lookup scheme instead. First look up the vm_struct, then change the direct mapping, then finally unmap it. That's ok because nobody can change the particular virtual address range as long as the vm_struct is still in the global list. Also added some LinuxDoc documentation to iounmap. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e9ef02ec00c70840661d174dc2f4862db471bb6 Author: Shaohua Li Date: Mon Dec 12 22:17:08 2005 -0800 [PATCH] i386/x86-64 disable LAPIC completely for offline CPU Disabling LAPIC timer isn't sufficient. In some situations, such as we enabled NMI watchdog, there is still unexpected interrupt (such as NMI) invoked in offline CPU. This also avoids offline CPU receives spurious interrupt and anything similar. Signed-off-by: Shaohua Li Signed-off-by: Andi Kleen Acked-by: "Seth, Rohit" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 68e188911263adb06e28fa2c9dc9e017774de68d Author: Andi Kleen Date: Mon Dec 12 22:17:07 2005 -0800 [PATCH] x86_64: Make sure hpet_address is 0 when any part of HPET initialization fails Otherwise TSC->HPET fallback could see incorrect state and crash later. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 47807ce381acc34a7ffee2b42e35e96c0f322e52 Author: Dave Airlie Date: Tue Dec 13 04:18:41 2005 +0000 [drm] fix radeon aperture issue Ben noticed that on certain cards we've landed the AGP space on top of the second aperture instead of after it.. Which messes things up a lot on those machines. This just moves the gart further out, a more correct fix is in the works from Ben for after 2.6.15. Signed-off-by: Dave Airlie CC: Ben Herrenschmidt Signed-off-by: Linus Torvalds commit 1cf9e8a7865c0ac216034e519cf6b8505055ea50 Author: Olaf Hering Date: Thu Dec 1 21:22:37 2005 +0100 [PATCH] ieee80211_crypt_tkip depends on NET_RADIO *** Warning: ".wireless_send_event" [net/ieee80211/ieee80211_crypt_tkip.ko] undefined! Signed-off-by: Olaf Hering net/ieee80211/Kconfig | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Signed-off-by: Jeff Garzik commit ee1c81917a0c10f44c1b400482b8372e68238ff8 Author: Stephen Hemminger Date: Tue Dec 6 15:01:49 2005 -0800 [PATCH] skge: get rid of warning on race Get rid of warning in case of race with ring full and lockless tx on the skge driver. It is possible to be in the transmit routine with no available slots and already stopped. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit d51e86c18a479f1dbcef3aa20e58ad04d1233016 Author: Stefan Richter Date: Mon Dec 5 16:28:59 2005 -0500 ieee1394: write broadcast_channel only to select nodes (fixes device recognition) Some old 1394-1995 SBP-2 bridges would hang if they received a broadcast write request to BROADCAST_CHANNEL before the config ROM was read. Affected devices include Datafab MD2-FW2 2.5" HDD and SmartDisk VST FWCDRW-V8 portable CD writer. The write request is now directed to specific nodes instead of being broadcast to all nodes at once, and it is only performed if a previous read request at this register succeeded. Fixes an old interoperability problem which was perceived as a 2.6.14-specific regression: http://marc.theaimsgroup.com/?t=113190586800003 Signed-off-by: Stefan Richter Signed-off-by: Jody McIntyre (cherry picked from 61c7f775ca25ccfc0e51486103a724fb1a3a08f2 commit) commit 48622b7bde008387218a416586e9d072b385f1ae Author: Stefan Richter Date: Thu Dec 1 18:51:52 2005 -0500 ieee1394: resume remote ports when starting a host (fixes device recognition) After initializing an IEEE 1394 host, broadcast a resume packet. This makes remote nodes visible which suspended their ports while the host was down. Such nodes had to be unplugged and replugged in order to be recognized. Motorola DCT6200 cable reciever was affected, probably other devices too. http://marc.theaimsgroup.com/?t=113202715800001 Signed-off-by: Stefan Richter Signed-off-by: Jody McIntyre (cherry picked from 14c0fa243b358c24040ff5f44b60c47aaf6430c3 commit) commit dfa159886f38344ede31e3b13ec614e0bebc09c6 Author: Mark Lord Date: Mon Dec 12 23:19:28 2005 -0500 [PATCH] libata-core.c: fix parameter bug on kunmap_atomic() calls Fix incorrect pointer usage on two calls to kunmap_atomic(). This seems to happen a lot, because kunmap() wants the struct page *, whereas kunmap_atomic() instead wants the mapped virtual address. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 1ff8038988adecfde71d82c0597727fc239d4e8c Author: Linus Torvalds Date: Mon Dec 12 16:24:33 2005 -0800 get_user_pages: don't try to follow PFNMAP pages Nick Piggin points out that a few drivers play games with VM_IO (why? who knows..) and thus a pfn-remapped area may not have that bit set even if remap_pfn_range() set it originally. So make it explicit in get_user_pages() that we don't follow VM_PFNMAP pages, since pretty much by definition they do not have a "struct page" associated with them. Signed-off-by: Linus Torvalds commit 2f9616d4c44349c903bc1b54fe46ab0ce0210b74 Author: Marcus Sundberg Date: Mon Dec 12 15:02:48 2005 -0800 [NETFILTER]: ip_nat_tftp: Fix expectation NAT When a TFTP client is SNATed so that the port is also changed, the port is never changed back for the expected connection. Signed-off-by: Marcus Sundberg Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 1df2ab48f995b1599740a3f430df77fe24cb8ce9 Author: Paul Jackson Date: Mon Dec 12 14:42:44 2005 -0800 [SPARC]: block/ needed in final image link With this fix, sparc links vmlinuz again using crosstool. Without this fix, the final link fails missing several dozen dozen symbols, beginning with: kernel/built-in.o(.text+0x6fd0): In function `do_exit': : undefined reference to `exit_io_context' (exit_io_context is defined in block/ll_rw_blk.c). Signed-off-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 1d66a79dc8dd892c0db04396a0b1d05e0f53fe4f Author: Paul Jackson Date: Mon Dec 12 14:42:31 2005 -0800 [SPARC]: atomic_clear_mask build fix This fixes one build error introduced in sparc with the patch of Oct 30, resent Nov 4 "[patch 3/5] atomic: atomic_inc_not_zero" I still can't get sparc to build, but at least it gets further after I remove this line. Apparently, this change was agreed to by Andrew and Nick on Nov 14, but everyone thought someone else was doing it. Signed-off-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 2c27d4e53043de1c821e0af09e08dee3e92a01d6 Author: Hareesh Nagarajan Date: Mon Dec 12 14:42:07 2005 -0800 [SBUSFB] tcx: Use FB_BLANK_UNBLANK instead of magic constant. From: Hareesh Nagarajan Signed-off-by: David S. Miller commit 806f7bf605bdb0f2ea2253f832943890edb85d83 Author: David S. Miller Date: Mon Dec 12 14:41:20 2005 -0800 [SBUSFB]: Kill 'list' member from foo_par structs, totally unused. Based upon a patch from Hareesh Nagarajan. Signed-off-by: David S. Miller commit ecc51b6d5ca04bb6346c9ad6b37d6ca8bace12b3 Author: Arnaldo Carvalho de Melo Date: Mon Dec 12 14:38:10 2005 -0800 [TCPv6]: Fix skb leak Spotted by Francois Romieu, thanks! Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 66e05225262cd9271fac13fe2fd1e9edb65e3978 Author: Brian King Date: Mon Dec 12 13:05:08 2005 -0600 [PATCH] Fix SCSI scanning slab corruption There is a double free in the scsi scan code if a LLDD's slave_alloc() call fails. There is a direct call to scsi_free_queue and then the following put_device calls the release function, which also frees the queue. Remove the redundant scsi_free_queue. Signed-off-by: Brian King Tested-by: Nathan Lynch [ Also removed some strange whitespace artifacts in that area ] Signed-off-by: Linus Torvalds commit 016cc85072944bfa03c5e4b587ae89588ce2e5df Author: Olaf Hering Date: Fri Dec 9 19:12:10 2005 +0100 [PATCH] pcnet32: use MAC address from prom also on powerpc The CSR contains garbage after a coldboot on RS/6000. One some systems (like my 44p 270) the MAC address is all FF, on others (like my B50) it is ff:ff:ff:fd:ff:6b. It can eventually be fixed by loading pcnet32, set the interface into the UP state, rmmod pcnet32 and load it again. But this worked only on the 270. Only netbooting after a cold start provides the correct MAC address via prom and CSR. This makes it very unreliable. I dont know why the MAC is stored in two different places. Remove the special case for powerpc, which was added in early 2.4 development. Signed-off-by: Olaf Hering drivers/net/pcnet32.c | 5 ----- 1 files changed, 5 deletions(-) Signed-off-by: Jeff Garzik commit 1a68de5c08be8c77c4ad208306187bd95107c7cd Author: Brian King Date: Mon Dec 12 13:05:08 2005 -0600 [SCSI] fix double free of scsi request queue Current scsi scanning code appears to have a use after free bug is a LLDD's slave_alloc fails. Remove the redundant scsi_free_queue. Signed-off-by: Brian King Signed-off-by: James Bottomley commit 49d7bc64283970ee83d2c954d04ba00d04e5943d Author: Linus Torvalds Date: Mon Dec 12 11:25:04 2005 -0800 Revert revert of "[SCSI] fix usb storage oops" This reverts commit 1b0997f561bf46689cc6e0903f342e9bf2506bf1, which in turn reverted 34ea80ec6a02ad02e6b9c75c478c18e5880d6713 (which is thus re-instated). Quoth James Bottomley: "All it's doing is deferring the device_put() from the scsi_put_command() to after the scsi_run_queue(), which doesn't fix the sleep while atomic problem of the device release method. In both cases we still get the semaphore in atomic context problem which is caused by scsi_reap_target() doing a device_del(), which I assumed (wrongly) was valid from atomic context." who also promised to fix scsi_reap_target(). Signed-off-by: Linus Torvalds commit 5036805be7b815eb18dcce489d974f3aee4f3841 Author: NeilBrown Date: Mon Dec 12 02:39:17 2005 -0800 [PATCH] md: use correct size of raid5 stripe cache when measuring how full it is The raid5 stripe cache was recently changed from fixed size (NR_STRIPES) to variable size (conf->max_nr_stripes). However there are two places that still use the constant and as a result, reducing the size of the stripe cache can result in a deadlock. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3795bb0fc52fe2af2749f3ad2185cb9c90871ef8 Author: NeilBrown Date: Mon Dec 12 02:39:16 2005 -0800 [PATCH] md: fix a use-after-free bug in raid1 Who would submit code with a FIXME like that in it !!!! Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0de502aa44aae5712a18d471818d6c785e07c92e Author: Andrew Morton Date: Mon Dec 12 00:37:41 2005 -0800 [PATCH] raw driver: Kconfig fix CONFIG_MAX_RAW_DEVS should appear immediately after CONFIG_RAW_DRIVER. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a64882e795cc1d890e3359d0aa143af1cf67e8d4 Author: Dave Jones Date: Mon Dec 12 00:37:40 2005 -0800 [PATCH] ACPI: fix sleeping whilst atomic warnings on resume This has been broken for months. On resume, we call acpi_pci_link_set() with interrupts off, so we get a warning when we try to do a kmalloc of non atomic memory. The actual allocation is just 2 long's (plus extra byte for some reason I can't fathom), so a simple conversion to GFP_ATOMIC is probably the safest way to fix this. The error looks like this.. Debug: sleeping function called from invalid context at mm/slab.c:2486 in_atomic():0, irqs_disabled():1 [] kmem_cache_alloc+0x40/0x56 [] acpi_pci_link_set+0x3f/0x17f [] irqrouter_resume+0x1e/0x3c [] __sysdev_resume+0x11/0x6b [] sysdev_resume+0x34/0x52 [] device_power_up+0x5/0xa Signed-off-by: Dave Jones Cc: "Brown, Len" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66d43e98ea6ff291cd4e524386bfb99105feb180 Author: Haren Myneni Date: Mon Dec 12 00:37:39 2005 -0800 [PATCH] fix in __alloc_bootmem_core() when there is no free page in first node's memory Hitting BUG_ON() in __alloc_bootmem_core() when there is no free page available in the first node's memory. For the case of kdump on PPC64 (Power 4 machine), the captured kernel is used two memory regions - memory for TCE tables (tce-base and tce-size at top of RAM and reserved) and captured kernel memory region (crashk_base and crashk_size). Since we reserve the memory for the first node, we should be returning from __alloc_bootmem_core() to search for the next node (pg_dat). Currently, find_next_zero_bit() is returning the n^th bit (eidx) when there is no free page. Then, test_bit() is failed since we set 0xff only for the actual size initially (init_bootmem_core()) even though rounded up to one page for bdata->node_bootmem_map. We are hitting the BUG_ON after failing to enter second "for" loop. Signed-off-by: Haren Myneni Cc: Andy Whitcroft Cc: Dave Hansen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ff9569bc5558e958777fd43580f2ccd83733cdf6 Author: Yasunori Goto Date: Mon Dec 12 00:37:37 2005 -0800 [PATCH] Fix Kconfig of DMA32 for ia64 I realized ZONE_DMA32 has a trivial bug at Kconfig for ia64. In include/linux/gfp.h on 2.6.15-rc5-mm1, CONFIG is define like followings. #ifdef CONFIG_DMA_IS_DMA32 #define __GFP_DMA32 ((__force gfp_t)0x01) /* ZONE_DMA is ZONE_DMA32 */ : : So, CONFIG_"ZONE"_DMA_IS_DMA32 is clearly wrong. Signed-off-by: Yasunori Goto Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1393c3edc307e0a2ec4274f67e342907ffd7deb5 Author: Nicolas Pitre Date: Mon Dec 12 00:37:36 2005 -0800 [PATCH] input: fix ucb1x00-ts breakage after conversion to dynamic input_dev allocation The bd622663192e8ebebb27dc1d9397f352a82d2495 commit broke the UCB1x00 touchscreen driver since the idev structure was assumed to be into the ts structure, simply casting the former to the later in a couple places. This patch fixes those, and also cache the idev pointer between multiple calls to input_report_abs() to avoid growing the compiled code needlessly. Signed-off-by: Nicolas Pitre Cc: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 68799398cea44b81d1e919f842d8d84d471053d5 Author: Dave Jones Date: Mon Dec 12 00:37:35 2005 -0800 [PATCH] broken cast in parport_pc Spotted by a Fedora user. Compiling with DEBUG_PARPORT set fails due to the broken cast. Just remove it. Signed-off-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bf8d5c52c3b6b27061e3b7d779057fd9a6cac164 Author: Keshavamurthy Anil S Date: Mon Dec 12 00:37:34 2005 -0800 [PATCH] kprobes: increment kprobe missed count for multiprobes When multiple probes are registered at the same address and if due to some recursion (probe getting triggered within a probe handler), we skip calling pre_handlers and just increment nmissed field. The below patch make sure it walks the list for multiple probes case. Without the below patch we get incorrect results of nmissed count for multiple probe case. Signed-off-by: Anil S Keshavamurthy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 00d7c05ab168c10f9b520e07400923267bc04419 Author: Keshavamurthy Anil S Date: Mon Dec 12 00:37:33 2005 -0800 [PATCH] kprobes: no probes on critical path For Kprobes critical path is the path from debug break exception handler till the control reaches kprobes exception code. No probes can be supported in this path as we will end up in recursion. This patch prevents this by moving the below function to safe __kprobes section onto which no probes can be inserted. Signed-off-by: Anil S Keshavamurthy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cda315aba34ff4fb66bbb2945b723688f3414a75 Author: Matt Domsch Date: Mon Dec 12 00:37:32 2005 -0800 [PATCH] ipmi: fix panic generator ID The IPMI specifcation says the generator ID is 0x20, but that is for bits 7-1. Bit 0 is set to specify it is a software event. The correct value is 0x41. Without this fix, panic events written into the System Event Log appear to come from an "unknown" generator, rather than from the kernel. Signed-off-by: Jordan Hargrave Signed-off-by: Matt Domsch Acked-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd815408106f3c56c3050493dda97f9355aa4971 Author: Mauro Carvalho Chehab Date: Mon Dec 12 00:37:31 2005 -0800 [PATCH] V4L/DVB: (3151) I2C ID renamed to I2C_DRIVERID_INFRARED I2C ID renamed to I2C_DRIVERID_INFRARED Acked-off-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3639c8619d50a6dea8fa106a5c61d848ffdcd3d6 Author: Sascha Sommer Date: Mon Dec 12 00:37:30 2005 -0800 [PATCH] V4L/DVB: (3113) Convert em28xx to use vm_insert_page instead of remap_pfn_range Convert em28xx to use vm_insert_page instead of remap_pfn_range Signed-off-by: Sascha Sommer Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 225a0cb6716da3aafaeb9ed2f8d9a7a1f2af9f09 Author: Ricardo Cerqueira Date: Mon Dec 12 00:37:28 2005 -0800 [PATCH] V4L/DVB: (3135) Fix tuner init for Pinnacle PCTV Stereo - The Pinnacle PCTV Stereo needs tda9887 port2 set to 1 - Without this patch, mt20xx tuner is not detected and the board doesn't tune. Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 674434c691e10015660022fc00b04985a23ef87b Author: Mauro Carvalho Chehab Date: Mon Dec 12 00:37:28 2005 -0800 [PATCH] V4L/DVB: (3086c) Whitespaces cleanups part 4 Clean up whitespaces at v4l/dvb files Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit afd1a0c9ac281eed3b22b293ccd92af7b0d60889 Author: Mauro Carvalho Chehab Date: Mon Dec 12 00:37:27 2005 -0800 [PATCH] V4L/DVB: (3086c) Whitespaces cleanups part 3 Clean up whitespaces at v4l/dvb files Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 808824b5f73e361503420ee318ca9689781da034 Author: Mauro Carvalho Chehab Date: Mon Dec 12 00:37:25 2005 -0800 [PATCH] V4L/DVB: (3086b) Whitespaces cleanups part 2 Clean up whitespaces at v4l/dvb files Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9101e6222cb115240e24160bb90cce425bb74de5 Author: Mauro Carvalho Chehab Date: Mon Dec 12 00:37:24 2005 -0800 [PATCH] V4L/DVB: (3086a) Whitespaces cleanups part 1 Clean up whitespaces at v4l/dvb files Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 68352e6ee3675e23b492c51908951058de4f6fe0 Author: Hugh Dickins Date: Mon Dec 12 00:37:23 2005 -0800 [PATCH] mips: setup_zero_pages count 1 Page count should be initialized to 1 on each of the MIPS empty zero pages, to avoid a bad_page warning whenever one of them is freed from all mappings. Signed-off-by: Hugh Dickins Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a4ae749a478f8bca73d4b5b8c1b8cbb178b2db5 Author: Pierre Ossman Date: Mon Dec 12 00:37:22 2005 -0800 [PATCH] Add try_to_freeze to kauditd kauditd was causing suspends to fail because it refused to freeze. Adding a try_to_freeze() to its sleep loop solves the issue. Signed-off-by: Pierre Ossman Acked-by: Pavel Machek Cc: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bf001b26793bd9f8a446577c361226fbcd617182 Author: Pekka J Enberg Date: Mon Dec 12 00:37:16 2005 -0800 [PATCH] uml: fix compile error for tt arch/um/kernel/tt/uaccess.c: In function `copy_from_user_tt': arch/um/kernel/tt/uaccess.c:11: error: `FIXADDR_USER_START' undeclared (first use in this function) arch/um/kernel/tt/uaccess.c:11: error: (Each undeclared identifier is reported only once arch/um/kernel/tt/uaccess.c:11: error: for each function it appears in.) I get the compile error when I disable CONFIG_MODE_SKAS. Signed-off-by: Pekka Enberg Acked-by: Paolo Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8140a5005bc6f1c9d0fa103460d50d472e6e3426 Author: John McCutchan Date: Mon Dec 12 00:37:14 2005 -0800 [PATCH] inotify: add two inotify_add_watch flags The below patch lets userspace have more control over the inodes that inotify will watch. It introduces two new flags. IN_ONLYDIR -- only watch the inode if it is a directory. This is needed to avoid the race that can occur when we want to be sure that we are watching a directory. IN_DONT_FOLLOW -- don't follow a symlink. In combination with IN_ONLYDIR we can make sure that we don't watch the target of symlinks. The issues the flags fix came up when writing the gnome-vfs inotify backend. Default behaviour is unchanged. Signed-off-by: John McCutchan Acked-by: Robert Love Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b4788f6d55548e587ced330ece711456f40ec8f1 Author: Jens Axboe Date: Mon Dec 12 00:37:13 2005 -0800 [PATCH] cciss: double put_disk() This undoes the put_disk patch I sent in before. If I had been paying attention I would have seen that we call put_disk from free_hba during driver unload. That's the only time we want to call it. If it's called from deregister disk we may remove the controller (cNd0) unintentionally. Signed-off-by: Mike Miller Signed-off-by: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit adad0f331f9c693129e81e233c5461e2e7c3e443 Author: Keshavamurthy Anil S Date: Mon Dec 12 00:37:12 2005 -0800 [PATCH] kprobes: fix race in aggregate kprobe registration When registering multiple kprobes at the same address, we leave a small window where the kprobe hlist will not contain a reference to the registered kprobe, leading to potentially, a system crash if the breakpoint is hit on another processor. Patch below now automically relpace the old kprobe with the new kprobe from the hash list. Signed-off-by: Anil S Keshavamurthy Acked-by: Ananth N Mavinakayanahalli Cc: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b88cb42428f14fabdaf947150c00d65891820635 Author: Ingo Molnar Date: Mon Dec 12 00:37:11 2005 -0800 [PATCH] add hlist_replace_rcu() Add list_replace_rcu: replace old entry by new one. Signed-off-by: Paul E. McKenney Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5650b736ad328f7f3e4120e8790940289b8ac144 Author: Matt Helsley Date: Mon Dec 12 00:37:10 2005 -0800 [PATCH] Add timestamp field to process events This adds a timestamp field to the events sent via the process event connector. The timestamp allows listeners to accurately account the duration(s) between a process' events and offers strong means with which to determine the order of events with respect to a given task while also avoiding the addition of per-task data. This alters the size and layout of the event structure and hence would break compatibility if process events connector as it stands in 2.6.15-rc2 were released as a mainline kernel. Signed-off-by: Matt Helsley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 64123fd42c7a1e4ebf6acd2399c98caddc7e0c26 Author: Matt Helsley Date: Mon Dec 12 00:37:09 2005 -0800 [PATCH] Add getnstimestamp function There are several functions that might seem appropriate for a timestamp: get_cycles() current_kernel_time() do_gettimeofday() Each has problems with combinations of SMP-safety, low resolution, and monotonicity. This patch adds a new function that returns a monotonic SMP-safe timestamp with nanosecond resolution where available. Changes: Split timestamp into separate patch Moved to kernel/time.c Renamed to getnstimestamp Fixed unintended-pointer-arithmetic bug Signed-off-by: Matt Helsley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 894ec8707ced240b96dc45944790fb35d9a6b03c Author: Daniel Drake Date: Mon Dec 12 00:37:08 2005 -0800 [PATCH] Fix listxattr() for generic security attributes Commit f549d6c18c0e8e6cf1bf0e7a47acc1daf7e2cec1 introduced a generic fallback for security xattrs, but appears to include a subtle bug. Gentoo users with kernels with selinux compiled in, and coreutils compiled with acl support, noticed that they could not copy files on tmpfs using 'cp'. cp (compiled with acl support) copies the file, lists the extended attributes on the old file, copies them all to the new file, and then exits. However the listxattr() calls were failing with this odd behaviour: llistxattr("a.out", (nil), 0) = 17 llistxattr("a.out", 0x7fffff8c6cb0, 17) = -1 ERANGE (Numerical result out of range) I believe this is a simple problem in the logic used to check the buffer sizes; if the user sends a buffer the exact size of the data, then its ok :) This change solves the problem. More info can be found at http://bugs.gentoo.org/113138 Signed-off-by: Daniel Drake Acked-by: James Morris Acked-by: Stephen Smalley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c3f5902325d3053986e7359f706581d8f032e72f Author: Srivatsa Vaddagiri Date: Mon Dec 12 00:37:07 2005 -0800 [PATCH] Fix RCU race in access of nohz_cpu_mask Accessing nohz_cpu_mask before incrementing rcp->cur is racy. It can cause tickless idle CPUs to be included in rsp->cpumask, which will extend graceperiods unnecessarily. Fix this race. It has been tested using extensions to RCU torture module that forces various CPUs to become idle. Signed-off-by: Srivatsa Vaddagiri Cc: Dipankar Sarma Cc: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 89d46b8778f65223f732d82c0166e0abba20fb1e Author: Srivatsa Vaddagiri Date: Mon Dec 12 00:37:06 2005 -0800 [PATCH] Fix bug in RCU torture test While doing some test of RCU torture module, I hit a OOPS in rcu_do_batch, which was trying to processes callback of a module that was just removed. This is because we weren't waiting long enough for all callbacks to fire. Signed-off-by: Srivatsa Vaddagiri Cc: Dipankar Sarma Acked-by: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab4720ec76b756e1f8705e207a7b392b0453afd6 Author: Dipankar Sarma Date: Mon Dec 12 00:37:05 2005 -0800 [PATCH] add rcu_barrier() synchronization point This introduces a new interface - rcu_barrier() which waits until all the RCUs queued until this call have been completed. Reiser4 needs this, because we do more than just freeing memory object in our RCU callback: we also remove it from the list hanging off super-block. This means, that before freeing reiser4-specific portion of super-block (during umount) we have to wait until all pending RCU callbacks are executed. The only change of reiser4 made to the original patch, is exporting of rcu_barrier(). Cc: Hans Reiser Cc: Vladimir V. Saveliev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 85b872424984e79519be904e7df02a91ba0a9486 Author: Andreas Gruenbacher Date: Mon Dec 12 00:37:04 2005 -0800 [PATCH] ext3: fix mount options documentation Reported by Jacques de Mer and Daniel Drake . Signed-off-by: Andreas Gruenbacher Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6b6a462c4ab75c1a5293b22562052cdf0e8bfb22 Author: Andreas Schwab Date: Mon Dec 12 00:37:03 2005 -0800 [PATCH] KERNELRELEASE depends on CONFIG_LOCALVERSION Sam Ravnborg writes: > Author: Uwe Zeisberger > > [PATCH] kbuild: make kernelrelease in unconfigured kernel prints an error > > Do not include .config for target kernelrelease This is wrong. KERNELRELEASE depends on CONFIG_LOCALVERSION, thus you need .config. Signed-off-by: Andreas Schwab Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 82584ef75b7c14f22028595b0e8aa904464c5240 Author: Shaohua Li Date: Mon Dec 12 00:37:02 2005 -0800 [PATCH] x86: fix NMI with CPU hotplug With CPU hotplug enabled, NMI watchdog stoped working. It appears the violation is the cpu_online check in nmi handler. local ACPI based NMI watchdog is initialized before we set CPU online for APs. It's quite possible a NMI is fired before we set CPU online, and that's what happens here. Signed-off-by: Shaohua Li Acked-by: Zwane Mwaikambo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b3e55c727ff7349c5db722fbdb8d99a151e8e0bf Author: Mao, Bibo Date: Mon Dec 12 00:37:00 2005 -0800 [PATCH] Kprobes: Reference count the modules when probed on it When a Kprobes are inserted/removed on a modules, the modules must be ref counted so as not to allow to unload while probes are registered on that module. Without this patch, the probed module is free to unload, and when the probing module unregister the probe, the kpobes code while trying to replace the original instruction might crash. Signed-off-by: Anil S Keshavamurthy Signed-off-by: Mao Bibo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3fe968f167975d10c639f03c4934f05a29da73c0 Author: Andrew Morton Date: Mon Dec 12 00:36:59 2005 -0800 [PATCH] blkmtd: use clear_page_dirty() SetPageDirty() and ClearPageDirty() are low-level thing which filesystems shouldn't be using. They bypass dirty page accounting. Cc: David Woodhouse Acked-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bf7ececa9b68f4720f1ce344f442435660bcdae7 Author: Keith Owens Date: Sat Dec 10 14:24:28 2005 +1100 [IA64] Define an ia64 version of __raw_read_trylock IA64 is using the generic version of __raw_read_trylock, which always waits for the lock to be free instead of returning when the lock is in use. Define an ia64 version of __raw_read_trylock which behaves correctly, and drop the generic one. Signed-off-by: Keith Owens Signed-off-by: Tony Luck commit 1ee9530a71686436dbeb5f31dd5b925c39cf71d7 Author: Lothar Wassmann Date: Mon Dec 12 16:44:05 2005 +0000 [ARM] 3201/1: PXA27x: Prevent hangup during resume due to inadvertedly enabling MBREQ (replaces: 3198/1) Patch from Lothar Wassmann The patch makes sure, that the ouptut functions of pins are restored before restoring the Alternat Function settings, preventing pins from being intermediately configured for undefined or unwanted alternate functions. Here is the original comment: I've got a PXA270 system that uses GPIO80 as nCS4. This system did hang on resume. Digging into the problem I found that the processor stalled immediately when restoring the GAFR2_U register which restored the alternate function for GPIO80. Since the GPDR registers were restored after the GAFR registers, the offending GPIO was configured as input at this point. Thus the alternate function that was in effect after restoring the GAFR was in fact the input function "MBREQ" instead of the output function "nCS4". The "PXA27x Processor Family Developer's Manual" (Footnote in Table 6-1 on page 6-3) states that: "The MBREQ alternate function must not be enabled until the PSSR[RDH] bit field is cleared. For more details, see Table 3-15, "PSSR Bit Definitions" on page 3-71." There is another note in the Developer's Manual (chapter 24.4.2 "GPIO operation as Alternate Function" on page 24-4) stating that: "Configuring a GPIO for an alternate function that is not defined for it causes unpredictable results." Since some GPIOs have no input function defined, and to prevent inadvertedly programming the MBREQ function on some pin, the GAFR registers should be restored after the GPDR registers have been restored. Additional provisions have to be made when the MBREQ function is actually required. The corresponding GAFR bits should not be restored with the regular GAFR restore, but must be set only after the PSSR bits have been cleared. Signed-off-by: Lothar Wassmann Signed-off-by: Russell King commit 67121172f9753f38689651b613a4850e0e75876f Author: Linus Torvalds Date: Sun Dec 11 20:38:17 2005 -0800 Allow arbitrary read-only shared pfn-remapping too The VM layer (for historical reasons) turns a read-only shared mmap into a private-like mapping with the VM_MAYWRITE bit clear. Thus checking just VM_SHARED isn't actually sufficient. So use a trivial helper function for the cases where we wanted to inquire if a mapping was COW-like or not. Moo! Signed-off-by: Linus Torvalds commit 7fc7e2eeecb599ba719c4c4503100fc8cd6a6920 Author: Linus Torvalds Date: Sun Dec 11 19:57:52 2005 -0800 Remove (at least temporarily) the "incomplete PFN mapping" support With the previous commit, we can handle arbitrary shared re-mappings even without this complexity, and since the only known private mappings are for strange users of /dev/mem (which never create an incomplete one), there seems to be no reason to support it. Signed-off-by: Linus Torvalds commit fb155c1619f056ae9765eed272cd6aba6e1a7399 Author: Linus Torvalds Date: Sun Dec 11 19:46:02 2005 -0800 Allow arbitrary shared PFNMAP's A shared mapping doesn't cause COW-pages, so we don't need to worry about the whole vm_pgoff logic to decide if a PFN-remapped page has gone through COW or not. This makes it possible to entirely avoid the special "partial remapping" logic for the common case. Signed-off-by: Linus Torvalds commit ef969434005e772218c0b8086539804605070fa8 Author: Johannes Berg Date: Sat Dec 10 18:41:50 2005 -0800 [PATCH] ppc32: set smp_tb_synchronized on UP with SMP kernel ppc32 kernel, when built with CONFIG_SMP and booted on a single CPU machine, will not properly set smp_tb_synchronized, thus causing gettimeofday() to not use the HW timebase and to be limited to jiffy resolution. This, among others, causes unacceptable pauses when launching X.org. Signed-Off-By: Johannes Berg Acked-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Paul Mackerras commit b39f9485e6cfe1bf21b18b60fd8c631a72a1304d Author: Benjamin Herrenschmidt Date: Mon Dec 12 13:13:24 2005 +1100 [PATCH] powerpc: Fix clock spreading setting on some powermacs The code that sets the clock spreading feature of the Intrepid ASIC must not be run on some machine models or those won't boot. This fixes it. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 22f975f4ffa707ea24507f6899bb9f5a1ff034bc Author: Nikola Valerjev Date: Sat Dec 10 11:59:15 2005 +0000 [ARM] 3200/1: Singlestep over ARM BX and BLX instructions using ptrace fix Patch from Nikola Valerjev Single stepping an application using ptrace() fails over ARM instructions BX and BLX. Steps to reproduce: Compile and link the following files main.c ----- void foo(); int main() { foo(); return 0; } foo.s ----- .text .globl foo foo: BX LR Using ptrace() functionality, run to main(), and start singlestepping. Singlestep over \"BX LR\" instruction won\'t transfer the control back to main, but run the code to completion. This problems seems to be in the function get_branch_address() in arch/arm/kernel/ptrace.c. The function doesn\'t seem to recognize BX and BLX instructions as branches. BX and BLX instructions can be used to convert from ARM to Thumb mode if the target address has the low bit set. However, they are also perfectly legal in the ARM only mode. Although other things in the kernel seem to indicate that only ARM mode is accepted (and not Thumb), many compilers will generate BX and BLX instructions even when generating ARM only code. Signed-off-by: Nikola Valerjev Signed-off-by: Russell King commit a8c730e85e80734412f4f73ab28496a0e8b04a7b Author: Jens Axboe Date: Fri Dec 9 14:42:16 2005 +0100 [SCSI] fix panic when ejecting ieee1394 ipod The scsi_library routines don't correctly set DMA_NONE when req->data_len is zero (instead they check the command type first, so if it's write, we end up with req->data_len == 0 and direction as DMA_TO_DEVICE which confuses some drivers) Signed-off-by: James Bottomley commit 73d4f84fd001b0be67fea46e84b75e6a7a5da08e Author: Kazunori MIYAZAWA Date: Thu Dec 8 23:11:42 2005 -0800 [IPv6] IPsec: fix pmtu calculation of esp It is a simple bug which uses the wrong member. This bug does not seriously affect ordinary use of IPsec. But it is important to pass IPv6 ready logo phase-2 conformance test of IPsec SGW. Signed-off-by: Kazunori MIYAZAWA Signed-off-by: David S. Miller commit 23ed6cb9a237902cce6018a24d1993c346abddb4 Author: David Gibson Date: Fri Dec 9 16:45:17 2005 +1100 [PATCH] powerpc: Fix SLB flushing path in hugepage On ppc64, when opening a new hugepage region, we need to make sure any old normal-page SLBs for the area are flushed on all CPUs. There was a bug in this logic - after putting the new hugepage area masks into the thread structure, we copied it into the paca (read by the SLB miss handler) only on one CPU, not on all. This could cause incorrect SLB entries to be loaded when a multithreaded program was running simultaneously on several CPUs. This patch corrects the error, copying the context information into the PACA on all CPUs using the mm in question before flushing any existing SLB entries. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit cbf52afdc0eb88492cf7808cc4b4f58a46f1b1ad Author: David Gibson Date: Fri Dec 9 14:20:52 2005 +1100 [PATCH] powerpc: Add missing icache flushes for hugepages On most powerpc CPUs, the dcache and icache are not coherent so between writing and executing a page, the caches must be flushed. Userspace programs assume pages given to them by the kernel are icache clean, so we must do this flush between the kernel clearing a page and it being mapped into userspace for execute. We were not doing this for hugepages, this patch corrects the situation. We use the same lazy mechanism as we use for normal pages, delaying the flush until userspace actually attempts to execute from the page in question. Tested on G5. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit dabcafd3f363bacd6b89f537af27dc79128e4806 Author: Olof Johansson Date: Thu Dec 8 19:40:17 2005 -0600 [PATCH] powerpc: Set cache info defaults Cache info is setup by walking the device tree in initialize_cache_info(). However, icache_flush_range might be called before that, in slb_initialize()->patch_slb_encoding, which modifies the load immediate instructions used with SLB fault code. Not only that, but depending on memory layout, we might take SLB faults during unflatten_device_tree. So that fault will load an SLB entry that might not contain the right LLP flags for the segment. Either we can walk the flattened device tree to setup cache info, or we can pick the known defaults that are known to work. Doing it in the flattened device tree is hairier since we need to know the machine type to know what property to look for, etc, etc. For now, it's just easier to go with the defaults. Worst thing that happens from it is that we might waste a few cycles doing too small dcbst/icbi increments. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit 326743ead7d0c08e0da715832386660ff3823170 Author: Michal Ostrowski Date: Thu Dec 8 16:56:17 2005 +1100 [PATCH] Fix windfarm model-id table model_id fields of wf_smu_sys_all_params should match the model ID they are supposed to represent (as commented). Fixes windfarm on some iMac 8,1 models. Signed-off-by: Michal Ostrowski Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 5b35193f5868da5e63f5b4cfe8fbcf9f10fe65cd Author: Deepak Saxena Date: Thu Dec 8 23:34:44 2005 +0000 [ARM] 3199/1: Remove bogus function prototype from arch-pxa/irq.h Patch from Deepak Saxena This looks like a leftover from 2.4 days... Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit 246a421207007a034da9b8cfa578bc00d16a9553 Author: Stephen Hemminger Date: Thu Dec 8 15:21:39 2005 -0800 [NET]: Fix NULL pointer deref in checksum debugging. The problem I was seeing turned out to be that skb->dev is NULL when the checksum is being completed in user context. This happens because the reference to the device is dropped (to allow it to be released when packets are in the queue). Because skb->dev was NULL, the netdev_rx_csum_fault was panicing on deref of dev->name. How about this? Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 85631672e6a8032267058b4ccbe53f1924a5d0be Author: Michael Reed Date: Wed Dec 7 21:46:27 2005 -0600 [SCSI] fix OOPS due to clearing eh_action prior to aborting eh command The eh_action semaphore in scsi_eh_send_command is cleared after a command timeout. The command is subsequently aborted and the abort will try to call scsi_done() on it. Unfortunately, the scsi_eh_done() routine unconditinally completes the semaphore (which is now null). Fix this race by makiong the scsi_eh_done() routine check that the semaphore is non null before completing it (mirroring the ordinary command done/timeout logic). Signed-off-by: James Bottomley commit f0353301e6752399ceb874ede7f44e3571c5e4f3 Author: Mark Lord Date: Wed Dec 7 17:46:57 2005 -0500 [SCSI] Fix incorrect pointer in megaraid.c MODE_SENSE emulation The SCSI megaraid drive goes to great effort to kmap the scatterlist buffer (if used), but then uses the wrong pointer when copying to it afterward. Signed-off-by: Mark Lord Acked by: Ju, Seokmann Signed-off-by: James Bottomley commit 6184b723876cd1a374e2d1094b3c73765d4c31c1 Author: Benjamin Herrenschmidt Date: Thu Dec 8 16:53:34 2005 +1100 [PATCH] powerpc: Remove debug code in hash path Some debug code wasn't properly removed from the initial 64k pages patch, and while it's harmless, it's also slowing down significantly a very hot code path, thus it should really be removed. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 325c82a029ca7ea80f8cb24815d6c9288d177190 Author: Benjamin Herrenschmidt Date: Thu Dec 8 16:51:44 2005 +1100 [PATCH] powerpc: Fix a huge page bug The 64k pages patch changed the meaning of one argument passed to the low level hash functions (from "large" it became "psize" or page size index), but one of the call sites wasn't properly updated, causing potential random weird problems with huge pages. This fixes it. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 6d91bb93e45857259ec80cf7393ea561dba1a1de Author: Mike Kravetz Date: Wed Dec 7 13:07:23 2005 -0800 [PATCH] powerpc/pseries: boot failures on numa if no memory on node This bug exists in the current code and prevents machines from booting with numa enabled if there is a node that does not contain memory. Workaround is to boot with 'numa=off'. Looks like a simple typo. Signed-off-by: Mike Kravetz Signed-off-by: Paul Mackerras commit f64fa6772aa874e5cad02a9d87e6b0d99ced3d48 Author: Christoph Lameter Date: Wed Dec 7 11:24:42 2005 -0800 [IA64] Fix missing parameter for local_add/sub Local add/sub macros need to have a parameter to specify the addend/subtrahend respectively. Signed-off-by: Christoph Lameter Signed-off-by: Tony Luck commit c2cd6d3c122798c39f63e21e4dd04ee5790010b6 Author: Dave Jones Date: Wed Dec 7 18:11:26 2005 +0000 [SERIAL] 8250_pci: Remove redundant assignment, and mark fallthrough. Signed-off-by: Dave Jones commit 0da69df1e54146eece38e0a144051f6dd3526821 Author: Andrew Vasquez Date: Tue Dec 6 10:58:06 2005 -0800 [SCSI] qla2xxx: Correct short-WRITE status handling. Properly check FC_RESID for any non-transfered bytes regardless of firmware completion status. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 23443b1d6130eff8e1335e4f84eaf0577a331dcf Author: Andrew Vasquez Date: Tue Dec 6 10:57:06 2005 -0800 [SCSI] qla2xxx: Correct mis-handling of AENs. A regression in a recent change 33135aa2a568ec1a30e734f18e5315e10516e4f3 caused the driver to mistakenly drop handling of AENs. Due to the incorrect handling, ports would not reappear after RSCNs and LIPs. Drops unused/incorrect compound #define from qla_def.h. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit bb58596f6802a4959c2cea02acd272245e671c1d Author: Dave C Boutcher Date: Tue Nov 15 09:53:00 2005 -0600 [SCSI] ibmvscsi kexec fix This makes ibmvscsi work correctly with the recent set of kexec patches that went in. This is based on work by Michael Ellerman, who chased this initially. He validated that it works during kexec. Handle kexec correctly in ibmvscsi. During kexec the adapter will not get cleaned up correctly, so we may need to reset it to make it sane again. Signed-off-by: Dave Boutcher Signed-off-by: James Bottomley commit 1f064a87c80c86bd3878e6633de61e8b71aa6788 Author: Stephen Hemminger Date: Tue Dec 6 17:36:44 2005 -0800 [TG3]: remove warning on race [ Move assosciated code comment to the correct spot, and update driver version and release date -DaveM ] Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 4ebf0ae2618fbbb0d365e5d295a30ccfcb91fe0b Author: David S. Miller Date: Tue Dec 6 16:38:35 2005 -0800 [AF_PACKET]: Convert PACKET_MMAP over to vm_insert_page(). So we can properly use __GFP_COMP and avoid the use of PG_reserved pages. With extremely helpful review from Hugh Dickins. Signed-off-by: David S. Miller commit dfb4b9dceb35c567a595ae5e9d035cfda044a103 Author: David S. Miller Date: Tue Dec 6 16:24:52 2005 -0800 [TCP] Vegas: timestamp before clone We have to store the congestion control timestamp on the SKB before we clone it, not after. Else we get no timestamping information at all. tcp_transmit_skb() has been reworked so that we can do the timestamp still in one spot, instead of at all the call sites. Problem discovered, and initial fix, from Tom Young . Signed-off-by: David S. Miller commit 0d7bef600acab393898bd5553e167496587da3e1 Author: Thomas Young Date: Tue Dec 6 16:17:11 2005 -0800 [TCP] Vegas: Remove extra call to tcp_vegas_rtt_calc Remove unneeded call to tcp_vegas_rtt_calc. The more accurate microsecond value has already been registered prior to calling tcp_vegas_cong_avoid. Signed-off-by: Thomas Young Signed-off-by: David S. Miller commit 5b4956138173cb8b58d83d3173360e8e681a2b66 Author: Thomas Young Date: Tue Dec 6 16:16:34 2005 -0800 [TCP] Vegas: stop resetting rtt every ack Move the resetting of rtt measurements to inside the once per RTT block of code. Signed-off-by: Thomas Young Signed-off-by: David S. Miller commit 590711b7dd731bb04e7892c0451566d788985e79 Author: Jack Steiner Date: Tue Dec 6 08:05:24 2005 -0600 [IA64-SGI] Fix SN PTC deadlock recovery The patch that added support for a new platform chipset (shub2) broke PTC deadlock recovery on older versions of the chipset. (PTCs are the SN platform-specific method for doing a global TLB purge). This patch fixes deadlock recovery so that it works on both the old & new chipsets. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit bd1d6e2451f2bb0132416fda4d129c4f57a827bc Author: Robin Holt Date: Mon Dec 5 20:02:31 2005 -0600 [IA64] Change SET_PERSONALITY to comply with comment in binfmt_elf.c. We have a customer application which trips a bug. The problem arises when a driver attempts to call do_munmap on an area which is mapped, but because current->thread.task_size has been set to 0xC0000000, the call to do_munmap fails thinking it is an unmap beyond the user's address space. The comment in fs/binfmt_elf.c in load_elf_library() before the call to SET_PERSONALITY() indicates that task_size must not be changed for the running application until flush_thread, but is for ia64 executing ia32 binaries. This patch moves the setting of task_size from SET_PERSONALITY() to flush_thread() as indicated. The customer application no longer is able to trip the bug. Signed-off-by: Robin Holt Signed-off-by: Tony Luck commit acb7f67280128a9ddaa756ff10212391d28caec4 Author: Jack Steiner Date: Mon Dec 5 13:56:50 2005 -0600 [IA64] Limit the maximum NODEDATA_ALIGN() offset The per-node data structures are allocated with strided offsets that are a function of the node number. This prevents excessive cache-aliasing from occurring. On systems with a large number of nodes, the strided offset becomes too large. This patch restricts the maximum offset to 32MB. This is far larger than the size of any current L3 cache. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 3ec829b6895092b0686254c315f42642b4a07efc Author: John Keller Date: Tue Nov 29 16:36:32 2005 -0600 [IA64-SGI] altix: pci_window fixup Altix only patch to add fixup code that sets up pci_controller->window. This code is a temporary fix until ACPI support on Altix is added. Also, corrects the usage of pci_dev->sysdata, which had previously been used to reference platform specific device info, to now point to a pci_controller struct. Signed-off-by: John Keller Signed-off-by: Tony Luck commit 92f268e034faf793f6d40de2f0fc81478a14ff39 Author: Stephen Hemminger Date: Mon Dec 5 11:00:40 2005 -0800 [PATCH] sk98lin: rx checksum offset not set The checksum offsets for receive offload were not being set correctly. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 1e483969930a82e16767884449f3a121a817ef00 Author: David Shaohua Li Date: Thu Dec 1 17:00:00 2005 -0500 [ACPI] correct earlier SMP deep C-states on HT patch http://bugzilla.kernel.org/show_bug.cgi?id=5165 Change polarity of test for PLVL2_UP flag. Skip promotion/demotion code when not needed. Signed-off-by: Shaohua Li Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit 1f12bcc9d1840fd26bf577065214f1ebeb2609ba Author: Steven Whitehouse Date: Mon Dec 5 13:42:06 2005 -0800 [DECNET]: add memory buffer settings The patch (originally from Steve) simply adds memory buffer settings to DECnet similar to those in TCP. Signed-off-by: Patrick Caulfield Signed-off-by: David S. Miller commit dab9630fb3d206f49658066a3ecf80ea120364db Author: Martin Waitz Date: Mon Dec 5 13:40:12 2005 -0800 [NET]: make function pointer argument parseable by kernel-doc When a function takes a function pointer as argument it should use the 'return (*pointer)(params...)' syntax used everywhere else in the kernel as this is recognized by kernel-doc. Signed-off-by: Martin Waitz Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 2fdf1faa8e33082d691bcba18814276f2bd5a6f0 Author: Patrick McHardy Date: Mon Dec 5 13:38:16 2005 -0800 [NETFILTER]: Don't use conntrack entry after dropping the reference Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 266c8543480e2202ab63d1d604a5ca049f350cd8 Author: Patrick McHardy Date: Mon Dec 5 13:37:33 2005 -0800 [NETFILTER]: Fix unbalanced read_unlock_bh in ctnetlink NFA_NEST calls NFA_PUT which jumps to nfattr_failure if the skb has no room left. We call read_unlock_bh at nfattr_failure for the NFA_PUT inside the locked section, so move NFA_NEST inside the locked section too. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 6636568cf85ef5898a892e90fcc88b61cca9ca27 Author: Patrick McHardy Date: Mon Dec 5 13:36:50 2005 -0800 [NETFILTER]: Wait for untracked references in nf_conntrack module unload Noticed by Pablo Neira . Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit a79575633300adb5d3f1bd856cc518c45fefcb86 Author: Patrick McHardy Date: Mon Dec 5 13:36:25 2005 -0800 [NETFILTER]: Mark ctnetlink as EXPERIMENTAL Should have been marked EXPERIMENTAL from the beginning, as the current bunch of fixes show. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 0be7fa92ca162bf5e7993c392e6f93909d617bbb Author: Patrick McHardy Date: Mon Dec 5 13:34:51 2005 -0800 [NETFILTER]: Fix CTA_PROTO_NUM attribute size in ctnetlink CTA_PROTO_NUM is a u_int8_t. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit afe5c6bb034bfa5824f8e7def6a739653e8f4655 Author: Patrick McHardy Date: Mon Dec 5 13:33:50 2005 -0800 [NETFILTER]: Fix ip_conntrack_flush abuse in ctnetlink ip_conntrack_flush() used to be part of ip_conntrack_cleanup(), which needs to drop _all_ references on module unload. Table flushed using ctnetlink just needs to clean the table and doesn't need to flush the event cache or wait for any references attached to skbs. Move everything but pure table flushing back to ip_conntrack_cleanup(). Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 3ebbe0cdd41f62e5c79cb4d7aa42a1ca50d7d2f2 Author: Yasuyuki Kozakai Date: Mon Dec 5 13:33:26 2005 -0800 [NETFILTER]: nfnetlink: Fix calculation of minimum message length At least, valid nfnetlink message should have nlmsghdr and nfgenmsg. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit f16c910724250c1af0f53111b4c76505000819f6 Author: Yasuyuki Kozakai Date: Mon Dec 5 13:32:50 2005 -0800 [NETFILTER]: nf_conntrack: Fix missing check for ICMPv6 type This makes nf_conntrack_icmpv6 check that ICMPv6 type isn't < 128 to avoid accessing out of array valid_new[] and invmap[]. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 8d1ca69984ed1e5930c0537b8f606c54007d7319 Author: Pablo Neira Ayuso Date: Mon Dec 5 13:32:14 2005 -0800 [NETFILTER]: Fix incorrect argument to ip_nat_initialized() in ctnetlink ip_nat_initialized() takes enum ip_nat_manip_type as it's second argument, not a hook number. Noticed and initial patch by Marcus Sundberg . Signed-off-by: Pablo Neira Ayuso Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 05f70395c642bed0300bc1955bfa8c0f93de2bc2 Author: Keith Owens Date: Fri Dec 2 13:40:15 2005 +1100 [IA64] Allow salinfo_decode to detect signals on read Return -EINTR instead of -ERESTARTSYS when signals are delivered during a blocked read of /proc/sal/*/event. This allows salinfo_decode to detect signals when it is blocked on a read of those files. Signed-off-by: Keith Owens Signed-off-by: Tony Luck commit 31a5539e57fa80e877a2f180cd4ec9ce9de6fea0 Author: Hiroki Kaminaga Date: Mon Dec 5 10:55:00 2005 +0000 [ARM] 3194/1: add pfn_to_kaddr macro for ARM take2 Patch from Hiroki Kaminaga This patch defines a new macro: pfn_to_kaddr(pfn). Same macro is already defined on other arch, such as i386. Signed-off-by: Hiroki Kaminaga Signed-off-by: Russell King commit a0d95af5c28666155ad4c85a63a5065436ae1d79 Author: Deepak Saxena Date: Mon Dec 5 10:54:59 2005 +0000 [ARM] 3191/1: Mark I/O pointer as const in __raw_reads[bwl] Patch from Deepak Saxena Mark the ioremap'd cookie/pointer in said functions as const since we should not be actualy touching the data. This fixes a slew of compile warnings on IXP4xx as our reads[bwl] already mark this parameter as const. Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit 9ddf61bd09a7668279d2b208a96eba784bec3d80 Author: Marcelo Tosatti Date: Mon Dec 5 10:15:06 2005 +0000 [ARM SMP] mpcore_wdt bogus fpos check drivers/char/watchdog/mpcore_wdt.c write function contains a check for (ppos != &file->f_pos). Such check used to make sense when a pointer to file->f_pos was handed by vfs_write(), not a copy of it as it stands now. Signed-off-by: Marcelo Tosatti Signed-off-by: Russell King commit e781de44153885d5f772731726b4c0c16f8af021 Author: Pierre Ossman Date: Mon Dec 5 10:00:50 2005 +0000 [MMC] Proper check of SCR error code The routine reading the SCR wasn't paying proper attention to the error codes returned from the driver. Signed-off-by: Pierre Ossman Signed-off-by: Russell King commit ca507eaf32fa599a92182ce91050046e807a994c Author: Olof Johansson Date: Tue Nov 29 14:04:17 2005 -0600 [PATCH] powerpc: remove redundant code in stab init There's never been a hardware platform that has both pSeries/RPA LPAR hypervisor and stab (pre-POWER4 segment management). This removes the redundant code in stab_initalize(). Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit b6d78157ad129b1bce87cc831d0d038e97ca5551 Author: Paul Mackerras Date: Mon Dec 5 14:39:53 2005 +1100 ppc: Build in all three of powermac, PREP and CHRP support This reverts commit da0825fd201a03294dbf7f8f030676d608da122c, making it so that if you select CONFIG_PPC_MULTIPLATFORM you get support for PMAC, PREP and CHRP built in. The reason for not allowing PMAC, PREP and CHRP to be selected individually for ARCH=ppc is that there is too much interdependency between them in the platform support code. For example, CHRP uses the PMAC nvram code. Configuring with ARCH=powerpc does allow you to select support for PMAC and CHRP separately. Support for PREP is not there yet but should be there soon. Signed-off-by: Paul Mackerras commit 6fbb618f5da0424adcba5f666035e4772a8df526 Author: Paul Mackerras Date: Mon Dec 5 14:19:10 2005 +1100 powerpc/pseries: Optimize IOMMU setup The previous commit will use the page-at-a-time hypervisor call for setting up IOMMU entries when we are using 64k pages and setting up one 64k page, even though that means 16 calls to the hypervisor, since the hypervisor still works on 4k pages. This optimizes this case by using the multi-page IOMMU setup hypervisor call instead. Signed-off-by: Paul Mackerras commit db20da32a22ccfa3a118408034eeb0ba61a42329 Author: Russell King Date: Sun Dec 4 17:56:46 2005 +0000 [ARM] Add memory.txt to 00-INDEX Signed-off-by: Russell King commit e4f5c82a92c2a546a16af1614114eec19120e40a Author: Mauro Carvalho Chehab Date: Sun Dec 4 12:41:54 2005 -0200 [PATCH] V4L/DVB (3087) fix analog NTSC for pcHDTV 3000 - fix analog NTSC for pcHDTV 3000 - Fix regression: broken analog NTSC for DViCO FusionHDTV3 Gold-T - add tda9887 to card struct, required for both cards. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Linus Torvalds commit 436b0f76f2cee6617f27a649637766628909dd5d Author: Linus Torvalds Date: Sat Dec 3 21:10:42 2005 -0800 Linux v2.6.15-rc5 Hey, for no other reason than the fact that I'll be off-line for a week. Of course, I could force everybody to just use git (and when I'm emperor of the world, don't think I won't!), but it seems some people want to just test official releases. Even if they are just -rc's. By the time I'm back, Andrew will have fixed all my bugs, and I'll release it as 2.6.15 and take all the credit. Mwahahahaaa Signed-off-by: Linus Torvalds commit 6015d2c4ca5470509d9721d7bab8d796617ed996 Author: Linus Torvalds Date: Sat Dec 3 20:50:51 2005 -0800 Link USB drivers later in the kernel We want to link the "regular" SCSI drivers before the USB storage driver, since historically we've always detected internal SCSI disks before the external USB storage modules. The link order matters for initcall ordering, and this got broken by mistake by commit 7586269c0b52970f60bb69fcb86e765fc1d72309 which moved the USB host controller PCI quirk handling around. Signed-off-by: Linus Torvalds commit e3c3374fbf7efe9487edc53cd10436ed641983aa Author: Linus Torvalds Date: Sat Dec 3 20:48:11 2005 -0800 Make vm_insert_page() available to NVidia module It used to use remap_pfn_range(), which wasn't GPL-only either, and the new interface is actually simpler and does more checking, so we shouldn't unnecessarily discourage people from switching over. Signed-off-by: Linus Torvalds commit 0ceaacc9785fedc500e19b024d606a82a23f5372 Author: Nick Piggin Date: Sun Dec 4 13:55:25 2005 +1100 [PATCH] Fix up per-cpu page batch sizes The code to clamp batch sizes to 2^n - 1 went missing and an extra check got added, which must have been a hunk of the "higer order pcp batch refills" work sneaking in. Signed-off-by: Nick Piggin Signed-off-by: Linus Torvalds commit 9a40525788a1b692ee0fc780a8cdb2ac808de1b0 Author: Tejun Heo Date: Fri Dec 2 11:49:11 2005 +0900 [PATCH] libata: fix ata_scsi_pass_thru error handling This patch makes ata_scsi_pass_thru() properly set result code and sense data on translation failures. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 3b6efee9231e12fce09c94930bfc59f66f18d662 Author: Trond Myklebust Date: Sat Dec 3 15:20:21 2005 -0500 NFSv4: Fix an Oops in the synchronous write path - Missing initialisation of attribute bitmask in _nfs4_proc_write() - On success, _nfs4_proc_write() must return number of bytes written. - Missing post_op_update_inode() in _nfs4_proc_write() - Missing initialisation of attribute bitmask in _nfs4_proc_commit() - Missing post_op_update_inode() in _nfs4_proc_commit() Signed-off-by: Trond Myklebust commit 5ba7cc4801ae0fe74b6e0160f008521ae71d9f5d Author: Trond Myklebust Date: Sat Dec 3 15:20:17 2005 -0500 NFS: Fix post-op attribute revalidation... - Missing nfs_mark_for_revalidate in nfs_proc_link() - Missing nfs_mark_for_revalidate in nfs_rename() Signed-off-by: Trond Myklebust commit bb713d6d38f7be4f4e7d790cddb1b076e7da6699 Author: Trond Myklebust Date: Sat Dec 3 15:20:14 2005 -0500 NFS: use set_page_writeback() in the appropriate places Ensure that we use set_page_writeback() in the appropriate places to help the VM in keeping its page radix_tree in sync. Signed-off-by: Trond Myklebust commit bb184f3356adbbb1605df2f7c570b4c92231fa3a Author: Trond Myklebust Date: Sat Dec 3 15:20:10 2005 -0500 SUNRPC: Fix Oopsable condition in rpc_pipefs The elements on rpci->in_upcall are tracked by the filp->private_data, which will ensure that they get released when the file is closed. The exception is if rpc_close_pipes() gets called first, since that sets rpci->ops to NULL. Signed-off-by: Trond Myklebust commit 24aa1fe6779eaddb3e0b1b802585dcf6faf9cc44 Author: Trond Myklebust Date: Sat Dec 3 15:20:07 2005 -0500 NFS: Fix a few further cache consistency regressions Steve Dickson writes: Doing the following: 1. On server: $ mkdir ~/t $ echo Hello > ~/t/tmp 2. On client, wait for a string to appear in this file: $ until grep -q foo t/tmp ; do echo -n . ; sleep 1 ; done 3. On server, create a *new* file with the same name containing that string: $ mv ~/t/tmp ~/t/tmp.old; echo foo > ~/t/tmp will show how the client will never (and I mean never ;-) ) see the updated file. The problem is that we do not update nfsi->cache_change_attribute when the file changes on the server (we only update it when our client makes the changes). This again means that functions like nfs_check_verifier() will fail to register when the parent directory has changed and should trigger a dentry lookup revalidation. Signed-off-by: Trond Myklebust commit 223db122bfccd463751d8b0c09a638abee03681d Author: Steve Dickson Date: Wed Nov 30 09:25:33 2005 -0500 NFS: Fix cache consistency regression Make sure cache_change_attribute is initialized to jiffies so when the mtime changes on directory, the directory will be refreshed. Signed-off by: Steve Dickson Signed-off-by: Trond Myklebust commit af2eb17bac41a116b73d85b3fb160405c32bea5b Author: Linus Torvalds Date: Fri Dec 2 23:09:06 2005 -0800 Add missing "local_irq_enable()" to C2/C3 exit logic Silly bug crept in with the C2/C3 TIF_POLLING_NRFLAG fixes. Signed-off-by: Linus Torvalds commit af1afe866297448ad8a1da99fa8a6af86c43c909 Author: YOSHIFUJI Hideaki Date: Fri Dec 2 20:56:57 2005 -0800 [IPV6]: Load protocol module dynamically. [ Modified to match inet_create() bug fix by Herbert Xu -DaveM ] Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 86c8f9d158f68538a971a47206a46a22c7479bac Author: Herbert Xu Date: Fri Dec 2 20:43:26 2005 -0800 [IPV4] Fix EPROTONOSUPPORT error in inet_create There is a coding error in inet_create that causes it to always return ESOCKTNOSUPPORT. It should return EPROTONOSUPPORT when there are protocols registered for a given socket type but none of them match the requested protocol. This is based on a patch by Jayachandran C. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 24c6927505ca77ee4ac25fb31dcd56f6506979ed Author: David Stevens Date: Fri Dec 2 20:32:59 2005 -0800 [IGMP]: workaround for IGMP v1/v2 bug From: David Stevens As explained at: http://www.cs.ucsb.edu/~krishna/igmp_dos/ With IGMP version 1 and 2 it is possible to inject a unicast report to a client which will make it ignore multicast reports sent later by the router. The fix is to only accept the report if is was sent to a multicast or unicast address. Signed-off-by: David S. Miller commit bf031fff1fac77775b2cd2c72ad8b017f4c0af13 Author: Neil Horman Date: Fri Dec 2 20:32:29 2005 -0800 [SCTP]: Fix getsockname for sctp when an ipv6 socket accepts a connection from an ipv4 socket. Signed-off-by: Neil Horman Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 6736dc35e9e1b9c8084d5c362a429a3e8189af6b Author: Neil Horman Date: Fri Dec 2 20:30:06 2005 -0800 [SCTP]: Return socket errors only if the receive queue is empty. This patch fixes an issue where it is possible to get valid data after a ENOTCONN error. It returns socket errors only after data queued on socket receive queue is consumed. Signed-off-by: Neil Horman Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 885da19e8044051a92cfd70099398c373245c431 Author: Tony Luck Date: Fri Dec 2 16:18:42 2005 -0800 [IA64] refresh tiger_defconfig ready for 2.6.15 Signed-off-by: Tony Luck commit 1b0997f561bf46689cc6e0903f342e9bf2506bf1 Author: Linus Torvalds Date: Fri Dec 2 15:54:37 2005 -0800 Revert "[SCSI] fix usb storage oops" This reverts commit 34ea80ec6a02ad02e6b9c75c478c18e5880d6713. It does a put_device() from softirq context, which is bad since it gets a semaphore for reading. Signed-off-by: Linus Torvalds commit 2a298a35ebe060a6f2b06b20c2a34ea188ddfd37 Author: Nick Piggin Date: Fri Dec 2 12:44:19 2005 +1100 [PATCH] Fix TIF_POLLING_NRFLAG in ACPI idle routines Commit 64c7c8f88559624abdbe12b5da6502e8879f8d28 broke the ACPI C2 and C3 sleep states, because it left TIF_POLLING_NRFLAG active even though those states do not actually poll the reschedule flag at all. As a result, the CPU wouldn't get sent an IPI when it was to be woken up, and would only notice that it had runnable processes on the next timer tick. Signed-off-by: Linus Torvalds commit 1448652a54b5de5189a217374706700275b857e6 Author: Robin Holt Date: Fri Dec 2 11:14:41 2005 -0600 [IA64] Updates to the sn2_defconfig for 2.6.15. This updates the sn2_defconfig file for the Altix 330 hardware, enables the AGP graphics for the SGI Prism, and removes prompts for the remainder of the new features. Greg Edwards reviewed the changes. Signed-off-by: Robin Holt Signed-off-by: Greg Edwards Signed-off-by: Tony Luck commit 4d5cda069b3f0a3bbc18576bc15903ed665d0295 Author: Hugh Dickins Date: Fri Dec 2 15:58:09 2005 +0000 [SCSI] sg: fix a bug in st_map_user_pages failure path sg's st_map_user_pages is modelled on an earlier version of st's sgl_map_user_pages, and has the same bug: if get_user_pages got some but not all of the pages, then those got were released, but the positive res code returned implied that they were still to be freed. Signed-off-by: Hugh Dickins Signed-off-by: Douglas Gilbert Signed-off-by: James Bottomley commit 032c09d76cdb448484859cc84dac4bba8f5f8f14 Author: Hugh Dickins Date: Fri Dec 2 15:59:59 2005 +0000 [SCSI] sg and st unmap_user_pages allow PageReserved 2.6.15-rc1 made sg's st_unmap_user_pages and st's sgl_unmap_user_pages BUG on a PageReserved page. But that's wrong: they could be unmapping the ZERO_PAGE, which is marked PG_reserved; and perhaps others (while get_user_pages is still permitted on VM_PFNMAP areas - that may change). More change is needed here: sg claims to dirty even pages written from, and st claims not to dirty even pages read into; and SetPageDirty is not adequate for this nowadays. Fixes to those follow in a later patch: for the moment just fix the 2.6.15 regression. Signed-off-by: Hugh Dickins Acked-by: Nick Piggin Signed-off-by: James Bottomley commit e8a167accb47de528d2ffddc0f13f8e84eaa71de Author: Olaf Hering Date: Thu Dec 1 21:10:10 2005 +0100 [PATCH] powerpc: correct the NR_CPUS description text Update the help text to match the allowed range. Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit cc8b5c96a7ac7d695c2887427b1003bd33ec9c97 Author: Michal Ostrowski Date: Fri Dec 2 13:09:13 2005 +1100 [PATCH] powerpc/pseries: Fix TCE building with 64k pagesize Must adjust tcenum and npages by TCE_PAGE_FACTOR to convert between 64KB pages and TCE (4K) pages. (This is done in other places, except for this one location.) Signed-off-by: Michal Ostrowski Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 31b3c31bca3b4df975631323d6ee6f49f43f4956 Author: Michael Krufky Date: Thu Dec 1 00:52:10 2005 -0800 [PATCH] V4l/dvb: Fix typo, removing incorrect info from CONFIG_BT848_DVB kconfig entry. Fix typo, removing incorrect info from CONFIG_BT848_DVB kconfig entry. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a72403594ad23bbd2ac0349dd0e537b28862faac Author: Mike Isely Date: Thu Dec 1 00:52:04 2005 -0800 [PATCH] V4l/dvb: Restore missing tuner definition for Hauppauge tuner type 0x103 Type 0x103 ("TCL MFNM05-4") in the Hauppauge eeprom is a more recent tuner that maps to TUNER_PHILIPS_FM1236_MK3. This had been previously defined but due to some accident the definition got removed. This change restores that definition. Change committed on advice from Hans Verkuil , who thinks he's the one who had accidentally removed it before. Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab60e303cd3e73a68d5e397be50a1cb35452513c Author: Hans Verkuil Date: Thu Dec 1 00:51:58 2005 -0800 [PATCH] V4L/dvb: fix kernel message (print of %s from random pointer) Fix kernel message ( basically printk("%s", random_pointer) ). Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3535396d3ac7fc5eeda4526aee34494a479cc628 Author: Mauro Carvalho Chehab Date: Thu Dec 1 00:51:57 2005 -0800 [PATCH] V4L/DVB: SCM update Add v4l/dvb quilt tree to MAINTAINERS file. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f05cb3239d078f16d082398818dd4e66e645f388 Author: Carlos Silva Date: Thu Dec 1 00:51:56 2005 -0800 [PATCH] DVB: BUDGET CI card depends on STV0297 demodulator. BUDGET_CI card depends on STV0297 demodulator. Signed-off-by: Johannes Stezenbach Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 48063a75aff8a572ed167470564309697cf0e8cc Author: Denis Vlasenko Date: Thu Dec 1 00:51:55 2005 -0800 [PATCH] DVB: Fixes ifs in ves1820 set symbolrate(). Remove stray semicolons after if (foo); in ves1820_set_symbolrate(). Signed-off-by: Denis Vlasenko Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1130ca45c719fe788fa544a54a82ea53ef5ea87a Author: Ralph Metzler Date: Thu Dec 1 00:51:54 2005 -0800 [PATCH] DVB: Fix locking to prevent Oops on SMP systems Fix locking to prevent Oops on SMP systems when starting/stopping dvb network interfaces. Signed-off-by: Ralph Metzler Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b9225f0f002c39f340da2ed1e7efec6885ca312 Author: Steven Toth Date: Thu Dec 1 00:51:53 2005 -0800 [PATCH] DVB: Update Steve's email address. Update Steve's email address. Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 15ac8e663b354ed98d43d149f718f6f15ab732ac Author: Adrian Bunk Date: Thu Dec 1 00:51:53 2005 -0800 [PATCH] DVB: Small cleanups and CodeStyle fixes - Small cleanups: - make needlessly global functions static - every file should #include the headers containing the prototypes for it's global functions Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 18e55eea0104927feedfe81de1adf5e46a7ad1f3 Author: Tim Schmielau Date: Thu Dec 1 00:51:51 2005 -0800 [PATCH] DVB: Include fixes for 2.6.15-rc1 for removing sched.h from module.h Include fixes for 2.6.15-rc1 for removing sched.h from module.h. Signed-off-by: Tim Schmielau Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 363bbf42da23898ab48dc227cca9d80b50b481eb Author: Patrick Boettcher Date: Thu Dec 1 00:51:51 2005 -0800 [PATCH] DVB: Fixed incorrect usage at the private state of the dvb-usb-devices Fixed mistake of an incorrect usage of pid_filter-callbacks inside the private state of the dvb-usb-devices Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ded928468407c8e08dcb6aedb91aaa97b80d5752 Author: Andrew de Quincey Date: Thu Dec 1 00:51:49 2005 -0800 [PATCH] DVB: Fix locking problems and code cleanup Fix locking problems and code cleanup Signed-off-by: Andrew de Quincey Signed-off-by: Johannes Stezenbach Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 69459f3d2fb9eea370535ceba91dd8c9df3d94bc Author: Oliver Endriss Date: Thu Dec 1 00:51:48 2005 -0800 [PATCH] DVB: Fixed DiSEqC timing for saa7146-based budget cards Fixed DiSEqC timing for saa7146-based budget cards (speed-up ioctls using SAA7146_I2C_SHORT_DELAY) Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f95006f89576cac504323daa53157013bf099fc9 Author: Hans Verkuil Date: Thu Dec 1 00:51:42 2005 -0800 [PATCH] V4L: Add workaround for Hauppauge PVR150 with certain NTSC tuner models Add workaround for Hauppauge PVR150 hardware problem with tuner models 85, 99 and 112 (model numbers as reported by tveeprom). The audio standard autodetection does not always work correctly for these models. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0fe22865ddee524017a1012528b0e15475acc942 Author: Steven Toth Date: Thu Dec 1 00:51:41 2005 -0800 [PATCH] V4L: Fixed eeprom handling for cx88 and added Nova-T PCI model 90003 - Fixed code handling for eeprom on cx88 boards. - Hauppauge released a new version of the Nova-T-PCI (9002) a few months ago with a different (compatible) tuner (but lacking RF passthru). The official model# is 90003. All features are working. - Adding entry to the known model list after testing. Signed-off-by: Steven Toth Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bbf7871e1cd58b89f77b1152f457250c6e94b614 Author: Michael H. Schimek Date: Thu Dec 1 00:51:40 2005 -0800 [PATCH] V4L: Fix bttv ioctls VIDIOC_ENUMINPUT, VIDIOCGTUNER, VIDIOC_QUERYCAP Fixed bttv ioctls VIDIOC_ENUMINPUT, VIDIOCGTUNER, VIDIOC_QUERYCAP. Signed-off-by: Nickolay V. Shmyrev Signed-off-by: Michael H. Schimek Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fd1eab73d50258b4c622b8dc23d896abd5cff2e6 Author: Reimar Doeffinger Date: Thu Dec 1 00:51:39 2005 -0800 [PATCH] V4L: Fix crash when not compiled as module Fix crash when not compiled as module. Signed-off-by: Reimar Doeffinger Signed-off-by: Nickolay V. Shmyrev Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1bcd2a36711e6a72802a92a4e3fcef9d0c59dc3f Author: Dwaine Garden Date: Thu Dec 1 00:51:37 2005 -0800 [PATCH] V4L: Write cached value to correct register for SECAM Write cached value to correct register for SECAM. Signed-off-by: Dwaine Garden Signed-off-by: Nickolay V. Shmyrev Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 13c72805b3d922d85d5c470e851c93e8f8c076d8 Author: Michael H. Schimek Date: Thu Dec 1 00:51:37 2005 -0800 [PATCH] V4L: Fixes Bttv raw format to fix VIDIOCSPICT ioctl Fixes Bttv raw format to fix VIDIOCSPICT ioctl. Signed-off-by: Michael H. Schimek Signed-off-by: Nickolay V. Shmyrev Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 943a49027b6d9829b737e6da3d72b867a7a6f832 Author: Adrian Bunk Date: Thu Dec 1 00:51:35 2005 -0800 [PATCH] V4L: Makes needlessly global code static This patch makes needlessly global code static. Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 769e24382dd47434dfda681f360868c4acd8b6e2 Author: Mauro Carvalho Chehab Date: Thu Dec 1 00:51:35 2005 -0800 [PATCH] V4L: Some funcions now static and I2C hw code for IR - Some funcions are now declared as static - Added a I2C code for InfraRed. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6f502b8a7858ecfa7d2a0762f7663b8b3d0808fc Author: Mauro Carvalho Chehab Date: Thu Dec 1 00:51:34 2005 -0800 [PATCH] V4L: Enables audio DMA setting on cx88 chips, even when dma not in use - Enabled audio DMA transfer code even when DMA not in use to solve a problem on some broken cx88 chips. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c87c948ebd75525df4d67dd5b40e6ea81859cc17 Author: Michael H. Schimek Date: Thu Dec 1 00:51:33 2005 -0800 [PATCH] V4L: Bttv bytes per line fix bttv bytes per line fix. Signed-off-by: Michael H. Schimek Signed-off-by: Nickolay V. Shmyrev Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 50ab5edc973c979e8f620e09d20b96761d271894 Author: Nickolay V. Shmyrev Date: Thu Dec 1 00:51:32 2005 -0800 [PATCH] V4L: Fix read() bugs in bttv driver Fix read() bugs in bttv driver. Signed-off-by: Nickolay V. Shmyrev Signed-off-by: Michael H. Schimek Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b86b9999deb04bbfbb20e6b6fe1119a4bf0ff34 Author: Mauro Carvalho Chehab Date: Thu Dec 1 00:51:31 2005 -0800 [PATCH] V4L: Removed audio DMA enabling from cx88-core - Removed code that enables audio DMA transfers at cx88-core. - This stuff should be at cx88-alsa when ready. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53a7338af60689817e81114d42cfa2ab4bb95516 Author: Ian Pickworth Date: Thu Dec 1 00:51:28 2005 -0800 [PATCH] V4L: Fixes nicam sound - Resolved problem of sporadic buzz after setting Nicam stereo - improved setting audio standard with dma reset - cleaned up comments format - more sensitive Nicam detection Signed-off-by: Ian Pickworth Signed-off-by: Michal Pytasz Signed-off-by: Marcin Rudowski Signed-off-by: Torsten Seeboth Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3ca0ea980697d3b3c3d5c13ba7e525ed6c434756 Author: Steven Toth Date: Thu Dec 1 00:51:27 2005 -0800 [PATCH] V4L: tveeprom MAC address parsing/cleanup - Added a mac address field to the tveeprom structure. - allow callers to query the MAC address. - removed some redundant eeprom parsing code in cx88-cards.c (specific to Hauppauge DVB products) Instead, placed calls directly to the single eeprom parsing function in tveeprom.c Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 759324c3c4b8d63203d7ea41b56553330bc0df06 Author: Steven Toth Date: Thu Dec 1 00:51:26 2005 -0800 [PATCH] V4: Include comments for DVB models and includes missing ones Include comments for DVB models and includes missing ones Signed-off-by: Steven Toth Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 97cb445df6c6cb81e4f06ee159331f15bf5c4513 Author: Luiz Capitulino Date: Thu Dec 1 00:51:24 2005 -0800 [PATCH] V4L: Fixes warning at bttv-driver.c Fixes warning at bttv-driver.c Signed-off-by: Luiz Capitulino Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f5b974cb16dd95d1ae0424f68f74550dbd793a33 Author: Ricardo Cerqueira Date: Thu Dec 1 00:51:20 2005 -0800 [PATCH] V4L: Fix hotplugging issues with saa7134 - Fixed issue with hotplugging and DMA sound (sound was lost when replugging a card) - Added notifiers to main saa7134 module to let the sound sub-modules know when a card has been inserted or removed Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 938606b02b3d7b587777e5b1e44f4196903250ca Author: Sigmund Augdal Helberg Date: Thu Dec 1 00:51:19 2005 -0800 [PATCH] V4L: Fixes maximum number of VBI devices - Increases the minor number limitation for vbi devices from 223 to 255. This is in agreement with the minor number allocation specified in Documentation/devices.txt. - Without this patch it is not possible to use more than 5 Hauppauge WinTV-PVR 350 cards since each of these allocate 3 vbi devices. Signed-of-by: Sigmund Augdal Helberg Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit db1d1d57e97700b4131fe80556dc6ef976d534c4 Author: David Howells Date: Thu Dec 1 00:51:18 2005 -0800 [PATCH] Keys: Fix permissions check for update vs add Permit add_key() to once again update a matching key rather than adding a new one if a matching key already exists in the target keyring. This bug causes add_key() to always add a new key, displacing the old from the target keyring. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c72c343719a8c5dba675cd1b27b63c06bfe23d1 Author: Eugene Surovegin Date: Thu Dec 1 00:51:17 2005 -0800 [PATCH] ppc32: fix treeboot image entrypoint Correctly specify treeboot based image entrypoint. Currently makefile uses $(ENTRYPOINT) which isn't defined anywhere. Each board port sets entrypoint-$(CONFIG_BOARD_NAME) instead. Without this patch I cannot boot Ocotea (PPC440GX eval board) anymore. I was getting random "OS panic" errors from OpenBIOS for a while, but with current kernel I get them all the time (probably because image became bigger). Signed-off-by: Eugene Surovegin Acked-by: Tom Rini Cc: Matt Porter Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42ea0d037860690dde07a015d3473a17da35f74a Author: Vitaly Bordug Date: Thu Dec 1 00:51:15 2005 -0800 [PATCH] ppc32: Fix incorrect PCI frequency value The time to wait after deasserting PCI_RST has been counted with incorrect value - this patch fixes the issue. Signed-off-by: Vitaly Bordug Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ea86575eaf99a9262a969309d934318028dbfacb Author: Thomas Graf Date: Thu Dec 1 14:30:00 2005 -0800 [NETLINK]: Fix processing of fib_lookup netlink messages The receive path for fib_lookup netlink messages is lacking sanity checks for header and payload and is thus vulnerable to malformed netlink messages causing illegal memory references. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 2a43c4af3fa2e701008d51c28365e26fccf9cbb0 Author: Phil Oester Date: Thu Dec 1 14:29:24 2005 -0800 [NETFILTER]: Fix recent match jiffies wrap mismatches Around jiffies wrap time (i.e. within first 5 mins after boot), recent match rules which contain both --seconds and --hitcount arguments experience false matches. This is because the last_pkts array is filled with zeros on creation, and when comparing 'now' to 0 (+ --seconds argument), time_before_eq thinks it has found a hit. Below patch adds a break if the packet value is zero. This has the unfortunate side effect of causing mismatches if a packet was received when jiffies really was equal to zero. The odds of that happening are slim compared to the problems caused by not adding the break however. Plus, the author used this same method just below, so it is "good enough". This fixes netfilter bugs #383 and #395. Signed-off-by: Phil Oester Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 73f306024c15bd12e59677d6eaf43ecced614f04 Author: Jozsef Kadlecsik Date: Thu Dec 1 14:28:58 2005 -0800 [NETFILTER]: Ignore ACKs ACKs on half open connections in TCP conntrack Mounting NFS file systems after a (warm) reboot could take a long time if firewalling and connection tracking was enabled. The reason is that the NFS clients tends to use the same ports (800 and counting down). Now on reboot, the server would still have a TCB for an existing TCP connection client:800 -> server:2049. The client sends a SYN from port 800 to server:2049, which elicits an ACK from the server. The firewall on the client drops the ACK because (from its point of view) the connection is still in half-open state, and it expects to see a SYNACK. The client will eventually time out after several minutes. The following patch corrects this, by accepting ACKs on half open connections as well. Signed-off-by: Jozsef Kadlecsik Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 6bc733e9f71c937f3c64159bf1e569321726a44c Author: Hugh Dickins Date: Thu Dec 1 20:21:57 2005 +0000 [SCSI] st: fix a bug in sgl_map_user_pages failure path Nick and I had already been looking at drivers/scsi/{sg.c,st.c}, brought there by __put_page in sg.c's peculiar sg_rb_correct4mmap, which we'd like to remove. But that's irrelevant to your pain, except... One extract from the patches I'd like to send Doug and Kai for 2.6.15 or 2.6.16 is this below: since the incomplete get_user_pages path omits to reset res, but has already released all the pages, it will result in premature freeing of user pages, and behaviour just like you've seen. Though I'd have thought incomplete get_user_pages was an exceptional case, and a bit surprised you'd encounter it. Perhaps there's some other premature freeing in the driver, and this instance has nothing whatever to do with it. If the problem were easily reproducible, it'd be great if you could try this patch; but I think you've said it's not :-( Signed-off-by: Kai Makisara Signed-off-by: James Bottomley commit c87e34efaecc952f9a0c1bbb9c6da76ccbf5ee3d Author: Moore, Eric Dean Date: Thu Dec 1 11:06:25 2005 -0700 [SCSI] mptfusion: Add maintainers Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit 2a238ea5fbf2bd9a18a4ffb607418a4b9394647e Author: Moore, Eric Dean Date: Thu Dec 1 10:50:32 2005 -0700 [SCSI] mptfusion : dv performance fix Syncronization for Domain Validation workqueue and the initiation of the alternate controller. Its possible that dv could be terminated if the workqueue on the 1st channel doesn complete in time before the 2nd channel begins initialization. Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit 8b2f81385aa02e9405990b7fe44462dfceb75ef7 Author: Matthew Wilcox Date: Tue Nov 29 23:08:38 2005 -0500 [SCSI] sym2: Disable IU and QAS negotiation Enabling these features causes problems with some drives, so disable them until they're debugged Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit fb121b067be77a9927e9453e427cf5819eb8ef01 Author: Andreas Herrmann Date: Thu Dec 1 02:49:29 2005 +0100 [SCSI] zfcp: fix return code of zfcp_scsi_slave_alloc Change return code in slave_alloc to avoid irritating error message from scsi_alloc_sdev() when scsi stack tries target scan. Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit ee69ab7af3cd68423e389272e1276718d4cd8ebc Author: Maxim Shchetynin Date: Thu Dec 1 02:48:41 2005 +0100 [SCSI] zfcp: fix link down handling during firmware update Don't check link down payload in case of firmware update. Signed-off-by: Maxim Shchetynin Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit 2448c45965870ca9cfdb66388b4fcc93f1e12bb7 Author: Andreas Herrmann Date: Thu Dec 1 02:50:36 2005 +0100 [SCSI] zfcp: fix adapter initialization Fixed various problems in opening sequence of adapters which was previously changed with NPIV support: o corrected handling when exchange port data function is not supported, otherwise adapters on z900 cannot be opened anymore o corrected setup of timer for exchange port data if called from error recovery o corrected check of return code of exchange config data Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit c48a29d065cfa18c3e8699f5e3a84a59ad35e062 Author: Heiko Carstens Date: Thu Dec 1 02:46:32 2005 +0100 [SCSI] zfcp: fix spinlock initialization Move initialization of locks and lists to adapter allocation function. Otherwise we might end up with some uninitialized locks, like e.g. the erp locks which only will be inititialized if an error recovery thread for an adapter will be started. Signed-off-by: Heiko Carstens Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit 8bdf810f89c3e686ba18a11e2852f32014f1506a Author: Mark Haverkamp Date: Wed Nov 30 12:01:39 2005 -0800 [SCSI] aacraid: Check scsi_bios_ptabe return code Received from Mark Salyzyn. scsi_bios_ptable return value is not being checked in aac_biosparm. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 349cd7cfe6ba0b2e7cd2afdc3e70ede845311afe Author: James Bottomley Date: Mon Nov 28 15:41:58 2005 -0600 [SCSI] SPI DV: be more conservative about echo buffer usage Some SCSI devices apparently get very confused if we try to use the echo buffer on a non-DT negotiated bus (this mirrors the problems of using PPR on non-LVD for some devices). The fix is to be far more conservative about when we use an echo buffer. With this patch, we'll now see what parameters are negotiated by the read only test, and only look for an echo buffer if DT is negotiated. Signed-off-by: James Bottomley commit 11849fe67430ba48547e17b25a7831da29863efa Author: Arthur Othieno Date: Thu Dec 1 20:58:01 2005 +0000 [ARM] sema_count() removal sema_count() defined only for ARM but not used anywhere. Signed-off-by: Arthur Othieno Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 08af295ba491123d067400228d887ca574aceecd Author: Richard Purdie Date: Thu Dec 1 15:52:47 2005 +0000 [ARM] 3188/1: Add missing i2c dependency for Akita Patch from Richard Purdie Akita requires inbuilt kernel i2c support for its GPIOs. Add this requirement to Kconfig and update the defconfig to match. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit a35d6c91b8f061da9b76c8c0102d1e1e6bc6f47b Author: Jeff Hansen Date: Thu Dec 1 15:50:35 2005 +0000 [ARM] Fix IXDP425 setup bug There is a typo in the ARM IXDP425 setup definition that mistakenly tries to use UART1's IRQ for UART2's traffic. Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 00b4c90787298349b799069360ced9ca843153dc Author: Russell King Date: Thu Dec 1 15:47:24 2005 +0000 [ARM SMP] Use event instructions for spinlocks ARMv6K CPUs have SEV (send event) and WFE (wait for event) instructions which allow the CPU clock to be suspended until another CPU issues a SEV, rather than spinning on the lock wasting power. Make use of these instructions. Note that WFE does not wait if an event has been sent since the last WFE cleared the event status, so although it may look racy, the instruction implementation ensures that these are dealt with. Signed-off-by: Russell King commit 80b42598eec1627084e225c575201bdd838f5b8f Author: Ralf Baechle Date: Thu Dec 1 11:05:19 2005 +0000 [MIPS] Update defconfigs to reflect Kconfig changes. Signed-off-by: Ralf Baechle commit 85b05496024fd913da2c1fbea711ebcdfd40c2f3 Author: Ralf Baechle Date: Wed Nov 30 17:21:06 2005 +0000 [MIPS] Avoid duplicate do_syscall_trace calls on return from sigreturn. Signed-off-by: Ralf Baechle commit 04a7052c8399edc95b5e120c980823ccaade6aaf Author: Ralf Baechle Date: Wed Nov 30 16:24:57 2005 +0000 [MIPS] Fix register handling in syscalls when debugging. Signed-off-by: Ralf Baechle commit ecd5a739048b4d94e4ae3545196eb752d6776c97 Author: Ralf Baechle Date: Tue Nov 29 17:03:02 2005 +0000 [MIPS] Alchemy: Set board type on initialization. From Sergei Shtylylov . Signed-off-by: Ralf Baechle commit dea91002d45e4f0fe83768703288e1cde917371c Author: Ralf Baechle Date: Tue Nov 29 16:01:32 2005 +0000 [MIPS] Alchemy: Fix BCSR accesses. Fixes BCSR accesses in the board setup/reset code. The registers are actually 16-bit, and their addresses are different between DBAu1550 and other DBAu1xx0 boards. From Sergei Shtylylov . Signed-off-by: Ralf Baechle commit edcb98d1db7d0320d7b1920c05a4f1cafe7cb798 Author: Ralf Baechle Date: Tue Nov 29 13:01:01 2005 +0000 [MIPS] Fix return path of sysmips(MIPS_ATOMIC_SET, ...) The way we were doing things does no longer work on 2.6. Signed-off-by: Ralf Baechle commit fe3d72858c34a464976c6f8076971e2862d5c3b8 Author: Ralf Baechle Date: Mon Nov 28 13:15:08 2005 +0000 [MIPS] Qemu: Accept kernel command line passed by the Emulator. From Daniel Jacobowitz . Signed-off-by: Ralf Baechle commit e76beeebff09b6a5eb338f306349ddc451a7804d Author: Ralf Baechle Date: Mon Nov 28 13:12:51 2005 +0000 [MIPS] Qemu: Qemu is emulating a 1193.182kHz i8254 PIC. From Daniel Jacobowitz . Signed-off-by: Ralf Baechle commit 56ebd51bae72c2e47c83f6eacf258479d5658ec8 Author: Daniel Jacobowitz Date: Sat Nov 26 22:34:41 2005 -0500 [MIPS] Generate SIGILL again The rdhwr emulation accidentally swallowed the SIGILL from most other illegal instructions. Make sure to return -EFAULT by default. Signed-off-by: Daniel Jacobowitz Signed-off-by: Ralf Baechle commit b6c3539bdd6d766cffea76698c85ebb92bf3fb12 Author: Ralf Baechle Date: Fri Nov 25 11:35:40 2005 +0000 [MIPS] Kconfig: Include init/Kconfig after we've set 32BIT / 64BIT. Signed-off-by: Ralf Baechle commit d981733aaf970e4537bb8dee9422ee775d92e5ae Author: Ralf Baechle Date: Wed Nov 23 13:49:09 2005 +0000 [MIPS] Use reset_page_mapcount to initialize empty_zero_page usage counter. Signed-off-by: Ralf Baechle commit 8b36612a23fda542fab5f0c6c26e15e2178e3d0e Author: Ralf Baechle Date: Tue Nov 22 17:53:59 2005 +0000 [MIPS] R10000 and R12000 need to set MIPS_CPU_4K_CACHE ... ... because they have R4000-style caches. Signed-off-by: Ralf Baechle commit 380b92537c23422b277ff66eb7086a092dbb75cb Author: Ralf Baechle Date: Sat Nov 19 21:51:56 2005 +0000 [MIPS] JMR3927: Declare puts function. Signed-off-by: Ralf Baechle commit 702a96a62b2a37025a752409b0dc08d8473096b1 Author: Sergei Shtylylov Date: Fri Nov 18 22:20:31 2005 +0300 [MIPS] JMR3927 fixes. o Check if IRQ is disabled or in progress before reenabling interrupts in jmr3927_irq_end.. o s/spinlock_irqsave/spin_lock_irqsave/ o s/spinlock_irqrestore/spin_unlock_irqrestore/ o Flush write buffer after setting IRQ mask o In 2.6 jmr3927_ioc_interrupt interrupt handlers return irqreturn_t Signed-off-by: Sergei Shtylyov Signed-off-by: Ralf Baechle commit ea182d4aefa3a27847d890b1592a608d1180aa45 Author: Jeff Garzik Date: Thu Dec 1 04:31:32 2005 -0500 [netdrvr skge] fix typo, fix build commit ab80882bf339c5954a69bb0603df0113b17d384f Author: Komuro Date: Thu Dec 1 02:37:17 2005 -0500 [netdrvr fmvj18x_cs] fix multicast bug * use set_rx_mode to (re)initialize the multicast table. * MC_FILTERBREAK is 64 (= 8 * 8bit) * remove local_info_t.mc_filter commit 1d97f384486a697ed227ef4609a26f18a8ea9a11 Author: Matthieu CASTET Date: Thu Dec 1 02:35:26 2005 -0500 [wireless airo] reset card in init without this patch after an rmmod, modprobe the card won't work anymore until the next reboot. This patch seem safe to apply for all cards as the bsd driver already do that. I had to add a timeout because strange things happen (issuecommand will fail) if the card is already reseted (after a reboot). PS : it seems there are missing reset when leaving monitor mode... Signed-off-by: Matthieu CASTET commit 1096e87174f925bb817a41386ee70573b2a7d6ff Author: Stephen Hemminger Date: Mon Nov 28 11:38:50 2005 -0800 [PATCH] skge: handle VLAN checksum correctly on yukon rev 0 If using UDP over VLAN, with the skge driver there is a possibility of generating an incorrect checksum. This is a unlikely occurrence because it is only an issue on Yukon revision 0, and that revision doesn't seem to exist on any current hardware (probably early prototype). Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit c08ad1e304061dbd6ef7545d8f2db530b43c0fbd Author: Pavel Roskin Date: Tue Nov 29 02:59:27 2005 -0500 [PATCH] orinoco: fix setting power management parameters Power management parameters could not be set by iwconfig due to incorrect error handling. Signed-off-by: Pavel Roskin Signed-off-by: Jeff Garzik commit ee7ebdf40260c6c5586f20cda5d253bc988e7baa Author: Ralf Baechle Date: Tue Nov 22 00:19:44 2005 +0000 [PATCH] jazzsonic: Fix platform device code Use platform_driver_unregister not driver_unregister to unregister a struct platform_driver. Signed-off-by: Ralf Baechle Signed-off-by: Jeff Garzik commit 23c2a7b5dea983c7cee2813817409552f9714e95 Author: Ralf Baechle Date: Tue Nov 22 00:16:51 2005 +0000 [PATCH] jazzsonic: Fix build error. jazz_sonnic_device -> jazz_sonic_device Signed-off-by: Ralf Baechle Signed-off-by: Jeff Garzik commit 56344d822efb25e66df87c5ee81aab8accf4d706 Author: Ralf Baechle Date: Mon Nov 21 21:05:02 2005 +0000 [PATCH] mipsnet: Fix Copyright notice. Sorry, no sekr1t mips c0dez ;-) Signed-off-by: Ralf Baechle Signed-off-by: Jeff Garzik commit 8169bd919146f468942f40c3e708f9ada74a30a4 Author: Eugene Surovegin Date: Thu Nov 24 14:48:40 2005 -0800 [PATCH] ibm_emac: fix graceful stop timeout handling This patch fixes graceful stop timeout handling in PPC4xx EMAC driver. Currently, when we stop TX/RX channels we just do some number of loops without relying on actual spent time. This has finally bitten me on one of our systems (heavy network traffic during start up, RX channel is stopped several times to configure multicast list). Graceful channel stop can take up to 1 frame time, so I've added device specific timeout counter which depends on current link speed and calls to udelay() to really wait required amount of time before giving up. Signed-off-by: Eugene Surovegin Signed-off-by: Jeff Garzik commit be0df20cb5ffd36ced9393d004e473d5c531b5da Author: shemminger@osdl.org Date: Wed Nov 23 22:00:51 2005 -0800 [PATCH] sk98lin: avoid message confusion with skge Avoid possible confusion between skge and sk98lin driver by tagging messages properly. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 4f4c81504284c0ab66fc6d773dfb3b54aca02427 Author: shemminger@osdl.org Date: Wed Nov 23 22:00:50 2005 -0800 [PATCH] sk98lin: add permanent address support Add permanent address and link status support via ethtool. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 596f86a8d8a70005728944143f08fe5414443355 Author: shemminger@osdl.org Date: Wed Nov 23 22:00:49 2005 -0800 [PATCH] sk98lin: fix checksumming code Remove code from sk98lin that does it's own checksum validation. This code is incorrect when dealing with nested protocols like VLAN's, and it is better to use regular receive code path to handle hardware checksum. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit a174fd88d2b73c1933ea24ed533354d618c7d089 Author: Jesse Brandeburg Date: Tue Nov 29 19:23:59 2005 -0800 [PATCH] e1000: fix for dhcp issue Parse outgoing packets in e1000_transfer_dhcp_info as raw packet even if protocol bits are set. pump, for instance causes kernel panic on some systems, if parsed via udp header. Thanks to Derrell Lipman for reporting and testing. Signed-off-by: Jesse Brandeburg Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 5666c0947ede0432ba5148570aa66ffb9febff5b Author: Linus Torvalds Date: Wed Nov 30 22:25:15 2005 -0800 Linux v2.6.15-rc4 commit cd8e2b48daee891011a4f21e2c62b210d24dcc9e Author: Venkatesh Pallipadi Date: Fri Oct 21 19:22:00 2005 -0400 [ACPI] fix 2.6.13 boot hang regression on HT box w/ broken BIOS http://bugzilla.kernel.org/show_bug.cgi?id=5452 Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit 59d399d357a7705568f424c6e861ee8657f7f655 Author: Thomas Renninger Date: Tue Nov 8 05:27:00 2005 -0500 [ACPI] Fix Null pointer deref in video/lcd/brightness http://bugzilla.kernel.org/show_bug.cgi?id=5571 Signed-off-by: Thomas Renninger Signed-off-by: Nishanth Aravamudan Signed-off-by: Yu Luming Cc: Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 1cbf4c563c0eaaf11c552a88b374e213181c6ddd Author: Thomas Renninger Date: Thu Sep 16 11:07:00 2004 -0400 [ACPI] Allow return to active cooling mode once passive mode is entered http://bugzilla.kernel.org/show_bug.cgi?id=3410 https://bugzilla.novell.com/show_bug.cgi?id=131543 Signed-off-by: Thomas Renninger Signed-off-by: Konstantin Karasyov Signed-off-by: Alexey Starikovskiy Signed-off-by: Yu Luming Signed-off-by: Andrew Morton commit e6e87b4bfe3720b4308a8e669078d9be58bc9780 Author: David Shaohua Li Date: Wed Sep 21 01:35:00 2005 -0400 [ACPI] properly detect pmtimer on ASUS a8v motherboard Handle FADT 2.0 xpmtmr address 0 case. http://bugzilla.kernel.org/show_bug.cgi?id=5283 Signed-off-by: Shaohua Li Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 0a47c906342e2447003e207d23917dfa5c912071 Author: Borislav Petkov Date: Wed Nov 30 22:12:45 2005 -0500 [ACPI] delete "default y" on Kconfig for ibm_acpi extras driver Signed-off-by: Borislav Petkov Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 5d8e7aa6e5c21e14843404c5e4c04d4cf043e40e Author: Al Viro Date: Thu Sep 22 01:15:57 2005 -0400 [ACPI] IA64 build: blacklist.c is used only on X86 Signed-off-by: Al Viro Signed-off-by: Len Brown (cherry picked from ef4611613657dfb8af8d336f2f61f08cfcdc9d8a commit) commit 981d9c176dacf397d267215d44a4060c28663480 Author: Francois Romieu Date: Wed Nov 30 22:35:39 2005 +0100 b44: increase version number Signed-off-by: Francois Romieu commit 3410572d519b6c68505f746f25033de97809eaa1 Author: Francois Romieu Date: Wed Nov 30 22:32:13 2005 +0100 b44: early return in dev->do_ioctl when the device is not up The device has not gone through a whole reset/init sequence until the device is up. Accessing the mii interface before this point is not safe. Signed-off-by: Francois Romieu commit d9e2d185bf01e20339158f77c3fca00b02014912 Author: Mark Lord Date: Wed Nov 30 22:30:23 2005 +0100 b44: missing netif_wake_queue() in b44_open() This patch fixes a problem plaguing Dell notebooks with built-in b44 ethernet: The driver refuses to transmit packets of any kind until after the first 5-second tx_timeout occurs. This bug causes DHCP negotiation to fail (timeout) during installation of Ubuntu Linux. Signed-off-by: Mark Lord Signed-off-by: Andrew Morton commit 346f7dbb17cb7d84317b4410df2e8f7bf2e57f44 Author: Linus Torvalds Date: Wed Nov 30 10:22:30 2005 -0800 Revert "[PATCH] pci_ids.h: remove duplicate entries" This reverts commit c9d6073fb3cda856132dd544d537679f9715436c. It was totally bogus. Signed-off-by: Linus Torvalds commit a145dd411eb28c83ee4bb68b66f62c326c0f764e Author: Linus Torvalds Date: Wed Nov 30 09:35:19 2005 -0800 VM: add "vm_insert_page()" function This is what a lot of drivers will actually want to use to insert individual pages into a user VMA. It doesn't have the old PageReserved restrictions of remap_pfn_range(), and it doesn't complain about partial remappings. The page you insert needs to be a nice clean kernel allocation, so you can't insert arbitrary page mappings with this, but that's not what people want. Signed-off-by: Linus Torvalds commit c801147c5a103eec864afee348c4ee3fdb0f380c Author: Egbert Eich Date: Wed Nov 30 15:32:59 2005 +0100 [PATCH] SiS DRM: Fix possible NULL dereference This fixes a NULL pointer reference in DRM. The SiS driver tries to allocate a big chunk of memory, but the return value is never checked. Reported in Novell bugzilla #132271: https://bugzilla.novell.com/show_bug.cgi?id=132271 Signed-off-by: Takashi Iwai Signed-off-by: Linus Torvalds commit df2f5e721ed36e21da27e1f415c71ba0e20f31b5 Author: Russell King Date: Wed Nov 30 16:02:54 2005 +0000 [ARM SMP] Disable lazy flush_dcache_page for SMP Lazy flush_dcache_page() causes userspace instability on SMP platforms, so disable it for now. Signed-off-by: Russell King commit bd7ce5b5ff930c29b1c0405051e9c9388660b785 Author: Thomas Renninger Date: Mon Oct 3 10:39:00 2005 -0700 [ACPI] fix HP nx8220 boot hang regression This patch reverts the acpi_bus_find_driver() return value check that came in via the PCI tree via 3fb02738b0fd36f47710a2bf207129efd2f5daa2 [PATCH] acpi bridge hotadd: Allow ACPI .add and .start operations to be done independently This particular change broke booting of some HP/Compaq laptops unless acpi=noirq is used. http://bugzilla.kernel.org/show_bug.cgi?id=5221 https://bugzilla.novell.com/show_bug.cgi?id=116763 Signed-off-by: Thomas Renninger Cc: Rajesh Shah Signed-off-by: Len Brown commit 4c0335526c95d90a1d958e0059f40a5745fc7c5d Author: Venkatesh Pallipadi Date: Thu Sep 15 12:20:00 2005 -0400 [ACPI] Add support for FADT P_LVL2_UP flag which tells us if C2 is valid for UP-only, or SMP. As there is no separate bit for C3, use P_LVL2_UP bit to cover both C2 and C3. http://bugzilla.kernel.org/show_bug.cgi?id=5165 Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown (cherry picked from 28b86b368af3944eb383078fc5797caf2dc8ce44 commit) commit 6d93c64803a5fea84839789aae13290419c62d92 Author: Venkatesh Pallipadi Date: Thu Sep 15 12:19:00 2005 -0400 [ACPI] Prefer _CST over FADT for C-state capabilities Note: This ACPI standard compliance may cause regression on some system, if they have _CST present, but _CST value is bogus. "nocst" module parameter should workaround that regression. http://bugzilla.kernel.org/show_bug.cgi?id=5165 Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown (cherry picked from 883baf7f7e81cca26f4683ae0d25ba48f094cc08 commit) commit 25741b3e43151bc207dd2b850b0bb157c442682b Author: Steve French Date: Tue Nov 29 22:38:43 2005 -0800 [CIFS] For previous fix, mode on mkdir needed S_IFDIR left out. Signed-off-by: Steve French commit 8926bfa7462d4c3f8b05cca929e0c4bcde93ae38 Author: David Brownell Date: Mon Nov 28 08:40:38 2005 -0800 [PATCH] USB: ehci fixups Rename the EHCI "reset" routine so it better matches what it does (setup); and move the one-time data structure setup earlier, before doing anything that implicitly relies on it having been completed already. From: David Brownell Signed-off-by: Greg Kroah-Hartman commit 8de98402652c01839ae321be6cb3054cf5735d83 Author: Benjamin Herrenschmidt Date: Fri Nov 25 09:59:46 2005 +1100 [PATCH] USB: Fix USB suspend/resume crasher (#2) This patch closes the IRQ race and makes various other OHCI & EHCI code path safer vs. suspend/resume. I've been able to (finally !) successfully suspend and resume various Mac models, with or without USB mouse plugged, or plugging while asleep, or unplugging while asleep etc... all without a crash. Alan, please verify the UHCI bit I did, I only verified that it builds. It's very simple so I wouldn't expect any issue there. If you aren't confident, then just drop the hunks that change uhci-hcd.c I also made the patch a little bit more "safer" by making sure the store to the interrupt register that disables interrupts is not posted before I set the flag and drop the spinlock. Without this patch, you cannot reliably sleep/wakeup any recent Mac, and I suspect PCs have some more sneaky issues too (they don't frankly crash with machine checks because x86 tend to silently swallow PCI errors but that won't last afaik, at least PCI Express will blow up in those situations, but the USB code may still misbehave). Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman commit d3420ba4930d61f4ec4abc046765de274182b4ed Author: Dave Jones Date: Mon Nov 28 13:44:52 2005 -0500 [PATCH] Additional device ID for Conexant AccessRunner USB driver Reported as working in Fedora bugzilla by Petr. From: Petr Tuma Signed-off-by: Dave Jones Signed-off-by: Greg Kroah-Hartman commit 620948a01c71060a32611bc2f792f58a88cf28b1 Author: Alan Stern Date: Mon Nov 28 15:22:55 2005 -0500 [PATCH] USB: documentation update This patch (as611) fixes a minor mistake and misspelling in the USB documentation. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit c9d6073fb3cda856132dd544d537679f9715436c Author: Grant Coady Date: Thu Nov 24 20:41:06 2005 +1100 [PATCH] pci_ids.h: remove duplicate entries G'day Albert, Andrew, commit 4fb80634d30f5e639a92b78c8f215f96a61ba8c7 Author: Albert Lee Date: Thu May 12 15:49:21 2005 -0400 duplicates symbols already appearing in pci_ids.h, appended patch removes them again :o) From: Grant Coady pci_ids: commit 4fb80634d30f5e639a92b78c8f215f96a61ba8c7 duplicated a couple existing symbols in pci_ids.h, remove them. Signed-off-by: Grant Coady Signed-off-by: Greg Kroah-Hartman commit 9632051963cb6e6f7412990f8b962209b9334e13 Author: Jean Delvare Date: Tue Nov 29 22:27:14 2005 +0100 [PATCH] hwmon: w83792d fix unused fan pins 1. This patch add check for fan4,5,6,7 and do not create device file if their pins are not configured as fan. 2. Fix the issue that can not set fan divisor to 128. 3. Fix the index out of bounds bug in w83792d_detect function. Signed-off-by: Yuan Mu Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 2a138ebb012ac42c082ae8b40c87c1f265664391 Author: Steve French Date: Tue Nov 29 21:22:19 2005 -0800 [CIFS] Missing parenthesis and typo in previous fix Signed-off-by: Steve French commit 6ab16d249513a50bef3f1b275cea6aa8d3f51832 Author: Steve French Date: Tue Nov 29 20:55:11 2005 -0800 [CIFS] Fix umount --force to wake up the pending response queue, not just the request queue. Also periodically wakeup response_q so threads can check if stuck requests have timed out. Workaround Windows server illegal smb length on transact2 findfirst response. Signed-off-by: Steve French commit 6473a559c336d5c407f9df412ca2f55357767ff8 Author: Steve French Date: Tue Nov 29 20:20:10 2005 -0800 [CIFS] Fix missing permission check on setattr when noperm mount option is disabled. Also set mode, uid, gid better on mkdir and create for the case when Unix Extensions is not enabled and setuids is enabled. This is necessary to fix the hole in which chown could be allowed for non-root users in some cases if root mounted, and also to display the mode and uid properly in some cases. Signed-off-by: Steve French commit 1a57198609615a936ff57da37b6957db9bafde83 Author: Mark Fortescue Date: Tue Nov 29 19:34:44 2005 -0800 [PATCH] fbdev: cg3fb: Kconfig fix A cut and past error regarding the CG3 frame buffer needs to be fixed. It also affects Creator/Creator3D/Elite3D. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 49d5c7b08713c3a482d62b5a0ad41b4ec32905a5 Author: Antonino A. Daplas Date: Tue Nov 29 19:34:43 2005 -0800 [PATCH] fbdev: cirrusfb: Driver cleanup and bug fixes - pseudo_palette is only 16 entries long - the pseudo_palette, if using the generic drawing functions, must always be u32 regardless of bpp - the fillrect accelerator is using region->color regardless of the visual. region->color is the index to the pseudo_palette if visual is truecolor Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fe655d3a06488c8a188461bca493e9f23fc8c448 Author: Shaohua Li Date: Tue Nov 29 19:34:42 2005 -0800 [PATCH] setting irq affinity is broken in ia32 with MSI enabled Setting irq affinity stops working when MSI is enabled. With MSI, move_irq is empty, so we can't change irq affinity. It appears a typo in Ashok's original commit for this issue. X86_64 actually is using move_native_irq. Signed-off-by: Shaohua Li Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b0b623c3b22d57d6941b200321779d56c4e79e6b Author: Roman Zippel Date: Tue Nov 29 19:34:41 2005 -0800 [PATCH] hfsplus: don't modify journaled volume Access to a journaled HFS+ volume is not officially supported under Linux, so mount such a volume read-only, but users can override this behaviour using the "force" mount option. The minimum requirement to relax this check is to at least check that the journal is empty and so nothing needs to be replayed to make sure the volume is consistent. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 576f6d79564d0d2c1f43088e6805674d2e122935 Author: Jeff Mahoney Date: Tue Nov 29 19:34:39 2005 -0800 [PATCH] reiserfs: handle cnode allocation failure gracefully If an external device is used for a journal, by default it will use the entire device. The reiserfs journal code allocates structures per journal block when it mounts the file system. If the journal device is too large, and memory cannot be allocated for the structures, it will continue and ultimately panic when it can't pull one off the free list. This patch handles the allocation failure gracefully and prints an error message at mount time. Changes: Updated error message to be more descriptive to the user. Discussed and approved on ReiserFS Mailing List, Nov 28. Signed-off-by: Jeff Mahoney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9f232a125bf86b0dae09f8ea4a0553535cf6b658 Author: Paolo Galtieri Date: Tue Nov 29 19:34:38 2005 -0800 [PATCH] ppc: fix floating point register corruption I recently discovered a bug on PPC which causes the floating point registers to get corrupted when CONFIG_PREEMPT=y. The problem occurred while running a multi threaded Java application that does floating point. The problem could be reproduced in anywhere from 2 to 6 hours. With the patch I have included below it ran for over a week without failure. Signed-off-by: Paolo Galtieri Cc: Kumar Gala Cc: Matt Porter Cc: Tom Rini Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 123d3c13e2853a11b4d599d754b356acb12886e2 Author: Pavel Machek Date: Tue Nov 29 19:34:37 2005 -0800 [PATCH] fix swsusp on machines not supporting S4 Fix swsusp on machines not supporting S4. With recent changes, it is not possible to trigger it using /sys filesystem. Swsusp does not really need any support from low-level code, it is possible to reboot or halt at the end of suspend. Signed-off-by: Pavel Machek Cc: "Brown, Len" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d91b14c463306eb6527550ba48617e7f5500d3ae Author: Thierry Vignaud Date: Tue Nov 29 19:34:35 2005 -0800 [PATCH] fix rebooting on HP nc6120 laptop Anne NICOLAS and Andres Kaaber reported their HP laptop didn't reboot smoothly. Signed-off-by: Thierry Vignaud Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5bd0190bf3d7e53043a048e809ffa29d41b9d6ac Author: David Gibson Date: Tue Nov 29 19:34:32 2005 -0800 [PATCH] Fix crash when ptrace poking hugepage areas set_page_dirty() will not cope with being handed a page * which is part of a compound page, but not the master page in that compound page. This case can occur via access_process_vm() if you attemp to write to another process's hugepage memory area using ptrace() (causing an oops or hang). This patch fixes the bug by only calling set_page_dirty() from access_process_vm() if the page is not a compound page. We already use a similar fix in bio_set_pages_dirty() for the case of direct io to hugepages. Signed-off-by: David Gibson Acked-by: William Irwin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit df69a60dc6afc2936d79054d30b481c1fd9720e5 Author: Matt Helsley Date: Tue Nov 29 19:34:31 2005 -0800 [PATCH] process events connector: uid_t gid_t size issues The uid_t and gid_t fields appear to present a 32/64-bit userspace/kernel problem for some archs. This patch addresses the problem by fixing the size to the largest size for uid_t/gid_t used in the kernel. This preserves the total size of the event structure while ensuring that the layouts of the ID change event match in 32 and 64-bit kernels and applications. Signed-off-by: Matt Helsley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ed1189b7e8cd8144f0b232c220aed4ee26d89463 Author: Olaf Hering Date: Tue Nov 29 14:04:05 2005 +0100 [PATCH] powerpc: prevent stack corruption in call_prom_ret Use the correct pointer to clear the memory of the return values, to prevent stack corruption in the callers stackframe. Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit 48abec07cf8063184d397560a6a5f27eaf9caddf Author: Paul Mackerras Date: Wed Nov 30 13:20:54 2005 +1100 powerpc: Fix bug causing FP registers corruption on UP + preempt This fixes a bug noticed by Paolo Galtieri and fixed for ARCH=ppc in the previous commit (ppc: fix floating point register corruption). This fixes the arch/powerpc code by adding preempt_disable/enable, and also cleans it up a bit by pulling out the code that discards any lazily-switched CPU register state into a new function, rather than having that code repeated in three places. Signed-off-by: Paul Mackerras commit 8117ce76c28ef0cab8545b518fa0543f6d1437e6 Author: Paolo Galtieri Date: Tue Nov 29 14:26:47 2005 -0800 [PATCH] ppc: fix floating point register corruption I recently discovered a bug on PPC which causes the floating point registers to get corrupted when CONFIG_PREEMPT=y. The problem occurred while running a multi threaded Java application that does floating point. The problem could be reproduced in anywhere from 2 to 6 hours. With the patch I have included below it ran for over a week without failure. Signed-off-by: Paolo Galtieri Cc: Kumar Gala Cc: Matt Porter Cc: Tom Rini Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Paul Mackerras commit 49c91fb01ff3948285608c65754b3ffbf57d50f2 Author: Trond Myklebust Date: Tue Nov 29 19:27:22 2005 -0500 [PATCH] VM: Fix typos in get_locked_pte Signed-off-by: Trond Myklebust Signed-off-by: Linus Torvalds commit f4e401562c11c7ca65592ebd749353cf0b19af7b Author: Jack Morgenstein Date: Tue Nov 29 16:57:01 2005 -0800 IB/uverbs: track multicast group membership for userspace QPs uverbs needs to track which multicast groups is each qp attached to, in order to properly detach when cleanup is performed on device file close. Signed-off-by: Jack Morgenstein Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 34a0b3cdc078746788ffc49e56da0db62b8b6ea4 Author: Adrian Bunk Date: Tue Nov 29 16:28:56 2005 -0800 [IPV6]: make two functions static This patch makes two needlessly global functions static. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit d127e94a5cf1c9c996b8c67cd2595b96c3e35e4c Author: Adrian Bunk Date: Tue Nov 29 16:28:18 2005 -0800 [NETFILTER] ipv4: small cleanups This patch contains the following cleanups: - make needlessly global code static - ip_conntrack_core.c: ip_conntrack_flush() -> ip_conntrack_flush(void) Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 4b30b1c6a3e58dc74f2dbb0aa39f16a23cfcdd56 Author: Adrian Bunk Date: Tue Nov 29 16:27:20 2005 -0800 [IPV4]: make two functions static This patch makes two needlessly global functions static. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 9b5b5cff9a6655dbb6d2e2be365bb95eec3950eb Author: Arjan van de Ven Date: Tue Nov 29 16:21:38 2005 -0800 [NET]: Add const markers to various variables. the patch below marks various variables const in net/; the goal is to move them to the .rodata section so that they can't false-share cachelines with things that get written to, as well as potentially helping gcc a bit with optimisations. (these were found using a gcc patch to warn about such variables) Signed-off-by: Arjan van de Ven Signed-off-by: David S. Miller commit fb29644994744a63bc57186cefa79534b5d9b5a9 Author: Chas Williams Date: Tue Nov 29 16:17:11 2005 -0800 [ATM]: [adummy] dummy ATM driver (similar to net/dummy) Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 64bf69ddff7637b7ed7acf9b2a823cc0ee519439 Author: Stanislaw Gruszka Date: Tue Nov 29 16:16:41 2005 -0800 [ATM]: deregistration removes device from atm_devs list immediately atm_dev_deregister() removes device from atm_dev list immediately to prevent operations on a phantom device. Decision to free device based only on ->refcnt now. Remove shutdown_atm_dev() use atm_dev_deregister() instead. atm_dev_deregister() also asynchronously releases all vccs related to device. Signed-off-by: Stanislaw Gruszka Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit aaaaaadbe7a663d110814db50fcbe7d320eb4c32 Author: Stanislaw Gruszka Date: Tue Nov 29 16:16:21 2005 -0800 [ATM]: avoid race conditions related to atm_devs list Use semaphore to protect atm_devs list, as no one need access to it from interrupt context. Avoid race conditions between atm_dev_register(), atm_dev_lookup() and atm_dev_deregister(). Fix double spin_unlock() bug. Signed-off-by: Stanislaw Gruszka Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 49693280262a149e5430d3401e263e464c88334a Author: Mitchell Blank Jr Date: Tue Nov 29 16:15:59 2005 -0800 [ATM]: [lanai] kill lanai_ioctl() which just contains some old debugging code Signed-off-by: Mitchell Blank Jr Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 5045b6d34c6a9efa4a8a1815265ca9fcf44d6a7c Author: Chas Williams Date: Tue Nov 29 16:15:38 2005 -0800 [ATM]: linux/config.h only needed for #ifdef __KERNEL__ section Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 50accc9c428273501dd2a6295c84a533dd1fe645 Author: Mitchell Blank Jr Date: Tue Nov 29 16:15:18 2005 -0800 [ATM]: attempt to autoload atm drivers From: Mitchell Blank Jr Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit e91a73568b19b4a8145fc6e05314d522ee35a0b1 Author: Jan Pieter Date: Tue Nov 29 16:14:58 2005 -0800 [ATM]: drivers/atm/atmdev_init.c no longer necessary From: Jan Pieter Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit fd22f1e037be33040f5583fe091d39d1e632e183 Author: Dave Jones Date: Tue Nov 29 16:14:33 2005 -0800 [ATM]: [lanai] lanai missing unregister Signed-off-by: Dave Jones Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit c22c28f69b1e28505bd0d26bd0f64554a9e66fe8 Author: Mitchell Blank Jr Date: Tue Nov 29 16:14:12 2005 -0800 [ATM]: [lanai] better constification Signed-off-by: Mitchell Blank Jr Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit c219750b2e667f4f79f4d8faca5057dad793db87 Author: Mitchell Blank Jr Date: Tue Nov 29 16:13:55 2005 -0800 [ATM]: atm_pcr_goal() doesn't modify its argument's contents -- mark it as const Signed-off-by: Mitchell Blank Jr Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit c9933d0856d6d0ede6b4b30e5e7330614f5203af Author: Mitchell Blank Jr Date: Tue Nov 29 16:13:32 2005 -0800 [ATM]: always return the first interface for ATM_ITF_ANY From: Mitchell Blank Jr Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 18955cfcb2a5d75a08e0cb297f13ccfb6904de48 Author: Mike Stroyan Date: Tue Nov 29 16:12:55 2005 -0800 [IPV4] tcp/route: Another look at hash table sizes The tcp_ehash hash table gets too big on systems with really big memory. It is worse on systems with pages larger than 4KB. It wastes memory that could be better used. It also makes the netstat command slow because reading /proc/net/tcp and /proc/net/tcp6 needs to go through the full hash table. The default value should not be larger for larger page sizes. It seems that the effect of page size is an unintended error dating back a long time. I also wonder if the default value really should be a larger fraction of memory for systems with more memory. While systems with really big ram can afford more space for hash tables, it is not clear to me that they benefit from increasing the allocation ratio for this table. The amount of memory allocated is determined by net/ipv4/tcp.c:tcp_init and mm/page_alloc.c:alloc_large_system_hash. tcp_init calls alloc_large_system_hash passing parameters- bucketsize=sizeof(struct tcp_ehash_bucket) numentries=thash_entries scale=(num_physpages >= 128 * 1024) ? (25-PAGE_SHIFT) : (27-PAGE_SHIFT) limit=0 On i386, PAGE_SHIFT is 12 for a page size of 4K On ia64, PAGE_SHIFT defaults to 14 for a page size of 16K The num_physpages test above makes the allocation take a larger fraction of the total memory on systems with larger memory. The threshold size for a i386 system is 512MB. For an ia64 system with 16KB pages the threshold is 2GB. For smaller memory systems- On i386, scale = (27 - 12) = 15 On ia64, scale = (27 - 14) = 13 For larger memory systems- On i386, scale = (25 - 12) = 13 On ia64, scale = (25 - 14) = 11 For the rest of this discussion, I'll just track the larger memory case. The default behavior has numentries=thash_entries=0, so the allocated size is determined by either scale or by the default limit of 1/16 of total memory. In alloc_large_system_hash- | numentries = (flags & HASH_HIGHMEM) ? nr_all_pages : nr_kernel_pages; | numentries += (1UL << (20 - PAGE_SHIFT)) - 1; | numentries >>= 20 - PAGE_SHIFT; | numentries <<= 20 - PAGE_SHIFT; At this point, numentries is pages for all of memory, rounded up to the nearest megabyte boundary. | /* limit to 1 bucket per 2^scale bytes of low memory */ | if (scale > PAGE_SHIFT) | numentries >>= (scale - PAGE_SHIFT); | else | numentries <<= (PAGE_SHIFT - scale); On i386, numentries >>= (13 - 12), so numentries is 1/8196 of bytes of total memory. On ia64, numentries <<= (14 - 11), so numentries is 1/2048 of bytes of total memory. | log2qty = long_log2(numentries); | | do { | size = bucketsize << log2qty; bucketsize is 16, so size is 16 times numentries, rounded down to a power of two. On i386, size is 1/512 of bytes of total memory. On ia64, size is 1/128 of bytes of total memory. For smaller systems the results are On i386, size is 1/2048 of bytes of total memory. On ia64, size is 1/512 of bytes of total memory. The large page effect can be removed by just replacing the use of PAGE_SHIFT with a constant of 12 in the calls to alloc_large_system_hash. That makes them more like the other uses of that function from fs/inode.c and fs/dcache.c Signed-off-by: David S. Miller commit f747307ed1defcdfd37a3ef84c48e3138691cd26 Author: Linus Torvalds Date: Tue Nov 29 14:21:57 2005 -0800 Revert "[PATCH] drivers/message/fusion/mptbase.c: make code static" This reverts commit 252ac865535e1ea9cc2d28be83f477d8d8b961a2. It impacts the LSI customers using the mptstm target mode drivers (source tar-ball at ftp://ftp.lsil.com/HostAdapterDrivers/linux/Fusion-MPT/mptstm-1.00.13-src.tar.gz for those who care). Signed-off-by: Linus Torvalds commit 325f04dbca60a4cfe4ac25e7cf246edd07eb4c5f Author: Hugh Dickins Date: Tue Nov 29 16:55:48 2005 +0000 [PATCH] pfnmap: do_no_page BUG_ON again Use copy_user_highpage directly instead of cow_user_page in do_no_page: in the immediately following page_cache_release, and elsewhere, it is assuming that new_page is normal. If any VM_PFNMAP driver can get to do_no_page, it's just a BUG (but not in the case of do_anonymous_page). Signed-off-by: Hugh Dickins Signed-off-by: Linus Torvalds commit e5bbe4dfc8dbfc50ef89f8641e020616d4d1e69e Author: Hugh Dickins Date: Tue Nov 29 16:54:51 2005 +0000 [PATCH] pfnmap: remove src_page from do_wp_page Clean away do_wp_page's "src_page": cow_user_page makes it unnecessary. Signed-off-by: Hugh Dickins Signed-off-by: Linus Torvalds commit 5d2a2dbbc1025dbf7998b9289574d9592b8f21cc Author: Linus Torvalds Date: Tue Nov 29 14:07:55 2005 -0800 cow_user_page: fix page alignment High Dickins points out that the user virtual address passed to the page fault handler isn't necessarily page-aligned. Also, add a comment on why the copy could fail for the user address case. Signed-off-by: Linus Torvalds commit c9cfcddfd65735437a4cb8563d6b66a6da8a5ed6 Author: Linus Torvalds Date: Tue Nov 29 14:03:14 2005 -0800 VM: add common helper function to create the page tables This logic was duplicated four times, for no good reason. Signed-off-by: Linus Torvalds commit cab3f16febeaf1a60e38159ff578f609f9976544 Author: David S. Miller Date: Tue Nov 29 13:59:03 2005 -0800 [SPARC64]: Fix >8K I/O mappings. Increment the PFN field of the PTE so that the tests on vm_pfn in mm/memory.c match up. The TLB ignores these lower bits for larger page sizes, so it's OK to set things like this. Signed-off-by: David S. Miller commit 238f9b063dcc9f23493a0d3fecca29fe332d4905 Author: Christoph Hellwig Date: Tue Nov 29 21:36:16 2005 +0100 [PATCH] fix megaraid.c locking This fixes locking in megaraid.c, namely: (1) make sure megaraid_queue release the adapter lock by changing the code to have a single return (2) remove the errornous scsi_assign_lock call Testing by Burton Windle. Signed-off-by: Christoph Hellwig Acked-by: Burton Windle Signed-off-by: Linus Torvalds commit 238f58d898df941aa9d1cb390fb27ff4febe8965 Author: Linus Torvalds Date: Tue Nov 29 13:01:56 2005 -0800 Support strange discontiguous PFN remappings These get created by some drivers that don't generally even want a pfn remapping at all, but would really mostly prefer to just map pages they've allocated individually instead. For now, create a helper function that turns such an incomplete PFN remapping call into a loop that does that explicit mapping. In the long run we almost certainly want to export a totally different interface for that, though. Signed-off-by: Linus Torvalds commit eca351336acb2fa943611e0846562ce3997ef53b Author: Ben Collins Date: Tue Nov 29 11:45:26 2005 -0800 [PATCH] Fix missing pfn variables caused by vm changes I image this showed up because of "unused var..." when the changes occured, because flush_cache_page() is a noop in most places. This showed up for me on parisc however, where flush_cache_page() is a real function. Signed-off-by: Linus Torvalds commit e0ae9ecf469fdd3c1ad999efbf4fe6b782f49900 Author: Michael S. Tsirkin Date: Tue Nov 29 11:33:46 2005 -0800 IB/mthca: fix posting of send lists of length >= 255 on mem-free HCAs On mem-free HCAs, when posting a long list of send requests, a doorbell must be rung every 255 requests. Add code to handle this. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 267ee88ed34c76dc527eeb3d95f9f9558ac99973 Author: Roland Dreier Date: Tue Nov 29 10:55:58 2005 -0800 IPoIB: fix error handling in ipoib_open If ipoib_ib_dev_up() fails after ipoib_ib_dev_open() is called, then ipoib_ib_dev_stop() needs to be called to clean up. Signed-off-by: Roland Dreier commit 2b9175c174b83b8d97db9398efe948fa9092938f Author: Adrian Bunk Date: Tue Nov 29 14:49:38 2005 +0000 [MTD] Make functions static, include header files with prototypes This patch contains the following possible cleanups: - every file should #include the headers containing the prototypes for it's global functions - make needlessly global functions static Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit 4f71055a45a503273c039d80db8ba9b13cb17549 Author: Michael S. Tsirkin Date: Tue Nov 29 10:53:30 2005 -0800 IPoIB: protect child list in ipoib_ib_dev_flush race condition: ipoib_ib_dev_flush is accessing child list without locks. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit ee2d49de3e3a0b846ecedb36fec0e4a5ff222dcb Author: Richard Purdie Date: Tue Nov 29 14:28:31 2005 +0000 [MTD] chips: make sharps driver usable again Update the pre-CFI Sharp driver sharps.c so it compiles. map_read32 / map_write32 no longer exist in the kernel so the driver is totally broken as it stands. The replacement functions use different parameters resulting in the other changes. Change collie to use this driver until someone works out why the cfi driver fails on that machine. Signed-off-by: Richard Purdie Tested-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit 72af3b2c5a9946e78125e143b636f3d7217bcf08 Author: Thomas Gleixner Date: Mon Nov 28 22:36:12 2005 +0000 [MTD] Remove bogus PQ2FADS driver Remove disfunctional driver, which slipped through the review mechanism Signed-off-by: Thomas Gleixner commit e2602b347aa6f62b61754c5f65191ef67ffd0dc7 Author: Luiz Capitulino Date: Tue Nov 29 14:30:03 2005 +0000 [MTD] maps: sparse fixup The patch below fixes the following sparse warning: drivers/mtd/maps/nettel.c:482:27: warning: Using plain integer as NULL pointer Signed-off-by: Luiz Capitulino Signed-off-by: Thomas Gleixner commit 8bc3b3804a6123e634be26359558aa998102506a Author: Nicolas Pitre Date: Wed Nov 23 22:07:56 2005 +0000 [MTD] cfi_cmdset_0001: relax locking rules for multi hardware partition support Signed-off-by: Nicolas Pitre Signed-off-by: Thomas Gleixner commit 7ac571f8d0f843fb818f7c70ec77784545e91bc4 Author: David Woodhouse Date: Thu Nov 17 08:20:31 2005 +0000 [MTD] Make some tables 'const' so they can live in .rodata arjan: drivers/mtd/maps/sc520cdp.c:167: warning: par_table is never written to and should be declared 'const' arjan: drivers/mtd/maps/pci.c:105: warning: mtd_pci_map is never written to and should be declared 'const' arjan: mind fixing those up ? Signed-off-by: David Woodhouse Signed-off-by: Thomas Gleixner commit 3c77354794939143fdf1dd669895a812f94f9a38 Author: John Bowler Date: Wed Nov 16 16:23:25 2005 +0000 [MTD] maps/ixp4xx: half-word boundary and little-endian fixups ixp4xx updates: - Handle reads that don't start on a half-word boundary. - Make it work when CPU is in little-endian mode. Signed-off-by: John Bowler Signed-off-by: Alessandro Zummo Signed-off-by: David Vrabel Signed-off-by: Thomas Gleixner commit 987d24018dc83d27e491674c50ff2272f51eb719 Author: Todd Poynor Date: Tue Nov 15 23:28:20 2005 +0000 [MTD] CFI: Use 16-bit access to autoselect/read device id data Recent models of Intel/Sharp and Spansion CFI flash now have significant bits in the upper byte of device ID codes, read via what Spansion calls "autoselect" and Intel calls "read device identifier". Currently these values are truncated to the low 8 bits in the mtd data structures, as all CFI read query info has previously been read one byte at a time. Add a new method for reading 16-bit info, currently just manufacturer and device codes; datasheets hint at future uses for upper bytes in other fields. Signed-off-by: Todd Poynor Signed-off-by: Thomas Gleixner commit 3eb8ceac486ed9b6eceed098423f1ca6b180ec9d Author: Maciej W. Rozycki Date: Mon Nov 14 13:41:51 2005 +0000 [MTD] devices/ms02-nv: phys/virt address fixups Merge from linux-mips: Use physical addresses at the interface level, letting drivers remap them as appropriate. Signed-off-by: Maciej W. Rozycki Signed-off-by: Thomas Gleixner commit 2e86541ec878de9ec5771600a77f451a80bebfc4 Author: Roland Dreier Date: Tue Nov 29 10:25:23 2005 -0800 IPoIB: don't zero members after we allocate with kzalloc ipoib_mcast_alloc() uses kzalloc(), so there's no need to zero out members of the mcast struct after it's allocated. Signed-off-by: Roland Dreier commit de922487890936470660e89f9095aee980637989 Author: Michael S. Tsirkin Date: Tue Nov 29 10:18:45 2005 -0800 IPoIB: reinitialize mcast structs' completions for every query Make sure mcast->done is initialized to uncompleted value before we submit a new query, so that it's safe to wait on. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 5872a9fc28e6cd3a4e51479a50970d19a01573b3 Author: Roland Dreier Date: Tue Nov 29 10:13:54 2005 -0800 IPoIB: always set path->query to NULL when query finishes Always set path->query to NULL when the SA path record query completes, rather than only when we don't have an address handle. Signed-off-by: Roland Dreier commit 5a94bcfd2a18edcf368b3128c7df07b58e529932 Author: Keshavamurthy Anil S Date: Tue Nov 22 14:15:49 2005 -0800 [IA64] Remove getting break_num by decoding instruction break.b always sets cr.iim to 0 and the current code tries to get the break_num by decoding instruction. However, their seems to be a race condition while reading the regs->cr_iip, as on other cpu the break.b at regs->cr_iip might have been replaced with the original instruction as a result of unregister_kprobe() and hence decoding instruction to obtain break_num will result in wrong value in this case. Also includes changes to kprobes.c which now has to handle break number zero. Signed-off-by: Anil S Keshavamurthy Signed-off-by: Tony Luck commit b77dae5293efba42ea1ff04d410ee68e66d5b0cf Author: Dean Roe Date: Wed Nov 9 14:25:06 2005 -0600 [IA64] - Make pfn_valid more precise for SGI Altix systems A single SGI Altix system can be divided into multiple partitions, each running their own instance of the Linux kernel. pfn_valid() is currently not optimal for any but the first partition, since it does not compare the pfn with min_low_pfn before calling the more costly ia64_pfn_valid(). Signed-off-by: Dean Roe Signed-off-by: Tony Luck commit 21eeb7aa116b1f59fc23339521173cbb13e57f1a Author: Thomas Gleixner Date: Tue Nov 29 16:57:17 2005 +0100 [JFFS2] Fix the slab cache constructor of 'struct jffs2_inode_info' objects. JFFS2 initialize f->sem mutex as "locked" in the slab constructor which is a bug. Objects are freed with unlocked f->sem mutex. So, when they allocated again, f->sem is unlocked because the slab cache constructor is not called for them. The constructor is called only once when memory pages are allocated for objects (namely, when the slab layer allocates new slabs). So, sometimes 'struct jffs2_inode_info' are allocated with unlocked f->sem, sometimes with locked. This is a bug. Instead, initialize f->sem as unlocked in the constructor. I.e., in the "constructed" state f->sem must be unlocked. From: Keijiro Yano Acked-by: Artem B. Bityutskiy Signed-off-by: Thomas Gleixner commit fa2a455b028f3b6ca4dae129c6337d7edf21f12c Author: Nick Piggin Date: Tue Nov 29 18:43:17 2005 +1100 [PATCH] Fix vma argument in get_usr_pages() for gate areas The system call gate area handling called vm_normal_page() with the wrong vma (which was always NULL, and caused an oops). Signed-off-by: Nick Piggin Signed-off-by: Linus Torvalds commit bc4117f8767203927e78b92e9e5b3ddb71d6a84d Author: Sean Young Date: Tue Nov 29 11:48:00 2005 +0000 [MTD] RFD_FTL: Use lanana assigned major device number A major block device number is now assigned by lanana. Signed-off-by: Sean Young Signed-off-by: Thomas Gleixner commit 220bbd748335f73aafb472a97716762a42cb0d58 Author: YOSHIFUJI Hideaki Date: Mon Nov 28 22:27:11 2005 -0800 [IPV6]: Implement appropriate dummy rule 4 in ipv6_dev_get_saddr(). Ensure to update hiscore.rule in dummy rule 4 in ipv6_dev_get_saddr(). Pointed out by Yan Zheng . Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 65c7eddaba33995e013ef3c04718f6dc8fdf2335 Author: Roland Dreier Date: Mon Nov 28 21:20:34 2005 -0800 IPoIB: reinitialize path struct's completion for every query It's possible that IPoIB will issue multiple SA queries for the same path struct. Therefore the struct's completion needs to be initialized for each query rather than only once when the struct is allocated, or else we might not wait long enough for later queries to finish and free the path struct too soon. Signed-off-by: Roland Dreier commit 666acb94d155106e494c6dfdd8b2fae44e0fad61 Author: Paul Mackerras Date: Tue Nov 29 15:50:58 2005 +1100 powerpc: Export __flush_icache_range for 32-bit Both 32-bit and 64-bit use the same inline flush_icache_range definition now, so both need to export __flush_icache_range, not just 64-bit. Signed-off-by: Paul Mackerras commit 624f54be206adf970cd8eece16446b027913e533 Author: Linus Torvalds Date: Mon Nov 28 19:51:27 2005 -0800 Linux v2.6.15-rc3 commit 0e2d94f6a09d0a2d39c3b7d9529ac5c378098245 Author: Otavio Salvador Date: Tue Nov 29 08:02:24 2005 +1100 [PATCH] ppc: Export symbol needed by MOL Export symbol needed to allow MOL to run. This was changed to be inline in past and forgot to be change here. Signed-off-by: Paul Mackerras commit 2827d0b23b7279d0a717eea4029efeef2e1b0183 Author: Miklos Szeredi Date: Mon Nov 28 13:44:16 2005 -0800 [PATCH] fuse: check for invalid node ID in fuse_create_open() Check for invalid node ID values in the new atomic create+open method. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f007d5c961448170d0ec2998b1a80eef054b6235 Author: Miklos Szeredi Date: Mon Nov 28 13:44:16 2005 -0800 [PATCH] fuse: check directory aliasing in mkdir Check the created directory inode for aliases in the mkdir() method. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ea164d73a7a0b2b2be3a1d8c2a8a4dab8999fa9c Author: Andrea Arcangeli Date: Mon Nov 28 13:44:15 2005 -0800 [PATCH] shrinker->nr = LONG_MAX means deadlock for icache With Andrew Morton The slab scanning code tries to balance the scanning rate of slabs versus the scanning rate of LRU pages. To do this, it retains state concerning how many slabs have been scanned - if a particular slab shrinker didn't scan enough objects, we remember that for next time, and scan more objects on the next pass. The problem with this is that with (say) a huge number of GFP_NOIO direct-reclaim attempts, the number of objects which are to be scanned when we finally get a GFP_KERNEL request can be huge. Because some shrinker handlers just bail out if !__GFP_FS. So the patch clamps the number of objects-to-be-scanned to 2* the total number of objects in the slab cache. Signed-off-by: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 154f484b92e5c25c400f6903512c511644a49322 Author: Jan Kara Date: Mon Nov 28 13:44:14 2005 -0800 [PATCH] Fix oops in vfs_quotaon_mount() When quota file specified in mount options did not exist, we tried to dereference NULL pointer later. Fix it. Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6aea114a728db9296f42102d4885e7fb035de0a9 Author: NeilBrown Date: Mon Nov 28 13:44:13 2005 -0800 [PATCH] md: fix --re-add for raid1 and raid6 If you have an array with a write-intent-bitmap, and you remove a device, then re-add it, a full recovery isn't needed. We detect a re-add by looking at saved_raid_disk. For raid1, it doesn't matter which disk it was, only whether or not it was an active device. The old code being removed set a value of 'mirror' which was then ignored, so it can go. The changed code performs the correct check. For raid6, if there are two missing devices, make sure we chose the right slot on --re-add rather than always the first slot. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b2a2703c282ce77d189a250f58039daac1da3314 Author: NeilBrown Date: Mon Nov 28 13:44:12 2005 -0800 [PATCH] md: set default_bitmap_offset properly in set_array_info If an array is created using set_array_info, default_bitmap_offset isn't set properly meaning that an internal bitmap cannot be hot-added until the array is stopped and re-assembled. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b5ab28a3b81381103b686ff6b9d2f5fbb944bc8c Author: NeilBrown Date: Mon Nov 28 13:44:11 2005 -0800 [PATCH] md: fix problem with raid6 intent bitmap When doing a recovery, we need to know whether the array will still be degraded after the recovery has finished, so we can know whether bits can be clearred yet or not. This patch performs the required check. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 700e432d8364ce59c521abbe03a522051610ebc2 Author: NeilBrown Date: Mon Nov 28 13:44:10 2005 -0800 [PATCH] md: fix locking problem in r5/r6 bitmap_unplug actually writes data (bits) to storage, so we shouldn't be holding a spinlock... Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22dfdf5212e5864b844f629736fb993d4611f190 Author: NeilBrown Date: Mon Nov 28 13:44:09 2005 -0800 [PATCH] md: improve read speed to raid10 arrays using 'far copies' raid10 has two different layouts. One uses near-copies (so multiple copies of a block are at the same or similar offsets of different devices) and the other uses far-copies (so multiple copies of a block are stored a greatly different offsets on different devices). The point of far-copies is that it allows the first section (normally first half) to be layed out in normal raid0 style, and thus provide raid0 sequential read performance. Unfortunately, the read balancing in raid10 makes some poor decisions for far-copies arrays and you don't get the desired performance. So turn off that bad bit of read_balance for far-copies arrays. With this patch, read speed of an 'f2' array is comparable with a raid0 with the same number of devices, though write speed is ofcourse still very slow. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 20c5ab6821b3a7aad31fb5a4660e9fe414fb37f6 Author: Michael Krufky Date: Mon Nov 28 13:44:08 2005 -0800 [PATCH] fix broken hybrid v4l-dvb frontend selection Repair broken build configuration for hybrid v4l/dvb card frontend selection. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f7b7fd8f3ebbb2810d6893295aa984acd0fd30db Author: Rik van Riel Date: Mon Nov 28 13:44:07 2005 -0800 [PATCH] temporarily disable swap token on memory pressure Some users (hi Zwane) have seen a problem when running a workload that eats nearly all of physical memory - th system does an OOM kill, even when there is still a lot of swap free. The problem appears to be a very big task that is holding the swap token, and the VM has a very hard time finding any other page in the system that is swappable. Instead of ignoring the swap token when sc->priority reaches 0, we could simply take the swap token away from the memory hog and make sure we don't give it back to the memory hog for a few seconds. This patch resolves the problem Zwane ran into. Signed-off-by: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a93a117eaa0bec426d4671a49bfa96a6fdcd2ac9 Author: Latchesar Ionkov Date: Mon Nov 28 13:44:05 2005 -0800 [PATCH] v9fs: fix memory leak in v9fs dentry code Assign the appropriate dentry operations to the dentry. Fixes memory leak. Signed-off-by: Latchesar Ionkov Cc: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c4b8add83c93306b07d78469fd351dc462e4b66 Author: Paul Jackson Date: Mon Nov 28 13:44:05 2005 -0800 [PATCH] cpuset fork locking fix Move the cpuset_fork() call below the write_unlock_irq call in kernel/fork.c copy_process(). Since the cpuset-dual-semaphore-locking-overhaul.patch, the cpuset_fork() routine acquires task_lock(), so cannot be called while holding the tasklist_lock for write. Signed-off-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3148890bfa4f36c9949871264e06ef4d449eeff9 Author: Nick Piggin Date: Mon Nov 28 13:44:03 2005 -0800 [PATCH] mm: __alloc_pages cleanup fix I believe this patch is required to fix breakage in the asynch reclaim watermark logic introduced by this patch: http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=7fb1d9fca5c6e3b06773b69165a73f3fb786b8ee Just some background of the watermark logic in case it isn't clear... Basically what we have is this: --- pages_high | | (a) | --- pages_low | | (b) | --- pages_min | | (c) | --- 0 Now when pages_low is reached, we want to kick asynch reclaim, which gives us an interval of "b" before we must start synch reclaim, and gives kswapd an interval of "a" before it need go back to sleep. When pages_min is reached, normal allocators must enter synch reclaim, but PF_MEMALLOC, ALLOC_HARDER, and ALLOC_HIGH (ie. atomic allocations, recursive allocations, etc.) get access to varying amounts of the reserve "c". Signed-off-by: Nick Piggin Cc: "Seth, Rohit" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aa877b3dc9f2a1fdffac4ea36bee97c21db11a69 Author: Glauber de Oliveira Costa Date: Mon Nov 28 13:44:02 2005 -0800 [PATCH] ext3: Wrong return value for EXT3_IOC_GROUP_ADD This patch corrects the return value for the EXT3_IOC_GROUP_ADD in case it fails due to the presence of multiple resizers at the filesystem. The problem is a little bit more serious than a wrong return value in this case, since the clause err=0 in the exit_journal path will lead to a call to update_backups which in turns causes a NULL pointer dereference. Signed-off-by: Glauber de Oliveira Costa Cc: "Stephen C. Tweedie" Cc: Andreas Dilger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad09d583106fadfdf751926107cfe35fba6bdbd4 Author: Hirokazu Takata Date: Mon Nov 28 13:44:00 2005 -0800 [PATCH] m32r: M3A-2170(Mappi-III) IDE support This patch is for supporting IDE interface for M3A-2170(Mappi-III) board. Signed-off-by: Mamoru Sakugawa Signed-off-by: Hirokazu Takata Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0332db5aff3eec73eead6d991782b0dee1376dc0 Author: Hirokazu Takata Date: Mon Nov 28 13:43:59 2005 -0800 [PATCH] m32r: Introduce atomic_cmpxchg and atomic_inc_not_zero operations Introduce atomic_cmpxchg and atomic_inc_not_zero operations for m32r. Signed-off-by: Hayato Fujiwara Signed-off-by: Hirokazu Takata Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 91f4ab056d85d23fa6955927fdeb1558673e8cd1 Author: Hirokazu Takata Date: Mon Nov 28 13:43:58 2005 -0800 [PATCH] m32r: Fix sys_tas() syscall This patch fixes a deadlock problem of the m32r SMP kernel. In the m32r kernel, sys_tas() system call is provided as a test-and-set function for userspace, for backward compatibility. In some multi-threading application program, deadlocks were rarely caused at sys_tas() funcion. Such a deadlock was caused due to a collision of __pthread_lock() and __pthread_unlock() operations. The "tas" syscall is repeatedly called by pthread_mutex_lock() to get a lock, while a lock variable's value is not 0. On the other hand, pthead_mutex_unlock() sets the lock variable to 0 for unlocking. In the previous implementation of sys_tas() routine, there was a possibility that a unlock operation was ignored in the following case: - Assume a lock variable (*addr) was equal to 1 before sys_tas() execution. - __pthread_unlock() operation is executed by the other processor and the lock variable (*addr) is set to 0, between a read operation ("oldval = *addr;") and the following write operation ("*addr = 1;") during a execution of sys_tas(). In this case, the following write operation ("*addr = 1;") overwrites the __pthread_unlock() result, and sys_tas() fails to get a lock in the next turn and after that. According to the attatched patch, sys_tas() returns 0 value in the next turn and deadlocks never happen. Signed-off-by: Hitoshi Yamamoto Signed-off-by: Hirokazu Takata Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bce61dd49d6ba7799be2de17c772e4c701558f14 Author: Ben Collins Date: Mon Nov 28 13:43:56 2005 -0800 [PATCH] Fix hardcoded cpu=0 in workqueue for per_cpu_ptr() calls Tracked this down on an Ultra Enterprise 3000. It's a 6-way machine. Odd thing about this machine (and it's good for finding bugs like this) is that the CPU id's are not 0 based. For instance, on my machine the CPU's are 6/7/10/11/14/15. This caused some NULL pointer dereference in kernel/workqueue.c because for single_threaded workqueue's, it hardcoded the cpu to 0. I changed the 0's to any_online_cpu(cpu_online_mask), which cpumask.h claims is "First cpu in mask". So this fits the same usage. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ee500f274914653a7d3dfca7d0140a3d21658e32 Author: Oleg Nesterov Date: Mon Nov 28 13:43:55 2005 -0800 [PATCH] fix 32bit overflow in timespec_to_sample() fix 32bit overflow in timespec_to_sample() Signed-off-by: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 46596338a10a54550ff03a6f60c28145a080296b Author: Chris Humbert Date: Mon Nov 28 13:43:54 2005 -0800 [PATCH] fix broken lib/genalloc.c genalloc improperly stores the sizes of freed chunks, allocates overlapping memory regions, and oopses after its in-band data is overwritten. Signed-off-by: Chris Humbert Cc: Jes Sorensen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7729ac5efe156129d172784fedeaddb2167a1914 Author: Oleg Drokin Date: Mon Nov 28 13:43:53 2005 -0800 [PATCH] reiserfs: fix 32-bit overflow in map_block_for_writepage() I now see another overflow in reiserfs that should lead to data corruptions with files that are bigger than 4G under certain circumstances when using mmap. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a9c3f78a32ddc4ec50f5da2cf2db5db6f442986 Author: Benjamin Herrenschmidt Date: Mon Nov 28 13:43:52 2005 -0800 [PATCH] Console rotation fixes Remove bogus usage of test/set_bit() from fbcon rotation code and just manipulate the bits directly. This fixes an oops on powerpc among others and should be faster. Seems to work fine on the G5 here. Signed-off-by: Benjamin Herrenschmidt Acked-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8080f231224ccd3169f39e73fd750ba98d5b98a7 Author: David Howells Date: Mon Nov 28 13:43:51 2005 -0800 [PATCH] FRV: Make the FRV arch work again The attached patch implements a bunch of small changes to the FRV arch to make it work again. It deals with the following problems: (1) SEM_DEBUG should be SEMAPHORE_DEBUG. (2) The argument list to pcibios_penalize_isa_irq() has changed. (3) CONFIG_HIGHMEM can't be used directly in #if as it may not be defined. (4) page->private is no longer directly accessible. (5) linux/hardirq.h assumes asm/hardirq.h will include linux/irq.h (6) The IDE MMIO access functions are given pointers, not integers, and so get type casting errors. (7) __pa() is passed an explicit u64 type in drivers/char/mem.c, but that can't be cast directly to a pointer on a 32-bit platform. (8) SEMAPHORE_DEBUG should not be contingent on WAITQUEUE_DEBUG as that no longer exists. (9) PREEMPT_ACTIVE is too low a value. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c13cf856cbe16aec3007604dc013cbf3a16c6686 Author: Andrew Morton Date: Mon Nov 28 13:43:48 2005 -0800 [PATCH] fork.c: proc_fork_connector() called under write_lock() Don't do that - it does GFP_KERNEL allocations, for a start. (Reported by Guillaume Thouvenin ) Acked-by: Matt Helsley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ff88a3b2f56ae4f3296ea957ea38f99f8bd0e5a8 Author: Andrew Morton Date: Mon Nov 28 13:43:47 2005 -0800 [PATCH] memory_sysdev_class is static So don't define it as extern in the header file. drivers/base/memory.c:28: error: static declaration of 'memory_sysdev_class' follows non-static declaration include/linux/memory.h:88: error: previous declaration of 'memory_sysdev_class' was here Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a9d9baa1e819b2f92f9cfa5240f766c535e636a6 Author: Ashok Raj Date: Mon Nov 28 13:43:46 2005 -0800 [PATCH] clean up lock_cpu_hotplug() in cpufreq There are some callers in cpufreq hotplug notify path that the lowest function calls lock_cpu_hotplug(). The lock is already held during cpu_up() and cpu_down() calls when the notify calls are broadcast to registered clients. Ideally if possible, we could disable_preempt() at the highest caller and make sure we dont sleep in the path down in cpufreq->driver_target() calls but the calls are so intertwined and cumbersome to cleanup. Hence we consistently use lock_cpu_hotplug() and unlock_cpu_hotplug() in all places. - Removed export of cpucontrol semaphore and made it static. - removed explicit uses of up/down with lock_cpu_hotplug() so we can keep track of the the callers in same thread context and just keep refcounts without calling a down() that causes a deadlock. - Removed current_in_hotplug() uses - Removed PF_HOTPLUG_CPU in sched.h introduced for the current_in_hotplug() temporary workaround. Tested with insmod of cpufreq_stat.ko, and logical online/offline to make sure we dont have any hang situations. Signed-off-by: Ashok Raj Cc: Zwane Mwaikambo Cc: Shaohua Li Cc: "Siddha, Suresh B" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e0f39591cc178026607fcbbe9a53be435fe8285d Author: Alan Stern Date: Mon Nov 28 13:43:44 2005 -0800 [PATCH] Workaround for gcc 2.96 (undefined references) LD .tmp_vmlinux1 mm/built-in.o(.text+0x100d6): In function `copy_page_range': : undefined reference to `__pud_alloc' mm/built-in.o(.text+0x1010b): In function `copy_page_range': : undefined reference to `__pmd_alloc' mm/built-in.o(.text+0x11ef4): In function `__handle_mm_fault': : undefined reference to `__pud_alloc' fs/built-in.o(.text+0xc930): In function `install_arg_page': : undefined reference to `__pud_alloc' make: *** [.tmp_vmlinux1] Error 1 Those missing references in mm/memory.c arise from this code in include/linux/mm.h, combined with the fact that __PGTABLE_PMD_FOLDED and __PGTABLE_PUD_FOLDED are both set and __ARCH_HAS_4LEVEL_HACK is not: /* * The following ifdef needed to get the 4level-fixup.h header to work. * Remove it when 4level-fixup.h has been removed. */ #if defined(CONFIG_MMU) && !defined(__ARCH_HAS_4LEVEL_HACK) static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address) { return (unlikely(pgd_none(*pgd)) && __pud_alloc(mm, pgd, address))? NULL: pud_offset(pgd, address); } static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address) { return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))? NULL: pmd_offset(pud, address); } #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */ With my configuration the pgd_none and pud_none routines are inlines returning a constant 0. Apparently the old compiler avoids generating calls to __pud_alloc and __pmd_alloc but still lists them as undefined references in the module's symbol table. I don't know which change caused this problem. I think it was added somewhere between 2.6.14 and 2.6.15-rc1, because I remember building several 2.6.14-rc kernels without difficulty. However I can't point to an individual culprit. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5cd9194a1b0b0fa219c31421ac64dfd38670ed49 Author: David S. Miller Date: Mon Nov 28 14:02:10 2005 -0800 [PATCH] sparc: convert IO remapping to VM_PFNMAP Here are the Sparc bits. Signed-off-by: Linus Torvalds commit 6aab341e0a28aff100a09831c5300a2994b8b986 Author: Linus Torvalds Date: Mon Nov 28 14:34:23 2005 -0800 mm: re-architect the VM_UNPAGED logic This replaces the (in my opinion horrible) VM_UNMAPPED logic with very explicit support for a "remapped page range" aka VM_PFNMAP. It allows a VM area to contain an arbitrary range of page table entries that the VM never touches, and never considers to be normal pages. Any user of "remap_pfn_range()" automatically gets this new functionality, and doesn't even have to mark the pages reserved or indeed mark them any other way. It just works. As a side effect, doing mmap() on /dev/mem works for arbitrary ranges. Sparc update from David in the next commit. Signed-off-by: Linus Torvalds commit bf6d9e23a36c8a01bf6fbb945387d8ca3870ff71 Author: Michael S. Tsirkin Date: Mon Nov 28 13:07:20 2005 -0800 IB/umad: fix RMPP handling ib_umad_write in user_mad.c is looking at rmpp_hdr field in MAD before checking that the MAD actually has the RMPP header. So for a MAD without RMPP header it looks like we are actually checking a bit inside M_Key, or something. Signed-off-by: Jack Morgenstein Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit cb3592be272d83011051dc49f4326355c01f1e1f Author: Arjan van de Ven Date: Mon Nov 28 21:04:11 2005 +0000 [SERIAL] mark several serial tables const This patch marks a few serial data structures const, moving them to .rodata where they won't false-share cachelines with things that get written to. Signed-off-by: Arjan van de Ven Signed-off-by: Russell King commit 24117defabc849a6ad5081ad0fafd0664bf55f13 Author: Pierre Ossman Date: Mon Nov 28 21:00:29 2005 +0000 [MMC] Fix protocol errors A review against MMC/SD specifications found some errors in the current implementation. Signed-off-by: Pierre Ossman Signed-off-by: Russell King commit 187a25863fe014486ee834164776b2a587d6934d Author: Michael S. Tsirkin Date: Mon Nov 28 11:19:43 2005 -0800 IB/mthca: reset QP's last pointers when transitioning to reset state last pointer is not updated when QP is modified to reset state. This causes data corruption if WQEs are already posted on the queue. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit dce200670d63615120de17d4aed0a4fd777cc825 Author: Vasily Averin Date: Sun Nov 27 20:15:06 2005 +0300 [SCSI] aic7xxx: reset handler selects a wrong command To transport scsi reset command to device aic7xxx reset handler looks at the driver's pending_list and searches any proper command. However the search condition has been inverted: ahc_match_scb() returns TRUE if a matched command is found. As a result the reset on required devices did not turn out well, a correctly working neighbour device may be surprised by the reset. aic7xxx reset handler reports about the success, but really the original situation is not corrected yet. Signed-off-by: Vasily Averin Naturally, there's a corresponding problem in the aic79xx driver, so I've also added the same fix for that. Signed-off-by: James Bottomley commit f5417612d787e6b619fd69616bbf95f1b895e900 Author: Sascha Hauer Date: Mon Nov 28 18:09:44 2005 +0000 [ARM] 3181/1: add PORT_ identifier for Hilscher netx uart Patch from Sascha Hauer This patch adds PORT_NETX for supporting the Hilscher netx embedded UARTs. Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit 0e1637420e94d501eb80763cce0c498f00d65b0a Author: Richard Purdie Date: Mon Nov 28 18:08:45 2005 +0000 [ARM] 3180/1: Update Zaurus defconfigs Patch from Richard Purdie This updates the Zaurus defconfigs. Poodle gets merged into corgi_defconfig and support for tosa and akita is enabled. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 243077f58f2ae2540e35d8ea01a15f13586d9e9e Author: Richard Purdie Date: Mon Nov 28 18:08:44 2005 +0000 [ARM] 3179/1: Update/correct Zaurus Kconfig entries Patch from Richard Purdie Add iWMMX Extentions for the pxa27x based Zaurus models and fix a couple of minor mistakes in the PXA Kconfig file. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 192cdc5809f676841d16d58e1f249176e38d7dda Author: Lucas Correia Villa Real Date: Mon Nov 28 18:08:43 2005 +0000 [ARM] 3178/1: S3C2400 - adds GPIO registers definitions to regs-gpio.h Patch from Lucas Correia Villa Real This patch adds definitions to GPIO registers for the S3C2400 into include/asm-arm/arch-s3c2410/regs-gpio.h. Signed-off-by: Lucas Correia Villa Real Signed-off-by: Russell King commit 3abb92722ab1784b419dadb5444daf8ea9636905 Author: Steve French Date: Mon Nov 28 08:16:13 2005 -0800 [CIFS] When file is deleted locally but later recreated on the server fix cifs negative dentries so they are freed faster (not requiring umount or readdir e.g.) so the client recognizes the new file on the server more quickly. Signed-off-by: Steve French commit 458af5439fe7ae7d95ca14106844e61f0795166c Author: Adrian Bunk Date: Sun Nov 27 00:36:37 2005 +0100 [PATCH] drivers/scsi/dpt_i2o.c: fix a NULL pointer dereference The Coverity checker spotted this obvious NULL pointer dereference. Signed-off-by: Adrian Bunk Acked-by: Mark Salyzyn Signed-off-by: Linus Torvalds commit 2012a116d9e6803fb072d0cfe1aae0cc4e6d6416 Author: Adrian Bunk Date: Sun Nov 27 00:37:36 2005 +0100 [PATCH] drivers/infiniband/core/mad.c: fix use-after-release case The Coverity checker spotted this obvious use-after-release bug caused by a wrong order of the cleanups. Signed-off-by: Adrian Bunk Signed-off-by: Linus Torvalds commit 16a631733135a625dd8bc83207553aaf34c0a72c Author: Adrian Bunk Date: Sun Nov 27 00:37:05 2005 +0100 [PATCH] drivers/message/i2o/pci.c: fix a NULL pointer dereference The Coverity checker spotted this obvious NULL pointer dereference. Signed-off-by: Adrian Bunk Acked-by: Markus Lidel Signed-off-by: Linus Torvalds commit b3eb67a2ab4e14fc6cc035907400b86462d174db Author: Trond Myklebust Date: Fri Nov 25 17:10:11 2005 -0500 SUNRPC: Funny looking code in __rpc_purge_upcall In __rpc_purge_upcall (net/sunrpc/rpc_pipe.c), the newer code to clean up the in_upcall list has a typo. Thanks to Vince Busam for spotting this! Signed-off-by: Trond Myklebust commit b37b03b7051493c9f9a6b336c9c0f81334885b7d Author: Trond Myklebust Date: Fri Nov 25 17:10:06 2005 -0500 NFS: Fix a spinlock recursion inside nfs_update_inode() In cases where the server has gone insane, nfs_update_inode() may end up calling nfs_invalidate_inode(), which again calls stuff that takes the inode->i_lock that we're already holding. In addition, given the sort of things we have in NFS these days that need to be cleaned up on inode release, I'm not sure we should ever be calling make_bad_inode(). Fix up spinlock recursion, and limit nfs_invalidate_inode() to clearing the caches, and marking the inode as being stale. Thanks to Steve Dickson for spotting this. Signed-off-by: Trond Myklebust commit ff6040667ad5a21fa1090e02941ecefb94ebe32c Author: Trond Myklebust Date: Fri Nov 25 17:10:01 2005 -0500 NFSv4: Fix typo in lock caching When caching locks due to holding a file delegation, we must always check against local locks before sending anything to the server. Signed-off-by: Trond Myklebust commit 36f20c6df75d599393d79c7feb6283b20913e3d5 Author: Trond Myklebust Date: Fri Nov 25 17:09:57 2005 -0500 NFSv4: Fix buggy nfs_wait_on_sequence() Signed-off-by: Trond Myklebust commit 79a558ffba25ecefe21a5203077971a08dda598b Author: Russell King Date: Fri Nov 25 15:59:01 2005 +0000 [ARM] Update mach-types Signed-off-by: Russell King commit 9f2209078089e223a773a77518e53016173ead39 Author: Russell King Date: Fri Nov 25 15:57:21 2005 +0000 [ARM] Realview core.c does not need mach-types.h Signed-off-by: Russell King commit 5edf71ae129167ac276ebac18b25ccc7bec6ac3e Author: Russell King Date: Fri Nov 25 15:52:51 2005 +0000 [ARM] Do not call flush_tlb_kernel_range() with IRQs disabled. We must not call TLB maintainence operations with interrupts disabled, otherwise we risk a lockup in the SMP IPI code. This means that consistent_free() can not be called from a context with IRQs disabled. In addition, we must not hold the lock in consistent_free when we call flush_tlb_kernel_range(). However, we must continue to prevent consistent_alloc() from re-using the memory region until we've finished tearing down the mapping and dealing with the TLB. Therefore, leave the vm_region entry in the list, but mark it inactive before dropping the lock and starting the tear-down process. After the mapping has been torn down, re-acquire the lock and remove the entry from the list. Signed-off-by: Russell King commit 3c0bdac3875505516eda1c6b6e68dd84eff3b231 Author: Russell King Date: Fri Nov 25 15:43:22 2005 +0000 [ARM] Remove mach-types.h from head.S We don't really need to check whether the machine type is Netwinder or CATS before setting up the PCI IO mapping for debugging. This allows us to eliminate asm/mach-types.h from head.S Signed-off-by: Russell King commit 225937bd5d69a40b886f47a7bc1f0837882586e3 Author: Russell King Date: Fri Nov 25 15:33:12 2005 +0000 [ARM] Remove asm/hardware.h include from SA1100 io.h Unfortunately, we have a symbol clash between the SA-1100 header and some drivers. Since everywhere which needs SA1100 specifics includes asm/hardware.h, we don't need to include it in the SA1100 io.h header. In file included from drivers/net/wireless/wavelan_cs.p.h:459, from drivers/net/wireless/wavelan_cs.c:60: drivers/net/wireless/wavelan_cs.h:97:1: warning: "LCSR" redefined In file included from include/asm/arch/hardware.h:56, from include/asm/hardware.h:16, from include/asm/arch/io.h:13, from include/asm/io.h:71, from drivers/net/wireless/wavelan_cs.p.h:433, from drivers/net/wireless/wavelan_cs.c:60: include/asm/arch/SA-1100.h:1907:1: warning: this is the location of the previous definition Signed-off-by: Russell King commit 9a94c5793a7b44720f19ebb71b636bc9c31b44d8 Author: David Gibson Date: Thu Nov 24 13:34:56 2005 +1100 [PATCH] powerpc: More hugepage boundary case fixes Blah. The patch [0] I recently sent fixing errors with in_hugepage_area() and prepare_hugepage_range() for powerpc itself has an off-by-one bug. Furthermore, the related functions touches_hugepage_*_range() and within_hugepage_*_range() are also buggy. Some of the bugs, like those addressed in [0] originated with commit 7d24f0b8a53261709938ffabe3e00f88f6498df9 where we tweaked the semantics of where hugepages are allowed. Other bugs have been there essentially forever, and are due to the undefined behaviour of '<<' with shift counts greater than the type width (LOW_ESID_MASK could return non-zero for high ranges with the right congruences). The good news is that I now have a testsuite which should pick up things like this if they creep in again. [0] "powerpc-fix-for-hugepage-areas-straddling-4gb-boundary" Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit 55bb239e5464ecde046af3e45052ef06efda6444 Author: Stephen Rothwell Date: Tue Nov 22 12:05:26 2005 +1100 [PATCH] powerpc: remove arch/powerpc/include hack for 64 bit With the removal of include/asm-powerpc, we no longer need arch/powerpc/include/asm for the 64 bit build. We also do not need -Iarch/powerpc for the 64 bit build either. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 551c81e2d32c5867fb592091365d8c37e1509dce Author: Nathan Scott Date: Fri Nov 25 16:42:28 2005 +1100 [XFS] Resolve the xlog_grant_log_space hang, revert inline to macro. SGI-PV: 946205 SGI-Modid: xfs-linux-melb:xfs-kern:24567a Signed-off-by: Nathan Scott commit e0144ca55391556d781cb1c90fd6f00bb0c20760 Author: Nathan Scott Date: Fri Nov 25 16:42:22 2005 +1100 [XFS] Fix a case where attr2 format was being used unconditionally. SGI-PV: 941645 SGI-Modid: xfs-linux-melb:xfs-kern:24566a Signed-off-by: Nathan Scott commit 6b2cf618cc8445a03640d1e5e36829352e297017 Author: Felix Blyakher Date: Fri Nov 25 16:42:13 2005 +1100 [XFS] Tight loop in xfs_finish_reclaim_all prevented the xfslogd to run its queue of IO completion callbacks, thus creating the deadlock between umount and xfslogd. Breaking the loop solves the problem. SGI-PV: 943821 SGI-Modid: xfs-linux-melb:xfs-kern:202363a Signed-off-by: Felix Blyakher Signed-off-by: Nathan Scott commit a4656391b76ed93faed724c5963f033164ee477e Author: Nathan Scott Date: Fri Nov 25 16:41:57 2005 +1100 [XFS] Fix a 32 bit value wraparound when providing a mapping for a large direct write. SGI-PV: 944820 SGI-Modid: xfs-linux-melb:xfs-kern:24351a Signed-off-by: Nathan Scott commit f33c6797bccc695c4c85885f2c676ad4c8fed98d Author: Christoph Hellwig Date: Fri Nov 25 16:41:47 2005 +1100 [XFS] handle error returns from freeze_bdev SGI-PV: 945483 SGI-Modid: xfs-linux-melb:xfs-kern:201884a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit 55b02d74e126df70fb6b92a0e4e4bed2f0a13fe4 Author: Eric Sandeen Date: Fri Nov 25 16:41:33 2005 +1100 [XFS] Fix potential overflow in xfs_iomap_t delta for very large extents SGI-PV: 945311 SGI-Modid: xfs-linux-melb:xfs-kern:201708a Signed-off-by: Eric Sandeen Signed-off-by: Nathan Scott commit 6d9885a8ce45cd9b7d36517ee823a480eaf95c02 Author: Jasper Spaans Date: Thu Nov 24 16:53:36 2005 +0100 [PATCH] fbcon: fix obvious bug in fbcon logo rotation code This code fixes a tiny problem with the recent fbcon rotation changes: fb_prepare_logo doesn't check the return value of fb_find_logo and that causes a crash for my while booting. Obvious & working & tested fix is here. Signed-off-by: Jasper Spaans Acked-by: Antonino Daplas Signed-off-by: Linus Torvalds commit cf65f1623dd005ddfb1cbba20af3423a6c638dbe Author: Dave Airlie Date: Thu Nov 24 21:41:14 2005 +1100 drm: fix quiescent locking A fix for a locking bug which is triggered when a client tries to lock with flag DMA_QUIESCENT (typically the X server), but gets interrupted by a signal. The locking IOCTL should then return an error, but if DMA_QUIESCENT succeeds it returns 0, and the client falsely thinks it has the lock. In addition The client waits for DMA_QUISCENT and possibly DMA_READY without having the lock. From: Thomas Hellstrom Signed-off-by: Dave Airlie commit 569cfaadb0ea21bfcedac85dbc5147b4a9ed42d2 Author: Nicolas Kaiser Date: Wed Nov 23 15:45:58 2005 -0800 [PATCH] usb serial: remove redundant include remove redundant include Signed-off-by: Nicolas Kaiser Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 8dd396ec7bf706fe85d8c6792b478ee6f09e8de6 Author: Randy Dunlap Date: Wed Nov 23 15:45:53 2005 -0800 [PATCH] USB: kernel-doc for linux/usb.h Fix kernel-doc warning in linux/usb.h. Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 63dc3ff3e019287e8cb4647808de1d93acddd006 Author: David Härdeman Date: Wed Nov 23 15:45:49 2005 -0800 [PATCH] USB: fix USB key generates ioctl_internal_command errors issue On Wed, Nov 16, 2005 at 06:34:24PM -0800, Pete Zaitcev wrote: >On Wed, 16 Nov 2005 23:52:32 +0100, David Härdeman wrote: >> usb-storage: waiting for device to settle before scanning >> Vendor: I0MEGA Model: UMni1GB*IOM2K4 Rev: 1.01 >> Type: Direct-Access ANSI SCSI revision: 02 >> SCSI device sda: 2048000 512-byte hdwr sectors (1049 MB) >> sda: Write Protect is off >> sda: Mode Sense: 00 00 00 00 >> sda: assuming drive cache: write through >> ioctl_internal_command: <8 0 0 0> return code = 8000002 >> : Current: sense key=0x0 >> ASC=0x0 ASCQ=0x0 >> SCSI device sda: 2048000 512-byte hdwr sectors (1049 MB) > >I think it's harmless. I saw things like that, and initially I plugged >them with workarounds like this: Thanks for the pointer, and yes, it is harmless, but it floods the console with the messages which hides other (potentially important) messages...following your example I've made a patch which fixes the problem. Signed-off-by: David Härdeman Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 21b1861fb2ba5b25b32c63bc540bbc7ca1d186f8 Author: David Brownell Date: Wed Nov 23 15:45:42 2005 -0800 [PATCH] USB: ohci, move ppc asic tweaks nearer pci This should fix a suspend/resume issues that appear with OHCI on some PPC hardware. The PCI layer should doesn't have the hooks needed for such ASIC-specific hooks (in this case, software clock gating), so this moves the code to do that into hcd-pci.c ... where it can be done after the relevant PCI PM state transition (to/from D3). Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 188075211cc75a31190de4a19a084e3d83ee1c89 Author: David Brownell Date: Wed Nov 23 15:45:37 2005 -0800 [PATCH] USB: EHCI updates split init/reinit logic for resume Moving the PCI-specific parts of the EHCI driver into their own file created a few issues ... notably on resume paths which (like swsusp) require re-initializing the controller. This patch: - Splits the EHCI startup code into run-once HCD setup code and separate "init the hardware" reinit code. (That reinit code is a superset of the "early usb handoff" code.) - Then it makes the PCI init code run both, and the resume code only run the reinit code. - It also removes needless pci wrappers around EHCI start/stop methods. - Removes a byteswap issue that would be seen on big-endian hardware. The HCD glue still doesn't actually provide a good way to do all this run-one init stuff in one place though. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit abcc94480634f6fe9fc29b821261e8162c87ddd2 Author: David Brownell Date: Wed Nov 23 15:45:32 2005 -0800 [PATCH] USB: EHCI updates mostly whitespace cleanups This cleans up the recent updates to EHCI PCI support: - Gets rid of checks for "is this a PCI device", they're no longer needed since this is now all PCI-only code. - Reduce log spamming: MWI is only interesting in the atypical case that it can actually be used. - Whitespace cleanup, as appropriate for a new file with no other pending patches. So other than that minor logging change, no functional updates. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit f03c17fc9abe8582d6ad830290b3093fdf1eea61 Author: David Brownell Date: Wed Nov 23 15:45:28 2005 -0800 [PATCH] USB: EHCI updates This fixes some bugs in EHCI suspend/resume that joined us over the past few releases (as usbcore, PCI, pmcore, and other components evolved): - Removes suspend and resume recursion from the EHCI driver, getting rid of the USB_SUSPEND special casing. - Updates the wakeup mechanism to work again; there's a newish usbcore call it needs to use. - Provide simpler tests for "do we need to restart from scratch", to address another case where PCI Vaux was lost. (In this case it was restoring a swsusp snapshot, but there could be others.) Un-exports a symbol that was temporarily exported. A notable change from previous version is that this doesn't move the spinlock init, so there's still a resume/reinit path bug. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit b4723ae3cc66fd067a8e661b5c05d5bd41be29b5 Author: Ian Abbott Date: Wed Nov 23 15:45:23 2005 -0800 [PATCH] USB: ftdi_sio: new IDs for KOBIL devices This patch adds two new devices to the ftdi_sio driver's device ID table. The device IDs were supplied by Stefan Nies of KOBIL Systems for two of their devices using the FTDI chip. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 0b67ba63605a0107f4f3f6d928cdea1e8953fb63 Author: Damian Wrobel Date: Wed Nov 23 15:45:17 2005 -0800 [PATCH] USB: SN9C10x driver - bad page state fix This patch solves the following problem I've already discovered on the latest 2.6.15-rc1-git1 kernel: Nov 13 07:37:28 wrobel kernel: Bad page state at free_hot_cold_page (in process 'motion', page c164e020) Nov 13 07:37:28 wrobel kernel: flags:0x40000400 mapping:00000000 mapcount:0 count:0 Nov 13 07:37:28 wrobel kernel: Backtrace: Nov 13 07:37:28 wrobel kernel: [] bad_page+0x85/0xbe Nov 13 07:37:28 wrobel kernel: [] free_hot_cold_page+0x54/0x129 Nov 13 07:37:28 wrobel kernel: [] __vunmap+0xa9/0xfe Nov 13 07:37:28 wrobel kernel: [] vmalloc_to_page+0x34/0x55 Nov 13 07:37:28 wrobel kernel: [] vfree+0x27/0x35 Nov 13 07:37:28 wrobel kernel: [] sn9c102_release_buffers+0x30/0x3f [sn9c102] Nov 13 07:37:28 wrobel kernel: [] sn9c102_release+0x37/0xeb [sn9c102] Nov 13 07:37:28 wrobel kernel: [] __fput+0xa9/0x1aa Nov 13 07:37:28 wrobel kernel: [] filp_close+0x49/0x6d Nov 13 07:37:30 wrobel kernel: [] sys_close+0x74/0x95 Nov 13 07:37:30 wrobel kernel: [] syscall_call+0x7/0xb Nov 13 07:37:31 wrobel kernel: Trying to fix it up, but a reboot is needed Signed-off-by: Damian Wrobel Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit cac1a293469a868fab1ecc2dc1b6441728f7e0e7 Author: Daniel Marjamäki Date: Wed Nov 23 15:45:09 2005 -0800 [PATCH] PCI: direct.c: DBG The DBG() call where updated with the appropriate KERN_* symbol. Signed-off-by: Daniel Marjamäki Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit f366633fc31db1668b4c261e94816d7304ae9810 Author: Randy Dunlap Date: Wed Nov 23 15:45:04 2005 -0800 [PATCH] PCI: kernel-doc fix for pci-acpi.c Fix kernel-doc warning in pci/pci-acpi.c. Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit ed6d14f9760857c745206c978b80352fc09cfd19 Author: Rajesh Shah Date: Wed Nov 23 15:44:59 2005 -0800 [PATCH] PCI: remove bogus resource collision error When attempting to hotadd a PCI card with a bridge on it, I saw the kernel reporting resource collision errors even when there were really no collisions. The problem is that the code doesn't skip over "invalid" resources with their resource type flag not set. Others have reported similar problems at boot time and for non-bridge PCI card hotplug too, where the code flags a resource collision for disabled ROMs. This patch fixes both problems. Signed-off-by: Rajesh Shah Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 5a49f2036ad14092c11d09f186da86fd5ae49a05 Author: Rajesh Shah Date: Wed Nov 23 15:44:54 2005 -0800 [PATCH] PCI Express Hotplug: clear sticky power-fault bit Per the PCI Express spec, the power-fault-detected bit in the slot status register can be set anytime hardware detects a power fault, regardless of whether the slot has a device populated in it or not. This bit is sticky and must be explicitly cleared. This patch is needed to allow hot-add after such a power fault has been detected. Signed-off-by: Rajesh Shah Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit dcb890749bbe63af96163c499e9c86b441fb6c83 Author: Daniel Marjamäkia Date: Wed Nov 23 15:44:49 2005 -0800 [PATCH] PCI: trivial printk updates in common.c Modified common.c so it's using the appropriate KERN_* in printk() calls. Signed-off-by: Daniel Marjamäkia Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 657a19ebb74128ec52f20b7e34705bdeadc59400 Author: Eugeniy Meshcheryakov Date: Wed Nov 23 15:44:35 2005 -0800 [PATCH] hwmon: hdaps missing an axis Trivial patch to report both hdaps axises to the joystick device, not just the X axis. Signed-off-by: Robert Love Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 07eab46db7f78b2ed49bc9e41eda80695f93886f Author: Jean Delvare Date: Wed Nov 23 15:44:31 2005 -0800 [PATCH] hwmon: Fix missing it87 fan div init Fix a bug where setting the low fan speed limits will not work if no data was ever read through the sysfs interface and the fan clock dividers have not been explicitely set yet either. The reason is that data->fan_div[nr] may currently be used before it is initialized from the chip register values. The fix is to explicitely initialize data->fan_div[nr] before using it. Bug reported, and fix tested, by Nicolas Mailhot. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit d0d3cd6965d8e957764663cbb5aaa5ff486a2616 Author: Jean Delvare Date: Wed Nov 23 15:44:26 2005 -0800 [PATCH] hwmon: Fix lm78 VID conversion Fix the lm78 VID reading, which I accidentally broke while making this driver use the common vid_from_reg function rather than reimplementing its own in 2.6.14-rc1. I'm not proud of it, trust me. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 2723ab91cb4019def10bdb01b0fecb85e6ac7884 Author: Yuan Mu Date: Wed Nov 23 15:44:21 2005 -0800 [PATCH] hwmon: Fix missing boundary check when setting W83627THF in0 limits Add SENSORS_LIMIT in store VCore limit functions. This fixes a potential u8 overflow on out-of-range user input. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 1adc123079207bf9ba5bcf3dbf52bcdb22f82c7c Author: Josh Boyer Date: Wed Nov 23 15:44:15 2005 -0800 [PATCH] Add more SCM trees to MAINTAINERS Greg requested a patch to update MAINTAINERS with more SCM entries. The patch below is what I've found so far. Signed-off-by: Josh Boyer Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 50306fb5398f0aac65047c966a4341adee37f512 Author: Jody McIntyre Date: Wed Nov 23 15:44:03 2005 -0800 [PATCH] Clarify T: field in MAINTAINERS Pavel Machek points out that for git repos, what we include is not actually a URL. It is undesirable to use a URL since git repos can be accessed in many different ways. Signed-off-by: Jody McIntyre Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 2c560ace1531870715fdfdae36fa9d75f4e63ae1 Author: Josh Boyer Date: Wed Nov 23 15:43:57 2005 -0800 [PATCH] MTD git tree location added to MAINTAINERS Here's the MTD one. More later as I find them. Signed-off-by: Josh Boyer Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 2b08c8d0468866f86da97f836c6ac14338cb81a9 Author: Alan Stern Date: Wed Nov 23 15:43:50 2005 -0800 [PATCH] Small fixes to driver core This patch (as603) makes a few small fixes to the driver core: Change spin_lock_irq for a klist lock to spin_lock; Fix reference count leaks; Minor spelling and formatting changes. Signed-off-by: Alan Stern Acked-by Patrick Mochel Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 133747e8d1e912863edfb3869e36b97b9939d4fc Author: Olaf Rempel Date: Wed Nov 23 19:04:08 2005 -0800 [BRIDGE]: recompute features when adding a new device We must recompute bridge features everytime the list of underlying devices changes, or we might end up with features that are not supported by all devices (eg. NETIF_F_TSO) This patch adds the missing recompute when adding a device to the bridge. Signed-off-by: Olaf Rempel Signed-off-by: David S. Miller commit de919820cf7fe6674cdf47f8f47d2af284e4309f Author: Benoit Boissinot Date: Wed Nov 23 19:03:46 2005 -0800 [NETFILTER]: ip_conntrack_netlink.c needs linux/interrupt.h net/ipv4/netfilter/ip_conntrack_netlink.c: In function 'ctnetlink_dump_table': net/ipv4/netfilter/ip_conntrack_netlink.c:409: warning: implicit declaration of function 'local_bh_disable' net/ipv4/netfilter/ip_conntrack_netlink.c:427: warning: implicit declaration of function 'local_bh_enable' Signed-off-by: Benoit Boissinot Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 479ef592f3664dd629417098c8599261c0f689ab Author: Oleg Drokin Date: Wed Nov 23 13:37:47 2005 -0800 [PATCH] 32bit integer overflow in invalidate_inode_pages2() Fix a 32 bit integer overflow in invalidate_inode_pages2_range. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 02b7068221eed702a37527fa2da4d63a27b3126a Author: Andrew Morton Date: Wed Nov 23 13:37:47 2005 -0800 [PATCH] jffs2 debug gcc-2.9x fix Work around gcc-2.95.x macro expansion bug. Cc: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e391dc9e3fec68922137ae317bf680a74656c1b Author: David Gibson Date: Wed Nov 23 13:37:45 2005 -0800 [PATCH] powerpc: fix for hugepage areas straddling 4GB boundary Commit 7d24f0b8a53261709938ffabe3e00f88f6498df9 fixed bugs in the ppc64 SLB miss handler with respect to hugepage handling, and in the process tweaked the semantics of the hugepage address masks in mm_context_t. Unfortunately, it left out a couple of necessary changes to go with that change. First, the in_hugepage_area() macro was not updated to match, second prepare_hugepage_range() was not updated to correctly handle hugepages regions which straddled the 4GB point. The latter appears only to cause process-hangs when attempting to map such a region, but the former can cause oopses if a get_user_pages() is triggered at the wrong point. This patch addresses both bugs. Signed-off-by: David Gibson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e9b15b54d3646108bbd3e054158b402025d3e704 Author: Benjamin Herrenschmidt Date: Wed Nov 23 13:37:44 2005 -0800 [PATCH] Fix crash in unregister_console() If unregister_console() is inadvertently called while no consoles are registered, it will crash trying to dereference NULL pointer. It is necessary to fix that because register_console() provides no indication that it actually registered the console passed in. In fact, it may well decide not to register it based on various things... (akpm: It'd be better to make register_console() return something and fix the callers. All 106 of them...) Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 962b564cf1ec8041e8890a3c3847e3a630a08f42 Author: Oleg Nesterov Date: Wed Nov 23 13:37:43 2005 -0800 [PATCH] fix do_wait() vs exec() race When non-leader thread does exec, de_thread adds old leader to the init's ->children list in EXIT_ZOMBIE state and drops tasklist_lock. This means that release_task(leader) in de_thread() is racy vs do_wait() from init task. I think de_thread() should set old leader's state to EXIT_DEAD instead. Signed-off-by: Oleg Nesterov Cc: george anzinger Cc: Roland Dreier Cc: Ingo Molnar Cc: Linus Torvalds Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8bf1101bd52573e0573e374d56d2feecdbb5e444 Author: Jim Keniston Date: Wed Nov 23 13:37:42 2005 -0800 [PATCH] kprobes: Fix return probes on sys_execve Fix a bug in kprobes that can cause an Oops or even a crash when a return probe is installed on one of the following functions: sys_execve, do_execve, load_*_binary, flush_old_exec, or flush_thread. The fix is to remove the call to kprobe_flush_task() in flush_thread(). This fix has been tested on all architectures for which the return-probes feature has been implemented (i386, x86_64, ppc64, ia64). Please apply. BACKGROUND Up to now, we have called kprobe_flush_task() under two situations: when a task exits, and when it execs. Flushing kretprobe_instances on exit is correct because (a) do_exit() doesn't return, and (b) one or more return-probed functions may be active when a task calls do_exit(). Neither is the case for sys_execve() and its callees. Initially, the mistaken call to kprobe_flush_task() on exec was harmless because we put the "real" return address of each active probed function back in the stack, just to be safe, when we recycled its kretprobe_instance. When support for ppc64 and ia64 was added, this safety measure couldn't be employed, and was eventually dropped even for i386 and x86_64. sys_execve() and its callees were informally blacklisted for return probes until this fix was developed. Acked-by: Prasanna S Panchamukhi Signed-off-by: Jim Keniston Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7c72aaf29621d29ed19fd68c44edb45321645049 Author: Hugh Dickins Date: Wed Nov 23 13:37:40 2005 -0800 [PATCH] mm: fill arch atomic64 gaps alpha, sparc64, x86_64 are each missing some primitives from their atomic64 support: fill in the gaps I've noticed by extrapolating asm, follow the groupings in each file. But powerpc and parisc still lack atomic64. Signed-off-by: Hugh Dickins Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: "David S. Miller" Cc: Andi Kleen Cc: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ce774b4808c019c2f143ff5dea1a1b094ff01e1 Author: Hugh Dickins Date: Wed Nov 23 13:37:39 2005 -0800 [PATCH] mm: powerpc init_mm without ptlock Restore an earlier mod which went missing in the powerpc reshuffle: the 4xx mmu_mapin_ram does not need to take init_mm.page_table_lock. Signed-off-by: Hugh Dickins Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 01edcd891c3e9f4bb992ff2ceb69836bf76f8ddf Author: Hugh Dickins Date: Wed Nov 23 13:37:39 2005 -0800 [PATCH] mm: powerpc ptlock comments Update comments (only) on page_table_lock and mmap_sem in arch/powerpc. Removed the comment on page_table_lock from hash_huge_page: since it's no longer taking page_table_lock itself, it's irrelevant whether others are; but how it is safe (even against huge file truncation?) I can't say. Signed-off-by: Hugh Dickins Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cc3327e7dfc16a9a3e164075234c869867a59e45 Author: Hugh Dickins Date: Wed Nov 23 13:37:38 2005 -0800 [PATCH] mm: unbloat get_futex_key The follow_page changes in get_futex_key have left it with two almost identical blocks, when handling the rare case of a futex in a nonlinear vma. get_user_pages will itself do that follow_page, and its additional find_extend_vma is hardly any overhead since the vma is already cached. Let's just delete the follow_page block and let get_user_pages do it. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7b6ac9dffe6f4dd8776908b234ac1410ed15f112 Author: Hugh Dickins Date: Wed Nov 23 13:37:37 2005 -0800 [PATCH] mm: update split ptlock Kconfig Closer attention to the arithmetic shows that neither ppc64 nor sparc really uses one page for multiple page tables: how on earth could they, while pte_alloc_one returns just a struct page pointer, with no offset? Well, arm26 manages it by returning a pte_t pointer cast to a struct page pointer, harumph, then compensating in its pmd_populate. But arm26 is never SMP, so it's not a problem for split ptlock either. And the PA-RISC situation has been recently improved: CONFIG_PA20 works without the 16-byte alignment which inflated its spinlock_t. But the current union of spinlock_t with private does make the 7xxx struct page significantly larger, even without debug, so disable its split ptlock. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c101e77301877086e6f977fcfb140d1cbbe23fd5 Author: Andrew Morton Date: Wed Nov 23 13:37:36 2005 -0800 [PATCH] revert floppy-fix-read-only-handling This fix causes problems on the very first floppy access - we haven't yet talked to the FDC so we don't know which state the write-protect tab is in. Revert for now. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3238c448c6e26d7c26d2e9b070ef149d066cb6c2 Author: Adam Brooks Date: Wed Nov 23 22:45:27 2005 +0000 [ARM] 3173/1: Fix to allow 2.6.15-rc2 to compile for IOP3xx boards Patch from Adam Brooks Fixes an issue in 2.6.15-rc2 that prevented compilation of kernels for IOP3xx boards. Signed-off-by: Adam Brooks Signed-off-by: Russell King commit c2b5a251b9feca727661f1a3278cafb1de4c80f3 Author: Matthew Wilcox Date: Thu Nov 3 07:51:18 2005 -0700 [PATCH] Check the irq number is within bounds Most of the functions already check. Do the ones that didn't. Signed-off-by: Matthew Wilcox Signed-off-by: Linus Torvalds commit 2d0ebb36038c0626cde662a3b06da9787cfb68c3 Author: Linus Torvalds Date: Wed Nov 23 08:44:05 2005 -0800 Revert "[NET]: Shut up warnings in net/core/flow.c" This reverts commit af2b4079ab154bd12e8c12b02db5f31b31babe63 Changing the #define to an inline function breaks on non-SMP builds, since wuite a few places in the kernel do not implement the ipi handler when compiling for UP. Signed-off-by: Linus Torvalds commit 7655f493b74f3048c02458bc32cd0b144f7b394f Author: Dave Airlie Date: Wed Nov 23 22:12:59 2005 +1100 drm: move is_pci to the end of the structure We memset the structure across opens except for the flags. The correct fix is more intrusive but this should fix a problem with bad iounmaps seen on AGP radeons acting like PCI ones. Signed-off-by: Dave Airlie commit c41f47121d8bf44b886ef2039779dab8c1e3a25f Author: Dave Airlie Date: Wed Nov 23 22:09:13 2005 +1100 drm: add __GFP_COMP to the drm_alloc_pages The DRM only uses drm_alloc_pages for non-SG PCI cards using DRM. Signed-off-by: Hugh Dickins Signed-off-by: Dave Airlie commit bd07ed2b4d7071716c09895e19849e8b04991656 Author: Dave Airlie Date: Wed Nov 23 21:45:43 2005 +1100 I think that if a PCI bus is a root bus, attached to a host bridge not a PCI->PCI bridge, then bus->self is allowed to be NULL. Certainly that's the case on my Pegasos, and it makes the MGA DRM driver oops... Signed-off-by: David Woodhouse Signed-off-by: Dave Airlie commit 91f14480a55a7487d61c3fb40500380099e0da50 Author: Olof Johansson Date: Mon Nov 21 02:12:32 2005 -0600 [PATCH] powerpc: update my email address Email address update, changing old work address to personal (permanent) one. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit 1778d55edb62753a92b979fa57072c2e1ff3d062 Author: Linus Torvalds Date: Tue Nov 22 21:58:37 2005 -0800 compat-ioctl.c: fix compile with no CONFIG_JBD The ext3 compat-ioctl translation wants to translate data structures that only declared when CONFIG_JBD was enabled. So make play nicely even when we don't actually end up using it. Acked-by: Andrew Morton Acked-by: Jeffrey Hundstad Acked-by: Zan Lynx Signed-off-by: Linus Torvalds commit ac3461ad632e86e7debd871776683c05ef3ba4c6 Author: Linus Torvalds Date: Tue Nov 22 19:39:30 2005 -0800 Fix up GFP_ZONEMASK for GFP_DMA32 usage There was some confusion about the different zone usage, this should fix up the resulting mess in the GFP zonemask handling. The different zone usage is still confusing (it's very easy to mix up the individual zone numbers with the GFP zone _list_ numbers), so we might want to clean up some of this in the future, but in the meantime this should fix the actual problems. Acked-by: Andi Kleen Signed-off-by: Linus Torvalds commit a9b1ef8ec7df544b236b19fb6cc42ed2591b65cd Author: Adrian Bunk Date: Tue Nov 22 15:30:29 2005 -0800 [SPARC]: drivers/sbus/char/aurora.c: "extern inline" -> "static inline" "extern inline" doesn't make much sense. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit e6d184e33109010412ad1d59719af74755a935f4 Author: Neil Horman Date: Tue Nov 22 14:56:32 2005 -0800 [NET]: Fix ifenslave to not fail on lack of IP information Patch to ifenslave so that under older ABI versions, a failure to propogate ip information from master to slave does not result in a filure to enslave the slave device. Signed-off-by: Neil Horman Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 00cb277a4a1fb76aafb2fb28aa99f30546e619c5 Author: Pablo Neira Ayuso Date: Tue Nov 22 14:54:34 2005 -0800 [NETFILTER] ctnetlink: Fix refcount leak ip_conntrack/nat_proto Remove proto == NULL checking since ip_conntrack_[nat_]proto_find_get always returns a valid pointer. Fix missing ip_conntrack_proto_put in some paths. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 0ff60a45678e67b2547256a636fd00c1667ce4fa Author: Jamal Hadi Salim Date: Tue Nov 22 14:47:37 2005 -0800 [IPV4]: Fix secondary IP addresses after promotion This patch fixes the problem with promoting aliases when: a) a single primary and > 1 secondary addresses b) multiple primary addresses each with at least one secondary address Based on earlier efforts from Brian Pomerantz , Patrick McHardy and Thomas Graf Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit c27bd492fd84c590767a3c0f9f74e637b17af138 Author: Herbert Xu Date: Tue Nov 22 14:41:50 2005 -0800 [NETLINK]: Use tgid instead of pid for nlmsg_pid Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit af2b4079ab154bd12e8c12b02db5f31b31babe63 Author: Russell King Date: Tue Nov 22 14:38:04 2005 -0800 [NET]: Shut up warnings in net/core/flow.c Not really a network problem, more a !SMP issue. net/core/flow.c:295: warning: statement with no effect flow.c:295: smp_call_function(flow_cache_flush_per_cpu, &info, 1, 0); Fix this by converting the macro to an inline function, which also increases the typechecking for !SMP builds. Signed-off-by: Russell King Signed-off-by: David S. Miller commit b3a5225f31180322fd7d692fd4cf786702826b94 Author: Roman Zippel Date: Mon Nov 21 21:32:38 2005 -0800 [PATCH] prefer pkg-config for the QT check This makes pkg-config now the prefered way to configure QT and properly fixes the recent Fedora breakage and leaves the old QT detection as fallback mechanism. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7692c5dd48026d952199c2b97c3418f927cc0407 Author: Jonathan E Brassow Date: Mon Nov 21 21:32:37 2005 -0800 [PATCH] device-mapper raid1: drop mark_region spinlock fix The spinlock region_lock is held while calling mark_region which can sleep. Drop the spinlock before calling that function. A region's state and inclusion in the clean list are altered by rh_inc and rh_dec. The state variable is set to RH_CLEAN in rh_dec, but only if 'pending' is zero. It is set to RH_DIRTY in rh_inc, but not if it is already so. The changes to 'pending', the state, and the region's inclusion in the clean list need to be atomicly. Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 233886dd32ad71daf9c21bf3728c0933a94870f0 Author: jblunck@suse.de Date: Mon Nov 21 21:32:36 2005 -0800 [PATCH] device-mapper snapshot: bio_list fix bio_list_merge() should do nothing if the second list is empty - not oops. Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 640eb3b0456f8273726d31160aa24568ae703eec Author: Stefan Bader Date: Mon Nov 21 21:32:35 2005 -0800 [PATCH] device-mapper dm-mpath: endio spinlock fix do_end_io() can be called without interrupts blocked. Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0e56822d30184d0da35a6ecc51f38c4ceb457a80 Author: Alasdair G Kergon Date: Mon Nov 21 21:32:34 2005 -0800 [PATCH] device-mapper: mirror log bitset fix The linux bitset operators (test_bit, set_bit etc) work on arrays of "unsigned long". dm-log uses such bitsets but treats them as arrays of uint32_t, only allocating and zeroing a multiple of 4 bytes (as 'clean_bits' is a uint32_t). The patch below fixes this problem. The problem is specific to 64-bit big endian machines such as s390x or ppc-64 and can prevent pvmove terminating. In the simplest case, if "region_count" were (say) 30, then bitset_size (below) would be 4 and bitset_uint32_count would be 1. Thus the memory for this butset, after allocation and zeroing would be 0 0 0 0 X X X X On a bigendian 64bit machine, bit 0 for this bitset is in the 8th byte! (and every bit that dm-log would use would be in the X area). 0 0 0 0 X X X X ^ here which hasn't been cleared properly. As the dm-raid1 code only syncs and counts regions which have a 0 in the 'sync_bits' bitset, and only finishes when it has counted high enough, a large number of 1's among those 'X's will cause the sync to not complete. It is worth noting that the code uses the same bitsets for in-memory and on-disk logs. As these bitsets are host-endian and host-sized, this means that they cannot safely be moved between computers with Signed-off-by: Neil Brown Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c4cc66351a24da5feec298be2da59a85f68dd3ea Author: Alasdair G Kergon Date: Mon Nov 21 21:32:33 2005 -0800 [PATCH] device-mapper: list_versions fix In some circumstances the LIST_VERSIONS output is truncated because the size calculation forgets about a 'uint32_t' in each structure - but the inclusion of the whole of ALIGN_MASK frequently compensates for the omission. This is a quick workaround to use an upper bound. (The code ought to be fixed to supply the actual size.) Running 'dmsetup targets' may demonstrate the problem: when I run it, the last line comes out as 'erro' instead of 'error'. Consequently, 'lvcreate --type error' doesn't work. Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6fcc80d03b41162ed88c3fb542aca9b654bc414 Author: Kiyoshi Ueda Date: Mon Nov 21 21:32:32 2005 -0800 [PATCH] device-mapper dm-ioctl: missing put in table load error case An error path in table_load() forgets to release a table that won't now be referenced. Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 98766fbe604bc198ced93c57220c2d4a78ad6c11 Author: Randy Dunlap Date: Mon Nov 21 21:32:31 2005 -0800 [PATCH] kernel Doc/ URL corrections Correct lots of URLs in Documentation/ Also a few minor whitespace cleanups and typo/spello fixes. Sadly there are still a lot of bad URLs remaining. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c52f1377d9cc4bedec5d4e1e3b22756b8978399 Author: Dave Jones Date: Mon Nov 21 21:32:30 2005 -0800 [PATCH] dell_rbu driver depends on x86[64] This driver only appears on IA32 & EM64T boxes. Signed-off-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 79e448bf2d71d52d28c99be4faff9cc51928f90b Author: Matthew Dobson Date: Mon Nov 21 21:32:29 2005 -0800 [PATCH] Fix a bug in scsi_get_command scsi_get_command() attempts to write into a structure that may not have been successfully allocated. Move this write inside the if statement that ensures we won't panic the kernel with a NULL pointer dereference. Signed-off-by: Matthew Dobson Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e738cf6d03786486b7e1adbaed1c5c4e14d23626 Author: Grant Coady Date: Mon Nov 21 21:32:28 2005 -0800 [PATCH] cpufreq: silence cpufreq for UP drivers/cpufreq/cpufreq.c: In function `cpufreq_remove_dev': drivers/cpufreq/cpufreq.c:696: warning: unused variable `cpu_sys_dev' Signed-off-by: Grant Coady Cc: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0bd0f9fb190a0fc0fb25b764c8b04869711f7657 Author: Eric Paris Date: Mon Nov 21 21:32:28 2005 -0800 [PATCH] hugetlb: fix race in set_max_huge_pages for multiple updaters of nr_huge_pages If there are multiple updaters to /proc/sys/vm/nr_hugepages simultaneously it is possible for the nr_huge_pages variable to become incorrect. There is no locking in the set_max_huge_pages function around alloc_fresh_huge_page which is able to update nr_huge_pages. Two callers to alloc_fresh_huge_page could race against each other as could a call to alloc_fresh_huge_page and a call to update_and_free_page. This patch just expands the area covered by the hugetlb_lock to cover the call into alloc_fresh_huge_page. I'm not sure how we could say that a sysctl section is performance critical where more specific locking would be needed. My reproducer was to run a couple copies of the following script simultaneously while [ true ]; do echo 1000 > /proc/sys/vm/nr_hugepages echo 500 > /proc/sys/vm/nr_hugepages echo 750 > /proc/sys/vm/nr_hugepages echo 100 > /proc/sys/vm/nr_hugepages echo 0 > /proc/sys/vm/nr_hugepages done and then watch /proc/meminfo and eventually you will see things like HugePages_Total: 100 HugePages_Free: 109 After applying the patch all seemed well. Signed-off-by: Eric Paris Acked-by: William Irwin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ef897c71a8985b62b7ec320a37376daaad364d0 Author: Antonino A. Daplas Date: Mon Nov 21 21:32:26 2005 -0800 [PATCH] vgacon: Fix usage of stale height value on vc initialization Reported by: Wayne E. Harlan "[1.] One line summary of the problem: When the kernel option "vga=1" is used, additional tty's (alt+control+Fx with x=2,3,4,5, etc) do not provide the full 50 lines of output. The first one does have 50 lines, however. [2.] Full description of the problem/report: These addtitional tty's show only 39 lines plus the top pixel of the 40-th line. The remaining lines are black and not shown. Kernel version 2.6.13.4 does not show this problem." This bug is caused by using a stale font height value on vgacon_init. Booting with vga=1 gives an 80x50 screen with an 8x8 font. Somewhere during the initialization, the font was changed to 8x9 and the first vc was correctly resized to 80x44. However, the rest of the vc's were not allocated yet, and when they were subsequently initialized, they still used a font height of 8 (instead of 9) causing the mentioned bug. Fix by saving the new font height to vga_video_font_height. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b4627dea032ab1f6e472fcf030e28f22ea971f9b Author: Antonino A. Daplas Date: Mon Nov 21 21:32:25 2005 -0800 [PATCH] fbcon: Console Rotation - Fix wrong shift calculation The shift value (amount to shift the bitmap so first pixel starts at origin(0,0)) is incorrect. This causes corrupted characters or a kernel crash if fontwidth is not divisible by 8 at 270 degrees, or fontheight not divisible by 8 at 180 degrees. Report and part of the fix contributed by Knut Petersen. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74a8a65c526187fe636a6a2abcb7d9ebc5c753ab Author: David Gibson Date: Mon Nov 21 21:32:24 2005 -0800 [PATCH] Fix hugetlbfs_statfs() reporting of block limits Currently, if a hugetlbfs is mounted without limits (the default), statfs() will return -1 for max/free/used blocks. This does not appear to be in line with normal convention: simple_statfs() and shmem_statfs() both return 0 in similar cases. Worse, it confuses the translation logic in put_compat_statfs(), causing it to return -EOVERFLOW on such a mount. This patch alters hugetlbfs_statfs() to return 0 for max/free/used blocks on a mount without limits. Note that we need the test in the patch below, rather than just using 0 in the sbinfo structure, because the -1 marked in the free blocks field is used internally to tell the Signed-off-by: David Gibson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86e07ce71a8aad5074f7316f9b297d2137630283 Author: David Gibson Date: Mon Nov 21 21:32:23 2005 -0800 [PATCH] Fix error handling with put_compat_statfs() In fs/compat.c, whenever put_compat_statfs() returns an error, the containing syscall returns -EFAULT. This is presumably by analogy with the non-compat case, where any non-zero code from copy_to_user() should be translated into an EFAULT. However, put_compat_statfs() is also return -EOVERFLOW. The same applies for put_compat_statfs64(). This bug can be observed with a statfs() on a hugetlbfs directory. hugetlbfs, when mounted without limits reports available, free and total blocks as -1 (itself a bug, another patch coming). statfs() will mysteriously return EFAULT although it's parameters are perfectly valid addresses. This patch causes the compat versions of statfs() and statfs64() to correctly propogate the return values from put_compat_statfs() and put_compat_statfs64(). Signed-off-by: David Gibson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f3d48f0373c14a6203202f7b1dfc7b0d8aaf6ed2 Author: Hugh Dickins Date: Mon Nov 21 21:32:22 2005 -0800 [PATCH] unpaged: fix sound Bad page states Earlier I unifdefed PageCompound, so that snd_pcm_mmap_control_nopage and others can give out a 0-order component of a higher-order page, which won't be mistakenly freed when zap_pte_range unmaps it. But many Bad page states reported a PG_reserved was freed after all: I had missed that we need to say __GFP_COMP to get compound page behaviour. Some of these higher-order pages are allocated by snd_malloc_pages, some by snd_malloc_dev_pages; or if SBUS, by sbus_alloc_consistent - but that has no gfp arg, so add __GFP_COMP into its sparc32/64 implementations. I'm still rather puzzled that DRM seems not to need a similar change. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0b0db14c536debd92328819fe6c51a49717e8440 Author: Hugh Dickins Date: Mon Nov 21 21:32:20 2005 -0800 [PATCH] unpaged: copy_page_range vma For copy_one_pte's print_bad_pte to show the task correctly (instead of "???"), dup_mmap must pass down parent vma rather than child vma. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 689bcebfda16d7bace742740bfb3137fff30b529 Author: Hugh Dickins Date: Mon Nov 21 21:32:20 2005 -0800 [PATCH] unpaged: PG_reserved bad_page It used to be the case that PG_reserved pages were silently never freed, but in 2.6.15-rc1 they may be freed with a "Bad page state" message. We should work through such cases as they appear, fixing the code; but for now it's safer to issue the message without freeing the page, leaving PG_reserved set. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f57e88a8d83de8d844b57e16b84d2f762fe9f092 Author: Hugh Dickins Date: Mon Nov 21 21:32:19 2005 -0800 [PATCH] unpaged: ZERO_PAGE in VM_UNPAGED It's strange enough to be looking out for anonymous pages in VM_UNPAGED areas, let's not insert the ZERO_PAGE there - though whether it would matter will depend on what we decide about ZERO_PAGE refcounting. But whereas do_anonymous_page may (exceptionally) be called on a VM_UNPAGED area, do_no_page should never be: just BUG_ON. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ee498ed730283e9cdfc8913f12b90a2246f1a8cc Author: Hugh Dickins Date: Mon Nov 21 21:32:18 2005 -0800 [PATCH] unpaged: anon in VM_UNPAGED copy_one_pte needs to copy the anonymous COWed pages in a VM_UNPAGED area, zap_pte_range needs to free them, do_wp_page needs to COW them: just like ordinary pages, not like the unpaged. But recognizing them is a little subtle: because PageReserved is no longer a condition for remap_pfn_range, we can now mmap all of /dev/mem (whether the distro permits, and whether it's advisable on this or that architecture, is another matter). So if we can see a PageAnon, it may not be ours to mess with (or may be ours from elsewhere in the address space). I suspect there's an entertaining insoluble self-referential problem here, but the page_is_anon function does a good practical job, and MAP_PRIVATE PROT_WRITE VM_UNPAGED will always be an odd choice. In updating the comment on page_address_in_vma, noticed a potential NULL dereference, in a path we don't actually take, but fixed it. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 920fc356f58d0e455bdfa53451f1c58eb211a846 Author: Hugh Dickins Date: Mon Nov 21 21:32:17 2005 -0800 [PATCH] unpaged: COW on VM_UNPAGED Remove the BUG_ON(vma->vm_flags & VM_UNPAGED) from do_wp_page, and let it do Copy-On-Write without touching the VM_UNPAGED's page counts - but this is incomplete, because the anonymous page it inserts will itself need to be handled, here and in other functions - next patch. We still don't copy the page if the pfn is invalid, because the copy_user_highpage interface does not allow it. But that's not been a problem in the past: can be added in later if the need arises. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 101d2be7646b7dd1c367d50208a59b29fce61398 Author: Hugh Dickins Date: Mon Nov 21 21:32:16 2005 -0800 [PATCH] unpaged: VM_NONLINEAR VM_RESERVED There's one peculiar use of VM_RESERVED which the previous patch left behind: because VM_NONLINEAR's try_to_unmap_cluster uses vm_private_data as a swapout cursor, but should never meet VM_RESERVED vmas, it was a way of extending VM_NONLINEAR to VM_RESERVED vmas using vm_private_data for some other purpose. But that's an empty set - they don't have the populate function required. So just throw away those VM_RESERVED tests. But one more interesting in rmap.c has to go too: try_to_unmap_one will want to swap out an anonymous page from VM_RESERVED or VM_UNPAGED area. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0b14c179a483e71ea41df2aa4a661760063115bd Author: Hugh Dickins Date: Mon Nov 21 21:32:15 2005 -0800 [PATCH] unpaged: VM_UNPAGED Although we tend to associate VM_RESERVED with remap_pfn_range, quite a few drivers set VM_RESERVED on areas which are then populated by nopage. The PageReserved removal in 2.6.15-rc1 changed VM_RESERVED not to free pages in zap_pte_range, without changing those drivers not to set it: so their pages just leak away. Let's not change miscellaneous drivers now: introduce VM_UNPAGED at the core, to flag the special areas where the ptes may have no struct page, or if they have then it's not to be touched. Replace most instances of VM_RESERVED in core mm by VM_UNPAGED. Force it on in remap_pfn_range, and the sparc and sparc64 io_remap_pfn_range. Revert addition of VM_RESERVED to powerpc vdso, it's not needed there. Is it needed anywhere? It still governs the mm->reserved_vm statistic, and special vmas not to be merged, and areas not to be core dumped; but could probably be eliminated later (the drivers are probably specifying it because in 2.4 it kept swapout off the vma, but in 2.6 we work from the LRU, which these pages don't get on). Use the VM_SHM slot for VM_UNPAGED, and define VM_SHM to 0: it serves no purpose whatsoever, and should be removed from drivers when we clean up. Signed-off-by: Hugh Dickins Acked-by: William Irwin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 664beed0190fae687ac51295694004902ddeb18e Author: Hugh Dickins Date: Mon Nov 21 21:32:14 2005 -0800 [PATCH] unpaged: unifdefed PageCompound It looks like snd_xxx is not the only nopage to be using PageReserved as a way of holding a high-order page together: which no longer works, but is masked by our failure to free from VM_RESERVED areas. We cannot fix that bug without first substituting another way to hold the high-order page together, while farming out the 0-order pages from within it. That's just what PageCompound is designed for, but it's been kept under CONFIG_HUGETLB_PAGE. Remove the #ifdefs: which saves some space (out- of-line put_page), doesn't slow down what most needs to be fast (already using hugetlb), and unifies the way we handle high-order pages. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1cdca61bf8537043edde8ef784ce1a1351361dac Author: Hugh Dickins Date: Mon Nov 21 21:32:13 2005 -0800 [PATCH] unpaged: sound nopage get_page Something noticed when studying use of VM_RESERVED in different drivers: snd_usX2Y_hwdep_pcm_vm_nopage omitted to get_page: fixed. And how did this work before? Aargh! That nopage is returning a page from within a buffer allocated by snd_malloc_pages, which allocates a high-order page, then does SetPageReserved on each 0-order page within. That would have worked in 2.6.14, because when the area was unmapped, PageReserved inhibited put_page. 2.6.15-rc1 removed that inhibition (while leaving ineffective PageReserveds around for now), but it hasn't caused trouble because.. we've not been freeing from VM_RESERVED at all. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 83e9b7e929d1323b9a155d186f77aa8c06155cc3 Author: Hugh Dickins Date: Mon Nov 21 21:32:12 2005 -0800 [PATCH] unpaged: private write VM_RESERVED The PageReserved removal in 2.6.15-rc1 issued a "deprecated" message when you tried to mmap or mprotect MAP_PRIVATE PROT_WRITE a VM_RESERVED, and failed with -EACCES: because do_wp_page lacks the refinement to COW pages in those areas, nor do we expect to find anonymous pages in them; and it seemed just bloat to add code for handling such a peculiar case. But immediately it caused vbetool and ddcprobe (using lrmi) to fail. So revert the "deprecated" messages, letting mmap and mprotect succeed. But leave do_wp_page's BUG_ON(vma->vm_flags & VM_RESERVED) in place until we've added the code to do it right: so this particular patch is only good if the app doesn't really need to write to that private area. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ed5297a94090d9a9f27b0ce1f9601ebe73561cff Author: Hugh Dickins Date: Mon Nov 21 21:32:11 2005 -0800 [PATCH] unpaged: get_user_pages VM_RESERVED The PageReserved removal in 2.6.15-rc1 prohibited get_user_pages on the areas flagged VM_RESERVED in place of PageReserved. That is correct in theory - we ought not to interfere with struct pages in such a reserved area; but in practice it broke BTTV for one. So revert to prohibiting only on VM_IO: if someone gets into trouble with get_user_pages on VM_RESERVED, it'll just be a "don't do that". You can argue that videobuf_mmap_mapper shouldn't set VM_RESERVED in the first place, but now's not the time for breaking drivers without notice. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aa1a64ee12ae130706f3fc0007841ce9b0ddf9c2 Author: Jeff Dike Date: Mon Nov 21 21:32:10 2005 -0800 [PATCH] uml: eliminate use of libc PAGE_SIZE On some systems, libc PAGE_SIZE calls getpagesize, which can't happen from a stub. So, I use UM_KERN_PAGE_SIZE, which is less variable in its definition, instead. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 17d469715c6453e4994e6617e8f644bf10f38584 Author: Jeff Dike Date: Mon Nov 21 21:32:09 2005 -0800 [PATCH] uml: properly invoke x86_64 system calls This patch makes stub_segv use the stub_syscall macros. This was needed anyway, but the bug that prompted this was the discovery that gcc was storing stuff in RCX, which is trashed across a system call. This is exactly the sort of problem that the new macros fix. There is a stub_syscall0 for getpid. stub_segv was changed to be a libc file, and that caused some include changes. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e23181deec0d2a8be576faf9d71211abb84d5ccc Author: Jeff Dike Date: Mon Nov 21 21:32:08 2005 -0800 [PATCH] uml: eliminate anonymous union and clean up symlink lossage This gives a name to the anonymous union introduced in skas-hold-own-ldt, allowing to build on a wider range of gccs. It also removes ldt.h, which somehow became real, and replaces it with a symlink, and creates ldt-x86_64.h as a copy of ldt-i386.h for now. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39d730ab87f07592e3a3794353f097d5184cae7a Author: Jeff Dike Date: Mon Nov 21 21:32:04 2005 -0800 [PATCH] uml: eliminate use of local in clone stub We have a bug in the i386 stub_syscall6 which pushes ebp before the system call and pops it afterwards. Because we use syscall6 to remap the stack, the old contents of the stack (and the former value of ebp) are no longer available. Some versions of gcc make from a real local, accessed through ebp, despite my efforts to make it obvious that references to from are really constants. This patch attempts to make it even more obvious by eliminating from and using a macro to access the stub's data explicitly with constants. My original thinking on this was to replace syscall6 with a remap_stack interface which saved ebp someplace and restored it afterwards. The problem is that there are no registers to put it in, except for esp. That could work, since we can store a constant in esp after the mmap because we just replaced the stack. However, this approach seems a tad cleaner. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 18317ab0ca5ac0c654be3eac31ebb781b4a5e9b2 Author: Richard Knutsson Date: Mon Nov 21 21:32:03 2005 -0800 [PATCH] net: Fix compiler-error on dgrs.c when !CONFIG_PCI drivers/net/dgrs.c: In function `dgrs_init_module': drivers/net/dgrs.c:1598: `dgrs_pci_driver' undeclared (first use in this function) Signed-off-by: Richard Knutsson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab2ff46a2d22177daeae4d473c8916e4f14b4253 Author: Russ Anderson Date: Fri Nov 11 16:52:02 2005 -0600 [IA64-SGI] bte_copy nasid_index fix The nasid_index was not being incremented if the pointer was null, causing an infinite loop. Signed-off-by: Russ Anderson (rja@sgi.com) Signed-off-by: Tony Luck commit 771388dc7d1efe26a40242bd509e87ade2c971d1 Author: Jack Steiner Date: Fri Nov 18 16:11:27 2005 -0600 [IA64-SGI] support for older versions of PROM Add support for old versions of the SN PROMs. Eventually this support will be deleted but it is useful right now to continue supporting older PROMs. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 090de0b77ceed1f1d05883fa744760f0c65d9c31 Author: hawkes@sgi.com Date: Fri Nov 18 11:30:34 2005 -0800 [IA64] fix bug in sn/ia64 for sparse CPU numbering The kernel's use of the for_each_*cpu(i) macros has allowed for sparse CPU numbering. When I hacked the kernel to test sparse cpu_present_map[] and cpu_possible_map[] cpumasks, I discovered one remaining spot, in sn_hwperf_ioctl() during sn initialization, that needs to be fixed. Signed-off-by: John Hawkes Signed-off-by: Dean Roe Signed-off-by: Tony Luck commit 9ad4f924ecd9c067a22a64699bcf4eaad1935a61 Author: Prarit Bhargava Date: Mon Nov 21 13:00:38 2005 -0500 [IA64] Prevent sn2 ptc code from executing on all ia64 subarches Patch to prevent sn2_ptc_init code from attempting to load on non-sn2 systems when sn2_smp.c is built-in to generic kernel. Signed-off-by: Prarit Bhargava Signed-off-by: Tony Luck commit 8ad9ebb391e4cd75837ee608b9c33fcaceda0bc2 Author: Jens Axboe Date: Mon Nov 21 19:49:41 2005 +0100 [PATCH] as-iosched: remove state assertion in as_add_request() Kill the arq->state poison statement in as_add_request(), it can trigger for perfectly valid code that just reuses a request after io completion instead of freeing it and allocating a new one. We probably should introduce a blk_init_request() to start from scratch, but for now just kill it as we will be removing the as specific poisoning soon. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit c889b89619339636240227abb9ee5c9ec1167a1a Author: Russell King Date: Mon Nov 21 17:05:21 2005 +0000 [SERIAL] imx: Fix missed platform_driver_unregister Signed-off-by: Russell King commit 9b73fcf85f65a301107c89e05227cd6fd6965680 Author: Russell King Date: Mon Nov 21 17:03:15 2005 +0000 [ARM] Shut up gcc warning in clps7500 core.c core.c:263: warning: initialization makes integer from pointer without a cast Signed-off-by: Russell King commit 2f3eca8b4f1e9ff3c712519170f5c070ddbddff9 Author: Russell King Date: Mon Nov 21 17:01:13 2005 +0000 [ARM] Shut up gcc warning in assabet.c assabet.c:291: warning: 'scr' may be used uninitialized in this function Signed-off-by: Russell King commit 30a09616df38ab282e66084f40fb438fe715b2ec Author: Russell King Date: Mon Nov 21 15:26:52 2005 +0000 [ARM] ebsa110: __arch_ioremap should be 3 args Signed-off-by: Russell King commit 5aaf291056b6142c11f6f7fd48cf937595a70e93 Author: Russell King Date: Mon Nov 21 15:26:18 2005 +0000 [ARM] Add asm/memory.h to asm/numnodes.h Since the defintion of NODES_SHIFT may be overridden in asm/arch/memory.h it's important to include asm/memory.h into asm/numnodes.h to ensure that the correct value is always defined. Signed-off-by: Russell King commit 19f07be3b83d707940cc29abd8cc99d36d9d1f4e Author: Kenneth Tan Date: Mon Nov 21 15:17:07 2005 +0000 [ARM] 3171/1: To add missing QMGR region size for IXP4XX Patch from Kenneth Tan To add queue manager region size which is missing from ixp4xx-regs.h Signed-off-by: Kenneth Tan Signed-off-by: Russell King commit 067c90481aad752dca9a4685091c0163dec7dfe0 Author: Dirk Opfer Date: Mon Nov 21 15:17:06 2005 +0000 [ARM] 3170/1: Sharp SL-6000x: platform device conversion fixup Patch from Dirk Opfer Fix an error in tosa.c after the platform device conversion. Signed-off-by: Dirk Opfer Signed-off-by: Russell King commit c243f1f1f6545985afcc6adf1fc085729029c3ee Author: Dave Jones Date: Mon Nov 21 06:53:16 2005 -0800 [AGPGART] Support VIA P4M800CE bridge. Signed-off-by: Dave Jones commit 461ddf3b90bb149b99c3f675959c1bd6b11ed936 Author: Randy Dunlap Date: Sun Nov 20 21:25:15 2005 -0800 [NET]: kernel-doc fixes Fix kernel-doc warnings in network files. Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit b84f4cc977ec4a1260dc8d9165efc9319a93c2a2 Author: Patrick McHardy Date: Sun Nov 20 21:19:21 2005 -0800 [NET]: Use unused bit for ipvs_property field in struct sk_buff Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit a516b04950f62d36b33db00c0d3c69d09dae99a9 Author: Patrick McHardy Date: Sun Nov 20 21:16:13 2005 -0800 [DCCP]: Add missing no_policy flag to struct net_protocol Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit bd4cfb594bdea00c3920b31bd12f497fc4a2e79c Author: Nicolas Kaiser Date: Sun Nov 20 21:11:31 2005 -0800 [NETFILTER]: Remove ARRAY_SIZE duplicate Signed-off-by: Nicolas Kaiser Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 2b8f2ff6f4c11fff9c3016b54fa261f522a54b70 Author: Yasuyuki Kozakai Date: Sun Nov 20 21:09:55 2005 -0800 [NETFILTER]: fixed dependencies between modules related with ip_conntrack - IP_NF_CONNTRACK_MARK is bool and depends on only IP_NF_CONNTRACK which is tristate. If a variable depends on IP_NF_CONNTRACK_MARK and doesn't care about IP_NF_CONNTRACK, it can be y. This must be avoided. - IP_NF_CT_ACCT has same problem. - IP_NF_TARGET_CLUSTERIP also depends on IP_NF_MANGLE. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit c9e53cbe7ad6eabb3c7c5140b6127b4e5f9ee840 Author: Patrick McHardy Date: Sun Nov 20 21:09:00 2005 -0800 [FIB_TRIE]: Don't show local table in /proc/net/route output Don't show local table to behave similar to fib_hash. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit db93a82fa9d8b4d6e31c227922eaae829253bb88 Author: Dmitry Torokhov Date: Sun Nov 20 11:13:29 2005 -0500 [PATCH] Fix an OOPS is CinergyT2 Fix an OOPS is CinergyT2 driver when registering IR remote Signed-off-by: Dmitry Torokhov Signed-off-by: Linus Torvalds commit 5d5780df23537ad0db72267fe11103d2c23d9b2a Author: Yan Zheng Date: Sun Nov 20 13:42:20 2005 -0800 [IPV6]: Acquire addrconf_hash_lock for read in addrconf_verify(...) addrconf_verify(...) only traverse address hash table when addrconf_hash_lock is held for writing, and it may hold addrconf_hash_lock for a long time. So I think it's better to acquire addrconf_hash_lock for reading instead of writing Signed-off-by: Yan Zheng Signed-off-by: David S. Miller commit 4909724b5dee8fb7c52bbe90afa40c65b17be9eb Author: Alexandra Kossovsky Date: Sun Nov 20 13:41:59 2005 -0800 [COMPAT] net: SIOCGIFCONF data corruption From: Alexandra Kossovsky From http://bugzilla.kernel.org/show_bug.cgi?id=4746 There is user data corruption when using ioctl(SIOCGIFCONF) in 32-bit application running amd64 kernel. I do not think that this problem is exploitable, but any data corruption may lead to security problems. Following code demonstrates the problem #include #include #include #include #include #include char buf[256]; main() { int s = socket(AF_INET, SOCK_DGRAM, 0); struct ifconf req; int i; req.ifc_buf = buf; req.ifc_len = 41; printf("Result %d\n", ioctl(s, SIOCGIFCONF, &req)); printf("Len %d\n", req.ifc_len); for (i = 41; i < 256; i++) if (buf[i] != 0) printf("Byte %d is corrupted\n", i); } Steps to reproduce: Compile the code above into 32-bit elf and run it. You'll get Result 0 Len 32 Byte 48 is corrupted Byte 52 is corrupted Byte 53 is corrupted Byte 54 is corrupted Byte 55 is corrupted Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit fb0d366b0803571f06a5b838f02c6706fc287995 Author: Kris Katterjohn Date: Sun Nov 20 13:41:34 2005 -0800 [NET]: Reject socket filter if division by constant zero is attempted. This way we don't have to check it in sk_run_filter(). Signed-off-by: Kris Katterjohn Signed-off-by: David S. Miller commit aa8751667dcd757dd9a711b51140adf181501c44 Author: Andrea Bittau Date: Sun Nov 20 13:41:05 2005 -0800 [PKT_SCHED]: sch_netem: correctly order packets to be sent simultaneously If two packets were queued to be sent at the same time in the future, their order would be reversed. This would occur because the queue is traversed back to front, and a position is found by checking whether the new packet needs to be sent before the packet being examined. If the new packet is to be sent at the same time of a previous packet, it would end up before the old packet in the queue. This patch places packets in the correct order when they are queued to be sent at a same time in the future. Signed-off-by: Andrea Bittau Signed-off-by: David S. Miller commit 9e18fcdd346c6befdac360c047327fb058f33628 Author: Andi Kleen Date: Sun Nov 20 18:49:08 2005 +0100 [PATCH] Remove compat ioctl semaphore Originally for 2.6.16, but the semaphore causes problems for some people so get rid of it now. It's not needed anymore because the ioctl hash table is never changed at run time now. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e6c667592e824c2871fe0ae3bc4b9bc7e81941f4 Author: Jacob.Shin@amd.com Date: Sun Nov 20 18:49:07 2005 +0100 [PATCH] Fix x86_64/msr.h interface to agree with i386/msr.h Ever since we remove msr.c from x86_64 branch and started grabbing it from i386, msr device (read functionality) has been broken for us. This is due to the differences between asm-i386/msr.h and asm-x86_64/msr.h interfaces. Here is a patch to our side to fix this. Thankfully, as of current (2.6.15-rc1-git6) tree, arch/i386/kernel/msr.c is the only file that uses rdmsr_safe macro. Signed-off-by: Jacob Shin Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit fbe83e209ad9c8281e29ac17a60f91119d86fa8c Author: Ashok Raj Date: Sun Nov 20 18:49:06 2005 +0100 [PATCH] Register disabled CPUs Needed to make the earlier use disabled CPUs for CPU hotplug patch actually work. Need to register disabled processors as well, so we can count them towards cpu_possible_map as hot pluggable cpus. Signed-off-by: Ashok Raj Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d7169160bb772efe6510d8bc0c8e7625efbcc0b3 Author: Andi Kleen Date: Sun Nov 20 18:49:05 2005 +0100 [PATCH] i386: Use bigsmp for > 8 core Opteron systems bigsmp is reported to work on large Opteron systems on 32bit too. Enable it by default there. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d4892279d786dd11f9d6269b3029ad3340e79597 Author: Dmitry Torokhov Date: Sun Nov 20 00:57:02 2005 -0500 Fix missing initialization in ir-kbd-gpio.c Signed-off-by: Dmitry Torokhov commit d271d1c2217b2e9868c32c0437d76b2af3a4b971 Author: Dmitry Torokhov Date: Sun Nov 20 00:56:54 2005 -0500 Fix an OOPS when initializing IR remote on saa7134 Signed-off-by: Dmitry Torokhov commit 9e50afd0cb3ff9ee152dbcf8601f5fb7eba5cff8 Author: Dmitry Torokhov Date: Sun Nov 20 00:56:43 2005 -0500 Input: make serio and gameport more swsusp friendly kseriod and kgameportd used to process all pending events before checking for freeze condition. This may cause swsusp to time out while stopping tasks when resuming. Switch to process events one by one to check freeze status more often. Signed-off-by: Dmitry Torokhov commit bd0ef2356cd85d39387be36fdf1f83a40075057f Author: Dmitry Torokhov Date: Sun Nov 20 00:56:31 2005 -0500 Input: handle failures in input_register_device() Signed-off-by: Dmitry Torokhov commit e597f0c80de7e2ef840b28d111ec532988abc432 Author: Dmitry Torokhov Date: Sun Nov 20 00:51:43 2005 -0500 Input: uinput - don't use "interruptible" in FF code If thread that submitted FF request gets interrupted somehow it will release request structure and ioctl handler will work with freed memory. TO prevent that from happening switch to using wait_for_completion instead of wait_for_completion_interruptible. Signed-off-by: Dmitry Torokhov commit 59c7c0377e00a3cbd7b71631177fb92166ceb437 Author: Dmitry Torokhov Date: Sun Nov 20 00:51:33 2005 -0500 Input: uinput - add UI_SET_SWBIT ioctl Signed-off-by: Dmitry Torokhov commit 29506415a0ff0152cc2928f8fcac724fbbf98651 Author: Dmitry Torokhov Date: Sun Nov 20 00:51:22 2005 -0500 Input: uinput - convert to dynalloc allocation Also introduce proper locking when creating/deleting device. Signed-off-by: Dmitry Torokhov commit e753b650e10af8a040b1081e72088b826bdef72f Author: Miloslav Trmac Date: Sun Nov 20 00:51:05 2005 -0500 Input: wistron - disable wifi/bluetooth on suspend Try to save battery power by disabling wifi and bluetooth on suspend. Signed-off-by: Miloslav Trmac Signed-off-by: Dmitry Torokhov commit a5b0cc80bc3cc98809c7674bda9928db497f0ebb Author: Dmitry Torokhov Date: Sun Nov 20 00:50:58 2005 -0500 Input: wistron - add PM support Register wistron-bios as a platform device, restore WIFI and Bluetooth state upon resume. Signed-off-by: Dmitry Torokhov commit 22a397e2c189dedf857836f2a49542b8aedfeb65 Author: Dmitry Torokhov Date: Sun Nov 20 00:50:46 2005 -0500 Input: wistron - convert to dynamic input_dev allocation Signed-off-by: Dmitry Torokhov commit 84b256a66360cedc25eb6e2ac6f167ca9778307b Author: Bernhard Rosenkraenzer Date: Sun Nov 20 00:50:37 2005 -0500 Input: wistron - add support for Acer Aspire 1500 notebooks Also fix a potential issue with some notebooks: The current code assumes the response to bios_wifi_get_default_setting is either 1 (disabled) or 3 (enabled), or wifi isn't supported. The BIOS response appears to be a bit field w/ 0x1 indicating hardware presence, 0x2 indicating actiation status, and the other 6 bits being unknown/reserved -- with the patch, these 6 bits are ignored. Signed-off-by: Bernhard Rosenkraenzer Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit e9fb028ea2a0a70dad0f467410418e5ee2af811b Author: Andrew Morton Date: Sun Nov 20 00:50:21 2005 -0500 Input: wistron - disable for x86_64 On x86_64: {standard input}:233: Error: suffix or operands invalid for `push' {standard input}:233: Error: suffix or operands invalid for `pop' Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit 5fc1468029e2a4da90ded1e0e2cdd94fbdf83bac Author: Dmitry Torokhov Date: Sun Nov 20 00:50:06 2005 -0500 Input: add Wistron driver A driver for laptop buttons using an x86 BIOS interface that is apparently used on quite a few laptops and seems to be originating from Wistron. This driver currently "knows" only about Fujitsu-Siemens Amilo Pro V2000 (i.e. it can detect the laptop using DMI and it contains the keycode->key meaning mapping for this laptop) and Xeron SonicPro X 155G (probably can't be reliably autodetected, requires a module parameter), adding other laptops should be easy. In addition to reporting button presses to the input layer the driver also allows enabling/disabling the embedded wireless NIC (using the "Wifi" button); this is done using the same BIOS interface, so it seems only logical to keep the implementation together. Any flexibility possibly gained by allowing users to remap the function of the "Wifi" button is IMHO not worth it when weighted against the necessity to run an user-space daemon to convert button presses to wifi state changes. Signed-off-by: Miloslav Trmac Signed-off-by: Dmitry Torokhov commit 0d4c859734a818721b2d5ac712283ba8f92bd23a Author: Dmitry Torokhov Date: Sun Nov 20 00:49:42 2005 -0500 Input: atkbd - speed up setting leds/repeat state Changing led state is pretty slow operation; when there are multiple requests coming at a high rate they may interfere with normal typing. Try optimize (skip) changing hardware state when multiple requests are coming back-to-back. Signed-off-by: Dmitry Torokhov commit cdbce9c87e4ebd186389919b95e49592ec35dae6 Author: Steve French Date: Sat Nov 19 21:04:52 2005 -0800 [CIFS] Fix setattr of mode only (e.g. in some chmod cases) to Windows so it does not return EACCESS (unless server really returns that). Signed-off-by: Steve French commit 3bedff1d73b86e0cf52634efb447e9ada08f2cc6 Author: Linus Torvalds Date: Sat Nov 19 19:25:03 2005 -0800 Linux v2.6.15-rc2 commit df9890c31a1a447254f39e40c3fd81ad6547945b Author: YOSHIFUJI Hideaki Date: Sun Nov 20 12:23:18 2005 +0900 [IPV6]: Fix sending extension headers before and including routing header. Based on suggestion from Masahide Nakamura . Signed-off-by: YOSHIFUJI Hideaki commit a305989386e402f48b216786a5c8cf440b33bdad Author: Ville Nuorvala Date: Sun Nov 20 12:21:59 2005 +0900 [IPV6]: Fix calculation of AH length during filling ancillary data. Signed-off-by: YOSHIFUJI Hideaki commit 8b8aa4b5a66ecf90f0a7033c8cbc49cfd97c4347 Author: YOSHIFUJI Hideaki Date: Sun Nov 20 12:18:17 2005 +0900 [IPV6]: Fix memory management error during setting up new advapi sockopts. Signed-off-by: YOSHIFUJI Hideaki commit 17514e8a6f1836a5c95b1f18d2bc0493ad732cf0 Author: Bartlomiej Zolnierkiewicz Date: Sat Nov 19 22:24:35 2005 +0100 [PATCH] ide: add missing __init tags to device drivers Also remove bogus comments for idefloppy_init() and idetape_init(). commit e07bc7096424b977e53a16d72ec02645389107ba Author: Bartlomiej Zolnierkiewicz Date: Sat Nov 19 22:17:55 2005 +0100 [PATCH] ide: remove dead code from flagged_taskfile() flagged_taskfile() is called from execute_drive_cmd() (the only user) only if args->tf_out_flags.all != 0. commit c0bc113373d94ebd89d0d024421df8aac60ed08a Author: Bartlomiej Zolnierkiewicz Date: Sat Nov 19 22:04:10 2005 +0100 [PATCH] ide: remove dead DEBUG_TASKFILE code commit 071ffcc0f7dd8df871f443be3f5059f05da528e2 Author: Bartlomiej Zolnierkiewicz Date: Sat Nov 19 22:01:35 2005 +0100 [PATCH] ide: remove unused ide_action_t:ide_next commit 84e7b9e94b474d40582090b7e09139f0029cff2c Author: Bartlomiej Zolnierkiewicz Date: Sat Nov 19 21:54:04 2005 +0100 [PATCH] ide: remove duplicate documentation for ide_do_drive_cmd() Remove duplicate documentation for ide_do_drive_cmd() from , this function is already documented in ide-io.c. commit 14351f8e573442e2437d4b177fa10075aaefd5c9 Author: Aurelien Jarno Date: Sat Nov 19 21:43:45 2005 +0100 [PATCH] sis5513: enable ATA133 for the SiS965 southbridge Signed-off-by: Aurelien Jarno commit 4f1d774aadfc5a6ed1545dca180f66ab6d0f543d Author: Mathias Kretschmer Date: Sat Nov 19 21:32:38 2005 +0100 [PATCH] via82cxxx: add VIA VT6410 IDE support From: Mathias Kretschmer Signed-off-by: Daniel Drake Acked-by: Alan Cox Signed-off-by: Andrew Morton commit 832f4ede791ae0a96dcbb231ccb181ad7a54bfc2 Author: Russell King Date: Sat Nov 19 11:26:17 2005 +0000 [SERIAL] Remove unused variable in sa1100.c Since the spinlock was removed from sa1100_start_tx(), the "flags" variable becomes redundant. Remove it. Signed-off-by: Russell King commit b63d4f0fb80918ab37b6c0ee1adcd49e05c9994c Author: Russell King Date: Sat Nov 19 11:10:35 2005 +0000 [SERIAL] Fix status reporting with PL011 serial driver The receiver status register reports latched error conditions, which must be cleared by writing to it. However, the data register reports unlatched conditions which are associated with the current character. Use the data register to interpret error status rather than the RSR. Signed-off-by: Russell King commit 54c4e6b5fee0347ab81e2c2fe4239c455c3422ae Author: Paul Mackerras Date: Sat Nov 19 21:24:55 2005 +1100 powerpc: Fix bug in timebase synchronization on 32-bit SMP powermac We were using udelay in the loop on the primary cpu waiting for the secondary cpu to take the timebase value. Unfortunately now that udelay uses the timebase, and the timebase is stopped at this point, the udelay never terminated. This fixes it by not using udelay, and increases the number of loops before we time out to compensate. Signed-off-by: Paul Mackerras commit a6c61e9dfdd0adf8443932cfc43b0c1e25036ad5 Author: Daniel Jacobowitz Date: Sat Nov 19 10:01:07 2005 +0000 [ARM] 3168/1: Update ARM signal delivery and masking Patch from Daniel Jacobowitz After delivering a signal (creating its stack frame) we must check for additional pending unblocked signals before returning to userspace. Otherwise signals may be delayed past the next syscall or reschedule. Once that was fixed it became obvious that the ARM signal mask manipulation was broken. It was a little bit broken before the recent SA_NODEFER changes, and then very broken after them. We must block the requested signals before starting the handler or the same signal can be delivered again before the handler even gets a chance to run. Signed-off-by: Daniel Jacobowitz Signed-off-by: Russell King commit 0212ddd839470f7a54cccccbaecd4833b4123da2 Author: Paul Mackerras Date: Sat Nov 19 20:50:46 2005 +1100 powerpc: Merge spinlock.h The result is mostly similar to the original ppc64 version but with some adaptations for 32-bit compilation. include/asm-ppc64 is now empty! Signed-off-by: Paul Mackerras commit 21a6290220679d94912a068c75db2c5cd9c6552a Author: Paul Mackerras Date: Sat Nov 19 20:47:22 2005 +1100 powerpc: move include/asm-ppc64/ptrace-common.h to arch/powerpc/kernel It's only used by arch/powerpc/kernel/ptrace{,32}.c. Signed-off-by: Paul Mackerras commit f8ef2705969e0409efedeb889445da67806ba9ea Author: Paul Mackerras Date: Sat Nov 19 20:46:04 2005 +1100 powerpc: Merge pci.h This involves some minor changes: a few unused functions that the ppc32 pci.c provides are no longer declared here or exported; pcibios_assign_all_busses now just refers to the pci_assign_all_buses variable on both 32-bit and 64-bit; pcibios_scan_all_fns is now just 0 instead of a function that always returns 0 on 64-bit. Signed-off-by: Paul Mackerras commit 047ea7846565917c4a666635fa1fa4b5c587cd55 Author: Paul Mackerras Date: Sat Nov 19 20:17:32 2005 +1100 powerpc: Trivially merge several headers from asm-ppc64 to asm-powerpc For these, I have just done the lame-o merge where the file ends up looking like: #ifndef CONFIG_PPC64 #include #else ... contents from asm-ppc64/foo.h #endif so nothing has changed, really, except that we reduce include/asm-ppc64 a bit more. Signed-off-by: Paul Mackerras commit 86c96b4bb70dac67d6815e09a0949427d439b280 Author: Steve French Date: Fri Nov 18 20:25:31 2005 -0800 [CIFS] Fix mknod of block and chardev over SFU mounts Signed-off-by: Steve French commit 800fc3eeb0eed3bf98d621c0da24d68cabcf6526 Author: David Gibson Date: Wed Nov 16 15:43:48 2005 +1100 [PATCH] powerpc: Remove imalloc.h asm-ppc64/imalloc.h is only included from files in arch/powerpc/mm. We already have a header for mm local definitions, arch/powerpc/mm/mmu_decl.h. Thus, this patch moves the contents of imalloc.h into mmu_decl.h. The only exception are the definitions of PHBS_IO_BASE, IMALLOC_BASE and IMALLOC_END. Those are moved into pgtable.h, next to similar definitions of VMALLOC_START and VMALLOC_SIZE. Built for multiplatform 32bit and 64bit (ARCH=powerpc). Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit e53566409c38d38680cc02299fa9fa5fe8623e9f Author: Benjamin Herrenschmidt Date: Fri Nov 18 17:18:15 2005 +1100 [PATCH] powerpc: Fix setting MPIC priority Trying to set the priority would just disable the interrupt due to an incorrect mask used. We rarely use that call, in fact, I think only in the powermac code for the cmd-power key combo that triggers xmon. So it got unnoticed for a while. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit bcb6ad1f5adb267c7b509f83e8edb16cc59d8500 Author: David S. Miller Date: Fri Nov 18 14:50:20 2005 -0800 [COMPAT]: EXT3_IOC_SETVERSION is _IOW() not _IOR(). Noticed by Helge Deller. Signed-off-by: David S. Miller commit eabc77935d8d2a761c88b9cbb6313bd54b6ddbb3 Author: Roland Dreier Date: Fri Nov 18 14:18:26 2005 -0800 IB/umad: make sure write()s have sufficient data Make sure that userspace passes in enough data when sending a MAD. We always copy at least sizeof (struct ib_user_mad) + IB_MGMT_RMPP_HDR bytes from userspace, so anything less is definitely invalid. Also, if the length is less than this limit, it's possible for the second copy_from_user() to get a negative length and trigger a BUG(). Signed-off-by: Roland Dreier commit 6593178dd46d64a5bcb0402a4f3acd95b0687abd Author: James Bottomley Date: Fri Nov 18 23:13:33 2005 +0100 [PATCH] ide: fix ide_toggle_bounce() to not try to bounce if we have an IOMMU The following patch fixes a crash caused by attempting to bounce buffer when an IDE CD-ROM is used on a machine with an IO-MMU. [At least, this patch fixes things so I can use my IDE CD-ROM behind an ns87415 on a HP PA-RISC workstation.] Signed-off-by: James Bottomley Signed-off-by: Kyle McMartin commit c37ea218cb43c67bf1578f5e535fcc3a751018ef Author: Ralf Baechle Date: Fri Nov 18 23:11:24 2005 +0100 [PATCH] ide: make comment match reality Signed-off-by: Ralf Baechle commit 48fd0d1fdd357caa2de8cb4ce6af810df7535f43 Author: Michael S. Tsirkin Date: Fri Nov 18 14:11:17 2005 -0800 IB/mthca: Safer max_send_sge/max_recv_sge calculation Calculation of QP capabilities still isn't exactly right in mthca: max_send_sge/max_recv_sge fields returned in create_qp can exceed the handware supported limits. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 1e39dead2bfa8023bcdee4f1e5e6c933aff24e20 Author: Amit Gud Date: Fri Nov 18 23:03:19 2005 +0100 [PATCH] cs5520: fix return value of cs5520_init_one() From: Amit Gud Patch follows from the suggestions by AC and Felipe W Damasio for fixing the return codes from IDE drivers. [ bart: fix coding style while at it ] Signed-off-by: Amit Gud Signed-off-by: Domen Puncer Signed-off-by: Alexey Dobriyan commit bf4c796df61c5b3772709bf0fd62296e0ae662d7 Author: Jeff Garzik Date: Fri Nov 18 22:55:47 2005 +0100 [PATCH] siimage: docs urls Signed-off-by: Jeff Garzik commit ec0fb4bd31e1ef60aa26798f594265a9ad061f21 Author: Thibaut VARENE Date: Fri Nov 18 22:51:48 2005 +0100 [PATCH] aec62xxx: remove all dead (#if0'd) code Signed-off-by: Thibaut VARENE commit 963f48a116bf3b797fe184e74c79c50de1da70bb Author: Jody McIntyre Date: Mon Nov 7 06:29:39 2005 -0500 sbp2_command_orb_lock must be held when accessing the _orb_inuse list. Fixes an oops in sbp2util_find_command_for_SCpnt after sbp2scsi_abort: https://bugzilla.novell.com/show_bug.cgi?id=113734 Signed-off-by: Jody McIntyre Signed-off-by: Stefan Richter (cherry picked from 7945619794314414a5c44df11fca4d3f2a3389cf commit) commit fba51bae8c3797034f497ed68f4ed120a903f941 Author: Thibaut VARENE Date: Fri Nov 18 22:37:37 2005 +0100 [PATCH] pmac IDE: don't release empty interfaces From: Thibaut VARENE Cleaning up the hwif without knowing its previous state in pmac.c is a big and potentially dangerous job, and there seems to be no generic code interface that would provide either a way to properly release an hwif or to clean it up. Fixes OOPS for empty PMAC interface and add-on PCI controller. Acked-by: Benjamin Herrenschmidt commit 2fefef1828ded4df17cfb51481b9e0782d2b3ce2 Author: Alexey Dobriyan Date: Fri Nov 18 22:22:21 2005 +0100 [PATCH] alim15x3: use KERN_WARNING Signed-off-by: Alexey Dobriyan commit e670dfb9a4f9e136da44db167da75b2365f7cebb Author: Kyle McMartin Date: Fri Nov 18 16:21:12 2005 -0500 [PARISC] Update CREDITS entries Update Randolph Chung's location, and add Thibaut Varene. Signed-off-by: Randolph Chung Signed-off-by: Thibaut Varene Signed-off-by: Kyle McMartin commit 21b3d1d792af367854e61ee05dd9b2c931b60fed Author: Matthew Wilcox Date: Fri Nov 18 16:20:10 2005 -0500 [PARISC] Mark hisax and pcbit ISDN drivers as not for parisc These drivers do not compile on big endian systems, and parisc is big endian. Also mark some as broken on m68k as well. Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit cc3f7ca51abb68b6ba0da719f56e33efcc2f450b Author: Hanna Linder Date: Fri Nov 18 22:19:15 2005 +0100 [PATCH] alim15x3: replace pci_find_device() with pci_dev_present() From: Hanna Linder The dev returned from pci_find_device() was not used so it can be replaced with pci_dev_present(). Compile tested. Signed-off-by: Hanna Linder Signed-off-by: Maximilian Attems Signed-off-by: Domen Puncer Signed-off-by: Alexey Dobriyan commit 41df894007c5607b3892336fd72024c4dfa35bdf Author: Matthew Wilcox Date: Fri Nov 18 16:18:40 2005 -0500 [PARISC] Mention PA-RISC in NS87415 help Mention PA-RISC in NS87415 help. PA-RISC [BCJ]xxx0 workstations come with NS87415 integrated for their CD-ROM drives. Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit 305f5167f1e9d832b332933979b6b5e3cc68ce73 Author: Matthew Wilcox Date: Fri Nov 18 16:17:50 2005 -0500 [PARISC] Make Serial MUX depend on a specific bus type. Depend on GSC, not PARISC. Machines without GSC don't have a MUX. Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit 9ab8851549fb9ed570013c33e0786a3fd084be41 Author: Matthew Wilcox Date: Fri Nov 18 16:16:42 2005 -0500 [PARISC] Fix compile warning caused by conflicting types of expand_upwards() Fix compile warning caused by conflicting types of expand_upwards. IA64 requires it to not be static inline, as it's used outside mm/mmap.c Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit 4ef3b8f4a5c056d5f784725974a530d1a7b4a811 Author: Laurent Riffard Date: Fri Nov 18 22:15:40 2005 +0100 [PATCH] ide: remove ide_driver_t.owner field The structure ide_driver_t have a .owner field which is a duplicate of .gendriver.owner field (.gen_driver is a struct device_driver). This patch removes ide_driver_t's owner field. Signed-off-by: Laurent Riffard commit 7462cbff7d4c2dc0d182613fb4e801efb29b90ac Author: Daniel Drake Date: Fri Nov 18 22:09:45 2005 +0100 [PATCH] via82cxxx IDE: support multiple controllers Support multiple controllers in the via82cxxx IDE driver. Cable detection and ISA bridge finding have been moved into their own functions. Signed-off-by: Daniel Drake commit 861e76a8ab7ba64a74c567fa8c4d1d38c4dfdd24 Author: Daniel Drake Date: Fri Nov 18 22:08:29 2005 +0100 [PATCH] via82cxxx IDE: remove /proc/via entry This entry adds needless complication to the driver as it requires the use of global variables to be passed into via_get_info(), making things quite ugly when we try and make this driver support multiple controllers simultaneously. This patch removes /proc/via for simplicity. On 10/13/05, Daniel Drake wrote: > Per Bart's suggestion, I've created a user-space app which shows identical > data (and doesn't even rely on the via82cxxx IDE driver). > > http://www.reactivated.net/software/viaideinfo/ > > So, I think we should be clear to drop /proc/ide/via now. Signed-off-by: Daniel Drake commit 48b1dcc5d80921dc0c54f2fabf4fe6e8538cb9b3 Author: Mark Maule Date: Thu Nov 17 15:50:01 2005 -0600 [IA64] altix: fix copyright in tioce .h files Fix up copyright in tioce header files Signed-off-by: Mark Maule Signed-off-by: Tony Luck commit 6f5a0f7c955d3567f800fa36f978758cb5b99aa2 Author: mikem Date: Fri Nov 18 22:05:36 2005 +0100 [PATCH 3/3] cciss: add put_disk into cleanup routines Jeff Garzik pointed me to his code to see how to remove a disk from the system _properly_. Well, here it is... Every place we remove disks we are now testing before calling del_gendisk or blk_cleanup_queue and then call put_disk. Signed-off-by: Mike Miller Signed-off-by: Jens Axboe commit 15534d3803993345d8db32246ec329d8f83502e1 Author: Jens Axboe Date: Fri Nov 18 22:02:44 2005 +0100 [PATCH 2/3] cciss: bug fix for BIG_PASS_THRU Applications using CCISS_BIG_PASSTHRU complained that the data written was zeros. The problem is that the buffer is being cleared after the user copy, unless the user copy has failed... Correct that logic. Signed-off-by: Mike Miller Signed-off-by: Jens Axboe commit 7f0d50391adf371a0e66da0a1a44ba5cc6744ee8 Author: mikem Date: Fri Nov 18 22:00:17 2005 +0100 [PATCH 1/3] cciss: bug fix for hpacucli This patch fixes a bug that breaks hpacucli, a command line interface for the HP Array Config Utility. Without this fix the utility will not detect any controllers in the system. I thought I had already fixed this, but I guess not. Thanks to all who reported the issue. Please consider this this inclusion. Signed-off-by: Mike Miller Signed-off-by: Jens Axboe commit eb97b73d75d5c9af7c78c05106de9e3fdc4455ab Author: Coywolf Qi Hunt Date: Wed Nov 16 15:27:24 2005 +0100 [BLOCK] new block/ directory comment tidy Some leftover comments referring to drivers/block that are now block/. They don't add any information we don't already have, so kill them. Signed-off-by: Coywolf Qi Hunt Signed-off-by: Jens Axboe commit c119b87d596cdd99ac20095ae2ae90b525418605 Author: Steve French Date: Fri Nov 18 12:27:27 2005 -0800 [CIFS] Missing part of previous patch Signed-off-by: Steve French commit f7492f17f2123f0f4db5f9e8ba89867a7b352658 Author: Jeff Garzik Date: Fri Nov 18 15:06:59 2005 -0500 [wireless hermes] build fix commit 3020a1f58c564e3060ec908c0c4f1b74a12e4280 Author: Steve French Date: Fri Nov 18 11:31:10 2005 -0800 [CIFS] Fix scheduling while atomic when pending writes at file close time Fix the case in which readdir reset file type when SFU mount option specified. Also fix sfu related functions to not request EAs (xattrs) when not configured in Kconfig Signed-off-by: Steve French commit e2b1be56c5656902744c2b52e8304126a40bb609 Author: Jeff Garzik Date: Fri Nov 18 14:04:23 2005 -0500 [libata sata_mv] update copyright, driver version commit eaf8f53bc001d20aa59aa4519b71f11a1cc7f945 Author: James Ketrenos Date: Sat Nov 12 12:50:12 2005 -0600 [PATCH] ipw2100: Fix 'Driver using old /proc/net/wireless...' message ipw2100: Fix 'Driver using old /proc/net/wireless...' message Wireless extensions moved the get_wireless_stats handler from being in net_device into wireless_handler. A prior instance of this patch resolved the issue for the ipw2200. This one fixes it for the ipw2100. Signed-off-by: Benoit Boissinot Signed-off-by: James Ketrenos Signed-off-by: John W. Linville commit a7a461b32fdff1e7db42b50db53840e4fa978384 Author: John W. Linville Date: Mon Nov 7 13:24:59 2005 -0500 [PATCH] fec_8xx: make CONFIG_FEC_8XX depend on CONFIG_8xx Change CONFIG_FEC_8XX to depend on CONFIG_8xx instead of CONFIG_FEC. CONFIG_FEC depends on ColdFire CPUs, which does not apply for the PPC 8xx processors. Signed-off-by: John W. Linville commit 8907e94be2661be940c622232d6ce5ae938f10c3 Author: Greg Kroah-Hartman Date: Fri Nov 18 09:31:15 2005 -0800 [PATCH] update Documentation/00-INDEX Update the index file with descriptions of the stable_api_nonsense.txt and stable_kernel_rules.txt files. Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit d36cc9d0813f813408a1f0bed5e8ced358bb43bf Author: Greg Kroah-Hartman Date: Fri Nov 18 09:31:11 2005 -0800 [PATCH] Add HOWTO do kernel development document to the Documentation directory Here's a document that describes the process and procedures of how to do Linux kernel development. It has gone through a number of rounds of review on the linux-kernel mailing list, and contains contributions and help from Paolo Ciarrocchi, Randy Dunlap, Gerrit Huizenga, Pat Mochel, Hanna Linder, Kay Sievers, Vojtech Pavlik, Jan Kara, Josh Boyer, Kees Cook, Andrew Morton, Andi Kleen, Vadim Lobanov, Jesper Juhl, Adrian Bunk, Keri Harris, Frans Pop, David A. Wheeler, Junio Hamano, Michael Kerrisk, and Alex Shepard. Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 6fb0425b99e00d4d73012264785c662e1783755f Author: Jody McIntyre Date: Fri Nov 18 09:31:06 2005 -0800 [PATCH] Add SCM info to MAINTAINERS Add tree information to MAINTAINERS file. Signed-off-by: Jody McIntyre Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit cea00da3972806d213a7dbe1b98e889435385e6b Author: Andrew Morton Date: Wed Nov 9 11:30:51 2005 -0800 [PATCH] git-netdev-all-ieee80211_get_payload-warning-fix include/net/ieee80211.h: In function `ieee80211_get_payload': include/net/ieee80211.h:1046: warning: control reaches end of non-void function Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit c5b42f343d19d0a04782db0dde5b128dd282f95c Author: Gabriel A. Devenyi Date: Sat Nov 12 16:00:46 2005 -0500 [PATCH] drivers/net/wireless/hermes.c unsigned int comparision hermas_bap_pread, hermes_bap_pwrite, and hermes_bap_pwrite_pad all have a parameter "len" that is declared unsigned, but checked for a value less than zero. Auditing the callers, it is possible for len to be passed a negative value, so len should be an int. Thanks to LinuxICC (http://linuxicc.sf.net) Signed-off-by: Gabriel A. Devenyi Signed-off-by: Jeff Garzik commit cbf7c42b727826770a44c0a10ef3663da08e64bc Author: Roger While Date: Mon Nov 14 11:50:46 2005 +0100 [PATCH] prism54 : Remove extraneous udelay/register read In isl_38xx.c In routine isl38xx_trigger-device Move unnecessary udelay/register read. This is only required when hand-compiling the driver and setting VERBOSE > SHOW_ERROR_MESSAGES Signed-off-by: Roger While Signed-off-by: Jeff Garzik commit 344547093274c8bdb87becb939e5c8ab009ebfe6 Author: Ralf Baechle Date: Mon Nov 14 00:19:44 2005 +0000 [PATCH] SAA9730: Add missing header bits. This header file patch was missing from the recent SAA9730 patch. Signed-off-by: Ralf Baechle Signed-off-by: Jeff Garzik commit 0c0abbc58011e977921eae9037668452bef80265 Author: Ralf Baechle Date: Mon Nov 14 00:16:29 2005 +0000 [PATCH] au1000_eth: Include Signed-off-by: Ralf Baechle The Au1000 ethernet driver references plenty of CONFIG_* symbols. Signed-off-by: Jeff Garzik commit 70f1e002cfaad708ac561bcc6700dc50888999f5 Author: Ralf Baechle Date: Sun Nov 13 10:13:05 2005 +0000 [PATCH] IOC3: Replace obsolete PCI API Signed-off-by: Ralf Baechle Signed-off-by: Jeff Garzik commit 620d9aa95b7910da07912340971bc2d9b2497382 Author: John W. Linville Date: Wed Nov 16 16:09:53 2005 -0500 [PATCH] i82593.h: make header comment GPL-compatible Signed-off-by: John W. Linville Signed-off-by: Jeff Garzik commit 2afecc047e9077d8dc9e312b32e944955e71ce53 Author: Jesse Brandeburg Date: Mon Nov 14 13:15:49 2005 -0800 [PATCH] e100: re-enable microcode with more useful defaults For the four versions of hardware that we (currently) support microcode download on, the default configuration of our receive interrupt mitigation microcode was too aggressive, and caused unnecessary delays when pinging, and low(er) throughput on single connection latency sensitive performance tests. This code adds microcode support, and sets the defaults to more reasonable settings. It also explains the functionality in the code in more detail. Compile and load tested, shows expected behavior for slight delay of ping packets (1-2ms) when ucode is loaded, and decent interrupt moderation for small packets, while maintaining good throughput. Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Garzik commit c0ab424238ceabcaa3a2948f283bcb94f6979c93 Author: Tejun Heo Date: Fri Nov 18 14:22:03 2005 +0900 [PATCH] sil24: make error_intr less verbose sil24_error_intr logs all error interrupts. ATAPI devices generates many harmless errors which can be ignored and all serious ones are reported via sense data by SCSI layer. Don't log device errors from ATAPI devices. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 69ad185fa139b8fff2442d89440e382679d51f0f Author: Tejun Heo Date: Fri Nov 18 14:16:45 2005 +0900 [PATCH] sil24: add ATAPI support This patch implements ATAPI support for sil24 and bumps driver version to 0.23. Signed-off-by: Tejun Heo -- Jeff, it has been converted to use ->dev_config as pointed out. Signed-off-by: Jeff Garzik commit ca45160db70661a006d884df07f82c9b51d27a52 Author: Tejun Heo Date: Fri Nov 18 14:14:01 2005 +0900 [PATCH] sil24: use SRST for phy_reset There seems to be no way to obtain device signature from sil24 after SATA phy reset and SRST is needed anyway for later port multiplier suppport. This patch converts sil24_phy_reset to use SRST instaed. Signed-off-by: Tejun Heo -- Jeff, I didn't remove the 10ms sleep just to be on the safe side. I think we can live with 10ms sleep on SRST. Signed-off-by: Jeff Garzik commit 7d1ce682d08625258524d23ef5eb9e7ae261c1d0 Author: Tejun Heo Date: Fri Nov 18 14:09:05 2005 +0900 [PATCH] sil24: add sil24_restart_controller When an error condition is raised by device via D2H FIS or SDB. sil24 controller should be restarted by setting PORT_CS_INIT and waiting until PORT_CS_RDY is asserted instead of resetting the controller. This patch implements sil24_restart_controller for those cases. This patch also makes sure that PORT_CS_RDY is asserted on sil24_reset_controller completion. Signed-off-by: Tejun Heo -- Jeff, delay is reduced to 1us and cnt increased to 10k. My sil3124 turns on PORT_CS_RDY on the second iteration even without any delay. I think 10k * 1us should be more than enough. I tried to convert both restart and reset to use msleep's with work queue, but if we do that, host_set lock should be released after initiating restart or reset, leading to race condition among reset/restart, other interrupts and timeout. Implementing synchronization among those in low-level driver doesn't seem right. Well, reduced timeout should work for the time being. Thanks. Signed-off-by: Jeff Garzik commit e52542443aa9be15439e9879baf6d41b290e94db Author: Russell King Date: Fri Nov 18 12:57:55 2005 -0500 [PATCH] smc91x: fix bank mismatch The smc91x driver relies upon register bank 2 being selected whenever the interrupt handler is called. This isn't always so, especially if we have a link change event during PHY configuration. This results in register bank 0 being selected when the interrupt handler is called, causing the wrong registers to be read for the IRQ mask and status. In turn, this causes us to spin with a permanently asserted IRQ. The patch ensures that smc_phy_configure always exits with register bank 2 selected. Signed-off-by: Russell King Signed-off-by: Nicolas Pitre Signed-off-by: Jeff Garzik commit 5d0571d915f3e281f151df9a18a6a0be5a57c4b0 Author: Nicolas Pitre Date: Thu Nov 17 14:02:48 2005 -0500 [PATCH] smc91x: fix one source of spurious interrupts Not only SMC_ACK_INT(IM_TX_EMPTY_INT) in in smc_hardware_send_pkt) appears to be unnecessary (tested with an SMC91C94 and SMC91C111), but it seems to trigger spurious interrupts on some machines as well. Removed. While at it, let's log any remaining spurious interrupts if any (and clean usage of the max IRQ loop count value). Signed-off-by: Nicolas Pitre Signed-off-by: Jeff Garzik commit fc71fe40d2bedcc57d3406bf2050481f8b3441b6 Author: Martin Schwidefsky Date: Fri Nov 18 01:11:03 2005 -0800 [PATCH] s390: fix class_device_create calls in 3270 the driver Add the missing NULL argument to the class_device_create calls. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b50ce2324cecf4efc7babe31f4aa1a07f9157317 Author: Andy Whitcroft Date: Fri Nov 18 01:11:02 2005 -0800 [PATCH] ppc64 need HPAGE_SHIFT when huge pages disabled With the new powerpc architecture we don't seem to be able to disable huge pages anymore. mm/built-in.o(.toc1+0xae0): undefined reference to `HPAGE_SHIFT' make: *** [.tmp_vmlinux1] Error 1 We seem to need to define HPAGE_SHIFT to something when HUGETLB_PAGE isn't defined. This patch defines it to PAGE_SHIFT when we have no support. Signed-off-by: Andy Whitcroft Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c0e485216de80046dd0d448b7cd530dbfc31402f Author: NeilBrown Date: Fri Nov 18 01:11:01 2005 -0800 [PATCH] md: fix is_mddev_idle calculation now that disk/sector accounting happens when request completes md needs to monitor the rate of requests to its devices when doing resync/recovery so that it can back-off when there is non-resync IO. It does this by comparing resync IO, which it counts, with total IO which is taken from disk_stats. disk_stats were recently changed to account sectors when a request completes instead of when it is queued. This upsets md's calculations. We could do the sync_io accounting at the end of requests too, but that has problems. If an underlying device is an md array, the accounting will still be done when the request is submitted. This could be changed for some raid levels, but it cannot be changed for raid0 or linear without substantial code changes. So instead, we increase the error that is_mddev_idle allows, up to the maximum amount of resync IO that can be in flight at any time. The calculation is current fragile as each personality as different limits for in-flight resync. This should be fixed up. For now, this simple patch fixes the problem. Increasing the error margin decreases the sensitivity to non-resync IO. To partially compensate for this, the time to wait when non-resync IO is detected is increased so that less steady IO is required to keep the resync at bay. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34ef75f09f09611b62ae11ae36c3c7b0a6a8a9cb Author: Neil Brown Date: Fri Nov 18 01:10:59 2005 -0800 [PATCH] md: don't pass a NULL file* into ->prepare_write() Some filesystems go oops. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c4b32b8b010d036dc03f77b0ef2a747db0cc3588 Author: Kylene Jo Hall Date: Fri Nov 18 01:10:59 2005 -0800 [PATCH] tpm: remove PCI kconfig dependency The driver dependencies on PCI have been removed. This patch clears that up in the Kconfig file Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 90612b308f2a2cc8aa08fbaf6f7184f5b7b5a855 Author: Kylene Jo Hall Date: Fri Nov 18 01:10:58 2005 -0800 [PATCH] tpm: use ioread8 and iowrite8 Use ioread8 and iowrite8 as suggested. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba3961152e7016237e15e3dfc18f08c1853d156b Author: Kylene Jo Hall Date: Fri Nov 18 01:10:57 2005 -0800 [PATCH] tpm: use flush_scheduled_work() Add the necessary flush_schedule_work calls when canceling the timer. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 966cc04b4d9d3d7a49e744888628acc36ebec5d4 Author: Vitaly Bordug Date: Fri Nov 18 01:10:55 2005 -0800 [PATCH] ppc32: add missing define for fs_enet Ethernet driver This adds the FCC_PSMR_RMII defenition, which is used in fs_enet to enable RMII mode. Signed-off-by: Vitaly Bordug Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 44f080c46e84090daf81b4d142359f8e38d7c5ee Author: Matt Domsch Date: Fri Nov 18 01:10:54 2005 -0800 [PATCH] ipmi: missing NULL test for kthread On IPMI systems with BT interfaces, we don't start the kernel thread, so smi_info->thread is NULL. Test for NULL when stopping the thread, because kthread_stop() doesn't, and an oops ensues otherwise. Signed-off-by: Matt Domsch Acked-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 58bb01a9cd72eebf60d00c57b948a76aa7b85727 Author: Hans Reiser Date: Fri Nov 18 01:10:53 2005 -0800 [PATCH] re-export clear_page_dirty_for_io() 2.6.14 has this exported, and reiser4 (at least) uses it. Put things back the way they were. Signed-off-by: Vladimir V. Saveliev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 996417d2c4eb583e94553e4ede58974e0da1c38e Author: Paul E. McKenney Date: Fri Nov 18 01:10:50 2005 -0800 [PATCH] add success/failure indication to RCU torture test One issue with the RCU torture test is that the current error flagging can be lost in dmesg. This patch adds a "SUCCESS"/"FAILURE" string to the line that flags the end of the test, where it can easily be seen with "dmesg | tail" at the end of the test. Also adds tests of architecture-specific memory barriers -- or, more likely, of the RCU torture test itself. Cc: Signed-off-by: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2463ade2cb78224302998ee3c7dc7d53da88d258 Author: Andrey Volkov Date: Fri Nov 18 01:10:48 2005 -0800 [PATCH] Fix copy-paste bug in ohci-ppc-soc.c Fix copy-paste bug in ohci-ppc-soc.c(ohci_hcd_ppc_soc_drv_remove) Signed-off-by: Andrey Volkov Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2203d6ed448ff3b777ee6bb614a53e686b483e5b Author: Linus Torvalds Date: Fri Nov 18 07:29:51 2005 -0800 Fix ACPI processor power block initialization Properly clear the memory, and set "pr->flags.power" only if a C2 or deeper state is valid (to make the code match both the comment and previous behaviour). This fixes a boot-time lockup reported by Maneesh Soni when using "maxcpus=1". Acked-by: Maneesh Soni Signed-off-by: Linus Torvalds commit 78b09735a2f42f32c4611d92ea51755e1faae385 Author: Stephen Rothwell Date: Sat Nov 19 01:40:46 2005 +1100 powerpc: merge dma-mapping.h Signed-off-by: Stephen Rothwell commit 78baa2f8ad53968ff82ad9827b7793b3f46cba0e Author: Stephen Rothwell Date: Sat Nov 19 00:33:56 2005 +1100 ppc32: move some dma routines Every other architecture define dma_cache_{inv,wback,wback_inv} in asm/io.h and doing so brings us closer to ppc64. Signed-off-by: Stephen Rothwell commit d2c5b69099ff747f9757da2416383b9a999171b1 Author: Russell King Date: Fri Nov 18 14:22:03 2005 +0000 [ARM] Fix get_user when passed a const pointer Unfortunately, later gcc versions error out when our get_user is passed a const pointer, since we write to a temporary variable declared as typeof(*(p)) which propagates the const-ness. Signed-off-by: Russell King commit f365cfd0d8b6d8fb3583d23d48f54efa88ee8563 Author: Paul Mackerras Date: Fri Nov 18 16:41:49 2005 +1100 offb: Fix compile error on ppc32 systems The code Ben H added needs for things like pci_dev, etc. Signed-off-by: Paul Mackerras commit 8a5abdf80ecf3ad3fa052878778c7185c5911a53 Author: Paul Mackerras Date: Fri Nov 18 16:39:08 2005 +1100 powerpc: Move defconfig over and remove remaining arch/ppc64 files make defconfig will now use arch/powerpc/configs/ppc64_defconfig if running on a ppc64 system. I need to add an arch/powerpc/configs/ppc_defconfig sometime. Signed-off-by: Paul Mackerras commit 44aedfe7dedb1ba9f4f9d17f55dec5727f5ff82f Author: Paul Mackerras Date: Fri Nov 18 15:54:12 2005 +1100 powerpc: Fix a couple of compile warnings for 32-bit compiles Signed-off-by: Paul Mackerras commit 49e16b7becd6320bde51aa238c11815708f836d9 Author: Paul Mackerras Date: Fri Nov 18 15:52:38 2005 +1100 powerpc: time-of-day fixes for 32-bit CHRP systems This makes 32-bit CHRP systems use the RTAS time-of-day routines if available. It fixes a bug in the RTAS time-of-day routines where they were storing a 64-bit timebase value in an unsigned long by making those variables u64. Also, the direct-access time-of-day routines had the wrong convention for the month and year in the struct rtc_time. Signed-off-by: Paul Mackerras commit 6146eed1e972a7de93ce2e36adc5812de81e879c Author: Paul Mackerras Date: Fri Nov 18 15:47:18 2005 +1100 powerpc: Fix compile error on pSeries arising from delay.h changes pseries_dedicated_idle() was using __get_tb which used to be defined in asm/delay.h. Change it to use get_tb from asm/time.h, which is in fact exactly the same thing. Signed-off-by: Paul Mackerras commit 437a58db57c61385baaa1cb8b7fa590b6a2f1607 Author: Paul Mackerras Date: Fri Nov 18 15:43:34 2005 +1100 powerpc: Move remaining .c files from arch/ppc64 to arch/powerpc This also deletes the now-unused Makefiles under arch/ppc64. Both of the files moved over could use some merging, but for now I have moved them as-is and arranged for them to be used only in 64-bit kernels. For 32-bit kernels we still use arch/ppc/kernel/idle.c and drivers/char/generic_nvram.c as before. Signed-off-by: Paul Mackerras commit f62859bb6871c5e4a8e591c60befc8caaf54db8c Author: Mike Kravetz Date: Mon Nov 14 16:12:49 2005 -0800 [PATCH] Remove SPAN_OTHER_NODES config definition The config option SPAN_OTHER_NODES was created so that we could make pSeries numa layouts work within the DISCONTIG memory model. Now that DISCONTIG has been replaced by SPARSEMEM, we can eliminate this option. I'll be sending a separate patch to Andrew to remove the arch independent code as pSeries was the only arch that needed this. Signed-off-by: Mike Kravetz Signed-off-by: Paul Mackerras commit 5daf9071b527089b1bd5d9cb3a5354b83121550e Author: Benjamin Herrenschmidt Date: Fri Nov 18 14:09:41 2005 +1100 [PATCH] powerpc: merge align.c This patch merges align.c, the result isn't quite what was in ppc64 nor what was in ppc32 :) It should implement all the functionalities of both though. Kumar, since you played with that in the past, I suppose you have some test cases for verifying that it works properly before I dig out the 601 machine ? :) Since it's likely that I won't be able to test all scenario, code inspection is much welcome. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 6defa38b3754c84cd3449447477aed81ea979407 Author: Paul Mackerras Date: Fri Nov 18 13:44:17 2005 +1100 powerpc: Fix delay functions for 601 processors My earlier merge of delay.h introduced a timebase-based udelay for 32-bit machines but also broke the 601, which doesn't have the timebase register. This fixes it by using the 601's RTC register on the 601, and also moves __delay() and udelay() to be out-of-line in arch/powerpc/kernel/time.c. These functions aren't really performance critical, after all. Signed-off-by: Paul Mackerras commit fe7bce5ef70105a6546dc9b5c354219b9f6ea991 Author: Kumar Gala Date: Thu Nov 17 17:45:40 2005 -0600 [PATCH] ppc: Fix warnings related to seq_file When we moved things around in irq.h seq_file became an issue. Fix warnings related to its usage. Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras commit 6760a1bdf56de6e1a30399d9069b94bfea59c13d Author: Kumar Gala Date: Thu Nov 17 17:05:02 2005 -0600 [PATCH] ppc: Fix MPC83xx device table The SVRs for MPC8343/E were incorrect and really the SVRs for MPC8347/E. Signed-off-by: David Updegraff Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras commit a097a35c9a6de6316c18a3e914c64400b5a6db57 Author: Segher Boessenkool Date: Thu Nov 17 22:22:14 2005 +0100 [PATCH] powerpc: Maple: request I/O resource. Reserve the Maple RTC I/O resource. Needed now we use genrtc. Signed-off-by: Segher Boessenkool Signed-off-by: Paul Mackerras commit 68643cfb879ad8c327441f875b60981822016575 Author: Olaf Hering Date: Thu Nov 17 22:09:02 2005 +0100 [PATCH] ppc boot: replace string labels with numbers Replacing the string labels with numbers saves 117 bytes in the final zImage. These local labels are not discared. Signed-off-by: Olaf Hering arch/powerpc/boot/crt0.S | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) Signed-off-by: Paul Mackerras commit d2a33170972c5772826f7f6cc950ab69ba034667 Author: Michael Ellerman Date: Thu Nov 17 20:34:35 2005 +1100 [PATCH] powerpc: Fix typo in topology.h The fix to topology.h (5cfccd7f132432dd4705444a44b51d12ef88a85f) seems to have a typeo, struct sched_domain has an idle_idx member but not an idle_id member. I assume this is the fix. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 976164497d6d8050403c96894ad418de44ec748f Author: Kumar Gala Date: Thu Nov 17 17:45:40 2005 -0600 [PATCH] ppc: Fix warnings related to seq_file When we moved things around in irq.h seq_file became an issue. Fix warnings related to its usage. Signed-off-by: Kumar Gala Signed-off-by: Linus Torvalds commit 87c89dd7330735d70cc9912483f6f4c7bc3ff19c Author: Steve French Date: Thu Nov 17 17:03:00 2005 -0800 [CIFS] Vectored and async i/o turned on and correct the writev and aio_write to flush properly. This is Christoph's patch merged with the new nobrl file operations Signed-off-by: Dave Kleikamp From: Christoph Hellwig - support vectored and async aio ops unconditionally - this is above the pagecache and transparent to the fs - remove cifs_read_wrapper. it was only doing silly checks and calling generic_file_write in all cases. - use do_sync_read/do_sync_write as read/write operations. They call ->readv/->writev which we now always implemente. - add the filemap_fdatawrite calls to writev/aio_write which were missing previously compared to plain write. no idea what the point behind them is, but let's be consistent at least.. Signed-off-by: Christoph Hellwig Signed-off-by: Steven French Signed-off-by: Andrew Morton commit 9e294f1c4d4a5fc0068fcb21f5809ff6e88e49bc Author: Steve French Date: Thu Nov 17 16:59:21 2005 -0800 [CIFS] Recognize properly symlinks and char/blk devices (not just FIFOs) created by SFU (part 2 of 2). Thanks to Martin Koeppe for useful analysis. Signed-off-by: Steve French commit 9e147a1cfce5ec6308b024abe425d5b4e1884a03 Author: David S. Miller Date: Thu Nov 17 16:52:51 2005 -0800 [IPV6]: Fib dump really needs GFP_ATOMIC. Revert: 8225ccbaf01b459cf1e462047a51b2851e756bc1 Based upon a report by Yan Zheng. Signed-off-by: David S. Miller commit 05b8b0fafd4cac75d205ecd5ad40992e2cc5934d Author: Roman Zippel Date: Thu Nov 17 15:22:39 2005 -0800 [NET]: Sanitize NET_SCHED protection in /net/sched/Kconfig On Thu, 17 Nov 2005, David Gómez wrote: > I found out that if i select NET_CLS_ROUTE4, save my changes and exit > menuconfig, execute again make menuconfig and go to QoS options, then the new > available options are visible. So menuconfig has some problem refreshing > contents :? No, they were there before too, but you have to go up one level to see them. It's better in 2.6.15-rc1-git5, but the menu structure is still a little messed up, the patch below properly indents all menu entries. Signed-off-by: Roman Zippel Signed-off-by: David S. Miller commit 381998241fd1fc635596f4e8ae835f0d64ca1ba2 Author: David S. Miller Date: Thu Nov 17 15:17:42 2005 -0800 [LLC]: Fix compiler warnings introduced by TX window scaling changes. Noticed by Olaf Hering. The comparisons want a u8 here (the data type on the left-hand branch is a u8 structure member, and the constant on the right-hand branch is "~((u8) 128)"), but C turns it into an integer so we get: net/llc/llc_c_ac.c: In function `llc_conn_ac_inc_npta_value': net/llc/llc_c_ac.c:998: warning: comparison is always true due to limited range of data type net/llc/llc_c_ac.c:999: warning: large integer implicitly truncated to unsigned type Fix this up by explicitly recasting the right-hand branch constant into a "u8" once more. Signed-off-by: David S. Miller commit 2fce76afdb067fa3e7f8ee33c9fe366bd65887ea Author: Harald Welte Date: Thu Nov 17 15:06:47 2005 -0800 [NETFILTER] ip_conntrack: fix ftp/irc/tftp helpers on ports >= 32768 Since we've converted the ftp/irc/tftp helpers to use the new module_parm_array() some time ago, we ware accidentially using signed data types - thus preventing those modules from being used on ports >= 32768. This patch fixes it by using 'ushort' module parameters. Thanks to Jan Nijs for reporting this bug. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit d5ea655376c471731845735dfe9a0bdfbe4492e9 Author: David S. Miller Date: Thu Nov 17 15:04:34 2005 -0800 [COMPAT]: Add ext3 ioctl translations. So things like on-line resizing et al. work. Based almost entirely upon a patch by Guido Günther Signed-off-by: David S. Miller commit 02b30839220fa3ef80a34ed6ee174fa2d9937eac Author: Russell King Date: Thu Nov 17 22:43:30 2005 +0000 [ARM] Fix some corner cases in new mm initialisation Document that the VMALLOC_END address must be aligned to 2MB since it must align with a PGD boundary. Allocate the vectors page early so that the flush_cache_all() later will cause any dirty cache lines in the direct mapping will be safely written back. Move the flush_cache_all() to the second local_flush_cache_tlb() and remove the now redundant first local_flush_cache_tlb(). Signed-off-by: Russell King commit bd6af700a7191f483f41706467033588f28c8877 Author: Stephen Hemminger Date: Thu Nov 17 14:11:18 2005 -0800 [TCP]: TCP highspeed build error There is a compile error that crept in with the last patch of TCP patches. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit a39cf72ceb406e152c4682c0b635a96f1439c5ed Author: Kyle McMartin Date: Thu Nov 17 16:44:57 2005 -0500 [PARISC] Make superio.c initialize before any driver needs it Convert superio_init to use PCI_FIXUP_FINAL as ohci_pci being called before superio_probe really makes a mess. superio_init will then fail to register irq 20 (the "SuperIO" irq) and BUG() because ohci_pci has stolen it before superio_fixup_irq can be moved USB to irq 1. Signed-off-by: Kyle McMartin commit 29a622dd2b577d98731d325954f328b810826cfa Author: Matthew Wilcox Date: Thu Nov 17 16:44:14 2005 -0500 [PARISC] Always spinlock tlb flush operations to ensure preempt safety Since taking a spinlock disables preempt, and we need to spinlock tlb flush on SMP for N class, we might as well just spinlock on uniprocessor machines too. Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit 9d7d57567c026a06f0cb2edabe75250d8f61d44a Author: Grant Grundler Date: Thu Nov 17 16:43:52 2005 -0500 [PARISC] Remove unused variable in signal.c Remove unused variable "struct siginfo si" in signal.c Signed-off-by: Grant Grundler Signed-off-by: Kyle McMartin commit 784412f74c0f74dac8ba30a4713273423c2ae155 Author: Christoph Hellwig Date: Thu Nov 17 16:41:26 2005 -0500 [PARISC] remove drm compat ioctls handlers Remove drm compat_ioctl handlers. The drm drivers have proper compat_ioctl methods these days. Signed-off-by: Christoph Hellwig Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit ad7dd338fbb82ea54a866b369c4c9a78cfd16234 Author: Christoph Hellwig Date: Thu Nov 17 16:40:31 2005 -0500 [PARISC] move PA perf driver over to ->compat_ioctl Move PA perf driver over to ->compat_ioctl. Signed-off-by: Christoph Hellwig Acked-by: Randolph Chung Signed-off-by: Kyle McMartin commit a137ce8536f6124c42ac300be01b9b611c7db5a1 Author: Ryan Bradetich Date: Thu Nov 17 16:38:28 2005 -0500 [PARISC] Define port->timeout to fix a long msleep in mux.c This commit is in response to a bug reported by Vesa on the irc channel a couple of weeks ago. The bug was that the console would apparently hang (not return) while using the mux console. The root cause of this bug is that bash (with readline support) makes a call to the tcsetattr() glibc function with the argument TCSADRAIN. This causes the serial core in the kernel use the uart_wait_until_sent() to be called. This function verifies the mux transmit queue is empty or calls the msleep_interruptable() with a calculated timeout value that is dependant upon the port->timeout variable. The real problem here is that the port->timeout was not defined so it was defaulted to 0 and the timeout calculation performs the following calculation: char_time = (port->timeout - HZ/50) / port->fifosize; where char_time is an unsigned long. Since the serial Mux does not use interrupts, the msleep_interruptable() function waits until the timeout has been reached ... and when the port->timeout < HZ/50 this timeout will be a long time. (I have validated that the console will eventually return ... but it takes quite a while for this to happen). This patch simply sets the port->timeout on the Mux to HZ/50 to avoid this long timeout period. Signed-off-by: Ryan Bradetich Signed-off-by: Kyle McMartin commit 83aceb5b6a561c7fd7cc2d481fb55a0a2ae37c12 Author: Matthew Wilcox Date: Thu Nov 17 16:37:24 2005 -0500 [PARISC] Fix some compile problems in ptrace.c Fix some compile problems: - ret wasn't being initialised in all code paths - I'm pretty sure 'goto out' should have been 'goto out_tsk' Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit 92495c0ebc99ee00651571cba6939783234f7696 Author: Ryan Bradetich Date: Thu Nov 17 16:36:52 2005 -0500 [PARISC] Compile fixups for serial/mux.c This patch does the following: * Fixes compiler warnings. * Replaces a __raw_readl call with the existing macro. Signed-off-by: Ryan Bradetich Signed-off-by: Kyle McMartin commit 08dc2ca61e683e9119ff534dfcd0fd555401fcf7 Author: James Bottomley Date: Thu Nov 17 16:35:09 2005 -0500 [PARISC] Fix our spinlock implementation We actually have two separate bad bugs 1. The read_lock implementation spins with disabled interrupts. This is completely wrong 2. Our spin_lock_irqsave should check to see if interrupts were enabled before the call and re-enable interrupts around the inner spin loop. The problem is that if we spin with interrupts off, we can't receive IPIs. This has resulted in a bug where SMP machines suddenly spit smp_call_function timeout messages and hang. The scenario I've caught is CPU0 does a flush_tlb_all holding the vmlist_lock for write. CPU1 tries a cat of /proc/meminfo which tries to acquire vmlist_lock for read CPU1 is now spinning with interrupts disabled CPU0 tries to execute a smp_call_function to flush the local tlb caches This is now a deadlock because CPU1 is spinning with interrupts disabled and can never receive the IPI Signed-off-by: James Bottomley Signed-off-by: Kyle McMartin commit 4269b0d371c43bc8f3c9e183847a08258587cf06 Author: Matthew Wilcox Date: Thu Nov 17 16:33:56 2005 -0500 [PARISC] Improve the error message when we get a clashing mod path Improve the error message when we get a clashing mod path, and actually display the IODC data and path for the conflicting device. Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit ba5c4f1bae89eba7b03e58a5448e8b28a006d4df Author: Matthew Wilcox Date: Thu Nov 17 16:33:29 2005 -0500 [PARISC] Return PDC_OK when alloc_pa_dev fails to enumerate all devices Return PDC_OK when device registration fails so that we enumerate all subsequent devices, even when we get two devices with the same hardware path (which should never happen, but does with at least one revision of rp8400 firmware). Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit aa0eecb07f27bea25a7cbe4150822be72493e574 Author: Carlos O'Donell Date: Thu Nov 17 16:32:46 2005 -0500 [PARISC] Document some register usages in assembly files Document clobbers and args in entry.S and syscall.S. entry.S: Add comment to indicate that cr27 may recycle and EDEADLOCK detection is not 100% correct. Since this is only enabled when using ENABLE_LWS_DEBUG, the user is warned by the comment. Signed-off-by: Carlos O'Donell Signed-off-by: Kyle McMartin commit 75be99a8c597aaebf82802109cdfd1249eea951e Author: Ryan Bradetich Date: Thu Nov 17 16:29:50 2005 -0500 [PARISC] Make redirecting irq messages less noisy Make the "redirecting irq" message to not display on the console by setting the severity to KERN_DEBUG. The console was basically unusable. Signed-off-by: Ryan Bradetich Signed-off-by: Kyle McMartin commit 03afe22f074231196dcf3298f962cfc787ebbc60 Author: Grant Grundler Date: Thu Nov 17 16:29:16 2005 -0500 [PARISC] irq_affinityp[] only available for SMP builds irq_affinityp[] only available for SMP builds, make code that uses it conditional on CONFIG_SMP. Signed-off-by: Grant Grundler Signed-off-by: Kyle McMartin commit c2ab64d09815cc4d48347ee3679658f197455a2a Author: James Bottomley Date: Thu Nov 17 16:28:37 2005 -0500 [PARISC] Add IRQ affinities This really only adds them for the machines I can check SMP on, which is CPU interrupts and IOSAPIC (so not any of the GSC based machines). With this patch, irqbalanced can be used to maintain irq balancing. Unfortunately, irqbalanced is a bit x86 centric, so it doesn't do an incredibly good job, but it does work. Signed-off-by: James Bottomley Signed-off-by: Kyle McMartin commit 1d4c452a85503cdb4bca5925cf698b61d3aa43a0 Author: Kyle McMartin Date: Thu Nov 17 16:27:44 2005 -0500 [PARISC] Fix uniprocessor build by dummying smp_send_all_nop() Since irq.c uses smp_send_all_nop, we must define it for UP builds as well. Make it a static inline so it gets optimized away. This forces irq.c to include though. Signed-off-by: Kyle McMartin commit d911aed8adf74e1fae88d082b8474b2175b7f1da Author: James Bottomley Date: Thu Nov 17 16:27:02 2005 -0500 [PARISC] Fix our interrupts not to use smp_call_function Fix our interrupts not to use smp_call_function On K and D class smp, the generic code calls this under an irq spinlock, which causes the WARN_ON() message in smp_call_function() (and is also illegal because it could deadlock). The fix is to use a new scheme based on the IPI_NOP. Signed-off-by: James Bottomley Signed-off-by: Kyle McMartin commit 3f902886a81c6d4e6c399760936b645b5c7a7342 Author: Grant Grundler Date: Thu Nov 17 16:26:20 2005 -0500 [PARISC] Disable nesting of interrupts Disable nesting of interrupts - still has holes The offending sequence starts out like this: 1) take external interrupt 2) set_eiem() to only allow TIMER_IRQ; local interrupts still disabled 3) read the EIRR to get a "list" of pending interrupts 4) clear EIRR of pending interrupts we intend to handle 5) call __do_IRQ() to handle IRQ. 6) handle_IRQ_event() enables local interrupts (I-Bit) 7) take a timer interrupt 8) read EIRR to get a new list of pending interrupts 9) clear EIRR of pending interrupts we just read 10) handle pending interrupts found in (8) 11) set_eiem(cpu_eiem) and return [ TROUBLE! all enabled CPU IRQs are unmasked. } 12) handle remaining interrupts pending from (3) e.g. call __do_IRQ() -> handle_IRQ_event()..etc [ TROUBLE! call to handle_IRQ_event() can now enable *any* IRQ. } 13) set_eiem(cpu_eiem) and return The problem is we now get into ugly race conditions with Timer and IPI interrupts at this point. I'm not exactly sure what happens when things go wrong (perhaps nest calls to IPI or timer interrupt?). But I'm certain it's not good. This sequence will break sooner if (10) would accidentally leave interrupts enabled. I'm pretty sure the right answer is now to make cpu_eiem a per CPU variable since all external interrupts on parisc are per CPU. This means we will NOT need to send an IPI to every CPU in the system when enabling or disabling an IRQ since only one CPU needs to change it's EIEM. Thanks to James Bottomley for (once again) pointing out the problem. Signed-off-by: Grant Grundler Signed-off-by: Kyle McMartin commit 9a8b4584065dd241d6c2bf818e349986bd900b8e Author: James Bottomley Date: Thu Nov 17 16:24:52 2005 -0500 [PARISC] Make sure timer and IPI execute with interrupts disabled Fix a longstanding smp bug The problem is that both the timer and ipi interrupts are being called with interrupts enabled, which isn't what anyone is expecting. The IPI issue has just started to show up by causing a BUG_ON in the slab debugging code. The timer issue never shows up because there's an eiem work around in our irq.c The fix is to label both these as SA_INTERRUPT which causes the generic irq code not to enable interrupts. I also suspect the smp_call_function timeouts we're seeing might be connected with the fact that we disable IPIs when handling any other type of interrupt. I've put a WARN_ON in the code for executing smp_call_function() with IPIs disabled. Signed-off-by: James Bottomley Signed-off-by: Kyle McMartin commit 6b1de9161e973bac8c4675db608fe4f38d2689bd Author: Jens Axboe Date: Thu Nov 17 21:35:02 2005 +0100 [PATCH] VM: fix zone list restart in page allocatate We must reassign z before looping through the zones kicking kswapd, since it will be NULL if we hit an OOM condition and jump back to the beginning again. 'z' is initially assigned before the restart: label. So move the restart label up a little. Signed-off-by: Jens Axboe commit bb833986674ce1fc1b237b3d81459511ad2df393 Author: Greg Kroah-Hartman Date: Thu Nov 17 09:48:18 2005 -0800 [PATCH] USB: add the anydata usb-serial driver Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 2d117403ae4006eeeb9037b82e9ecd8b3b043584 Author: Greg Kroah-Hartman Date: Thu Nov 17 09:48:13 2005 -0800 [PATCH] USB: delete the nokia_dku2 driver It was causing too many problems, and this is not the proper type of driver for this device. Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 654f31189e550cd5924b786487a5d93d9feaada9 Author: Greg Kroah-Hartman Date: Thu Nov 17 09:48:09 2005 -0800 [PATCH] USB: move CONFIG_USB_DEBUG checks into the Makefile This lets us remove a lot of code in the drivers that were all checking the same thing. It also found some bugs in a few of the drivers, which has been fixed up. Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 87cf203935a646d5fb00464dc5887292da71d928 Author: Richard Purdie Date: Thu Nov 17 09:47:57 2005 -0800 [PATCH] USB: OHCI lh7a404 platform device conversion fixup Fix an error in the OHCI lh7a404 driver after the platform device conversion. Signed-off-by: Richard Purdie Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 9465663965fbe7de4e21d090e8eb0cc34b65294f Author: Antti Andreimann Date: Thu Nov 17 09:47:53 2005 -0800 [PATCH] USB: Maxtor OneTouch button support for older drives This small patch adds a device ID used by older Maxtor OneTouch drives (the ones with blue face-plate instead of the fancy silver one used in newer models). The button on those drives works well with the current driver. From: Antti Andreimann Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 058120d70ebb430e27ad55871429028361c5baed Author: Andrew Morton Date: Thu Nov 17 09:47:49 2005 -0800 [PATCH] usb devio warning fix drivers/usb/core/devio.c: In function `proc_ioctl_compat': drivers/usb/core/devio.c:1401: warning: passing arg 1 of `compat_ptr' makes integer from pointer without a cast Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit d23b536bb715673ca0ccbdaac2b6ce2c001d06e9 Author: Herbert Xu Date: Thu Nov 17 09:47:45 2005 -0800 [PATCH] USB: fix race in kaweth disconnect this patch from Herbert Xu fixes a race by moving termination of the URBs into close() exclusively. Signed-off-by: Herbert Xu Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 8845add380854ffce5268714a093df8c80b4a6e2 Author: Daniel Drake Date: Thu Nov 17 09:48:01 2005 -0800 [PATCH] usb-storage: Fix detection of kodak flash readers in shuttle_usbat driver Peter Favrholdt reported that his Kodak flash device was getting detected as a CDROM, and he helped me track this down to the fact that the device takes a long time (approx 440ms!) to reset. This patch increases the delay to 500ms, which solves the problem. Signed-off-by: Daniel Drake Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 9142d59a451731d23539d218c962418acc93283c Author: Oliver Neukum Date: Thu Nov 17 09:47:41 2005 -0800 [PATCH] USB: Adapt microtek driver to new scsi features the scsi layer now uses very short sg lists. This breaks the microtek driver. Here is a patch fixes this and some other issues. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit b8f4c1d6674463e5824eada1ad7ec799276718bd Author: Luiz Fernando Capitulino Date: Thu Nov 17 09:47:36 2005 -0800 [PATCH] USB: pl2303: updates pl2303_update_line_status() Updates pl2303_update_line_status() to handle X75 and SX1 Siemens mobiles Signed-off-by: Luiz Capitulino Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit a8310f3b8b713e52d77c56d4b8865685ee40d02a Author: Luiz Fernando Capitulino Date: Thu Nov 17 09:47:32 2005 -0800 [PATCH] USB: pl2303: adds new IDs. This patch adds two new Siemens mobiles IDs for the pl2303 driver. Signed-off-by: Luiz Capitulino Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit c9d00fc148b210aa8cf388d6e1eac187a0e855a6 Author: David Brownell Date: Thu Nov 17 09:47:28 2005 -0800 [PATCH] USB: onetouch doesn't suspend yet The onetouch support doesn't suspend correctly (leaves an interrupt URB posted, instead of unlinking it) so for now just disable it when PM is in the air. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit b0ce84d5539de88a1001f9aa3deeaa20fde3d152 Author: Josef Balatka Date: Thu Nov 17 09:47:24 2005 -0800 [PATCH] USB: cp2101.c: Jablotron usb serial interface identification Jablotron usb serial interface identification Signed-off-by: Josef Balatka Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit c5dbf868e2bbeea6581f388a09539779c0d61357 Author: Pavel Machek Date: Thu Nov 17 09:47:11 2005 -0800 [PATCH] USB: kill unneccessary usb-storage blacklist entries I actually have this device, and kernel reports blacklist entry is no longer neccessary. Signed-off-by: Pavel Machek Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 777da5905e82695d1dd73eee6cfe50bd486d8fe9 Author: Andrew Morton Date: Thu Nov 17 09:47:02 2005 -0800 [PATCH] USB: usbdevfs_ioctl 32bit fix drivers/usb/core/devio.c: In function `proc_ioctl_compat': drivers/usb/core/devio.c:1401: warning: passing arg 1 of `compat_ptr' makes integer from pointer without a cast NFI if this is correct... Cc: Pete Zaitcev Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit bc7cb323bab717660830211d50555dedf19e372e Author: OGAWA Hirofumi Date: Thu Nov 17 09:47:07 2005 -0800 [PATCH] usbfs: usbfs_dir_inode_operations cleanup Signed-off-by: OGAWA Hirofumi Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit c611d2cd2f74988baa9a4c6cfc8a48064fd075e6 Author: Marcel Holtmann Date: Thu Nov 17 09:46:39 2005 -0800 [PATCH] USB: Delete leftovers from bluetty driver This patch deletes the bluetooth.txt help file of the bluetty driver and hands over its major device nodes for character devices to the RFCOMM TTY implementation of the Bluetooth subsystem. Signed-off-by: Marcel Holtmann Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit d4ece29d89d424ea045753c639971429faa9ee58 Author: Dmitry Torokhov Date: Thu Nov 17 09:46:44 2005 -0800 [PATCH] USB: fix 'unused variable' warning USB: fix 'unused variable' warning Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit ebb6f371ac5ce623051c4431c5d0f093462f679b Author: Ping Cheng Date: Thu Nov 17 09:46:51 2005 -0800 [PATCH] USB: wacom tablet driver update This patch adds support for Graphire4, Cintiq 710, Intuos3 6x11, etc. and report Device IDs. Signed-off-by: Ping Cheng Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 116d75bd4d539309e0e1391e509f852a9cce82a6 Author: Ping Cheng Date: Thu Nov 17 09:46:33 2005 -0800 [PATCH] USB: add new wacom devices to usb hid-core list This patch adds support for Graphire4, Cintiq 710, Intuos3 6x11, etc. Signed-off-by: Ping Cheng Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 80ed89f6105fd2f35b3b9ee2078f31e1510da71e Author: Greg Kroah-Hartman Date: Thu Nov 17 09:46:28 2005 -0800 [PATCH] USB Serial: rename ChangeLog.old People are complaining about a .old file in the tree. So rename drivers/usb/serial/ChangeLog.old to ChangeLog.history. Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit cca2362c64429283d384df5b4cb948dcd6e8127b Author: Greg Kroah-Hartman Date: Thu Nov 17 09:46:24 2005 -0800 [PATCH] USB: fix build breakage in dummy_hcd.c Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 1a7ec1a6a1df63aab9a1fa6174bd704241329805 Author: Deepak Saxena Date: Thu Nov 17 11:09:53 2005 -0800 [PATCH] Fix IXP4xx I2C driver build breakage Platform device conversion missed a couple of spots. Signed-off-by: Deepak Saxena Signed-off-by: Linus Torvalds commit cd02e27b1514a27b2a8ab59755ae6d23d4d8a10f Author: Linus Torvalds Date: Thu Nov 17 10:04:31 2005 -0800 x86: Fix silly typo in recent fixes The second __const_sigaddset() should have been a sigdelset.. Compile trouble noted by Greg K-H. Signed-off-by: Linus Torvalds commit e8aabc47168d24eabc08418db4e034a4c625721c Author: Chen, Kenneth W Date: Thu Nov 17 01:55:34 2005 -0800 [IA64] polish comments for tlb fault handler in ivt.S Polish the comments specifically in vhpt_miss and nested_dtlb_miss handlers. I think it's better to explicitly name each page table level with its name instead of numerically name them. i.e., use pgd, pud, pmd, and pte instead of referring as L1, L2, L3 etc. Along the line, remove some magic number in the comments like: "PTA + (((IFA(61,63) << 7) | IFA(33,39))*8)". No code change at all, pure comment update. Feel free to shoot anything you have, darts or tomahawk cruise missile. I will duck behind a bunker ;-) Signed-off-by: Ken Chen Acked-by: Robin Holt Signed-off-by: Tony Luck commit fedb25fae72bc2c3709448a43be067439643da87 Author: Chen, Kenneth W Date: Thu Nov 17 01:38:42 2005 -0800 [IA64] 4 level page table bug fix in vhpt_miss From source code inspection, I think there is a bug with 4 level page table with vhpt_miss handler. In the code path of rechecking page table entry against previously read value after tlb insertion, *pte value in register r18 was overwritten with value newly read from pud pointer, render the check of new *pte against previous *pte completely wrong. Though the bug is none fatal and the penalty is to purge the entry and retry. For functional correctness, it should be fixed. The fix is to use a different register so new *pud don't trash *pte. (btw, the comments in the cmp statement is wrong as well, which I will address in the next patch). Signed-off-by: Ken Chen Signed-off-by: Tony Luck commit 67a1901ff498363e253b90ba132e336c925203ed Author: Russell King Date: Thu Nov 17 16:48:00 2005 +0000 [ARM] __ioremap doesn't use 4th argument The "align" argument in ARMs __ioremap is unused and provides a misleading expectation that it might do something. It doesn't. Remove it. Signed-off-by: Russell King commit 0c2e4b4ff38986e5b6f707d006799bff9663c802 Author: Russell King Date: Thu Nov 17 16:46:41 2005 +0000 [ARM] Drivers should not make use of architecture private __ioremap __ioremap is an architecture private interface and must not be used by drivers when the architecture independent interface will do just as well. Switch the ipaq drivers to use the correct interface. Signed-off-by: Russell King commit 728f5c076ad000e547aa9e00d16792043ee1bfc6 Author: Russell King Date: Thu Nov 17 16:43:14 2005 +0000 [ARM] Improve comment about ASSERT()s in vmlinux.lds.S Provide folk with an idea what to do if the ASSERT statements fail with their linker. Signed-off-by: Russell King commit b7fd1edd2c0c225afa96af92d4adecb91e7d439d Author: Constantine Gavrilov Date: Thu Nov 17 11:40:43 2005 +0200 [PATCH] x86: fix sigaddset() inline asm memory constraint Due to incomplete memory constraints, gcc would miscompile code with sigaddset on i386 if sig arg was const. A quote form Jakub to make the issue clear: "You need either __asm__("btsl %1,%0" : "+m"(*set) : "Ir"(_sig-1) : "cc"); or __asm__("btsl %1,%0" : "=m"(*set) : "Ir"(_sig-1), "m"(*set) : "cc"); because the btsl instruction doesn't just set the memory to some value, but needs to read its previous content as well. If you don't tell that fact to GCC, GCC is of course free to optimize as if the asm was just setting the value and not depended on the previous value." Signed-off-by: Linus Torvalds commit 3b26b1100e26811e54770abaa221eae140ba840d Author: Zhu Yi Date: Thu Nov 17 13:58:30 2005 +0800 [PATCH] ipw2200: fix error log offset calculation This fixes a slab corruption issue in the ipw2200 driver: it essentially multiplied the error log number _twice_ by the size of the error element entry (once explicitly in the code, and once implicitly as part of the regular pointer arithmetic). Cc: Henrik Brix Andersen Cc: Bernard Blackham Cc: Zilvinas Valinskas Cc: Pekka Enberg Signed-off-by: Zhu Yi Signed-off-by: Linus Torvalds -- commit efb3442cf1c65747a858476e10f705612383eed1 Author: Pekka Enberg Date: Wed Nov 16 21:55:05 2005 +0200 [PATCH] ipw2200: disallow direct scanning when device is down The function ipw_request_direct_scan() should bail out when the device is down. This fixes a lockup caused by wpa_supplicant triggering ipw_request_direct_scan() while the driver was in a middle of a reset due to firmware errors. Thanks to Zilvinas Valinskas for reporting the bug and helping me debug it. Signed-off-by: Pekka Enberg Acked-by: Zhu Yi Signed-off-by: Linus Torvalds commit aec8b7557cf0fc4dac059112328b5aa89271c77e Author: Ralf Baechle Date: Thu Nov 17 16:23:58 2005 +0000 [MIPS] Update defconfigs Signed-off-by: Ralf Baechle commit 1a6ea3ec6784cf3dedc338e1980dc0b4cf28a805 Author: Ralf Baechle Date: Tue Nov 15 16:10:01 2005 +0000 [MIPS] SEAD: More build fixes. Signed-off-by: Ralf Baechle commit 09b696efd93560609f25821208dae18027187425 Author: Ralf Baechle Date: Tue Nov 15 13:55:06 2005 +0000 [MIPS] TX3927: Try to glue the PCI code. Signed-off-by: Ralf Baechle commit 561a0792405bea8ead78990d755dd1f95b8e95b8 Author: Ralf Baechle Date: Tue Nov 15 13:25:59 2005 +0000 [MIPS] SEAD: Delete seadint_init() prototype. There is no definition for seadint_init() and the unprotected prototype breaks compilation of assembler files. Signed-off-by: Ralf Baechle commit 3d5d44017601c927f5e14c43b0efee34e7e50a66 Author: Ralf Baechle Date: Tue Nov 15 13:11:35 2005 +0000 [MIPS] Ocelot G: Use CPU_MASK_NONE instead of 0 to initialize cpu mask. Signed-off-by: Ralf Baechle commit c183f1224bbae052b5fbb971d6eafc5cbdc6be4f Author: Ralf Baechle Date: Tue Nov 15 13:05:26 2005 +0000 [MIPS] JMR3927: Fix include wrapper symbol. Signed-off-by: Ralf Baechle commit c32cf78c0289c4d8f5973c985dda18f2b3a03e2b Author: Ralf Baechle Date: Tue Nov 15 13:01:50 2005 +0000 [MIPS] JMR3927: Fix compilation by including . Signed-off-by: Ralf Baechle commit 5135b0cdb23e47dd48d8100e45bd48ce937732ff Author: Ralf Baechle Date: Tue Nov 15 12:19:46 2005 +0000 [MIPS] JMR3927: need include/asm-mips/mach-jmr3927 in it's include path. Signed-off-by: Ralf Baechle commit 8bf4057bdd8912c7388c28e625f0b846a4ca1468 Author: Ralf Baechle Date: Tue Nov 15 12:17:42 2005 +0000 [MIPS] JMR3927: It's ops-tx3927.o not ops-jmr3927.o Signed-off-by: Ralf Baechle commit 4237f229018ccf937578dee97565a49d712809e8 Author: Ralf Baechle Date: Thu Nov 17 16:23:50 2005 +0000 [IDE] Add driver for Sibyte Swarm evaluation board This driver supports the IDE port on the Sibyte Swarm evaluation boards and it's relatives for the BCM1250 family of systems on a chip. Signed-off-by: Ralf Baechle Acked-by: Bartlomiej Zolnierkiewicz commit b60ccd575c2d96041b856aad19a7d3af168d79b9 Author: Pantelis Antoniou Date: Sun Nov 13 23:27:46 2005 +0200 [MIPS] Alchemy: Console output fixup This is needed to make console output appear with the new driver... Signed-off-by: Ralf Baechle commit f10d14ddec8daf11a298f05ab3d644887df39830 Author: Arnaud Giersch Date: Sun Nov 13 00:38:18 2005 +0100 [MIPS] Fix documentation typos. Signed-off-by: Arnaud Giersch Signed-off-by: Ralf Baechle commit 99289a4e8a9cb3fa6caa8fc4ebf57a33db497340 Author: Arnaud Giersch Date: Sun Nov 13 00:38:18 2005 +0100 [MIPS] Add const qualifier to writes##bwlq. Add const qualifier to parameter addr of writes##bwlq. Signed-off-by: Arnaud Giersch Signed-off-by: Ralf Baechle commit 59f145d28ce853b13dafdfab438c48f3ead0b38e Author: Arnaud Giersch Date: Sun Nov 13 00:38:18 2005 +0100 [MIPS] IP32: Fix sparse warnings. Add __iomem qualifier to crime and mace pointers. Signed-off-by: Arnaud Giersch Signed-off-by: Ralf Baechle commit 84c493d8e143360cfba3efede97e5a93d62c4d3d Author: Arnaud Giersch Date: Sun Nov 13 00:38:18 2005 +0100 [MIPS] IP32 Fix and complete IP32 parport definitions Fix, complete, and indent IP32 parport definitions. Definition were wrong for CTXINUSE and DMACTIVE (1-bit shift). Add macros DATA_BOUND, DATALEN_SHIFT, and CTRSHIFT. Signed-off-by: Arnaud Giersch Signed-off-by: Ralf Baechle commit 19ce1cfb2d53e5b9f70d0199d551789db2718e6f Author: Arnaud Giersch Date: Sun Nov 13 00:38:18 2005 +0100 [MIPS] IP32: Export mace symbol. Export mace symbol so that it can be used in modules. Signed-off-by: Arnaud Giersch Signed-off-by: Ralf Baechle commit 70ad7d1840d3479ea8503c9f89ec503115bfd2cf Author: Ralf Baechle Date: Fri Nov 11 11:49:53 2005 +0000 [MIPS] JMR3927: Fix syntax error. Signed-off-by: Ralf Baechle commit efd9412d850397fc129c17eb33c84f74abb0d3ee Author: Ralf Baechle Date: Fri Nov 11 11:46:25 2005 +0000 [MIPS] JMR3927: Undo accidental rename. Signed-off-by: Ralf Baechle commit d93efab838ee399b45379bd97b2812ecee84471b Author: Ralf Baechle Date: Fri Nov 11 11:15:41 2005 +0000 [MIPS] DDB5477: Fix unused variable warning. Signed-off-by: Ralf Baechle commit 16212017a54afdb702ecc796aaa0448b795de03b Author: Ralf Baechle Date: Thu Nov 17 16:23:44 2005 +0000 [MIPS] IP32: No need to include . Signed-off-by: Ralf Baechle commit cd017fbdd33f2d8294b0e0324faa1dc7750b4af0 Author: Ralf Baechle Date: Thu Nov 17 16:23:43 2005 +0000 Add definitions for the Dallas DS1742 RTC / non-volatile memory. Signed-off-by: Ralf Baechle commit 443bf3292f04c53e92bf0588f1aa2c9b421545e2 Author: Ralf Baechle Date: Thu Nov 17 16:23:42 2005 +0000 Add definitions for the Dallas DS17287 RTC. Signed-off-by: Ralf Baechle commit bdc3c3c7cbc3e1244c03640b4b372d097a1dacf3 Author: Ralf Baechle Date: Thu Nov 17 16:23:42 2005 +0000 [MIPS] Add missing arch defines for the Alchemy MTD driver. Signed-off-by: Ralf Baechle commit 6f17ce33fef3fd84e3e45850c9388d118adfad96 Author: Yoichi Yuasa Date: Thu Nov 10 22:42:36 2005 +0900 Add GT64111 PCI ID back Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 0905780aae58ea69f2dafea9716ee2ea78dbe4e2 Author: Maciej W. Rozycki Date: Mon Jun 13 19:58:50 2005 +0000 [MIPS] zs.c: Resurrect the deceased zs.c for now. Not that it's meant to be sustained for long, but from time to time it's useful to have some console... Signed-off-by: Maciej W. Rozycki Signed-off-by: Ralf Baechle commit e0c9b7973021ea4baa1ed76ff25ceb80f75edd8f Author: Ralf Baechle Date: Tue Nov 8 22:36:48 2005 +0000 [MIPS] feature-removal-schedule.txt: Schedule au1x00_uart for removal. The 8250 serial driver now has the ability to deal with the differences between the standard 8250 family of UARTs and their slightly strange brother on Alchemy SOCs. The loss of features is not considered an issue. Signed-off-by: Ralf Baechle commit db7f6861822c80f17a23647b4d0042dcc56e2024 Author: Ralf Baechle Date: Tue Nov 8 22:23:13 2005 +0000 [MIPS] Delete duplicate definitions of break codes. Signed-off-by: Ralf Baechle commit 20913a9f6e3ae9a7facf96c7b1299e3875a895a0 Author: Andrey Volkov Date: Thu Nov 17 16:05:35 2005 +0000 [DRIVER MODEL] Fix typo in ohci-ppc-soc.c Fix copy-paste bug in ohci-ppc-soc.c(ohci_hcd_ppc_soc_drv_remove) Signed-off-by: Andrey Volkov Signed-off-by: Russell King commit 7d78c887a94067ba218dc71b89d0d7a09415197f Author: Russell King Date: Thu Nov 17 15:47:30 2005 +0000 [DRIVER MODEL] Fix merge clashes with ARM ixp2000 / ixp4xx platforms Signed-off-by: Russell King commit a2c91a8819e315e9fd1aef3ff57badb6c1be3f80 Author: Jeff Garzik Date: Thu Nov 17 05:44:44 2005 -0500 [libata sata_mv] handle lack of hardware nIEN support Handle errata (it was unintentional on this h/w, whereas its intentional on others) whereby the nIEN bit in Device Control is ignored, leading to a situation where a hardware interrupt completes the qc before the polling code has a chance to. This will get fixed The Right Way(tm) once Albert Lee's irq-pio branch is merged, as the more natural PIO method on this hardware is interrupt-driven. commit 22374677d18c5eeefd3a283431d312b8c44fef02 Author: Jeff Garzik Date: Thu Nov 17 10:59:48 2005 -0500 [libata sata_mv] SATA probe, DMA boundary fixes - DMA boundary was being handled incorrectly. Copied the code from ata_fill_sg(), since Marvell has the same DMA boundary needs. (we can't use ata_fill_sg directly since we have different hardware descriptors) - cleaned up the SATA phy reset code, to deal with various errata commit 64f043d80752a8e5f0d55255e7bb9a1a05af206f Author: Jeff Garzik Date: Thu Nov 17 10:50:01 2005 -0500 [libata] add timeout to commands for which we call wait_completion() commit 4a59a810513d5f7aa76515908b8e3620fa1b9b69 Author: Patrick McHardy Date: Wed Nov 16 23:14:19 2005 -0800 [NETFILTER]: Fix nf_conntrack compilation with CONFIG_NETFILTER_DEBUG CC [M] net/netfilter/nf_conntrack_core.o net/netfilter/nf_conntrack_core.c: In function 'nf_ct_unlink_expect': net/netfilter/nf_conntrack_core.c:390: error: 'exp_timeout' undeclared (first use in this function) net/netfilter/nf_conntrack_core.c:390: error: (Each undeclared identifier is reported only once net/netfilter/nf_conntrack_core.c:390: error: for each function it appears in.) Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit b341e32e5cc1a154cb0ac2f4229c2d040647