commit 6810b548b25114607e0814612d84125abccc0a4f tree 51dab8f9b809479b038e2d957e74fba7e1e99e49 parent ac71d12c990526b01ef6cfe50907ef8530a30331 author Andi Kleen Mon, 08 May 2006 15:17:31 +0200 committer Linus Torvalds Mon, 08 May 2006 09:34:56 -0700 [PATCH] x86_64: Move ondemand timer into own work queue Taking the cpu hotplug semaphore in a normal events workqueue is unsafe because other tasks can wait for any workqueues with it hold. This results in a deadlock. Move the DBS timer into its own work queue which is not affected by other work queue flushes to avoid this. Has been acked by Venkatesh. Cc: venkatesh.pallipadi@intel.com Cc: cpufreq@lists.linux.org.uk Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit ac71d12c990526b01ef6cfe50907ef8530a30331 tree 30d00436366c107eeac83e1af12b3e09a41e7607 parent 8b1ffe9550e71224c43d8c754245bd76f4ea9bb8 author Andi Kleen Mon, 08 May 2006 15:17:28 +0200 committer Linus Torvalds Mon, 08 May 2006 09:34:56 -0700 [PATCH] x86_64: Avoid EBDA area in early boot allocator Based on analysis&patch from Robert Hentosch Observed on a Dell PE6850 with 16GB The problem occurs very early on, when the kernel allocates space for the temporary memory map called bootmap. The bootmap overlaps the EBDA region. EBDA region is not historically reserved in the e820 mapping. When the bootmap is freed it marks the EBDA region as usable. If you notice in setup.c there is already code to work around the EBDA in reserve_ebda_region(), this check however occurs after the bootmap is allocated and doesn't prevent the bootmap from using this range. AK: I redid the original patch. Thanks also to Jan Beulich for spotting some mistakes. Cc: Robert_Hentosch@dell.com Cc: jbeulich@novell.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 8b1ffe9550e71224c43d8c754245bd76f4ea9bb8 tree f569da4b1dabc94867ff2a7a0d383bef0d4f49bf parent cdc60a4c8e71c4bcf67e83fac6c0cabd0ff19bfe author Corey Minyard Mon, 08 May 2006 15:17:25 +0200 committer Linus Torvalds Mon, 08 May 2006 09:34:56 -0700 [PATCH] x86_64: add nmi_exit to die_nmi Playing with NMI watchdog on x86_64, I discovered that it didn't do what I expected. It always panic-ed, even when it didn't happen from interrupt context. This patch solves that problem for me. Also, in this case, do_exit() will be called with interrupts disabled, I believe. Would it be wise to also call local_irq_enable() after nmi_exit()? [Yes I added it -AK] Currently, on x86_64, any NMI watchdog timeout will cause a panic because the irq count will always be set to be in an interrupt when do_exit() is called from die_nmi(). If we add nmi_exit() to the die_nmi() call (since the nmi will never exit "normally") it seems to solve this problem. The following small program can be used to trigger the NMI watchdog to reproduce this: main () { iopl(3); for (;;) asm("cli"); } Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit cdc60a4c8e71c4bcf67e83fac6c0cabd0ff19bfe tree 204e3ab2ccaa9828d0ea71b43891729b216db7bf parent 5192d84e4c32cd335fd572e5ff0712041f45f7e7 author Corey Minyard Mon, 08 May 2006 15:17:22 +0200 committer Linus Torvalds Mon, 08 May 2006 09:34:56 -0700 [PATCH] x86_64: fix die_lock nesting I noticed this when poking around in this area. The oops_begin() function in x86_64 would only conditionally claim the die_lock if the call is nested, but oops_end() would always release the spinlock. This patch adds a nest count for the die lock so that the release of the lock is only done on the final oops_end(). Signed-off-by: Corey Minyard Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 5192d84e4c32cd335fd572e5ff0712041f45f7e7 tree cff2adc01b146cb240c6e9e8662374d969a50284 parent e0c1e9bf81badc7ba59e120d6218101903d5d103 author Andi Kleen Mon, 08 May 2006 15:17:19 +0200 committer Linus Torvalds Mon, 08 May 2006 09:34:56 -0700 [PATCH] x86_64: Check for too many northbridges in IOMMU code The IOMMU code can only deal with 8 northbridges. Error out when more are found. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e0c1e9bf81badc7ba59e120d6218101903d5d103 tree 78f53a42795c935ff7a212d479c3fc00f0357ea3 parent abfd3057187812352cd8502c29ca50cd010b3ccc author Kimball Murray Mon, 08 May 2006 15:17:16 +0200 committer Linus Torvalds Mon, 08 May 2006 09:34:56 -0700 [PATCH] x86_64: avoid IRQ0 ioapic pin collision The patch addresses a problem with ACPI SCI interrupt entry, which gets re-used, and the IRQ is assigned to another unrelated device. The patch corrects the code such that SCI IRQ is skipped and duplicate entry is avoided. Second issue came up with VIA chipset, the problem was caused by original patch assigning IRQs starting 16 and up. The VIA chipset uses 4-bit IRQ register for internal interrupt routing, and therefore cannot handle IRQ numbers assigned to its devices. The patch corrects this problem by allowing PCI IRQs below 16. Cc: len.brown@intel.com Signed-off by: Natalie Protasevich Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit abfd3057187812352cd8502c29ca50cd010b3ccc tree c84ff2b16ba38351f5ff461b74d97fe33f1e83c0 parent 96b8eaa14a20771997b501a049e418b871bf9def parent 913ed41eb5c948d2f8b5deffd29c2638eceef3d7 author Linus Torvalds Mon, 08 May 2006 09:28:35 -0700 committer Linus Torvalds Mon, 08 May 2006 09:28:35 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] remove asm-ia64/bitops.h self-inclusion [IA64] strcpy returns NULL pointer and not destination pointer commit 96b8eaa14a20771997b501a049e418b871bf9def tree 31d9724f7628fab85bbb0a08e694450770494e96 parent bed7a560333d40269a886c4421d4c8f964a32177 parent 0eb1bd210d94e9f2c87551d794bb2755e5e24eed author Linus Torvalds Mon, 08 May 2006 09:11:10 -0700 committer Linus Torvalds Mon, 08 May 2006 09:11:10 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [IRDA] irda-usb: use NULL instead of 0 [IPV4]: Remove likely in ip_rcv_finish() [NET]: Create netdev attribute_groups with class_device_add [CLASS DEVICE]: add attribute_group creation commit bed7a560333d40269a886c4421d4c8f964a32177 tree 2350415cae5724d07862a84140d94522fca3f6ab parent 75dff55af9a989293e9f9bacf049858f4262bc08 parent fd5f0cd6b0cef59ba18e5ac13be5b2775fa6ec28 author Linus Torvalds Mon, 08 May 2006 09:10:44 -0700 committer Linus Torvalds Mon, 08 May 2006 09:10:44 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: kbuild: Do not overwrite makefile as anohter user kbuild: drivers/video/logo/ - fix ident glitch kbuild: fix gen_initramfs_list.sh kbuild modpost - relax driver data name kbuild: removing .tmp_versions considered harmful kbuild: fix modpost segfault for 64bit mipsel kernel commit 75dff55af9a989293e9f9bacf049858f4262bc08 tree 0de0ec3f7910ef24201ae2eaf3c3f4ae4cfcb7f7 parent 9d21f09ca03d1142f1988001f228d02581d8986c author Trond Myklebust Sun, 07 May 2006 23:02:42 -0400 committer Linus Torvalds Mon, 08 May 2006 08:07:17 -0700 [PATCH] fs/locks.c: Fix lease_init It is insane to be giving lease_init() the task of freeing the lock it is supposed to initialise, given that the lock is not guaranteed to be allocated on the stack. This causes lockups in fcntl_setlease(). Problem diagnosed by Daniel Hokka Zakrisson Also fix a slab leak in __setlease() due to an uninitialised return value. Problem diagnosed by Björn Steinbrink. Signed-off-by: Trond Myklebust Tested-by: Daniel Hokka Zakrisson Signed-off-by: Linus Torvalds commit fd5f0cd6b0cef59ba18e5ac13be5b2775fa6ec28 tree 3ae3209f1846261c9a455339ddcd40d16cd2bf99 parent cc873e1aa1fa916a485294117a9846e668505671 author Jan Beulich Tue, 02 May 2006 12:33:20 +0200 committer Sam Ravnborg Mon, 08 May 2006 06:55:32 +0200 kbuild: Do not overwrite makefile as anohter user Change the conditional of the outputmakefile rule to be evaluated entirely in make, and add a conditional to not touch the generated makefile when e.g. running 'make install' as root while the build was done as non-root. Also adjust the comment describing this, and move the message printing and redirection to mkmakefile. Signed-off-by: Jan Beulich Signed-off-by: Sam Ravnborg commit 9d21f09ca03d1142f1988001f228d02581d8986c tree ae2d485159ac4c3cbc2e4e5269434236c2de9104 parent f5b40e363ad6041a96e3da32281d8faa191597b9 parent 74fae122eb9f0db8b8718b9851c31c2f374fb134 author Linus Torvalds Sun, 07 May 2006 17:32:57 -0700 committer Linus Torvalds Sun, 07 May 2006 17:32:57 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 3507/1: Replace map_desc.physical with map_desc.pfn: aaed2000 [ARM] 3506/1: aaec2000: debug-macro.S needs hardware.h [ARM] 3505/1: aaec2000: entry-macro.S needs asm/arch/irqs.h [ARM] 3504/1: Fix clcd includes for aaec2000 [ARM] 3503/1: Fix map_desc structure for aaec2000 [ARM] 3501/1: i.MX: fix lowlevel debug macros [ARM] rtc-sa1100: fix compiler warnings and error cleanup [ARM] Allow SA1100 RTC alarm to be configured for wakeup commit 74fae122eb9f0db8b8718b9851c31c2f374fb134 tree c8df9806f9b65c2916170331223f68ccf81c6a8b parent 9a708becafe99fa32211e8c53dbacefdb4b11718 author Bellido Nicolas Sun, 07 May 2006 22:49:24 +0100 committer Russell King Sun, 07 May 2006 22:49:24 +0100 [ARM] 3507/1: Replace map_desc.physical with map_desc.pfn: aaed2000 Patch from Bellido Nicolas aaed2000 map_desc.pfn conversion Signed-off-by: Nicolas Bellido Signed-off-by: Russell King commit 9a708becafe99fa32211e8c53dbacefdb4b11718 tree 9cc99991d4e29d25a0987f92c87c0629931271c7 parent 201be92a4243e58bcc6c0878489bcc2aaaf51c80 author Bellido Nicolas Sun, 07 May 2006 22:49:23 +0100 committer Russell King Sun, 07 May 2006 22:49:23 +0100 [ARM] 3506/1: aaec2000: debug-macro.S needs hardware.h Patch from Bellido Nicolas Include hardware.h in debug-macro.S, otherwise io_p2v is undefined. Signed-off-by: Nicolas Bellido Signed-off-by: Russell King commit 201be92a4243e58bcc6c0878489bcc2aaaf51c80 tree 35db24e06ba8bc60fe6f826fa73281bad2827885 parent 8a33b224ecb576e27695ff8922c8e579dbf7070e author Bellido Nicolas Sun, 07 May 2006 22:49:22 +0100 committer Russell King Sun, 07 May 2006 22:49:22 +0100 [ARM] 3505/1: aaec2000: entry-macro.S needs asm/arch/irqs.h Patch from Bellido Nicolas Since git commit 2b78838842346da390e8547cd37035184376d506, entry-macro.S needs to include asm/arch/irqs.h Signed-off-by: Nicolas Bellido Signed-off-by: Russell King commit 8a33b224ecb576e27695ff8922c8e579dbf7070e tree eb346e45f50c24a1c05957fc9987ce2d1a92155c parent 16b6dd4419cdef637a907cfc26594e4ebe688975 author Bellido Nicolas Sun, 07 May 2006 22:49:21 +0100 committer Russell King Sun, 07 May 2006 22:49:21 +0100 [ARM] 3504/1: Fix clcd includes for aaec2000 Patch from Bellido Nicolas Since this patch: [ARM] 3366/1: Allow the 16bpp mode configuration in the CLCD control register linux/amba/bus.h needs to be included before linux/amba/clcd.h Signed-off-by: Nicolas Bellido Signed-off-by: Russell King commit 16b6dd4419cdef637a907cfc26594e4ebe688975 tree 358e43c7b117b9b92508410c0a4e63b6ac20ff7e parent 216251cff98838f2b79c53fc8a9e76884944be7d author Bellido Nicolas Sun, 07 May 2006 22:49:21 +0100 committer Russell King Sun, 07 May 2006 22:49:21 +0100 [ARM] 3503/1: Fix map_desc structure for aaec2000 Patch from Bellido Nicolas Patch: [ARM] 2982/1: Replace map_desc.physical with map_desc.pfn: aaec2000 incorrectly expanded the struct map_desc for aaec2000. Signed-off-by: Nicolas Bellido Signed-off-by: Russell King commit 216251cff98838f2b79c53fc8a9e76884944be7d tree 7ebc33641b066c15031871c7251fdfa03559b5a2 parent f12267011d16b1722e71aa12cd3e89eb70a9edd6 author Sascha Hauer Sun, 07 May 2006 18:56:27 +0100 committer Russell King Sun, 07 May 2006 18:56:27 +0100 [ARM] 3501/1: i.MX: fix lowlevel debug macros Patch from Sascha Hauer This patch fixes the addruart macro to work with both mmu enabled and disabled. Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit f5b40e363ad6041a96e3da32281d8faa191597b9 tree 5f35453cff7acd5df5622a108381bbd011a383c5 parent 5528e568a760442e0ec8fd2dea1f0791875a066b author Linus Torvalds Sun, 07 May 2006 10:49:33 -0700 committer Linus Torvalds Sun, 07 May 2006 10:49:33 -0700 Fix ptrace_attach()/ptrace_traceme()/de_thread() race This holds the task lock (and, for ptrace_attach, the tasklist_lock) over the actual attach event, which closes a race between attacking to a thread that is either doing a PTRACE_TRACEME or getting de-threaded. Thanks to Oleg Nesterov for reminding me about this, and Chris Wright for noticing a lost return value in my first version. Signed-off-by: Linus Torvalds commit 0eb1bd210d94e9f2c87551d794bb2755e5e24eed tree 710c9b897f46c07b855aaa51611ad2e7f9a74908 parent 0182bd2b1e2fb45a55f110795bfdb9aa5f6c6b0b author Randy Dunlap Sat, 06 May 2006 18:34:10 -0700 committer David S. Miller Sat, 06 May 2006 18:34:10 -0700 [IRDA] irda-usb: use NULL instead of 0 Use NULL instead of 0 for a null pointer value (sparse warning): drivers/net/irda/irda-usb.c:1781:30: warning: Using plain integer as NULL pointer Also, correct timeout argument to use milliseconds instead of jiffies. Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 0182bd2b1e2fb45a55f110795bfdb9aa5f6c6b0b tree 0dc080da5d8cd3bdcdee609f08ca73d8df23a544 parent fe9925b551a95fae6ec61470c79f8b701a2fe928 author Hua Zhong Sat, 06 May 2006 18:11:39 -0700 committer David S. Miller Sat, 06 May 2006 18:11:39 -0700 [IPV4]: Remove likely in ip_rcv_finish() This is another result from my likely profiling tool (dwalker@mvista.com just sent the patch of the profiling tool to linux-kernel mailing list, which is similar to what I use). On my system (not very busy, normal development machine within a VMWare workstation), I see a 6/5 miss/hit ratio for this "likely". Signed-off-by: Hua Zhong Signed-off-by: David S. Miller commit fe9925b551a95fae6ec61470c79f8b701a2fe928 tree 3df1817dee3c804d155e3a1c52b6ff696bc60293 parent 1498221d51a43d5fa1a580618591497d90f957d9 author Stephen Hemminger Sat, 06 May 2006 17:56:03 -0700 committer David S. Miller Sat, 06 May 2006 17:56:03 -0700 [NET]: Create netdev attribute_groups with class_device_add Atomically create attributes when class device is added. This avoids the race between registering class_device (which generates hotplug event), and the creation of attribute groups. Signed-off-by: Stephen Hemminger Signed-off-by: Greg Kroah-Hartman Signed-off-by: David S. Miller commit 1498221d51a43d5fa1a580618591497d90f957d9 tree 20554a3fa474c9d09f649958b85b90a3de718477 parent 5528e568a760442e0ec8fd2dea1f0791875a066b author Stephen Hemminger Sat, 06 May 2006 17:55:11 -0700 committer David S. Miller Sat, 06 May 2006 17:55:11 -0700 [CLASS DEVICE]: add attribute_group creation Extend the support of attribute groups in class_device's to allow groups to be created as part of the registration process. This allows network device's to avoid race between registration and creating groups. Note that unlike attributes that are a property of the class object, the groups are a property of the class_device object. This is done because there are different types of network devices (wireless for example). Signed-off-by: Stephen Hemminger Signed-off-by: Greg Kroah-Hartman Signed-off-by: David S. Miller commit f12267011d16b1722e71aa12cd3e89eb70a9edd6 tree b49f0deb0d2d0cf53f452f418a88b127caf146b9 parent 19ca5d27e15c10d8529984ecd98dcba2637edcd2 author Russell King Sat, 06 May 2006 11:29:21 +0100 committer Russell King Sat, 06 May 2006 11:29:21 +0100 [ARM] rtc-sa1100: fix compiler warnings and error cleanup Fix: drivers/rtc/rtc-sa1100.c: In function `sa1100_rtc_proc': drivers/rtc/rtc-sa1100.c:298: warning: unsigned int format, long unsigned int arg (arg 3) and arrange for sa1100_rtc_open() to pass the devid to free_irq() rather than NULL. Signed-off-by: Russell King commit 19ca5d27e15c10d8529984ecd98dcba2637edcd2 tree b4ad4055362306c184a12cdf040b0ce515de25e9 parent 5528e568a760442e0ec8fd2dea1f0791875a066b author Russell King Sat, 06 May 2006 11:26:30 +0100 committer Russell King Sat, 06 May 2006 11:26:30 +0100 [ARM] Allow SA1100 RTC alarm to be configured for wakeup The SA1100 RTC alarm can be configured to wake up the CPU from sleep mode, and the RTC driver has been using the API to configure this mode. Unfortunately, the code was which sets the required bit in the hardware was missing. Signed-off-by: Russell King commit 5528e568a760442e0ec8fd2dea1f0791875a066b tree 726a177e2e623294a4514e9423912395dee90199 parent f530937b2cccdb131cb459977943c98421ab09b3 author John Heffner Fri, 05 May 2006 17:41:44 -0700 committer David S. Miller Fri, 05 May 2006 17:41:44 -0700 [TCP]: Fix snd_cwnd adjustments in tcp_highspeed.c Xiaoliang (David) Wei wrote: > Hi gurus, > > I am reading the code of tcp_highspeed.c in the kernel and have a > question on the hstcp_cong_avoid function, specifically the following > AI part (line 136~143 in net/ipv4/tcp_highspeed.c ): > > /* Do additive increase */ > if (tp->snd_cwnd < tp->snd_cwnd_clamp) { > tp->snd_cwnd_cnt += ca->ai; > if (tp->snd_cwnd_cnt >= tp->snd_cwnd) { > tp->snd_cwnd++; > tp->snd_cwnd_cnt -= tp->snd_cwnd; > } > } > > In this part, when (tp->snd_cwnd_cnt == tp->snd_cwnd), > snd_cwnd_cnt will be -1... snd_cwnd_cnt is defined as u16, will this > small chance of getting -1 becomes a problem? > Shall we change it by reversing the order of the cwnd++ and cwnd_cnt -= > cwnd? Absolutely correct. Thanks. Signed-off-by: John Heffner Signed-off-by: David S. Miller commit f530937b2cccdb131cb459977943c98421ab09b3 tree 88c19d9542bd88b0c88ac4e4601953248fc86e80 parent 134af34632a7b3b0a98a79a2e56bf9cc927e0eac author Ralf Baechle Fri, 05 May 2006 17:19:26 -0700 committer David S. Miller Fri, 05 May 2006 17:19:26 -0700 [NETROM/ROSE]: Kill module init version kernel log messages. There are out of date and don't tell the user anything useful. The similar messages which IPV4 and the core networking used to output were killed a long time ago. Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit 134af34632a7b3b0a98a79a2e56bf9cc927e0eac tree b54012edae78a294723fba01d684cd41b8cd6e97 parent 1c29fc4989bc2a3838b2837adc12b8aeb0feeede author Herbert Xu Fri, 05 May 2006 17:09:13 -0700 committer David S. Miller Fri, 05 May 2006 17:09:13 -0700 [DCCP]: Fix sock_orphan dead lock Calling sock_orphan inside bh_lock_sock in dccp_close can lead to dead locks. For example, the inet_diag code holds sk_callback_lock without disabling BH. If an inbound packet arrives during that admittedly tiny window, it will cause a dead lock on bh_lock_sock. Another possible path would be through sock_wfree if the network device driver frees the tx skb in process context with BH enabled. We can fix this by moving sock_orphan out of bh_lock_sock. The tricky bit is to work out when we need to destroy the socket ourselves and when it has already been destroyed by someone else. By moving sock_orphan before the release_sock we can solve this problem. This is because as long as we own the socket lock its state cannot change. So we simply record the socket state before the release_sock and then check the state again after we regain the socket lock. If the socket state has transitioned to DCCP_CLOSED in the time being, we know that the socket has been destroyed. Otherwise the socket is still ours to keep. This problem was discoverd by Ingo Molnar using his lock validator. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 1c29fc4989bc2a3838b2837adc12b8aeb0feeede tree f278c0d3da836be2cff9b3a8ec577e803d5e522f parent 35d63edb1c807bc5317e49592260e84637bc432e author Stephen Hemminger Fri, 05 May 2006 17:07:13 -0700 committer David S. Miller Fri, 05 May 2006 17:07:13 -0700 [BRIDGE]: keep track of received multicast packets It makes sense to add this simple statistic to keep track of received multicast packets. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 35d63edb1c807bc5317e49592260e84637bc432e tree 84109934c99367f71303b34f1607403875d8e74a parent 62b08083ec3dbfd7e533c8d230dd1d8191a6e813 author Sridhar Samudrala Fri, 05 May 2006 17:05:23 -0700 committer David S. Miller Fri, 05 May 2006 17:05:23 -0700 [SCTP]: Fix state table entries for chunks received in CLOSED state. Discard an unexpected chunk in CLOSED state rather can calling BUG(). Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 62b08083ec3dbfd7e533c8d230dd1d8191a6e813 tree 55d2a2d6773cdc86e181b27506b1043be640fa53 parent 672e7cca17ed6036a1756ed34cf20dbd72d5e5f6 author Sridhar Samudrala Fri, 05 May 2006 17:04:43 -0700 committer David S. Miller Fri, 05 May 2006 17:04:43 -0700 [SCTP]: Fix panic's when receiving fragmented SCTP control chunks. Use pskb_pull() to handle incoming COOKIE_ECHO and HEARTBEAT chunks that are received as skb's with fragment list. Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 672e7cca17ed6036a1756ed34cf20dbd72d5e5f6 tree d4c5b340e42fb7cca4d1a5282669ffae94227fdc parent 7c3ceb4fb9667f34f1599a062efecf4cdc4a4ce5 author Vladislav Yasevich Fri, 05 May 2006 17:03:49 -0700 committer David S. Miller Fri, 05 May 2006 17:03:49 -0700 [SCTP]: Prevent possible infinite recursion with multiple bundled DATA. There is a rare situation that causes lksctp to go into infinite recursion and crash the system. The trigger is a packet that contains at least the first two DATA fragments of a message bundled together. The recursion is triggered when the user data buffer is smaller that the full data message. The problem is that we clone the skb for every fragment in the message. When reassembling the full message, we try to link skbs from the "first fragment" clone using the frag_list. However, since the frag_list is shared between two clones in this rare situation, we end up setting the frag_list pointer of the second fragment to point to itself. This causes sctp_skb_pull() to potentially recurse indefinitely. Proposed solution is to make a copy of the skb when attempting to link things using frag_list. Signed-off-by: Vladislav Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 7c3ceb4fb9667f34f1599a062efecf4cdc4a4ce5 tree e54921ec9e8cffac5fa3d4155d18f144d61ad878 parent 91ef5d2d6e934762db9c3e0d9e5b2862e40ea429 author Neil Horman Fri, 05 May 2006 17:02:09 -0700 committer David S. Miller Fri, 05 May 2006 17:02:09 -0700 [SCTP]: Allow spillover of receive buffer to avoid deadlock. This patch fixes a deadlock situation in the receive path by allowing temporary spillover of the receive buffer. - If the chunk we receive has a tsn that immediately follows the ctsn, accept it even if we run out of receive buffer space and renege data with higher TSNs. - Once we accept one chunk in a packet, accept all the remaining chunks even if we run out of receive buffer space. Signed-off-by: Neil Horman Acked-by: Mark Butler Acked-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 91ef5d2d6e934762db9c3e0d9e5b2862e40ea429 tree db494325a630175efe6ca9c15d5ec26d935310e1 parent 568cb09b9d889b6f2852ede19772b8e9eed36c1e parent 56cf6504fc1c0c221b82cebc16a444b684140fb7 author Linus Torvalds Fri, 05 May 2006 14:53:48 -0700 committer Linus Torvalds Fri, 05 May 2006 14:53:48 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-mmc * master.kernel.org:/home/rmk/linux-2.6-mmc: [BLOCK] Fix oops on removal of SD/MMC card commit 568cb09b9d889b6f2852ede19772b8e9eed36c1e tree 7ae4d5289c9f20ae323291fe3a5337cc1c3096f7 parent 99532559dc7a8e686b2cef14c780a7ad5dbd4a31 author Nicolas Pitre Fri, 05 May 2006 22:35:05 +0100 committer Russell King Fri, 05 May 2006 22:35:05 +0100 [ARM] 3495/1: EABI: undefine removed syscalls, but... Patch from Nicolas Pitre ... but only for user space. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 99532559dc7a8e686b2cef14c780a7ad5dbd4a31 tree 3dff94d714f3e32739cd898b7eebf7910e1ef227 parent b7d7ef87e15dea105be59ec8f14e2f92182dd421 author Nicolas Pitre Fri, 05 May 2006 22:32:24 +0100 committer Russell King Fri, 05 May 2006 22:32:24 +0100 [ARM] 3500/1: fix PXA27x DMA allocation priority Patch from Nicolas Pitre Intel PXA27x developers manual section 5.4.1.1 lists a priority distribution for the DMA channels differently than what the code currently assumes. This patch fixes that. Noticed by Simon Vogl Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit b7d7ef87e15dea105be59ec8f14e2f92182dd421 tree 2dc6e24528e63900f42bdf8a73e6bfcce1249692 parent 2eb9d3157107497fdccb51e1570fea677f6e3c82 author George G. Davis Fri, 05 May 2006 22:32:23 +0100 committer Russell King Fri, 05 May 2006 22:32:23 +0100 [ARM] 3499/1: Fix VFP FPSCR corruption for double exception case Patch from George G. Davis The ARM VFP FPSCR register is corrupted when a condition flags modifying VFP instruction is followed by a non-condition flags modifying VFP instruction and both instructions raise exceptions. The fix is to read the current FPSCR in between emulation of these two instructions and use the current FPSCR value when handling the second exception. Signed-off-by: George G. Davis Signed-off-by: Russell King commit 913ed41eb5c948d2f8b5deffd29c2638eceef3d7 tree 1389f4758f41ff61ee098d574a69f9a81eeda7f8 parent 3e6e155646706f1ef9f791a4402d145f112a3f8d author Jon Mason Wed, 03 May 2006 17:26:58 -0500 committer Tony Luck Fri, 05 May 2006 11:37:15 -0700 [IA64] remove asm-ia64/bitops.h self-inclusion asm-ia64/bitops.h includes itself. The #ifndef _ASM_IA64_BITOPS_H prevents this from being an issue, but it should still be removed. Signed-off-by: Jon Mason Signed-off-by: Tony Luck commit 3e6e155646706f1ef9f791a4402d145f112a3f8d tree 43e3327d4c053a0a595925aa3679bb5e1e0f87aa parent d98550e334715b2d9e45f8f0f4e1608720108640 author Chen, Kenneth W Wed, 03 May 2006 11:53:43 -0700 committer Tony Luck Fri, 05 May 2006 11:34:55 -0700 [IA64] strcpy returns NULL pointer and not destination pointer Bob Picco noted that 6edfba1b33c701108717f4e036320fc39abe1912 dropped the -ffreestanding compiler flag from the top level Makefile, which allows the compiler to substitute memcpy() in places where strcpy() is used with a known size source string. But the ia64 memcpy() returns 0 for success, and "bytes copied" for failure. Fix to return the address of the destination string (like stdlibc version, and other architectures). There are no places where ia64 specific code makes use of the non-standard return value. Signed-off-by: Ken Chen Signed-off-by: Tony Luck commit 56cf6504fc1c0c221b82cebc16a444b684140fb7 tree 95c74c06397dfe29081afb7a38ad6f1810e0704b parent d98550e334715b2d9e45f8f0f4e1608720108640 author Russell King Fri, 05 May 2006 17:57:52 +0100 committer Russell King Fri, 05 May 2006 17:57:52 +0100 [BLOCK] Fix oops on removal of SD/MMC card The block layer keeps a reference (driverfs_dev) to the struct device associated with the block device, and uses it internally for generating uevents in block_uevent. Block device uevents include umounting the partition, which can occur after the backing device has been removed. Unfortunately, this reference is not counted. This means that if the struct device is removed from the device tree, the block layers reference will become stale. Guard against this by holding a reference to the struct device in add_disk(), and only drop the reference when we're releasing the gendisk kobject - in other words when we can be sure that no further uevents will be generated for this block device. Signed-off-by: Russell King Acked-by: Jens Axboe commit 2eb9d3157107497fdccb51e1570fea677f6e3c82 tree 5defe41298ee451b32719591ffb1f73b8b9e3e55 parent ff10952a547dad934d9ed9afc5cf579ed1ccb53a author Uwe Zeisberger Fri, 05 May 2006 15:11:14 +0100 committer Russell King Fri, 05 May 2006 15:11:14 +0100 [ARM] 3496/1: more constants for asm-offsets.h Patch from Uwe Zeisberger added the following constants: - MACHINFO_TYPE - MACHINFO_NAME - MACHINFO_PHYSIO - MACHINFO_PGOFFIO - PROCINFO_INITFUNC - PROCINFO_MMUFLAGS and removed their definition from head.S and head-nommu.S Signed-off-by: Uwe Zeisberger Signed-off-by: Russell King commit ff10952a547dad934d9ed9afc5cf579ed1ccb53a tree 1dda301b204967e8a4da0c9a28e42601f4881788 parent d98550e334715b2d9e45f8f0f4e1608720108640 author Nicolas Pitre Fri, 05 May 2006 15:11:14 +0100 committer Russell King Fri, 05 May 2006 15:11:14 +0100 [ARM] 3494/1: asm-arm/bug.h needs linux/stddef.h Patch from Nicolas Pitre ... for the definition of NULL. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit d98550e334715b2d9e45f8f0f4e1608720108640 tree cd6a52960d479701cf6a29fd6535627481c5b27d parent f9cc8475e7595dbb41a9567f83288e2cd7445b6c parent d205819e2346d20fee41297ea6cf789c591abccf author Linus Torvalds Thu, 04 May 2006 15:09:52 -0700 committer Linus Torvalds Thu, 04 May 2006 15:09:52 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [PATCH] powerpc: Use the ibm,pa-features property if available powerpc: Fix incorrect might_sleep in __get_user/__put_user on kernel addresses [PATCH] ppc32 CPM_UART: fixes and improvements [PATCH] ppc32 CPM_UART: Fixed break send on SCC [PATCH] powerpc/kprobes: fix singlestep out-of-line [PATCH] powerpc/pseries: avoid crash in PCI code if mem system not up commit f9cc8475e7595dbb41a9567f83288e2cd7445b6c tree ee7b80def9339c51413f6bb5fc9557643dc4ead0 parent 6fc56ccfe44c8bc3fb47d6346c12c3b865756ef8 parent 5b802344357338a4d645beac8ca97470bcbe3542 author Linus Torvalds Thu, 04 May 2006 14:52:43 -0700 committer Linus Torvalds Thu, 04 May 2006 14:52:43 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 3490/1: i.MX: move uart resources to board files [ARM] 3488/1: make icedcc_putc do the right thing [ARM] 3487/1: IXP4xx: Support non-PCI systems [ARM] 3486/1: Mark memory as clobbered by the ARM _syscallX() macros commit 6fc56ccfe44c8bc3fb47d6346c12c3b865756ef8 tree e7e9dabd9d5bcf547946b3ae68e64ea68525e9d0 parent cbdf811c77cf2906a099b8da92e9f6f335b68a73 parent 920e70c5c603ada05dd480ca0ccc0ae12a5fdc39 author Linus Torvalds Thu, 04 May 2006 14:52:27 -0700 committer Linus Torvalds Thu, 04 May 2006 14:52:27 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-mmc * master.kernel.org:/home/rmk/linux-2.6-mmc: [MMC] Move set_ios debugging into mmc.c [MMC] Correct mmc_request_done comments [MMC] PXA: reduce the number of lines PXAMCI debug uses [MMC] PXA and i.MX: don't avoid sending stop command on error [MMC] extend data timeout for writes [ARM] 3485/1: i.MX: MX1 SD/MMC fix of unintentional double start possibility commit cbdf811c77cf2906a099b8da92e9f6f335b68a73 tree c4f96893936eddb31c60476ea4e776499d9046df parent 936ef1d48ac9a9fc90746bacd93624969711775a parent 98232d504db0a1f91ecaa93686ed3bf61963103b author Linus Torvalds Thu, 04 May 2006 13:25:40 -0400 committer Linus Torvalds Thu, 04 May 2006 13:25:40 -0400 Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block * 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block: [PATCH] compat_sys_vmsplice: one-off in UIO_MAXIOV check [PATCH] splice: redo page lookup if add_to_page_cache() returns -EEXIST [PATCH] splice: rename remaining info variables to pipe [PATCH] splice: LRU fixups [PATCH] splice: fix unlocking of page on error ->prepare_write() commit 936ef1d48ac9a9fc90746bacd93624969711775a tree 312bb8643445c80426ae7fa299903e322dc06b2d parent 0de2a93e80917c70716c20b8b6a75e5350da3f71 parent d1a649838802edd94b6335834919463c6ae61f40 author Linus Torvalds Thu, 04 May 2006 13:25:19 -0400 committer Linus Torvalds Thu, 04 May 2006 13:25:19 -0400 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [DECNET]: Fix level1 router hello [TCP]: Fix sock_orphan dead lock [ROSE]: Eleminate HZ from ROSE kernel interfaces [NETROM]: Eleminate HZ from NET/ROM kernel interfaces [AX.25]: Eleminate HZ from AX.25 kernel interfaces [ROSE]: Fix routing table locking in rose_remove_neigh. [AX.25]: Move AX.25 symbol exports [HAMRADIO]: Remove remaining SET_MODULE_OWNER calls from hamradio drivers. [AX25, ROSE]: Remove useless SET_MODULE_OWNER calls. [AX.25]: Spelling fix [ROSE]: Remove useless prototype for rose_remove_neigh(). [NETFILTER]: x_tables: don't use __copy_{from,to}_user on unchecked memory in compat layer [NETFILTER]: H.323 helper: Change author's email address [NETFILTER]: NAT: silence unused variable warnings with CONFIG_XFRM=n [NETFILTER]: H.323 helper: fix use of uninitialized data [NETFILTER]: H.323 helper: fix endless loop caused by invalid TPKT len commit 0de2a93e80917c70716c20b8b6a75e5350da3f71 tree cd729f3c98bc0b343c0f1789890c974236d6960d parent fed3be9bd56e67c9b9324277b7f95c32e73a75bb parent 8c45112b823972e9ff7bbca77dc592ca2224951b author Linus Torvalds Thu, 04 May 2006 13:25:05 -0400 committer Linus Torvalds Thu, 04 May 2006 13:25:05 -0400 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC]: Hook up vmsplice into syscall tables. commit fed3be9bd56e67c9b9324277b7f95c32e73a75bb tree 6f9c69bac0a9a9f295d14f427d6f01eac28d6c01 parent 5dea5176e5c32ef9f0d1a41d28427b3bf6881b3a author Linus Torvalds Thu, 04 May 2006 13:23:40 -0400 committer Linus Torvalds Thu, 04 May 2006 13:23:40 -0400 CREDITS file update (Tristan Greaves) By request from Tristan. Signed-off-by: Linus Torvalds commit 920e70c5c603ada05dd480ca0ccc0ae12a5fdc39 tree 8eb39280a5d5ce881315b9ac774ad41ca9516bc4 parent fe10c6abea8bc83291a13e0580b3e4c355710b09 author Russell King Thu, 04 May 2006 18:22:51 +0100 committer Russell King Thu, 04 May 2006 18:22:51 +0100 [MMC] Move set_ios debugging into mmc.c Rather than having every driver duplicate the set_ios debugging, provide a single version in mmc.c which can be expanded as we add additional functionality. Signed-off-by: Russell King commit 5b802344357338a4d645beac8ca97470bcbe3542 tree f3f8df6cb9bec5ddb6dc947ea99eb9454232066b parent b2556da55f78a9dbe92830b1d1c0b612edfea9fd author Sascha Hauer Thu, 04 May 2006 14:07:42 +0100 committer Russell King Thu, 04 May 2006 14:07:42 +0100 [ARM] 3490/1: i.MX: move uart resources to board files Patch from Sascha Hauer This patch moves the i.MX uart resources and the gpio pin setup to the board files. This allows the boards to decide how many internal uarts are connected to the outside world and whether they use rts/cts or not. Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit fe10c6abea8bc83291a13e0580b3e4c355710b09 tree 1d54fce87090f12de008c25e8717335a6988fc70 parent d78e9079af7526c4661ff484322094832776ef41 author Russell King Thu, 04 May 2006 13:51:45 +0100 committer Russell King Thu, 04 May 2006 13:51:45 +0100 [MMC] Correct mmc_request_done comments mmc_request_done should be called at the end of handling a request, not between the data and initial command parts of the request. Signed-off-by: Russell King commit 98232d504db0a1f91ecaa93686ed3bf61963103b tree 0034c6798c6463775da82e30561ef6a7e37c5a08 parent a0548871ed267ae12eb1c860c5aaebd9e466b34e author Jens Axboe Thu, 04 May 2006 09:13:49 +0200 committer Jens Axboe Thu, 04 May 2006 09:13:49 +0200 [PATCH] compat_sys_vmsplice: one-off in UIO_MAXIOV check nr_segs may not be > UIO_MAXIOV, however it may be equal to. This makes the behaviour identical to the real sys_vmsplice(). The other foov syscalls also agree that this is the way to go. Signed-off-by: Jens Axboe commit d1a649838802edd94b6335834919463c6ae61f40 tree f4500b91df6e48a94b9c490f95f772f911a9de12 parent 75c2d9077c63ac21488129cc23561d4f4fd0f5e5 author Patrick Caulfield Wed, 03 May 2006 23:36:23 -0700 committer David S. Miller Wed, 03 May 2006 23:36:23 -0700 [DECNET]: Fix level1 router hello This patch fixes hello messages sent when a node is a level 1 router. Slightly contrary to the spec (maybe) VMS ignores hello messages that do not name level2 routers that it also knows about. So, here we simply name all the routers that the node knows about rather just other level1 routers. (I hope the patch is clearer than the description. sorry). Signed-off-by: Patrick Caulfield Signed-off-by: David S. Miller commit 75c2d9077c63ac21488129cc23561d4f4fd0f5e5 tree f32af17fdadc749f899f66371981055fa8eab35a parent 82e84249f0ee098e004c8bd6d90a1640bd56cfbb author Herbert Xu Wed, 03 May 2006 23:31:35 -0700 committer David S. Miller Wed, 03 May 2006 23:31:35 -0700 [TCP]: Fix sock_orphan dead lock Calling sock_orphan inside bh_lock_sock in tcp_close can lead to dead locks. For example, the inet_diag code holds sk_callback_lock without disabling BH. If an inbound packet arrives during that admittedly tiny window, it will cause a dead lock on bh_lock_sock. Another possible path would be through sock_wfree if the network device driver frees the tx skb in process context with BH enabled. We can fix this by moving sock_orphan out of bh_lock_sock. The tricky bit is to work out when we need to destroy the socket ourselves and when it has already been destroyed by someone else. By moving sock_orphan before the release_sock we can solve this problem. This is because as long as we own the socket lock its state cannot change. So we simply record the socket state before the release_sock and then check the state again after we regain the socket lock. If the socket state has transitioned to TCP_CLOSE in the time being, we know that the socket has been destroyed. Otherwise the socket is still ours to keep. Note that I've also moved the increment on the orphan count forward. This may look like a problem as we're increasing it even if the socket is just about to be destroyed where it'll be decreased again. However, this simply enlarges a window that already exists. This also changes the orphan count test by one. Considering what the orphan count is meant to do this is no big deal. This problem was discoverd by Ingo Molnar using his lock validator. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 82e84249f0ee098e004c8bd6d90a1640bd56cfbb tree 26c59ccd404255839b0c26709ebc0f54a99f0ab8 parent 4d8937d0b113e8ec39f7d18cf13804f3b5fb8fd4 author Ralf Baechle Wed, 03 May 2006 23:28:20 -0700 committer David S. Miller Wed, 03 May 2006 23:28:20 -0700 [ROSE]: Eleminate HZ from ROSE kernel interfaces Convert all ROSE sysctl time values from jiffies to ms as units. Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit 4d8937d0b113e8ec39f7d18cf13804f3b5fb8fd4 tree a9f530d23b756c00a885491e335cd7afda2d70ec parent e1fdb5b39656ea2be8cadde565e543649a988af9 author Ralf Baechle Wed, 03 May 2006 23:27:47 -0700 committer David S. Miller Wed, 03 May 2006 23:27:47 -0700 [NETROM]: Eleminate HZ from NET/ROM kernel interfaces Convert all NET/ROM sysctl time values from jiffies to ms as units. Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit e1fdb5b39656ea2be8cadde565e543649a988af9 tree 1e8af7a60fb23c871cd3c6db194156563bce1e18 parent 4cc7c2734e2b4032103e47d8f3e8b6fa3360d3f1 author Ralf Baechle Wed, 03 May 2006 23:27:16 -0700 committer David S. Miller Wed, 03 May 2006 23:27:16 -0700 [AX.25]: Eleminate HZ from AX.25 kernel interfaces Convert all AX.25 sysctl time values from jiffies to ms as units. Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit 4cc7c2734e2b4032103e47d8f3e8b6fa3360d3f1 tree 2c9cac8015217e46a9166c1968ab2d90cb9fd5bf parent 70868eace5031298c6f6e991a40a2106957f582c author Ralf Baechle Wed, 03 May 2006 23:26:20 -0700 committer David S. Miller Wed, 03 May 2006 23:26:20 -0700 [ROSE]: Fix routing table locking in rose_remove_neigh. The locking rule for rose_remove_neigh() are that the caller needs to hold rose_neigh_list_lock, so we better don't take it yet again in rose_neigh_list_lock. Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit 70868eace5031298c6f6e991a40a2106957f582c tree 96f05538eabb42671b6d153474342903fd65d711 parent 3ab33dcc82e014c69ebad3b524d0053378ef76c3 author Ralf Baechle Wed, 03 May 2006 23:25:17 -0700 committer David S. Miller Wed, 03 May 2006 23:25:17 -0700 [AX.25]: Move AX.25 symbol exports Move AX.25 symbol exports to next to their definitions where they're supposed to be these days. Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit 3ab33dcc82e014c69ebad3b524d0053378ef76c3 tree d654ef57ea5a1791be116ed4319aa1e9ceccd8e1 parent 86cfcb95ec60e910d7efcb35ae89bf3403befaad author Ralf Baechle DL5RB Wed, 03 May 2006 23:24:35 -0700 committer David S. Miller Wed, 03 May 2006 23:24:35 -0700 [HAMRADIO]: Remove remaining SET_MODULE_OWNER calls from hamradio drivers. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller commit 86cfcb95ec60e910d7efcb35ae89bf3403befaad tree 5477ef554d43afe1acf7124156a95cad7c4eab5f parent 3f072310d0ca85891323e9d325c37c76de389387 author Ralf Baechle Wed, 03 May 2006 23:23:48 -0700 committer David S. Miller Wed, 03 May 2006 23:23:48 -0700 [AX25, ROSE]: Remove useless SET_MODULE_OWNER calls. Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit 3f072310d0ca85891323e9d325c37c76de389387 tree 72c309846856d6e532955275c5203a8cf3942715 parent 0cc5ae24af08abe8e2a467f45b54c48a0f52670f author Ralf Baechle Wed, 03 May 2006 23:22:36 -0700 committer David S. Miller Wed, 03 May 2006 23:22:36 -0700 [AX.25]: Spelling fix Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit 0cc5ae24af08abe8e2a467f45b54c48a0f52670f tree 53c959a4384b7e87716d2a4700e825ccc13efd90 parent 7800007c1e2d42cd4120b87b0ba3f3480f17f30a author Ralf Baechle Wed, 03 May 2006 23:22:01 -0700 committer David S. Miller Wed, 03 May 2006 23:22:01 -0700 [ROSE]: Remove useless prototype for rose_remove_neigh(). Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit 7800007c1e2d42cd4120b87b0ba3f3480f17f30a tree 831514416c91adcf7bdf87b6c6fd8d7660e1883e parent 7582e9d17edbabab6cbe59467c5d1b5e8c04fca8 author Patrick McHardy Wed, 03 May 2006 23:20:27 -0700 committer David S. Miller Wed, 03 May 2006 23:20:27 -0700 [NETFILTER]: x_tables: don't use __copy_{from,to}_user on unchecked memory in compat layer Noticed by Linus Torvalds Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 7582e9d17edbabab6cbe59467c5d1b5e8c04fca8 tree ba48a25b3d885892e988302fe84eac477797b6d9 parent 2354feaeb2acb78f6aabdf8410d55b44492a7949 author Jing Min Zhao Wed, 03 May 2006 23:19:59 -0700 committer David S. Miller Wed, 03 May 2006 23:19:59 -0700 [NETFILTER]: H.323 helper: Change author's email address Signed-off-by: Jing Min Zhao Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 2354feaeb2acb78f6aabdf8410d55b44492a7949 tree f2375ea5f0baeb1568fce42bd38328aad41c7e4a parent 4228e2a9890cd01b0c8cc58af6fd9e08a4b5e8a7 author Patrick McHardy Wed, 03 May 2006 23:19:26 -0700 committer David S. Miller Wed, 03 May 2006 23:19:26 -0700 [NETFILTER]: NAT: silence unused variable warnings with CONFIG_XFRM=n net/ipv4/netfilter/ip_nat_standalone.c: In function 'ip_nat_out': net/ipv4/netfilter/ip_nat_standalone.c:223: warning: unused variable 'ctinfo' net/ipv4/netfilter/ip_nat_standalone.c:222: warning: unused variable 'ct' Surprisingly no complaints so far .. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 4228e2a9890cd01b0c8cc58af6fd9e08a4b5e8a7 tree 67aff9f4ab715b37af0f27bdae4a6aa7ff1a5219 parent 6fd737031eb6869430d0f3cf6bf1440adf7aedf5 author Patrick McHardy Wed, 03 May 2006 23:17:11 -0700 committer David S. Miller Wed, 03 May 2006 23:17:11 -0700 [NETFILTER]: H.323 helper: fix use of uninitialized data When a Choice element contains an unsupported choice no error is returned and parsing continues normally, but the choice value is not set and contains data from the last parsed message. This may in turn lead to parsing of more stale data and following crashes. Fixes a crash triggered by testcase 0003243 from the PROTOS c07-h2250v4 testsuite following random other testcases: CPU: 0 EIP: 0060:[] Not tainted VLI EFLAGS: 00210646 (2.6.17-rc2 #3) EIP is at memmove+0x19/0x22 eax: d7be0307 ebx: d7be0307 ecx: e841fcf9 edx: d7be0307 esi: bfffffff edi: bfffffff ebp: da5eb980 esp: c0347e2c ds: 007b es: 007b ss: 0068 Process events/0 (pid: 4, threadinfo=c0347000 task=dff86a90) Stack: <0>00000006 c0347ea6 d7be0301 e09a6b2c 00000006 da5eb980 d7be003e d7be0052 c0347f6c e09a6d9c 00000006 c0347ea6 00000006 00000000 d7b9a548 00000000 c0347f6c d7b9a548 00000004 e0a1a119 0000028f 00000006 c0347ea6 00000006 Call Trace: [] mangle_contents+0x40/0xd8 [ip_nat] [] ip_nat_mangle_tcp_packet+0xa1/0x191 [ip_nat] [] set_addr+0x60/0x14d [ip_nat_h323] [] q931_help+0x2da/0x71a [ip_conntrack_h323] [] q931_help+0x30c/0x71a [ip_conntrack_h323] [] ip_conntrack_help+0x22/0x2f [ip_conntrack] [] nf_iterate+0x2e/0x5f [] xfrm4_output_finish+0x0/0x39f [] nf_hook_slow+0x42/0xb0 [] xfrm4_output_finish+0x0/0x39f [] xfrm4_output+0x3c/0x4e [] xfrm4_output_finish+0x0/0x39f [] ip_forward+0x1c2/0x1fa [] ip_rcv+0x388/0x3b5 [] netif_receive_skb+0x2bc/0x2ec [] process_backlog+0x6b/0xd0 [] net_rx_action+0x4b/0xb7 [] __do_softirq+0x35/0x7d [] do_softirq+0x38/0x3f Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 6fd737031eb6869430d0f3cf6bf1440adf7aedf5 tree f4dfd6500f1ba0b915531c3b340164e30328e20f parent e17df688f7064dae1417ce425dd1e4b71d24d63b author Patrick McHardy Wed, 03 May 2006 23:16:29 -0700 committer David S. Miller Wed, 03 May 2006 23:16:29 -0700 [NETFILTER]: H.323 helper: fix endless loop caused by invalid TPKT len When the TPKT len included in the packet is below the lowest valid value of 4 an underflow occurs which results in an endless loop. Found by testcase 0000058 from the PROTOS c07-h2250v4 testsuite. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit a0548871ed267ae12eb1c860c5aaebd9e466b34e tree 457aff209cd9a2a1c3c2678b639268dfa482f3d1 parent 76ad4d11105ccd40a536db1057083f28326019fd author Jens Axboe Wed, 03 May 2006 10:58:22 +0200 committer Jens Axboe Thu, 04 May 2006 06:55:12 +0200 [PATCH] splice: redo page lookup if add_to_page_cache() returns -EEXIST This can happen quite easily, if several processes are trying to splice the same file at the same time. It's not a failure, it just means someone raced with us in allocating this file page. So just dump the allocated page and relookup the original. Signed-off-by: Jens Axboe commit 76ad4d11105ccd40a536db1057083f28326019fd tree dea71a387ca8821c47a00da5496d4b6edbab9d5e parent 1432873af7ae29d4bb3c56114c05b539d078ca62 author Jens Axboe Wed, 03 May 2006 10:41:33 +0200 committer Jens Axboe Thu, 04 May 2006 06:55:12 +0200 [PATCH] splice: rename remaining info variables to pipe Same thing was done in fs/pipe.c and most of fs/splice.c, but we had a few missing still. Signed-off-by: Jens Axboe commit 1432873af7ae29d4bb3c56114c05b539d078ca62 tree cf4f72608d2e10f7ff786b9d60067963f1ab4ca9 parent bfc4ee39fdbb2deb8864785d5e5bc5cdd3b31a69 author Jens Axboe Wed, 03 May 2006 10:35:26 +0200 committer Jens Axboe Thu, 04 May 2006 06:55:12 +0200 [PATCH] splice: LRU fixups Nick says that the current construct isn't safe. This goes back to the original, but sets PIPE_BUF_FLAG_LRU on user pages as well as they all seem to be on the LRU in the first place. Signed-off-by: Jens Axboe commit bfc4ee39fdbb2deb8864785d5e5bc5cdd3b31a69 tree 6f5f678cd07a4c65c1e7ea78f911fdd0932b0c7e parent 5dea5176e5c32ef9f0d1a41d28427b3bf6881b3a author Jens Axboe Wed, 03 May 2006 10:35:10 +0200 committer Jens Axboe Thu, 04 May 2006 06:55:12 +0200 [PATCH] splice: fix unlocking of page on error ->prepare_write() Looking at generic_file_buffered_write(), we need to unlock_page() if prepare write fails and it isn't due to racing with truncate(). Also trim the size if ->prepare_write() fails, if we have to. Signed-off-by: Jens Axboe commit 5dea5176e5c32ef9f0d1a41d28427b3bf6881b3a tree f7b6639fa6490bb9a519f50acf0c76fa087d295b parent 8683dc9990158c221e05959935e7dd50a956c574 author Mingming Cao Wed, 03 May 2006 19:55:12 -0700 committer Linus Torvalds Wed, 03 May 2006 20:05:41 -0700 [PATCH] ext3: multile block allocate little endian fixes Some places in ext3 multiple block allocation code (in 2.6.17-rc3) don't handle the little endian well. This was resulting in *wrong* block numbers being assigned to in-memory block variables and then stored on disk eventually. The following patch has been verified to fix an ext3 filesystem failure when run ltp test on a 64 bit machine. Signed-off-by; Mingming Cao Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8683dc9990158c221e05959935e7dd50a956c574 tree a68d126c603563982767b550e5332efd9c0d4121 parent 96941026a51e9cb8c2d2be7499301b7fcd9ee225 author Brent Casavant Wed, 03 May 2006 19:55:10 -0700 committer Linus Torvalds Wed, 03 May 2006 20:05:41 -0700 [PATCH] Altix: correct ioc4 port order Currently loading the ioc3 as a module will cause the ports to be numbered in reverse order. This mod maintains the proper order of cards for port numbering. Signed-off-by: Brent Casavant Cc: Pat Gefre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 96941026a51e9cb8c2d2be7499301b7fcd9ee225 tree 41467c30078e46ee87b082970a29d430de3703b0 parent 6760da0197a6ee327a09dafc070b26e2f02651fe author mark gross Wed, 03 May 2006 19:55:07 -0700 committer Linus Torvalds Wed, 03 May 2006 20:05:41 -0700 [PATCH] EDAC Coexistence with BIOS Address the issue of EDAC/BIOS coexistence for the e752x chip-sets. We have found a problem where the BIOS will start the system with the error registers (dev0:fun1) hidden and assuming it has exclusive access to them. The edac driver violates this assumption. The workaround this patch offers is to honor the hidden-ness as an indication that it is not safe to use those registers. Signed-off-by: Mark Gross Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6760da0197a6ee327a09dafc070b26e2f02651fe tree d46d67012dda04b679e1d62179e89906a9edea72 parent f0ec5e39765cd254d436a6d86e211d81795952a4 author Jeff Dike Wed, 03 May 2006 19:55:03 -0700 committer Linus Torvalds Wed, 03 May 2006 20:05:40 -0700 [PATCH] uml: change timer initialization inet_init, which schedules, is called before the UML timer_init, which sets up the timer. The result is the interval timers being manipulated before the appropriate signal handlers are established, causing unhandled timers. This is fixed by making timer_init be called earlier. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f0ec5e39765cd254d436a6d86e211d81795952a4 tree 1aad5506c0e758950990b9153754200b67389921 parent 30d55280b867aa0cae99f836ad0181bb0bf8f9cb author Andi Kleen Wed, 03 May 2006 19:54:57 -0700 committer Linus Torvalds Wed, 03 May 2006 20:05:31 -0700 [PATCH] Remove wrong cpu_has_apic checks that came from mismerging We only need to check cpu_has_apic in the IO-APIC/L-APIC parsing, not for all of ACPI. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c45112b823972e9ff7bbca77dc592ca2224951b tree 135a766a6cf1a6a7da5030315e9b88a02d49be48 parent e17df688f7064dae1417ce425dd1e4b71d24d63b author David S. Miller Wed, 03 May 2006 13:55:46 -0700 committer David S. Miller Wed, 03 May 2006 13:55:46 -0700 [SPARC]: Hook up vmsplice into syscall tables. Signed-off-by: David S. Miller commit 30d55280b867aa0cae99f836ad0181bb0bf8f9cb tree 8df537addd3709f36f24dbd654662568b79ca943 parent e17df688f7064dae1417ce425dd1e4b71d24d63b author Stephen Smalley Wed, 03 May 2006 10:52:36 -0400 committer Linus Torvalds Wed, 03 May 2006 10:08:11 -0700 [PATCH] selinux: Clear selinux_enabled flag upon runtime disable. Clear selinux_enabled flag upon runtime disable of SELinux by userspace, and make sure it is defined even if selinux= boot parameter support is not enabled in configuration. Signed-off-by: Stephen Smalley Acked-by: James Morris Tested-by: Jon Smirl Acked-by: Al Viro Signed-off-by: Linus Torvalds commit d205819e2346d20fee41297ea6cf789c591abccf tree 37698c88df06cb186026c9616d6d98405c72b161 parent 6bfd93c32a5065d0e858780b3beb0b667081601c author Paul Mackerras Wed, 03 May 2006 23:04:37 +1000 committer Paul Mackerras Wed, 03 May 2006 23:06:47 +1000 [PATCH] powerpc: Use the ibm,pa-features property if available Forthcoming IBM machines will have a "ibm,pa-features" property on CPU nodes, that contains bits indicating which optional architecture features are implemented by the CPU. This adds code to use the property, if present, to update our CPU feature bitmaps. Note that this means we can both set and clear feature bits based on what the firmware tells us. This is based on a patch by Will Schmidt . Signed-off-by: Paul Mackerras commit 6bfd93c32a5065d0e858780b3beb0b667081601c tree af13455be2b53f11fbbfec0305731b452db396a2 parent 6e1976961c9bd9a3dc368139fab1883961efc879 author Paul Mackerras Wed, 03 May 2006 23:02:04 +1000 committer Paul Mackerras Wed, 03 May 2006 23:06:46 +1000 powerpc: Fix incorrect might_sleep in __get_user/__put_user on kernel addresses We have a case where __get_user and __put_user can validly be used on kernel addresses in interrupt context - namely, the alignment exception handler, as our get/put_unaligned just do a single access and rely on the alignment exception handler to fix things up in the rare cases where the cpu can't handle it in hardware. Thus we can get alignment exceptions in the network stack at interrupt level. The alignment exception handler does a __get_user to read the instruction and blows up in might_sleep(). Since a __get_user on a kernel address won't actually ever sleep, this makes the might_sleep conditional on the address being less than PAGE_OFFSET. Signed-off-by: Paul Mackerras commit 6e1976961c9bd9a3dc368139fab1883961efc879 tree 5fd5795260072c15be659349462abad4fe8ef7e3 parent 61f5657c50341198ff05e375e6f1fc0476556562 author Vitaly Bordug Sat, 29 Apr 2006 23:06:00 +0400 committer Paul Mackerras Wed, 03 May 2006 23:06:44 +1000 [PATCH] ppc32 CPM_UART: fixes and improvements A number of small issues are fixed, and added the header file, missed from the original series. With this, driver should be pretty stable as tested among both platform-device-driven and "old way" boards. Also added missing GPL statement , and updated year field on existing ones to reflect code update. Signed-off-by: Vitaly Bordug Signed-off-by: Paul Mackerras commit 61f5657c50341198ff05e375e6f1fc0476556562 tree 33c0fa26dc730885176f4be2a8853b1c0b65aa8a parent 0ccde0a290b44b8296b82a7683b4c299eb51ba6b author Vitaly Bordug Sat, 29 Apr 2006 22:32:44 +0400 committer Paul Mackerras Wed, 03 May 2006 23:06:43 +1000 [PATCH] ppc32 CPM_UART: Fixed break send on SCC SCC uart sends a break sequence each time it is stopped with the CPM_CR_STOP_TX command. That means that each time an application closes the serial device, a break is transmitted. To fix this, graceful tx stop is issued for SCC. Signed-off-by: David Jander Signed-off-by: Vitaly Bordug Signed-off-by: Paul Mackerras commit 0ccde0a290b44b8296b82a7683b4c299eb51ba6b tree cc586aa319da07dcda8f91e3ee03d9da960d5fac parent 054d8ff37710efaebd1998ce94d366df315a354f author Ananth N Mavinakayanahalli Fri, 28 Apr 2006 17:38:42 +0530 committer Paul Mackerras Wed, 03 May 2006 23:06:41 +1000 [PATCH] powerpc/kprobes: fix singlestep out-of-line We currently single-step inline if the instruction on which a kprobe is inserted is a trap variant. - variants (such as tdnei, used by BUG()) typically evaluate a condition and cause a trap only if the condition is satisfied. - kprobes uses the unconditional "trap" (0x7fe00008) and single-stepping again on this instruction, resulting in another trap without evaluating the condition is obviously incorrect. Signed-off-by: Ananth N Mavinakayanahalli Signed-off-by: Paul Mackerras commit 054d8ff37710efaebd1998ce94d366df315a354f tree 5496fbdd8b3b27e8ca4850055c1c00f30d52e0b3 parent e17df688f7064dae1417ce425dd1e4b71d24d63b author Linas Vepstas Thu, 27 Apr 2006 02:31:20 -0700 committer Paul Mackerras Wed, 03 May 2006 23:06:40 +1000 [PATCH] powerpc/pseries: avoid crash in PCI code if mem system not up The powerpc code is currently performing PCI setup before memory initialization. PCI setup touches PCI config space registers. If the PCI card is bad, this will evoke an error, which currrently can't be handled, as the PCI error recovery code expects kmalloc() to be functional. This patch will cause the system to punt instead of crashing with cpu 0x0: Vector: 300 (Data Access) at [c0000000004434d0] pc: c0000000000c06b4: .kmem_cache_alloc+0x8c/0xf4 lr: c00000000004ad6c: .eeh_send_failure_event+0x48/0xfc This patch will also print name of the offending pci device. Signed-off-by: Linas Vepstas Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Paul Mackerras commit e17df688f7064dae1417ce425dd1e4b71d24d63b tree bc631aa05f4fde009ff260fca51005eb9077a203 parent ebf34c9b6fcd22338ef764b039b3ac55ed0e297b author Patrick McHardy Tue, 02 May 2006 23:23:07 +0200 committer Linus Torvalds Tue, 02 May 2006 17:26:39 -0700 [NETFILTER] SCTP conntrack: fix infinite loop fix infinite loop in the SCTP-netfilter code: check SCTP chunk size to guarantee progress of for_each_sctp_chunk(). (all other uses of for_each_sctp_chunk() are preceded by do_basic_checks(), so this fix should be complete.) Based on patch from Ingo Molnar CVE-2006-1527 Signed-off-by: Patrick McHardy Signed-off-by: Linus Torvalds commit b2556da55f78a9dbe92830b1d1c0b612edfea9fd tree 18487bb34291fa5d754ea90b98af86d7b205c057 parent 76bbb00288e569e7bd9ec18f45e4f814352260dd author Uwe Zeisberger Tue, 02 May 2006 20:40:56 +0100 committer Russell King Tue, 02 May 2006 20:40:56 +0100 [ARM] 3488/1: make icedcc_putc do the right thing Patch from Uwe Zeisberger a) use coprocessor 14 b) make reading the dcc status volatile Signed-off-by: Uwe Zeisberger Signed-off-by: Russell King commit ebf34c9b6fcd22338ef764b039b3ac55ed0e297b tree 3a9f16a8d6c33379b08a5ba3476baffedc6cbd6c parent 3e0d167a6b6e5722d7fadfad9b817f668ab41ec1 author Ayaz Abdulla Tue, 02 May 2006 15:26:06 -0400 committer Jeff Garzik Tue, 02 May 2006 15:26:06 -0400 forcedeth: fix multi irq issues This patch fixes the issues with multiple irqs. I am resending based on feedback. I decoupled the dma mask for consistent memory and fixed leak with multiple irq in error path. Thanks to Manfred for catching the spin lock problem. Signed-Off-By: Ayaz Abdulla commit 3e0d167a6b6e5722d7fadfad9b817f668ab41ec1 tree 94db08e05f3de8f2f959ebf01ad2c04a37642e64 parent b0b8dab288590ede2377a671db0a31380f454541 author Craig Brind Thu, 27 Apr 2006 02:30:46 -0700 committer Jeff Garzik Tue, 02 May 2006 15:21:52 -0400 [PATCH] via-rhine: zero pad short packets on Rhine I ethernet cards Fixes Rhine I cards disclosing fragments of previously transmitted frames in new transmissions. Before transmission, any socket buffer (skb) shorter than the ethernet minimum length of 60 bytes was zero-padded. On Rhine I cards the data can later be copied into an aligned transmission buffer without copying this padding. This resulted in the transmission of the frame with the extra bytes beyond the provided content leaking the previous contents of this buffer on to the network. Now zero-padding is repeated in the local aligned buffer if one is used. Following a suggestion from the via-rhine maintainer, no attempt is made here to avoid the duplicated effort of padding the skb if it is known that an aligned buffer will definitely be used. This is to make the change "obviously correct" and allow it to be applied to a stable kernel if necessary. There is no change to the flow of control and the changes are only to the Rhine I code path. The patch has run on an in-service Rhine-I host without incident. Frames shorter than 60 bytes are now correctly zero-padded when captured on a separate host. I see no unusual stats reported by ifconfig, and no unusual log messages. Signed-off-by: Craig Brind Signed-off-by: Roger Luethi Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit b0b8dab288590ede2377a671db0a31380f454541 tree a6b9b8e4c70dac9605f503ea9ffeab47d4614d18 parent 330ab71619bacc4d4494227a6cfc9b7f5500403d author Olaf Hering Thu, 27 Apr 2006 18:23:49 -0700 committer Jeff Garzik Tue, 02 May 2006 15:18:54 -0400 [PATCH] mv643xx_eth: provide sysfs class device symlink On Sat, Mar 11, Olaf Hering wrote: > Why is the /sys/class/net/eth0/device symlink not created for the > mv643xx_eth driver? Does this work for other platform device drivers? > Seems to work for the ps2 keyboard at least. The SET_NETDEV_DEV has to be done before a call to register_netdev. With the new patch below, the device symlink for the platform device was created. Unfortunately, after the 4 ls commands, the network connection died. No idea if the box crashed or if something else broke, lost remote access. Provide sysfs 'device' in /class/net/ethN Also, set module owner field, like pcnet32 driver does. Signed-off-by: Olaf Hering Acked-by: Dale Farnsworth Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit d78e9079af7526c4661ff484322094832776ef41 tree 8f173a501ed361a3c0e3644487b76aa603546997 parent 58741e8b3603e56c3699550e8bc89cb136329343 author Russell King Tue, 02 May 2006 20:18:53 +0100 committer Russell King Tue, 02 May 2006 20:18:53 +0100 [MMC] PXA: reduce the number of lines PXAMCI debug uses There's no reason for the PXAMCI debug code to print so many lines - it causes the kernel buffer to overflow when trying to debug this driver. Remove some debug messages which are duplicated by core code, and combine other messages, resulting in fewer characters written to the kernel log. Signed-off-by: Russell King commit 58741e8b3603e56c3699550e8bc89cb136329343 tree 84896f991d3d7cb08d7ae0588f0bba9e2937b681 parent 37be4e7809e0581db85387e126ae4da68c3d6286 author Russell King Tue, 02 May 2006 20:02:39 +0100 committer Russell King Tue, 02 May 2006 20:02:39 +0100 [MMC] PXA and i.MX: don't avoid sending stop command on error Always send a stop command at the end of a data transfer. If we avoid sending the stop command, some cards remain in data transfer mode, and refuse to accept further read/write commands. Signed-off-by: Russell King commit 37be4e7809e0581db85387e126ae4da68c3d6286 tree a3543202fa066bc930e09b9e36d32ab74fd38967 parent 81d38428df26377c91e7e193aa4d2fdfdcda300a author Russell King Tue, 02 May 2006 17:24:59 +0100 committer Russell King Tue, 02 May 2006 17:24:59 +0100 [MMC] extend data timeout for writes The CSD contains a "read2write factor" which determines the multiplier to be applied to the read timeout to obtain the write timeout. We were ignoring this parameter, resulting in the possibility for writes being timed out too early. Signed-off-by: Russell King commit 330ab71619bacc4d4494227a6cfc9b7f5500403d tree 43a9045011116f1afa506b80de1ede9872f45935 parent a893b99be71f1d669b74f840e3a683dd077d007b author Jens Axboe Tue, 02 May 2006 15:29:57 +0200 committer Jens Axboe Tue, 02 May 2006 15:29:57 +0200 [PATCH] vmsplice: restrict stealing a little more Apply the same rules as the anon pipe pages, only allow stealing if no one else is using the page. Signed-off-by: Jens Axboe commit a893b99be71f1d669b74f840e3a683dd077d007b tree 79591f70b57ef4504dc5c9584b7d8fcaa04faede parent 7591489a8fbee83f19bacc75756989a6a4d0389c author Jens Axboe Tue, 02 May 2006 15:03:27 +0200 committer Jens Axboe Tue, 02 May 2006 15:03:27 +0200 [PATCH] splice: fix page LRU accounting Currently we rely on the PIPE_BUF_FLAG_LRU flag being set correctly to know whether we need to fiddle with page LRU state after stealing it, however for some origins we just don't know if the page is on the LRU list or not. So remove PIPE_BUF_FLAG_LRU and do this check/add manually in pipe_to_file() instead. Signed-off-by: Jens Axboe commit 7591489a8fbee83f19bacc75756989a6a4d0389c tree ec185e3788e3c3f123ff3ee00b18441467eb4486 parent 532f57da408c5a5710075d17047e2d97bdfd22f3 author Jens Axboe Tue, 02 May 2006 12:57:18 +0200 committer Jens Axboe Tue, 02 May 2006 12:57:18 +0200 [PATCH] vmsplice: fix badly placed end paranthesis We need to use the minium of {len, PAGE_SIZE-off}, not {len, PAGE_SIZE}-off. The latter doesn't make any sense, and could cause us to attempt negative length transfers... Signed-off-by: Jens Axboe commit 532f57da408c5a5710075d17047e2d97bdfd22f3 tree 3fb378bea1816f637aeeed0df805d0c30969cfc3 parent 46c5ea3c9ae7fbc6e52a13c92e59d4fc7f4ca80a parent 2ad312d2093ae506ae0fa184d8d026b559083087 author Linus Torvalds Mon, 01 May 2006 21:43:05 -0700 committer Linus Torvalds Mon, 01 May 2006 21:43:05 -0700 Merge branch 'audit.b10' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current * 'audit.b10' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current: [PATCH] Audit Filter Performance [PATCH] Rework of IPC auditing [PATCH] More user space subject labels [PATCH] Reworked patch for labels on user space messages [PATCH] change lspp ipc auditing [PATCH] audit inode patch [PATCH] support for context based audit filtering, part 2 [PATCH] support for context based audit filtering [PATCH] no need to wank with task_lock() and pinning task down in audit_syscall_exit() [PATCH] drop task argument of audit_syscall_{entry,exit} [PATCH] drop gfp_mask in audit_log_exit() [PATCH] move call of audit_free() into do_exit() [PATCH] sockaddr patch [PATCH] deal with deadlocks in audit_free() commit 46c5ea3c9ae7fbc6e52a13c92e59d4fc7f4ca80a tree 4ab2c54a0b0d9621ed42c032cc67d93638c8681c parent 9817d207dc13e3a9fc0287bbd36bdfa3cffe5ed4 author Patrick McHardy Tue, 02 May 2006 05:12:22 +0200 committer Linus Torvalds Mon, 01 May 2006 20:48:32 -0700 [NETFILTER] x_tables: fix compat related crash on non-x86 When iptables userspace adds an ipt_standard_target, it calculates the size of the entire entry as: sizeof(struct ipt_entry) + XT_ALIGN(sizeof(struct ipt_standard_target)) ipt_standard_target looks like this: struct xt_standard_target { struct xt_entry_target target; int verdict; }; xt_entry_target contains a pointer, so when compiled for 64 bit the structure gets an extra 4 byte of padding at the end. On 32 bit architectures where iptables aligns to 8 byte it will also have 4 byte padding at the end because it is only 36 bytes large. The compat_ipt_standard_fn in the kernel adjusts the offsets by sizeof(struct ipt_standard_target) - sizeof(struct compat_ipt_standard_target), which will always result in 4, even if the structure from userspace was already padded to a multiple of 8. On x86 this works out by accident because userspace only aligns to 4, on all other architectures this is broken and causes incorrect adjustments to the size and following offsets. Thanks to Linus for lots of debugging help and testing. Signed-off-by: Patrick McHardy Signed-off-by: Linus Torvalds commit 9817d207dc13e3a9fc0287bbd36bdfa3cffe5ed4 tree 38f87e68f1cd36159fe5b9c03e9047b2fe374324 parent cf105601df49ba0ea5ac04a6154c6c1442994c74 parent 7afa6fd037e51e95d322990cb127bb2b1217251a author Linus Torvalds Mon, 01 May 2006 18:33:40 -0700 committer Linus Torvalds Mon, 01 May 2006 18:33:40 -0700 Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block * 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block: [PATCH] vmsplice: allow user to pass in gift pages [PATCH] pipe: enable atomic copying of pipe data to/from user space [PATCH] splice: call handle_ra_miss() on failure to lookup page [PATCH] Add ->splice_read/splice_write to def_blk_fops [PATCH] pipe: introduce ->pin() buffer operation [PATCH] splice: fix bugs in pipe_to_file() [PATCH] splice: fix bugs with stealing regular pipe pages commit cf105601df49ba0ea5ac04a6154c6c1442994c74 tree aafc54a8b2518b057f73deac08076bcb39f4b998 parent 6ba815ded3fef03e888a9fc8eae3113938ff5349 parent f6f0413e10b76440fb82efebc63120f3b6d42adb author Linus Torvalds Mon, 01 May 2006 18:26:31 -0700 committer Linus Torvalds Mon, 01 May 2006 18:26:31 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: IB/ipath: tidy up white space in a few files IB/ipath: fix label name in interrupt handler IB/ipath: improve sparse annotation IB/ipath: simplify IB timer usage IB/ipath: simplify RC send posting IB/ipath: prevent hardware from being accessed during reset IB/ipath: fix verbs registration IB/ipath: change handling of PIO buffers IB/ipath: iterate over correct number of ports during reset IB/ipath: set up 32-bit DMA mask if 64-bit setup fails IB/ipath: fix race with exposing reset file IB/mthca: Fix offset in query_gid method commit 6ba815ded3fef03e888a9fc8eae3113938ff5349 tree e05297499d19a85e374a5efd1df5f3826dce31f7 parent 160bd18e5e545cbb4e5c26f54414485f8ac291ec author Shaohua Li Mon, 01 May 2006 12:16:19 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:47 -0700 [PATCH] timer TSC check suspend notifier change At suspend time, the TSC CPUFREQ_SUSPENDCHANGE notifier change might wrongly enable interrupt. cpufreq driver suspend/resume is in interrupt disabled environment. Signed-off-by: Shaohua Li Cc: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 160bd18e5e545cbb4e5c26f54414485f8ac291ec tree 8aeb56b0f2c5292dd768e8beca13212706289872 parent f3537ea7b9c2f10397a8b68cd006981d7c615431 author Mikael Pettersson Mon, 01 May 2006 12:16:18 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:47 -0700 [PATCH] x86_64: make PC Speaker driver work The PC Speaker driver's ->probe() routine doesn't even get called in the 64-bit kernels. The reason for that is that the arch code apparently has to explictly add a "pcspkr" platform device in order for the driver core to call the ->probe() routine. arch/i386/kernel/setup.c unconditionally adds a "pcspkr" device, but the x86_64 kernel has no code at all related to the PC Speaker. The patch below copies the relevant code from i386 to x86_64, which makes the PC Speaker work for me on x86_64. Cc: Dmitry Torokhov Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f3537ea7b9c2f10397a8b68cd006981d7c615431 tree 4aedb112b5e39c09238f533804fc35996c58eeb0 parent 3418ff76119da52f808eb496191d1fd380f53f3d author Atsushi Nemoto Mon, 01 May 2006 12:16:17 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:47 -0700 [PATCH] genrtc: fix read on 64-bit platforms Fix genrtc's read() routine for 64-bit platforms. Current gen_rtc_read() stores 64bit integer and returns 8 even if an user tried to read a 32bit integer. Signed-off-by: Atsushi Nemoto Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3418ff76119da52f808eb496191d1fd380f53f3d tree 2b705944ed950def93eda54e7f551ba36d8f41c6 parent b44df334a7e909d88cf5c54cc0481b4e2eaeca23 author Atsushi Nemoto Mon, 01 May 2006 12:16:16 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:46 -0700 [PATCH] RTC: rtc-dev tweak for 64-bit kernel Make rtc-dev work well on 64-bit platforms with 32-bit userland. On those platforms, users might try to read 32-bit integer value. This patch make rtc-dev's read() work well for both "int" and "long" size. This tweak is came from genrtc driver. Signed-off-by: Atsushi Nemoto Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b44df334a7e909d88cf5c54cc0481b4e2eaeca23 tree 17654870a23ee053fe4edc908c452d32968ff1a9 parent 022e4fc0fb2e4e179aaba4ee139dcb8fded0cba2 author Heiko Carstens Mon, 01 May 2006 12:16:15 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:46 -0700 [PATCH] s390: bug in setup_rt_frame Consider return value of __put_user() when setting up a signal frame instead of ignoring it. Cc: Martin Schwidefsky Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 022e4fc0fb2e4e179aaba4ee139dcb8fded0cba2 tree fbe70e06b897015226d209f54225e68f52ff7dc5 parent 8261aa600943046a5305564a1cd7432009971799 author Heiko Carstens Mon, 01 May 2006 12:16:14 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:46 -0700 [PATCH] s390: fix ipd handling As pointed out by Paulo Marques MAX_IPD_TIME is by a factor of ten too small. Since this means that we allow ten times more IPDs in the intended time frame this could result in a cpu check stop of a physical cpu. Cc: Martin Schwidefsky Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8261aa600943046a5305564a1cd7432009971799 tree a25304dd85c473d2fae77bc27fec49183978feba parent 953039c8df7beb2694814e20e2707a77d335a2e3 author Jeremy Kerr Mon, 01 May 2006 12:16:13 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:46 -0700 [PATCH] powerpc: cell: Add numa id to struct spu Add an nid member to the spu structure, and store the numa id of the spu there on creation. Signed-off-by: Arnd Bergmann Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 953039c8df7beb2694814e20e2707a77d335a2e3 tree 8e8d6af92441d70074efc24f55cf5965ae28447a parent bed120c64eb07b6838bb758109811484af8cebba author Jeremy Kerr Mon, 01 May 2006 12:16:12 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:46 -0700 [PATCH] powerpc: Allow devices to register with numa topology Change of_node_to_nid() to traverse the device tree, looking for a numa id. Cell uses this to assign ids to SPUs, which are children of the CPU node. Existing users of of_node_to_nid() are altered to use of_node_to_nid_single(), which doesn't do the traversal. Export an attach_sysdev_to_node() function, allowing system devices (eg. SPUs) to link themselves into the numa topology in sysfs. Signed-off-by: Arnd Bergmann Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bed120c64eb07b6838bb758109811484af8cebba tree 884231ab38d01a2b19c6d062f5230ea8b9f5ecb3 parent 46a66eecdf7bc12562ecb492297447ed0e1ecf59 author Joel H Schopp Mon, 01 May 2006 12:16:11 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:46 -0700 [PATCH] spufs: fix for CONFIG_NUMA Based on an older patch from Mike Kravetz We need to have a mem_map for high addresses in order to make fops->no_page work on spufs mem and register files. So far, we have used the memory_present() function during early bootup, but that did not work when CONFIG_NUMA was enabled. We now use the __add_pages() function to add the mem_map when loading the spufs module, which is a lot nicer. Signed-off-by: Arnd Bergmann Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 46a66eecdf7bc12562ecb492297447ed0e1ecf59 tree b758b51763c2365130a2a58547fa0bc30d71cdc8 parent 2c43630fb0ff3f01c29367248ffa4a851e2c9b34 author Mike Kravetz Mon, 01 May 2006 12:16:09 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:46 -0700 [PATCH] sparsemem interaction with memory add bug fixes This patch fixes two bugs with the way sparsemem interacts with memory add. They are: - memory leak if memmap for section already exists - calling alloc_bootmem_node() after boot These bugs were discovered and a first cut at the fixes were provided by Arnd Bergmann and Joel Schopp . Signed-off-by: Mike Kravetz Signed-off-by: Joel Schopp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2c43630fb0ff3f01c29367248ffa4a851e2c9b34 tree 5dc42ec34af95d4727029f5cb16a91f86d754f5d parent 4c28f81193b6778f7b49090930d88e6d12bcb928 author Pat Gefre Mon, 01 May 2006 12:16:08 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:45 -0700 [PATCH] Altix: correct ioc3 port order Currently loading the ioc3 as a module will cause the ports to be numbered in reverse order. This mod maintains the proper order of cards for port numbering. Signed-off-by: Patrick Gefre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c28f81193b6778f7b49090930d88e6d12bcb928 tree 5e0d83368e7282060b8de5e73f13eb6003e99391 parent a4b741e380cb56045ccea36f2dbc10e42af21f24 author Christoph Lameter Mon, 01 May 2006 12:16:08 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:45 -0700 [PATCH] page migration: Fix fallback behavior for dirty pages Currently we check PageDirty() in order to make the decision to swap out the page. However, the dirty information may be only be contained in the ptes pointing to the page. We need to first unmap the ptes before checking for PageDirty(). If unmap is successful then the page count of the page will also be decreased so that pageout() works properly. This is a fix necessary for 2.6.17. Without this fix we may migrate dirty pages for filesystems without migration functions. Filesystems may keep pointers to dirty pages. Migration of dirty pages can result in the filesystem keeping pointers to freed pages. Unmapping is currently not be separated out from removing all the references to a page and moving the mapping. Therefore try_to_unmap will be called again in migrate_page() if the writeout is successful. However, it wont do anything since the ptes are already removed. The coming updates to the page migration code will restructure the code so that this is no longer necessary. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a4b741e380cb56045ccea36f2dbc10e42af21f24 tree 9f5f5529afda80ba799058128be5997c00c754e0 parent cead61a6717a9873426b08d73a34a325e3546f5d author Jeff Dike Mon, 01 May 2006 12:16:06 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:45 -0700 [PATCH] uml: uml-makefile-nicer uses SYMLINK incorrectly Blaisorblade's uml-makefile-nicer makes a V=0 build say SYMLINK where what's happening is really a LINK. Signed-off-by: Jeff Dike Acked-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cead61a6717a9873426b08d73a34a325e3546f5d tree 5243046032ed9f4a4c6fb240a34c39a7324c5098 parent 7b12b9137930eb821b68e1bfa11e9de692208620 author Paolo 'Blaisorblade' Giarrusso Mon, 01 May 2006 12:16:06 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:45 -0700 [PATCH] uml: export symbols added by GCC hardened GCC hardened introduces additional symbol refererences (for the canary and friends), also in modules - add weak export_symbols for them. We already tested that the weak declaration creates no problem on both GCC's providing the function definition and on GCC's which don't provide it. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7b12b9137930eb821b68e1bfa11e9de692208620 tree e2bfd312a5f2dd5665f2a834af679148bb1718d3 parent 275e6e1ee2bafde77e9390b27e876fa83f24cb60 author Paolo 'Blaisorblade' Giarrusso Mon, 01 May 2006 12:16:05 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:45 -0700 [PATCH] uml: cleanup unprofile expression and build infrastructure *) Rather than duplicate in various buggy ways the application of CFLAGS_NO_HARDENING and UNPROFILE (which apply to the same files), centralize it in Makefile.rules. UNPROFILE_OBJS mustn't be listed in USER_OBJS but are compiled as such. I've also verified that unprofile didn't work in the current form, because we set _c_flags directly (using CFLAGS and not USER_CFLAGS, which is wrong), which is normally used by c_flags, but we also override c_flags for all USER_OBJS, and there we don't call unprofile. Instead it only worked for unmap.o, the only one which wasn't a USER_OBJ. We need to set c_flags (which is not a public Kbuild API) to clear a lot of compilation flags like -nostdinc which Kbuild forces on everything. *) Rather than $(CFLAGS_$(notdir $@)), which expands to CFLAGS_anObj.s when building "anObj.s", use $(CFLAGS_$(*F).o) which always accesses CFLAGS_anObj.o, like done by Kbuild. *) Make c_flags apply to all targets having the same basename, rather than listing .s, .i, .lst and .o, with the use (which I tested) of $(USER_OBJS:.o=.%): c_flags = ... and of - $(obj)/unmap.c: _c_flags = ... + $(obj)/unmap.%: _c_flags = ... Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 275e6e1ee2bafde77e9390b27e876fa83f24cb60 tree fca0c0a7e3bdabe82bc75a0dad5c765f3b6edaf0 parent cb8aa3d29b562e4c16fdfa4ecc8170ddc55397f4 author Paolo 'Blaisorblade' Giarrusso Mon, 01 May 2006 12:16:04 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:45 -0700 [PATCH] uml: fix compilation and execution with hardened GCC To make some half-assembly stubs compile, disable various "hardened" GCC features: *) we can't make it build PIC code as we need %ebx to do syscalls and GCC wants it free for PIC *) we can't leave stack protection as the stub is moved (not relocated!) in memory so the RIP-relative access to the canary tries reading from an unmapped address and causes a segfault, since we move the stub of various megabytes (the exact amount will be decided at runtime) away from the link-time address. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cb8aa3d29b562e4c16fdfa4ecc8170ddc55397f4 tree 8bff8424e5a4652e46042435ef3e351157d39241 parent cb98cdcd0dd892dcaec7dabd57c3b00890006b61 author Paolo 'Blaisorblade' Giarrusso Mon, 01 May 2006 12:16:03 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:45 -0700 [PATCH] uml: use Kbuild tracking for all files and fix compilation output Move the build of user-offsets to arch/um/sys-$(SUBARCH), where it's located. So we can also build it via Kbuild with its dependency tracking rather than by hand. While hacking here, fix also a lot of little cosmetic things. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cb98cdcd0dd892dcaec7dabd57c3b00890006b61 tree 35498e769997902fae095acba6ad077c315b79a8 parent b15fb6b157b83ce983e42130ab7d1a866020d8f5 author Mattia Dongili Mon, 01 May 2006 12:16:01 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:45 -0700 [PATCH] uml: search from uml_net in a more reasonable PATH Append /usr/lib/uml to the existing PATH environment variable to let execvp() search uml_net in FHS compliant locations. Signed-off-by: Mattia Dongili Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b15fb6b157b83ce983e42130ab7d1a866020d8f5 tree 6a90f7c7162270c8858d4555115469cd78bbf4ae parent 2ace87b9502d922397cabaf07d73e0b60c480ecf author Paolo 'Blaisorblade' Giarrusso Mon, 01 May 2006 12:16:01 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:44 -0700 [PATCH] uml: fix patch mismerge I sent a patch, it was applied as cda402b283c34a24b091f78eee116963e9494762, then it was applied again as 181ae4005d0a4010802be534d929b38c42b9ac06 by mistake. But while the 1st time it modified (correctly) cow_header_v3, the 2nd it modified cow_header_v3_broken. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ace87b9502d922397cabaf07d73e0b60c480ecf tree b354425542c4b2cff20dc20cd65d0e8eeec2c7c4 parent 347b3dc2faf34d63a96b41e3244b743cc72a2aa0 author Jeff Dike Mon, 01 May 2006 12:16:00 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:44 -0700 [PATCH] uml: error handling fixes Blairsorblade noticed some confusion between our use of a system call's return value and errno. This patch fixes a number of related bugs - using errno instead of a return value using a return value instead of errno forgetting to negate a error return to get a positive error code Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 347b3dc2faf34d63a96b41e3244b743cc72a2aa0 tree 4bd6cb2c965a788d140da97f9397e5e1ffa35337 parent e3104f50d89b1fffe1fd973e32248a5c7f1bb41e author Jeff Dike Mon, 01 May 2006 12:15:59 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:44 -0700 [PATCH] uml: update defconfig Bring defconfig up to date. Also disable CONFIG_BLK_DEV_UBD_SYNC by default. By performing synchronous I/O to the host, it slows things down, only protects against host crashes, and can make a UML appear to hang while it waits for the host's disk. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e3104f50d89b1fffe1fd973e32248a5c7f1bb41e tree fc1b191345acb4eb30455bd3efddb73a4c463d68 parent 191ef966ac164a1ce3e06290ca52296744a4aee2 author Jeff Dike Mon, 01 May 2006 12:15:58 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:44 -0700 [PATCH] uml: clean up after MADVISE_REMOVE The MADVISE_REMOVE-checking code didn't clean up after itself. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 191ef966ac164a1ce3e06290ca52296744a4aee2 tree 0b141e946ed9ff65d94d393ba15384b958793586 parent 893bb96a29bee4a5cf2486720ac79412aaee5066 author Jesper Juhl Mon, 01 May 2006 12:15:57 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:44 -0700 [PATCH] uml: remove NULL checks and add some CodingStyle Remove redundant NULL checks before [kv]free + small CodingStyle cleanup for arch/ Signed-off-by: Jesper Juhl Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 893bb96a29bee4a5cf2486720ac79412aaee5066 tree 5e56b9ed14c84766c58a0185aafd679d8cb949b3 parent c39e50b4bada27102306d7fa68ea35dc4e61bd68 author Joris van Rantwijk Mon, 01 May 2006 12:15:56 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:43 -0700 [PATCH] uml: skas0 support for 2G/2G hosts A quick hack to allow skas0 mode to run on 2G/2G hosts. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c39e50b4bada27102306d7fa68ea35dc4e61bd68 tree fc19963a4cdb94e964f83fb23c24f7d169241a43 parent f3a19cb45f4730c4ce09ca9bccf197efd010dc3b author Victor V. Vengerov Mon, 01 May 2006 12:15:53 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:43 -0700 [PATCH] uml: fix iomem list traversal We need to walk the region list properly. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f3a19cb45f4730c4ce09ca9bccf197efd010dc3b tree 8d335d5ecfebf4040865e09d3cdb0e7c012cc5c7 parent 42e4c8585f8cbbfac3b70aa2d0a4f869509a0354 author Andrew Morton Mon, 01 May 2006 12:15:52 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:43 -0700 [PATCH] silence initcall warnings Suppress the initcall-return-value warnings unless initcall_debug was specified. They do find bugs, but they're extremely small ones and as Andi points out, people get distressed. Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42e4c8585f8cbbfac3b70aa2d0a4f869509a0354 tree 23d77cd10353b534c94e15710658b71f4d6d8957 parent 5871aa6d5a98f315016d1deee07425c269c37f29 author Andi Kleen Mon, 01 May 2006 12:15:51 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:43 -0700 [PATCH] i386: Remove apic= warning The apic= option can be used to set the APIC driver too. When that is done this code would always produce bogus warnings. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5871aa6d5a98f315016d1deee07425c269c37f29 tree 080fad156c503a485cfa4736d8e7b38561f5586a parent 32828546b32a96d550b85eab25609bc4ba3942ab author Andi Kleen Mon, 01 May 2006 12:15:50 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:43 -0700 [PATCH] i386: Fix overflow in e820_all_mapped The 32bit version of e820_all_mapped() needs to use u64 to avoid overflows on PAE systems. Pointed out by Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32828546b32a96d550b85eab25609bc4ba3942ab tree 96d48910315bca328d34985337a99a8b41e8be6e parent d2610202290b4924b71747314a0f88f28807702e author Andi Kleen Mon, 01 May 2006 12:15:49 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:43 -0700 [PATCH] i386/x86-64: Fix ACPI disabled LAPIC handling mismerge The patch I submitted earlier to fix disabled LAPIC handling in ACPI was mismerged for some reason I still don't quite understand. Parts of it was applied to the wrong function. This patch fixes it up. Cc: Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d2610202290b4924b71747314a0f88f28807702e tree bdfde16e24caa597f66504d555b06ee2e480ef54 parent 5e7dd2ab6b9bdfa60e19b8739e6b2a204fd4f477 author Andi Kleen Mon, 01 May 2006 12:15:48 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:43 -0700 [PATCH] x86_64: Add compat_sys_vmsplice and use it in x86-64 Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e7dd2ab6b9bdfa60e19b8739e6b2a204fd4f477 tree f9d3ac455ea67f1ea23e7e41848ac422506c474b parent 62de608da0b0ab17d81a233b50d1e952b9816f69 author NeilBrown Mon, 01 May 2006 12:15:47 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:42 -0700 [PATCH] md: Fix 'rdev->nr_pending' count when retrying barrier requests When retrying a failed BIO_RW_BARRIER request, we need to keep the reference in ->nr_pending over the whole retry. Currently, we only hold the reference if the failed request is the *last* one to finish - which is silly, because it would normally be the first to finish. So move the rdev_dec_pending call up into the didn't-fail branch. As the rdev isn't used in the later code, calling rdev_dec_pending earlier doesn't hurt. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 62de608da0b0ab17d81a233b50d1e952b9816f69 tree 12647d87f70cddf29edeeee2d85358667aa24cd8 parent bea2771871ed1084c9a85ed0c86340f188505702 author NeilBrown Mon, 01 May 2006 12:15:47 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:42 -0700 [PATCH] md: Improve detection of lack of barrier support in raid1 Move the test for 'do barrier work' down a bit so that if the first write to a raid1 is a BIO_RW_BARRIER write, the checking done by superblock writes will cause the right thing to happen. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bea2771871ed1084c9a85ed0c86340f188505702 tree 3c7e30dbab20419e609c63b96e39f43a7ef524ff parent e0a33270ed0e8e00cbb882a33d21e1f92aac0ceb author NeilBrown Mon, 01 May 2006 12:15:46 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:42 -0700 [PATCH] md: Change ENOTSUPP to EOPNOTSUPP Because that is what you get if a BIO_RW_BARRIER isn't supported! Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e0a33270ed0e8e00cbb882a33d21e1f92aac0ceb tree 37879a141c5168577813b318cf825ccc0c97204c parent df30d0f4ca3c41b60068232d6de9d58be88436f0 author NeilBrown Mon, 01 May 2006 12:15:45 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:42 -0700 [PATCH] md: Fixed refcounting/locking when attempting read error correction in raid10 We need to hold a reference to rdevs while reading and writing to attempt to correct read errors. This reference must be taken under an rcu lock. Signed-off-by: Neil Brown Cc: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit df30d0f4ca3c41b60068232d6de9d58be88436f0 tree f9ea546b15f0c8908d6248480c7f3dad820a5f5e parent 235acec78e87a60ace01d1ecb4b87ad1d689715a author NeilBrown Mon, 01 May 2006 12:15:44 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:42 -0700 [PATCH] md: Avoid oops when attempting to fix read errors on raid10 We should add to the counter for the rdev *after* checking if the rdev is NULL!!! Signed-off-by: Neil Brown Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 235acec78e87a60ace01d1ecb4b87ad1d689715a tree 5549b96af97db6b0c39feb371983f57e4531f50a parent 1f4a90670bacbf61f2fcc19a9e0e78748c932a25 author Bastian Blank Mon, 01 May 2006 12:15:42 -0700 committer Linus Torvalds Mon, 01 May 2006 18:17:42 -0700 [PATCH] s390: make qeth buildable Signed-off-by: Bastian Blank Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: "David S. Miller" Acked-by: Jeff Garzik Acked-by: Frank Pavlic Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f6f0413e10b76440fb82efebc63120f3b6d42adb tree 59be18af9ca5c47c6a552dadd884459a3eab0914 parent d562a5ae69bd5643d777788117d02acb22fab347 author Bryan O'Sullivan Mon, 24 Apr 2006 14:23:09 -0700 committer Roland Dreier Mon, 01 May 2006 12:14:23 -0700 IB/ipath: tidy up white space in a few files Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit d562a5ae69bd5643d777788117d02acb22fab347 tree d903dfecf15d3265ce13cdfd0ed76aa5abf30995 parent ae15f540cc52acbcbfdf4b902d214a5db5c835d2 author Bryan O'Sullivan Mon, 24 Apr 2006 14:23:08 -0700 committer Roland Dreier Mon, 01 May 2006 12:14:22 -0700 IB/ipath: fix label name in interrupt handler Names that are the opposite of their intended meanings are not so helpful. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit ae15f540cc52acbcbfdf4b902d214a5db5c835d2 tree 1e3e6a15f6d73fab9fa1a3bd0a8f5ec47cf6ccba parent 9b2017f1e1c95625b2ca2a1ec5317097117d7078 author Bryan O'Sullivan Mon, 24 Apr 2006 14:23:07 -0700 committer Roland Dreier Mon, 01 May 2006 12:14:21 -0700 IB/ipath: improve sparse annotation Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 9b2017f1e1c95625b2ca2a1ec5317097117d7078 tree 2f799016e4f05348ddf6e01d71993c08fd5b0a0f parent 76f0dd141b477094b026206c0d8c21beac6069f5 author Bryan O'Sullivan Mon, 24 Apr 2006 14:23:06 -0700 committer Roland Dreier Mon, 01 May 2006 12:14:21 -0700 IB/ipath: simplify IB timer usage Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 76f0dd141b477094b026206c0d8c21beac6069f5 tree 7ca7f8dace47a2aaa0440d881d581a589dec2463 parent c71c30dcba142f16bc5f651812b1bc0b9f70f02d author Bryan O'Sullivan Mon, 24 Apr 2006 14:23:05 -0700 committer Roland Dreier Mon, 01 May 2006 12:14:20 -0700 IB/ipath: simplify RC send posting Remove some unnecessarily complicated tests. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit c71c30dcba142f16bc5f651812b1bc0b9f70f02d tree a6cb67f3b2c59d5eeb3638c859d983d9006c5a2d parent fccea663643cedfa310c5254da30e1e35e09199b author Bryan O'Sullivan Mon, 24 Apr 2006 14:23:03 -0700 committer Roland Dreier Mon, 01 May 2006 12:14:16 -0700 IB/ipath: prevent hardware from being accessed during reset The reset code now turns off the PRESENT flag during a reset, so that other code won't attempt to access a device that's in mid-reset. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit fccea663643cedfa310c5254da30e1e35e09199b tree a377c3608bd8b0ce02f0145cde6012dcc046cfbb parent 52e7fad825c47fb86801f23b9f793da1d2774f18 author Bryan O'Sullivan Mon, 24 Apr 2006 14:23:02 -0700 committer Roland Dreier Mon, 01 May 2006 12:14:15 -0700 IB/ipath: fix verbs registration Remember when the verbs layer unregisters from the lower-level code. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 52e7fad825c47fb86801f23b9f793da1d2774f18 tree 22b5b7c03c07a786a20e7faa8d3a2901685b46f8 parent 23e86a4584606a08393e0ad3a5ca27b19a3de374 author Bryan O'Sullivan Mon, 24 Apr 2006 14:23:00 -0700 committer Roland Dreier Mon, 01 May 2006 12:14:14 -0700 IB/ipath: change handling of PIO buffers Different ipath hardware types have different numbers of buffers available, so we decide on the counts ourselves unless we are specifically overridden with a module parameter. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 23e86a4584606a08393e0ad3a5ca27b19a3de374 tree b0f7c792c53611402e31bb9405d05214467fa3d1 parent 68dd43a162b43218d2e5ac1d139c1d53da965f54 author Bryan O'Sullivan Mon, 24 Apr 2006 14:22:59 -0700 committer Roland Dreier Mon, 01 May 2006 12:14:13 -0700 IB/ipath: iterate over correct number of ports during reset Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 68dd43a162b43218d2e5ac1d139c1d53da965f54 tree 5c21df89d9b154b287cc340a5ac4be97d1a61e3f parent 755e4ca4a9885b79a14169ab5b615920eb38a32a author Bryan O'Sullivan Mon, 24 Apr 2006 14:22:58 -0700 committer Roland Dreier Mon, 01 May 2006 12:14:12 -0700 IB/ipath: set up 32-bit DMA mask if 64-bit setup fails Some systems do not set up 64-bit maps on systems with 2GB or less of memory installed, so we have to fall back to trying a 32-bit setup. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 755e4ca4a9885b79a14169ab5b615920eb38a32a tree df85b5a5f16f25db7f6d106c69f4ddb10b9f1880 parent 254abfd33a214617deb916585b306faee834c97f author Bryan O'Sullivan Mon, 24 Apr 2006 14:22:57 -0700 committer Roland Dreier Mon, 01 May 2006 12:14:11 -0700 IB/ipath: fix race with exposing reset file We were accidentally exposing the "reset" sysfs file more than once per device. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 7afa6fd037e51e95d322990cb127bb2b1217251a tree dbe4052947bff32a6ada378576b8d7669c581cf4 parent f6762b7ad8edd6abc802542ce845d3bc8adcb92f author Jens Axboe Mon, 01 May 2006 20:02:33 +0200 committer Jens Axboe Mon, 01 May 2006 20:02:33 +0200 [PATCH] vmsplice: allow user to pass in gift pages If SPLICE_F_GIFT is set, the user is basically giving this pages away to the kernel. That means we can steal them for eg page cache uses instead of copying it. The data must be properly page aligned and also a multiple of the page size in length. Signed-off-by: Jens Axboe commit f6762b7ad8edd6abc802542ce845d3bc8adcb92f tree c941aaf7295f8efecaf42aa86112649b9b6f23a9 parent e27dedd84c119e2f7af54fcde3293be5ad812103 author Jens Axboe Mon, 01 May 2006 20:02:05 +0200 committer Jens Axboe Mon, 01 May 2006 20:02:05 +0200 [PATCH] pipe: enable atomic copying of pipe data to/from user space The pipe ->map() method uses kmap() to virtually map the pages, which is both slow and has known scalability issues on SMP. This patch enables atomic copying of pipe pages, by pre-faulting data and using kmap_atomic() instead. lmbench bw_pipe and lat_pipe measurements agree this is a Good Thing. Here are results from that on a UP machine with highmem (1.5GiB of RAM), running first a UP kernel, SMP kernel, and SMP kernel patched. Vanilla-UP: Pipe bandwidth: 1622.28 MB/sec Pipe bandwidth: 1610.59 MB/sec Pipe bandwidth: 1608.30 MB/sec Pipe latency: 7.3275 microseconds Pipe latency: 7.2995 microseconds Pipe latency: 7.3097 microseconds Vanilla-SMP: Pipe bandwidth: 1382.19 MB/sec Pipe bandwidth: 1317.27 MB/sec Pipe bandwidth: 1355.61 MB/sec Pipe latency: 9.6402 microseconds Pipe latency: 9.6696 microseconds Pipe latency: 9.6153 microseconds Patched-SMP: Pipe bandwidth: 1578.70 MB/sec Pipe bandwidth: 1579.95 MB/sec Pipe bandwidth: 1578.63 MB/sec Pipe latency: 9.1654 microseconds Pipe latency: 9.2266 microseconds Pipe latency: 9.1527 microseconds Signed-off-by: Jens Axboe commit e27dedd84c119e2f7af54fcde3293be5ad812103 tree b388be80b04dd3f04c07ec12955e62f8ccb58bbc parent 7f9c51f0d9783c78db5c2aa16806d0c256ac667f author Jens Axboe Mon, 01 May 2006 19:59:54 +0200 committer Jens Axboe Mon, 01 May 2006 19:59:54 +0200 [PATCH] splice: call handle_ra_miss() on failure to lookup page Notify the readahead logic of the missing page. Suggested by Oleg Nesterov. Signed-off-by: Jens Axboe commit 7f9c51f0d9783c78db5c2aa16806d0c256ac667f tree 53cfd26bd0077ae6373e54a7f91b2023af26a842 parent f84d751994441292593523c7069ed147176f6cab author Jens Axboe Mon, 01 May 2006 19:59:32 +0200 committer Jens Axboe Mon, 01 May 2006 19:59:32 +0200 [PATCH] Add ->splice_read/splice_write to def_blk_fops It can use the generic handlers. Signed-off-by: Jens Axboe commit f84d751994441292593523c7069ed147176f6cab tree a1a0c4836289df86bb62e7eae5c80c66fca1643a parent 0568b409c74f7a125d92a09a3f386785700ef688 author Jens Axboe Mon, 01 May 2006 19:59:03 +0200 committer Jens Axboe Mon, 01 May 2006 19:59:03 +0200 [PATCH] pipe: introduce ->pin() buffer operation The ->map() function is really expensive on highmem machines right now, since it has to use the slower kmap() instead of kmap_atomic(). Splice rarely needs to access the virtual address of a page, so it's a waste of time doing it. Introduce ->pin() to take over the responsibility of making sure the page data is valid. ->map() is then reduced to just kmap(). That way we can also share a most of the pipe buffer ops between pipe.c and splice.c Signed-off-by: Jens Axboe commit 0568b409c74f7a125d92a09a3f386785700ef688 tree 79125b2f4755e98949f0d941a0092e5d3367bbff parent 46e678c96bbd775abd05d3ddbe2fd334794f9157 author Jens Axboe Mon, 01 May 2006 19:50:48 +0200 committer Jens Axboe Mon, 01 May 2006 19:50:48 +0200 [PATCH] splice: fix bugs in pipe_to_file() Found by Oleg Nesterov , fixed by me. - Only allow full pages to go to the page cache. - Check page != buf->page instead of using PIPE_BUF_FLAG_STOLEN. - Remember to clear 'stolen' if add_to_page_cache() fails. And as a cleanup on that: - Make the bottom fall-through logic a little less convoluted. Also make the steal path hold an extra reference to the page, so we don't have to differentiate between stolen and non-stolen at the end. Signed-off-by: Jens Axboe commit 254abfd33a214617deb916585b306faee834c97f tree a926e60a3733a24e5e666d9e21877813f34e1228 parent 1f4a90670bacbf61f2fcc19a9e0e78748c932a25 author Roland Dreier Mon, 01 May 2006 10:40:23 -0700 committer Roland Dreier Mon, 01 May 2006 10:40:23 -0700 IB/mthca: Fix offset in query_gid method GuidInfo records have 8 byte GUIDs in them, so an index should be multiplied by 8 to get an offset. mthca_query_gid() was incorrectly multiplying by 16. Noticed by Leonid Keller . Signed-off-by: Roland Dreier commit 1f4a90670bacbf61f2fcc19a9e0e78748c932a25 tree e3203c99f883439125892af1afefe95fe753ba09 parent 0d262424b07582a3aa3afa85af645bd436a94a39 parent b276764091cf241cf0b31e8cb76c67dcf9a9c1d8 author Linus Torvalds Mon, 01 May 2006 08:14:03 -0700 committer Linus Torvalds Mon, 01 May 2006 08:14:03 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [TG3]: Update version and reldate [TG3]: Fix bug in nvram write [TG3]: Add reset_phy parameter to chip reset functions [TG3]: Reset chip when changing MAC address [TG3]: Add phy workaround [TG3]: Call netif_carrier_off() during phy reset [IPV6]: Fix race in route selection. [XFRM]: fix incorrect xfrm_policy_afinfo_lock use [XFRM]: fix incorrect xfrm_state_afinfo_lock use [TCP]: Fix unlikely usage in tcp_transmit_skb() [XFRM]: fix softirq-unsafe xfrm typemap->lock use [IPSEC]: Fix IP ID selection [NET]: use hlist_unhashed() [IPV4]: inet_init() -> fs_initcall [NETLINK]: cleanup unused macro in net/netlink/af_netlink.c [PKT_SCHED] netem: fix loss [X25]: fix for spinlock recurse and spinlock lockup with timer handler commit 0d262424b07582a3aa3afa85af645bd436a94a39 tree 4ec3c7034bb244515904c6866642fdc9a9a4b39a parent 9f29333dae3488542b1344871e8ecb84084ad80e parent c9f2946fbec88d4baa3a6d47eb3a8e6b08b05cd9 author Linus Torvalds Mon, 01 May 2006 08:12:39 -0700 committer Linus Torvalds Mon, 01 May 2006 08:12:39 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Disable preemption during flush_tlb_pending(). [SPARC64]: Kill __flush_tlb_page() prototype. commit 9f29333dae3488542b1344871e8ecb84084ad80e tree 01314a20b6155cfbb881a7a797ab003b64b5f434 parent 494b9aea6d451e1eaab5d52b65951d7dc6e81cb8 parent 8fdc19486f4d3b0fc5f1c7ce69fe5f7b1c653e62 author Linus Torvalds Mon, 01 May 2006 07:48:38 -0700 committer Linus Torvalds Mon, 01 May 2006 07:48:38 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: make EVIOCGSND return meaningful data Input: ressurect EVIOCGREP and EVIOCSREP Input: psmouse - fix new device detection logic Input: move input_device_id to mod_devicetable.h Input: allow using several chords for braille Input: allow passing NULL to input_free_device() Input: spitzkbd - fix the reversed Address and Calender keys Input: ads7846 - improve filtering for thumb press accuracy Input: ads7846 - report 0 pressure value along with pen up event Input: ads7846 - handle IRQs that were latched during disabled IRQs Input: ads7846 - miscellaneous fixes Input: ads7846 - use msleep() instead of udelay() in suspend Input: ads7846 - debouncing and rudimentary sample filtering Input: ads7846 - power down ADC a bit later Input: ads7846 - add pen_down sysfs attribute Input: wistron - add support for Fujitsu N3510 Input: wistron - add signature for Amilo M7400 commit 494b9aea6d451e1eaab5d52b65951d7dc6e81cb8 tree ea70b0d3934a3a7f468d285833029798be24d5e1 parent e0a515bc6a2188f02916e976f419a8640312e32a parent a769577b3716c757e354a681aab3524ac6b651be author Linus Torvalds Mon, 01 May 2006 07:46:46 -0700 committer Linus Torvalds Mon, 01 May 2006 07:46:46 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa * git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa: (22 commits) [ALSA] via82xx - Use DXS_SRC as default for VIA8235/8237/8251 chips [ALSA] hda-codec - Add model entry for ASUS Z62F [ALSA] PCMCIA sound devices shouldn't depend on ISA [ALSA] hda-codec - Fix capture from line-in on VAIO SZ/FE laptops [ALSA] Fix Oops at rmmod with CONFIG_SND_VERBOSE_PROCFS=n [ALSA] PCM core - introduce CONFIG_SND_PCM_XRUN_DEBUG [ALSA] adding __devinitdata to pci_device_id [ALSA] add __devinitdata to all pci_device_id [ALSA] hda-codec - Add codec id for AD1988B codec chip [ALSA] hda-codec - Add model entry for ASUS M9 laptop [ALSA] pcxhr - Fix a compiler warning on 64bit architectures [ALSA] via82xx: tweak VT8251 workaround [ALSA] intel8x0 - Disable ALI5455 SPDIF-input [ALSA] via82xx: add support for VIA VT8251 (AC'97) [ALSA] Fix typos and add information about Jack support to Audiophile-Usb.txt [ALSA] Fix double free in error path of miro driver [ALSA] hda-codec - Add entry for Epox EP-5LDA+ GLi [ALSA] sound/pci/: remove duplicate #include's [ALSA] hda-codec - Use model 'hp' for all HP laptops with AD1981HD [ALSA] continue on IS_ERR from platform device registration ... commit 2ad312d2093ae506ae0fa184d8d026b559083087 tree 890337ebca18ab31546b84a9831fb9c337e8e272 parent 073115d6b29c7910feaa08241c6484637f5ca958 author Steve Grubb Tue, 11 Apr 2006 08:50:56 -0400 committer Al Viro Mon, 01 May 2006 06:10:07 -0400 [PATCH] Audit Filter Performance While testing the watch performance, I noticed that selinux_task_ctxid() was creeping into the results more than it should. Investigation showed that the function call was being called whether it was needed or not. The below patch fixes this. Signed-off-by: Steve Grubb Signed-off-by: Al Viro commit 073115d6b29c7910feaa08241c6484637f5ca958 tree 5fd32da9f54b3c12b65d3c0142fb9bdf87dc01c3 parent ce29b682e228c70cdc91a1b2935c5adb2087bab8 author Steve Grubb Sun, 02 Apr 2006 17:07:33 -0400 committer Al Viro Mon, 01 May 2006 06:10:04 -0400 [PATCH] Rework of IPC auditing 1) The audit_ipc_perms() function has been split into two different functions: - audit_ipc_obj() - audit_ipc_set_perm() There's a key shift here... The audit_ipc_obj() collects the uid, gid, mode, and SElinux context label of the current ipc object. This audit_ipc_obj() hook is now found in several places. Most notably, it is hooked in ipcperms(), which is called in various places around the ipc code permforming a MAC check. Additionally there are several places where *checkid() is used to validate that an operation is being performed on a valid object while not necessarily having a nearby ipcperms() call. In these locations, audit_ipc_obj() is called to ensure that the information is captured by the audit system. The audit_set_new_perm() function is called any time the permissions on the ipc object changes. In this case, the NEW permissions are recorded (and note that an audit_ipc_obj() call exists just a few lines before each instance). 2) Support for an AUDIT_IPC_SET_PERM audit message type. This allows for separate auxiliary audit records for normal operations on an IPC object and permissions changes. Note that the same struct audit_aux_data_ipcctl is used and populated, however there are separate audit_log_format statements based on the type of the message. Finally, the AUDIT_IPC block of code in audit_free_aux() was extended to handle aux messages of this new type. No more mem leaks I hope ;-) Signed-off-by: Al Viro commit ce29b682e228c70cdc91a1b2935c5adb2087bab8 tree 39e3e5b345748bec1c2d21962407689cdb1b7dab parent e7c3497013a7e5496ce3d5fd3c73b5cf5af7a56e author Steve Grubb Sat, 01 Apr 2006 18:29:34 -0500 committer Al Viro Mon, 01 May 2006 06:10:01 -0400 [PATCH] More user space subject labels Hi, The patch below builds upon the patch sent earlier and adds subject label to all audit events generated via the netlink interface. It also cleans up a few other minor things. Signed-off-by: Steve Grubb Signed-off-by: Al Viro commit e7c3497013a7e5496ce3d5fd3c73b5cf5af7a56e tree 2a57da5e958011b300256988e414387b1455660c parent 9c7aa6aa74fa8a5cda36e54cbbe4fffe0214497d author Steve Grubb Mon, 03 Apr 2006 09:08:13 -0400 committer Al Viro Mon, 01 May 2006 06:09:58 -0400 [PATCH] Reworked patch for labels on user space messages The below patch should be applied after the inode and ipc sid patches. This patch is a reworking of Tim's patch that has been updated to match the inode and ipc patches since its similar. [updated: > Stephen Smalley also wanted to change a variable from isec to tsec in the > user sid patch. ] Signed-off-by: Steve Grubb Signed-off-by: Al Viro commit 9c7aa6aa74fa8a5cda36e54cbbe4fffe0214497d tree 1e1489ed5080ea4aff6206bfa904f549de8e56ca parent 1b50eed9cac0e8e5e4d3a522d8aa267f7f8f8acb author Steve Grubb Fri, 31 Mar 2006 15:22:49 -0500 committer Al Viro Mon, 01 May 2006 06:09:56 -0400 [PATCH] change lspp ipc auditing Hi, The patch below converts IPC auditing to collect sid's and convert to context string only if it needs to output an audit record. This patch depends on the inode audit change patch already being applied. Signed-off-by: Steve Grubb Signed-off-by: Al Viro commit 1b50eed9cac0e8e5e4d3a522d8aa267f7f8f8acb tree c66a1c3be846e34f1aac5db640b7ccb8770e8a80 parent 3dc7e3153eddfcf7ba8b50628775ba516e5f759f author Steve Grubb Mon, 03 Apr 2006 14:06:13 -0400 committer Al Viro Mon, 01 May 2006 06:09:53 -0400 [PATCH] audit inode patch Previously, we were gathering the context instead of the sid. Now in this patch, we gather just the sid and convert to context only if an audit event is being output. This patch brings the performance hit from 146% down to 23% Signed-off-by: Al Viro commit 3dc7e3153eddfcf7ba8b50628775ba516e5f759f tree 926957e904739fc6c29e5125b7c1635b9f77548c parent 376bd9cb357ec945ac893feaeb63af7370a6e70b author Darrel Goeddel Fri, 10 Mar 2006 18:14:06 -0600 committer Al Viro Mon, 01 May 2006 06:09:36 -0400 [PATCH] support for context based audit filtering, part 2 This patch provides the ability to filter audit messages based on the elements of the process' SELinux context (user, role, type, mls sensitivity, and mls clearance). It uses the new interfaces from selinux to opaquely store information related to the selinux context and to filter based on that information. It also uses the callback mechanism provided by selinux to refresh the information when a new policy is loaded. Signed-off-by: Al Viro commit 376bd9cb357ec945ac893feaeb63af7370a6e70b tree 7e2848792982dfe30e19a600a41fa5cb49ee6e6e parent 97e94c453073a2aba4bb5e0825ddc5e923debf11 author Darrel Goeddel Fri, 24 Feb 2006 15:44:05 -0600 committer Al Viro Mon, 01 May 2006 06:06:24 -0400 [PATCH] support for context based audit filtering The following patch provides selinux interfaces that will allow the audit system to perform filtering based on the process context (user, role, type, sensitivity, and clearance). These interfaces will allow the selinux module to perform efficient matches based on lower level selinux constructs, rather than relying on context retrievals and string comparisons within the audit module. It also allows for dominance checks on the mls portion of the contexts that are impossible with only string comparisons. Signed-off-by: Darrel Goeddel Signed-off-by: Al Viro commit 97e94c453073a2aba4bb5e0825ddc5e923debf11 tree 9ed466c5252608302389f59d00c1e9e3eecd7303 parent 5411be59db80333039386f3b1ccfe5eb9023a916 author Al Viro Wed, 29 Mar 2006 20:26:24 -0500 committer Al Viro Mon, 01 May 2006 06:06:21 -0400 [PATCH] no need to wank with task_lock() and pinning task down in audit_syscall_exit() Signed-off-by: Al Viro commit 5411be59db80333039386f3b1ccfe5eb9023a916 tree 77873af4b7557768c3c48b56e7ae4508be4a70a5 parent e495149b173d8e133e1f6f2eb86fd97be7e92010 author Al Viro Wed, 29 Mar 2006 20:23:36 -0500 committer Al Viro Mon, 01 May 2006 06:06:18 -0400 [PATCH] drop task argument of audit_syscall_{entry,exit} ... it's always current, and that's a good thing - allows simpler locking. Signed-off-by: Al Viro commit e495149b173d8e133e1f6f2eb86fd97be7e92010 tree 387a11cc8a3e272df33bdb0f697ec434b9dfa3fa parent fa84cb935d4ec601528f5e2f0d5d31e7876a5044 author Al Viro Wed, 29 Mar 2006 20:17:10 -0500 committer Al Viro Mon, 01 May 2006 06:06:16 -0400 [PATCH] drop gfp_mask in audit_log_exit() now we can do that - all callers are process-synchronous and do not hold any locks. Signed-off-by: Al Viro commit fa84cb935d4ec601528f5e2f0d5d31e7876a5044 tree ba0694902a1fec4e32ff15503fc316c24b4a4501 parent d6fe3945b42d09a1eca7ad180a1646e585b8594f author Al Viro Wed, 29 Mar 2006 20:30:19 -0500 committer Al Viro Mon, 01 May 2006 06:06:13 -0400 [PATCH] move call of audit_free() into do_exit() Signed-off-by: Al Viro commit d6fe3945b42d09a1eca7ad180a1646e585b8594f tree dac7b5df78bc1a47adb9f1ae392133e5a69c6b33 parent 45d9bb0e37668b7c64d1e49e98fbc4733c23b334 author Steve Grubb Thu, 30 Mar 2006 12:20:22 -0500 committer Al Viro Mon, 01 May 2006 06:06:10 -0400 [PATCH] sockaddr patch On Thursday 23 March 2006 09:08, John D. Ramsdell wrote: > I noticed that a socketcall(bind) and socketcall(connect) event contain a > record of type=SOCKADDR, but I cannot see one for a system call event > associated with socketcall(accept). Recording the sockaddr of an accepted > socket is important for cross platform information flow analys Thanks for pointing this out. The following patch should address this. Signed-off-by: Steve Grubb Signed-off-by: Al Viro commit 45d9bb0e37668b7c64d1e49e98fbc4733c23b334 tree 29b518f84a4e9c4a295dfd92a24b5a5c42c032cc parent e0a515bc6a2188f02916e976f419a8640312e32a author Al Viro Wed, 29 Mar 2006 20:02:55 -0500 committer Al Viro Mon, 01 May 2006 06:06:07 -0400 [PATCH] deal with deadlocks in audit_free() Don't assume that audit_log_exit() et.al. are called for the context of current; pass task explictly. Signed-off-by: Al Viro commit c9f2946fbec88d4baa3a6d47eb3a8e6b08b05cd9 tree 2b18303a2a69cf0c9d0224daebda5e5fc34308d8 parent 1241140f5183db38393556832198a3b109bf9085 author David S. Miller Sun, 30 Apr 2006 22:54:27 -0700 committer David S. Miller Sun, 30 Apr 2006 22:54:27 -0700 [SPARC64]: Disable preemption during flush_tlb_pending(). A context switch will force a call to flush_tlb_pending() (via switch_to()), so if we test tlb_nr to be non-zero, then sleep, it would become zero and later back at the original context we'll pass zero down into the TLB flushing code which should never see a nr argument of zero. Signed-off-by: David S. Miller commit 1241140f5183db38393556832198a3b109bf9085 tree 5e8dc005b0396a6e9a8b47a12c35ef1239946a11 parent e0a515bc6a2188f02916e976f419a8640312e32a author David S. Miller Sun, 30 Apr 2006 21:40:13 -0700 committer David S. Miller Sun, 30 Apr 2006 21:40:13 -0700 [SPARC64]: Kill __flush_tlb_page() prototype. This function no longer exists. Signed-off-by: David S. Miller commit cc873e1aa1fa916a485294117a9846e668505671 tree 981e18ce1c2e5d5ba8629c8c24e62cc1a014c1df parent 46ed981d5d203703a01137cc58c841d34e90c147 author Sam Ravnborg Sun, 30 Apr 2006 23:59:16 +0200 committer Sam Ravnborg Sun, 30 Apr 2006 23:59:16 +0200 kbuild: drivers/video/logo/ - fix ident glitch Jan Engelhardt wrote: while compiling 2.6.17-rc2 with allyesconfig, this showed up: ... LOGO drivers/video/logo/logo_superh_clut224.c CC drivers/video/logo/logo_linux_mono.o ... A tab had sneaked in. Convert it to a few spaces. Signed-off-by: Sam Ravnborg commit 46ed981d5d203703a01137cc58c841d34e90c147 tree 181da1d9eac493d95035c2ac633da70bc67f1a07 parent 72ee59b5797e5d6fe32b5cf3473660a50a02db40 author Sam Ravnborg Sun, 30 Apr 2006 23:56:33 +0200 committer Sam Ravnborg Sun, 30 Apr 2006 23:56:33 +0200 kbuild: fix gen_initramfs_list.sh Create correct dependencies when specifying your own file with list of files etc. to include in initramfs. Reported by: Andre Noll Signed-off-by: Sam Ravnborg commit 72ee59b5797e5d6fe32b5cf3473660a50a02db40 tree 375dcc92c5e46f1772cfb7c3daa221a483e44542 parent fca1dff218163ffd34d1e9e0b9b244e8c8803601 author Randy Dunlap Sat, 15 Apr 2006 11:17:12 -0700 committer Sam Ravnborg Sun, 30 Apr 2006 23:52:31 +0200 kbuild modpost - relax driver data name Relax driver data name from *_driver to *driver. This fixes the 26 section mismatch warnings in drivers/ide/pci. Signed-off-by: Randy Dunlap Signed-off-by: Sam Ravnborg commit fca1dff218163ffd34d1e9e0b9b244e8c8803601 tree 15ad03f21c320c9a6f8112321c014bc698eb6b3a parent c8d8b837ebe4b4f11e1b0c4a2bdc358c697692ed author Pavel Roskin Mon, 24 Apr 2006 15:55:27 -0400 committer Sam Ravnborg Sun, 30 Apr 2006 23:48:03 +0200 kbuild: removing .tmp_versions considered harmful Remove *.mod files but not .tmp_versions for external builds When "make install" is run as root, .tmp_versions is re-created and becomes owned by root. Subsequent "make" run by user fails because .tmp_versions cannot be removed. Signed-off-by: Pavel Roskin Signed-off-by: Sam Ravnborg commit c8d8b837ebe4b4f11e1b0c4a2bdc358c697692ed tree b93d91d94d8ec862534ba01200e0c02a83f7d928 parent 543f2a3382bd7abd7380903518c61f00c7c87577 author Atsushi Nemoto Tue, 25 Apr 2006 01:53:43 +0900 committer Sam Ravnborg Sun, 30 Apr 2006 23:36:48 +0200 kbuild: fix modpost segfault for 64bit mipsel kernel 64bit mips has different r_info layout. This patch fixes modpost segfault for 64bit little endian mips kernel. Signed-off-by: Atsushi Nemoto Signed-off-by: Sam Ravnborg commit 46e678c96bbd775abd05d3ddbe2fd334794f9157 tree f82b77d9f2fd5d4eb5e66bc2bb8ff5df63db3c7f parent e0a515bc6a2188f02916e976f419a8640312e32a author Jens Axboe Sun, 30 Apr 2006 16:36:32 +0200 committer Jens Axboe Sun, 30 Apr 2006 16:36:32 +0200 [PATCH] splice: fix bugs with stealing regular pipe pages - Check that page has suitable count for stealing in the regular pipes. - pipe_to_file() assumes that the page is locked on succesful steal, so do that in the pipe steal hook - Missing unlock_page() in add_to_page_cache() failure. Signed-off-by: Jens Axboe commit 81d38428df26377c91e7e193aa4d2fdfdcda300a tree a20817dcdee6f2c73d8b5c8cbfb57518466794f8 parent e0a515bc6a2188f02916e976f419a8640312e32a author Pavel Pisa Sun, 30 Apr 2006 15:35:54 +0100 committer Russell King Sun, 30 Apr 2006 15:35:54 +0100 [ARM] 3485/1: i.MX: MX1 SD/MMC fix of unintentional double start possibility Patch from Pavel Pisa The clock starting imxmci_start_clock() function contains hardware issue workaround, which repeats start attempt, if SDHC does not react on the first trial. But the second start attempt can be taken even, if the first succeed and test code misses time limited clock running phase due to delay caused by schedule to other task or some another device interrupt. This change enables to detect such situation. The performance is not issue, because usually at full clock rate only about six loops in delay cycle are needed. Signed-off-by: Pavel Pisa Acked-by: Sascha Hauer Signed-off-by: Russell King commit 76bbb00288e569e7bd9ec18f45e4f814352260dd tree aba61c9801651aed96062701689ce03717b638c6 parent cd95842ca0ffb0e3df3b459832a60f9f4544ed9e author Deepak Saxena Sun, 30 Apr 2006 15:34:29 +0100 committer Russell King Sun, 30 Apr 2006 15:34:29 +0100 [ARM] 3487/1: IXP4xx: Support non-PCI systems Patch from Deepak Saxena This patch allows for the addition of IXP4xx systems that do not make use of the PCI interface by moving the CONFIG_PCI symbol selection to be platform-specific instead of for all of IXP4xx. If at least one machine with PCI support is built, the PCI code will be compiled in, but when building !PCI, this will drastically shrink the kernel size. Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit cd95842ca0ffb0e3df3b459832a60f9f4544ed9e tree ac05eb43e6e3449bcb6dd9357069f795e64d3e9f parent e0a515bc6a2188f02916e976f419a8640312e32a author Markus Gutschke Sun, 30 Apr 2006 15:34:29 +0100 committer Russell King Sun, 30 Apr 2006 15:34:29 +0100 [ARM] 3486/1: Mark memory as clobbered by the ARM _syscallX() macros Patch from Markus Gutschke In order to prevent gcc from making incorrect optimizations, all asm() statements that define system calls should report memory as clobbered. Recent versions of the headers for i386 have been changed accordingly, but the ARM headers are still defective. This patch fixes the bug tracked at http://bugzilla.kernel.org/show_bug.cgi?id=6205 Signed-off-by: Markus Gutschke Signed-off-by: Russell King commit b276764091cf241cf0b31e8cb76c67dcf9a9c1d8 tree e7cf44f07e0aa493729d7d3e8024d2d4107a8055 parent f6d9a2565bc754043f43b8f51b19f77ee0269411 author Michael Chan Sat, 29 Apr 2006 19:01:06 -0700 committer David S. Miller Sat, 29 Apr 2006 19:01:06 -0700 [TG3]: Update version and reldate Update version to 3.57. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit f6d9a2565bc754043f43b8f51b19f77ee0269411 tree 9d99366776a3191b363be38f8e692df405904501 parent 8e7a22e3eb49042c048f24bab40cf5cf8915487d author Michael Chan Sat, 29 Apr 2006 19:00:24 -0700 committer David S. Miller Sat, 29 Apr 2006 19:00:24 -0700 [TG3]: Fix bug in nvram write Fix bug in nvram write function. If the starting nvram address offset happens to be the last dword of the page, the NVRAM_CMD_LAST bit will not get set in the existing code. This patch fixes the bug by changing the "else if" to "if" so that the last dword condition always gets checked. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 8e7a22e3eb49042c048f24bab40cf5cf8915487d tree 6f14a777e098096b3482a57f4145269752aba0c4 parent 58712ef9f2cbaaeac5b32ac11810a4bbd0eeacc5 author Gary Zambrano Sat, 29 Apr 2006 18:59:13 -0700 committer David S. Miller Sat, 29 Apr 2006 18:59:13 -0700 [TG3]: Add reset_phy parameter to chip reset functions Add a reset_phy parameter to tg3_reset_hw() and tg3_init_hw(). With the full chip reset during MAC address change, the automatic PHY reset during chip reset will cause a link down and bonding will not work properly as a result. With this reset_phy parameter, we can do a chip reset without link down when changing MAC address or MTU. Signed-off-by: Gary Zambrano Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 58712ef9f2cbaaeac5b32ac11810a4bbd0eeacc5 tree 3e83bbcc8f9df47aaa507d5e72ef96fa31fa1d81 parent c424cb249dae10fb7f118f89091f1329b62b92f4 author Michael Chan Sat, 29 Apr 2006 18:58:01 -0700 committer David S. Miller Sat, 29 Apr 2006 18:58:01 -0700 [TG3]: Reset chip when changing MAC address Do the full chip reset when changing MAC address if ASF is enabled. ASF sometimes uses a different MAC address than the driver. Without the reset, the ASF MAC address may be overwritten when the driver's MAC address is changed. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit c424cb249dae10fb7f118f89091f1329b62b92f4 tree 71fec6de971313c0add0b0c0b7580c736e0f12cb parent c8e1e82b6a97ad44517517aa58b7b794ead0bf33 author Michael Chan Sat, 29 Apr 2006 18:56:34 -0700 committer David S. Miller Sat, 29 Apr 2006 18:56:34 -0700 [TG3]: Add phy workaround Add some PHY workaround code to reduce jitter on some PHYs. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit c8e1e82b6a97ad44517517aa58b7b794ead0bf33 tree 3044a83b7de83a70a0fa506e2c09d85e7311b3ae parent c302e6d54e468ee9b1e18152e2e9da06953f3473 author Michael Chan Sat, 29 Apr 2006 18:55:17 -0700 committer David S. Miller Sat, 29 Apr 2006 18:55:17 -0700 [TG3]: Call netif_carrier_off() during phy reset Add netif_carrier_off() call during tg3_phy_reset(). This is needed to properly track the netif_carrier state in cases where we do a PHY reset with interrupts disabled. The SerDes code will not run properly if the netif_carrier state is wrong. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit c302e6d54e468ee9b1e18152e2e9da06953f3473 tree 23ea6976bef7aad9a934b56714786a0d55256ec6 parent e959d8121fcbfee6ec049cc617e9423d1799f2e4 author YOSHIFUJI Hideaki Fri, 28 Apr 2006 15:59:15 -0700 committer David S. Miller Sat, 29 Apr 2006 18:33:22 -0700 [IPV6]: Fix race in route selection. We eliminated rt6_dflt_lock (to protect default router pointer) at 2.6.17-rc1, and introduced rt6_select() for general router selection. The function is called in the context of rt6_lock read-lock held, but this means, we have some race conditions when we do round-robin. Signed-off-by; YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit e959d8121fcbfee6ec049cc617e9423d1799f2e4 tree 5bbb925d554c1c0c29ce36cb9a771a12bf403861 parent f3111502c065d32dcb021f55e30398aaebd8fb0f author Ingo Molnar Fri, 28 Apr 2006 15:32:29 -0700 committer David S. Miller Sat, 29 Apr 2006 18:33:21 -0700 [XFRM]: fix incorrect xfrm_policy_afinfo_lock use xfrm_policy_afinfo_lock can be taken in bh context, at: [] lockdep_acquire_read+0x54/0x6d [] _read_lock+0x15/0x22 [] xfrm_policy_get_afinfo+0x1a/0x3d [] xfrm_decode_session+0x12/0x32 [] ip_route_me_harder+0x1c9/0x25b [] ip_nat_local_fn+0x94/0xad [] nf_iterate+0x2e/0x7a [] nf_hook_slow+0x3c/0x9e [] ip_push_pending_frames+0x2de/0x3a7 [] icmp_push_reply+0x136/0x141 [] icmp_reply+0x118/0x1a0 [] icmp_echo+0x44/0x46 [] icmp_rcv+0x111/0x138 [] ip_local_deliver+0x150/0x1f9 [] ip_rcv+0x3d5/0x413 [] netif_receive_skb+0x337/0x356 [] process_backlog+0x95/0x110 [] net_rx_action+0xa5/0x16d [] __do_softirq+0x6f/0xe6 [] do_softirq+0x52/0xb1 this means that all write-locking of xfrm_policy_afinfo_lock must be bh-safe. This patch fixes xfrm_policy_register_afinfo() and xfrm_policy_unregister_afinfo(). Signed-off-by: Ingo Molnar Signed-off-by: David S. Miller commit f3111502c065d32dcb021f55e30398aaebd8fb0f tree 59c51b1d18f866c38d23ad6fe74820f0a2cdb43d parent 83de47cd0c5738105f40e65191b0761dfa7431ac author Ingo Molnar Fri, 28 Apr 2006 15:30:03 -0700 committer David S. Miller Sat, 29 Apr 2006 18:33:20 -0700 [XFRM]: fix incorrect xfrm_state_afinfo_lock use xfrm_state_afinfo_lock can be read-locked from bh context, so take it in a bh-safe manner in xfrm_state_register_afinfo() and xfrm_state_unregister_afinfo(). Found by the lock validator. Signed-off-by: Ingo Molnar Signed-off-by: David S. Miller commit 83de47cd0c5738105f40e65191b0761dfa7431ac tree c519837e16dfaf3dd35f2454e6e969d6a47a27e1 parent 8dff7c29707b7514043539f5ab5e0a6eb7bd9dcd author Hua Zhong Fri, 28 Apr 2006 15:26:50 -0700 committer David S. Miller Sat, 29 Apr 2006 18:33:19 -0700 [TCP]: Fix unlikely usage in tcp_transmit_skb() The following unlikely should be replaced by likely because the condition happens every time unless there is a hard error to transmit a packet. Signed-off-by: Hua Zhong Signed-off-by: David S. Miller commit 8dff7c29707b7514043539f5ab5e0a6eb7bd9dcd tree a584dcfb2142d4596086d7081a3d63fd9988e7ce parent a76e07acd0de635122c5e60ccd5e55f9d5082391 author Ingo Molnar Fri, 28 Apr 2006 15:23:59 -0700 committer David S. Miller Sat, 29 Apr 2006 18:33:18 -0700 [XFRM]: fix softirq-unsafe xfrm typemap->lock use xfrm typemap->lock may be used in softirq context, so all write_lock() uses must be softirq-safe. Signed-off-by: Ingo Molnar Signed-off-by: David S. Miller commit a76e07acd0de635122c5e60ccd5e55f9d5082391 tree 81532bb4926f9122961da29b9914268deca1a508 parent da753beaeb1446aa87bcca7e8a0026633a8914f0 author Herbert Xu Fri, 28 Apr 2006 15:22:13 -0700 committer David S. Miller Sat, 29 Apr 2006 18:33:16 -0700 [IPSEC]: Fix IP ID selection I was looking through the xfrm input/output code in order to abstract out the address family specific encapsulation/decapsulation code. During that process I found this bug in the IP ID selection code in xfrm4_output.c. At that point dst is still the xfrm_dst for the current SA which represents an internal flow as far as the IPsec tunnel is concerned. Since the IP ID is going to sit on the outside of the encapsulated packet, we obviously want the external flow which is just dst->child. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit da753beaeb1446aa87bcca7e8a0026633a8914f0 tree 910ca47bce30c4ef5df66c0d6545051f61d2d49e parent a536e0778781c1f2ce38cf8e1d82ce258f0193c1 author Akinobu Mita Fri, 28 Apr 2006 15:21:23 -0700 committer David S. Miller Sat, 29 Apr 2006 18:33:15 -0700 [NET]: use hlist_unhashed() Use hlist_unhashed() rather than accessing inside data structure. Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit a536e0778781c1f2ce38cf8e1d82ce258f0193c1 tree e52714e23788874026242c0a6931f65413d8ce2b parent 09493abfdbe8144ce0805efac7a8a3c4eb869c12 author Heiko Carstens Fri, 28 Apr 2006 15:19:17 -0700 committer David S. Miller Sat, 29 Apr 2006 18:33:14 -0700 [IPV4]: inet_init() -> fs_initcall Convert inet_init to an fs_initcall to make sure its called before any device driver's initcall. Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 09493abfdbe8144ce0805efac7a8a3c4eb869c12 tree d29bab6343b66273a96b93acd887f6853ad6e87b parent 89bbb0a361cdae50eec863f10a876b58abf7d312 author Soyoung Park Fri, 28 Apr 2006 14:59:44 -0700 committer David S. Miller Sat, 29 Apr 2006 18:33:13 -0700 [NETLINK]: cleanup unused macro in net/netlink/af_netlink.c 1 line removal, of unused macro. ran 'egrep -r' from linux-2.6.16/ for Nprintk and didn't see it anywhere else but here, in #define... Signed-off-by: Soyoung Park Signed-off-by: David S. Miller commit 89bbb0a361cdae50eec863f10a876b58abf7d312 tree 47a12fa9cb97f5100992dbb407dbe081a725de2a parent 43dff98b022ded593e73c3784bac03bc9fc7ec55 author Stephen Hemminger Fri, 28 Apr 2006 12:11:36 -0700 committer David S. Miller Sat, 29 Apr 2006 18:33:12 -0700 [PKT_SCHED] netem: fix loss The following one line fix is needed to make loss function of netem work right when doing loss on the local host. Otherwise, higher layers just recover. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 43dff98b022ded593e73c3784bac03bc9fc7ec55 tree 93fc4549e1c5d2eee1186916ff8507ce63a99b63 parent e0a515bc6a2188f02916e976f419a8640312e32a author Shaun Pereira Fri, 28 Apr 2006 12:00:17 -0700 committer David S. Miller Sat, 29 Apr 2006 18:33:11 -0700 [X25]: fix for spinlock recurse and spinlock lockup with timer handler When the sk_timer function x25_heartbeat_expiry() is called by the kernel in a running/terminating process, spinlock-recursion and spinlock-lockup locks up the kernel. This has happened with testing on some distro's and the patch below fixed it. Signed-off-by: Shaun Pereira Signed-off-by: David S. Miller commit e0a515bc6a2188f02916e976f419a8640312e32a tree dd8f4f64cffe37725000c7a80d4b2b973c69f65a parent 991cef7be26ce78fe2bac72bedaf89e002cc2712 parent 6fb8f3acbe833586eb32598d1f844eb9f77c4fba author Linus Torvalds Sat, 29 Apr 2006 17:07:03 -0700 committer Linus Torvalds Sat, 29 Apr 2006 17:07:03 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [PATCH] powerpc: update cell_defconfig [PATCH] spufs: Disable local interrupts for SPE hash_page calls. [PATCH] powerpc: Add cputable entry for POWER6 [PATCH] ppc32 CPM_UART: Fixed odd address translations [PATCH] ppc32: Update board-specific code of the CPM UART users [PATCH] ppc32 CPM_UART: Convert to use platform devices [PATCH] ppc32: odd fixes and improvements in ppc_sys [PATCH] powerpc: Wire up *at syscalls [PATCH] ppc32: add 440GX erratum 440_43 workaround [PATCH] powerpc: Use check_legacy_ioport() on ppc32 too. [PATCH] powerpc64: Fix loading of modules without a .toc section [PATCH] sound/ppc: snd_pmac_toonie_init should be __init powerpc/pseries: Tell firmware our capabilities on new machines [PATCH] powerpc: Fix pagetable bloat for hugepages commit 991cef7be26ce78fe2bac72bedaf89e002cc2712 tree d484079aece3d19a2a645ac4bacd109a89ee58ed parent 4661e3eace2c7b8433476b5bf0ee437ab3c7dfd4 author Ralf Baechle Sat, 29 Apr 2006 08:52:44 +0800 committer Linus Torvalds Sat, 29 Apr 2006 17:05:11 -0700 [PATCH] au1200fb: Remove accidentally duplicated content of au1200fb.c Content of file au1200fb.c was duplicated. Remove. Signed-off-by: Ralf Baechle Signed-off-by: Antonino Daplas Signed-off-by: Linus Torvalds commit 4661e3eace2c7b8433476b5bf0ee437ab3c7dfd4 tree 4a7738c1703392c4d74bf6f7492630c310431812 parent 543f2a3382bd7abd7380903518c61f00c7c87577 author Linus Torvalds Sat, 29 Apr 2006 14:27:13 -0700 committer Linus Torvalds Sat, 29 Apr 2006 14:27:13 -0700 [SCSI] advansys driver: limp along on x86 Let people enable the advansys driver on x86-32, even though it's broken on other architectures due to missing DMA mapping infrastructure. It's used by Jeffrey Phillips Freeman and possibly others. Signed-off-by: Linus Torvalds commit 543f2a3382bd7abd7380903518c61f00c7c87577 tree ca6dff499b29f40b5ff62aaaed48def6e4c81016 parent 693f7d362055261882659475d2ef022e32edbff1 author Chuck Ebbert <76306.1226@compuserve.com> Sat, 29 Apr 2006 14:07:49 -0400 committer Linus Torvalds Sat, 29 Apr 2006 14:13:16 -0700 [PATCH] i386: fix broken FP exception handling The FXSAVE information leak patch introduced a bug in FP exception handling: it clears FP exceptions only when there are already none outstanding. Mikael Pettersson reported that causes problems with the Erlang runtime and has tested this fix. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Acked-by: Mikael Pettersson Signed-off-by: Linus Torvalds commit 8fdc19486f4d3b0fc5f1c7ce69fe5f7b1c653e62 tree 76b12c40bf4724e0d8ac52990bc043f03cc0e5cb parent 08791e5cf62b6952ca32106aebb79b6066005de4 author Dmitry Torokhov Sat, 29 Apr 2006 01:13:48 -0400 committer Dmitry Torokhov Sat, 29 Apr 2006 01:13:48 -0400 Input: make EVIOCGSND return meaningful data Signed-off-by: Dmitry Torokhov commit 08791e5cf62b6952ca32106aebb79b6066005de4 tree 7cb1f7bfdb2b31bbc8d504be2245df8f21a28574 parent 89c9b4805a525bdd4c6e7529d06292f60ac837fc author Dmitry Torokhov Sat, 29 Apr 2006 01:13:21 -0400 committer Dmitry Torokhov Sat, 29 Apr 2006 01:13:21 -0400 Input: ressurect EVIOCGREP and EVIOCSREP While writing to an event device allows to set repeat rate for an individual input device there is no way to retrieve current settings so we need to ressurect EVIOCGREP. Also ressurect EVIOCSREP so we have a symmetrical interface. Signed-off-by: Dmitry Torokhov commit 89c9b4805a525bdd4c6e7529d06292f60ac837fc tree b3cabcdd8f2626b7c1ff6bab1db18effef34ea27 parent 7b7e394185014e0f3bd8989cac937003f20ef9ce author Dmitry Torokhov Sat, 29 Apr 2006 01:12:44 -0400 committer Dmitry Torokhov Sat, 29 Apr 2006 01:12:44 -0400 Input: psmouse - fix new device detection logic Signed-off-by: Dmitry Torokhov commit 6fb8f3acbe833586eb32598d1f844eb9f77c4fba tree c2e1e66a100fd9de70419cf4d5ca937347bd2333 parent f807221dedbd30726c5dffcd5b5d22ce0ea683cb author Arnd Bergmann Sat, 29 Apr 2006 02:40:22 +0200 committer Paul Mackerras Sat, 29 Apr 2006 15:11:30 +1000 [PATCH] powerpc: update cell_defconfig reflect the changes to Kconfig since the last update. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit f807221dedbd30726c5dffcd5b5d22ce0ea683cb tree 7cc1f027c09c6265887711969b728d4cbf1dfe6d parent 03054d51a70e8c273df5d9bc31fea6c843eaa1c3 author Arnd Bergmann Sat, 29 Apr 2006 02:40:21 +0200 committer Paul Mackerras Sat, 29 Apr 2006 15:11:25 +1000 [PATCH] spufs: Disable local interrupts for SPE hash_page calls. This patch disables and saves local interrupts during hash_page processing for SPE contexts. We have to do it explicitly in the spu_irq_class_1_bottom function. For the interrupt handlers, we get the behaviour implicitly by using SA_INTERRUPT to disable interrupts while in the handler. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 7b7e394185014e0f3bd8989cac937003f20ef9ce tree 3beda5f979bba0aa9822534e239cf1b45f3be69c parent ddc5d3414593e4d7ad7fbd33e7f7517fcc234544 parent 693f7d362055261882659475d2ef022e32edbff1 author Dmitry Torokhov Sat, 29 Apr 2006 01:11:23 -0400 committer Dmitry Torokhov Sat, 29 Apr 2006 01:11:23 -0400 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 commit 03054d51a70e8c273df5d9bc31fea6c843eaa1c3 tree 44b1b9e52979a0b083edb5169c1ac328abd4c715 parent 09b03b6c29638eb5c79b02e585cb1b20d91a8ea0 author Anton Blanchard Sat, 29 Apr 2006 09:51:06 +1000 committer Paul Mackerras Sat, 29 Apr 2006 10:56:58 +1000 [PATCH] powerpc: Add cputable entry for POWER6 Add a cputable entry for the POWER6 processor. The SIHV and SIPR bits in the mmcra have moved in POWER6, so disable support for that until oprofile is fixed. Also tell firmware that we know about POWER6. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 693f7d362055261882659475d2ef022e32edbff1 tree c363d0ededf3ede77f7f35130931f5fc34ca0e30 parent 4de0b1ee1b630318553248c4cfc78358720a5c84 author shin, jacob Fri, 28 Apr 2006 10:54:37 -0500 committer Linus Torvalds Fri, 28 Apr 2006 09:00:35 -0700 [PATCH] slab: fix crash on __drain_alien_cahce() during CPU Hotplug transfer_objects should only be called when all of the cpus in the node are online. CPU_DEAD notifier callback marks l3->shared to NULL. Signed-off-by: Jacob Shin Signed-off-by: Linus Torvalds commit 4de0b1ee1b630318553248c4cfc78358720a5c84 tree 982f6bf9b73c9f00962ee77dee206d296479f4f0 parent 9587c4bf72bf6cc79e1c471a201c0bd73171fcd6 author Antonino A. Daplas Thu, 27 Apr 2006 18:40:47 -0700 committer Linus Torvalds Fri, 28 Apr 2006 08:33:49 -0700 [PATCH] asiliantfb: Add help text in Kconfig Add help text in Kconfig Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9587c4bf72bf6cc79e1c471a201c0bd73171fcd6 tree 70b20d1a63eb4fc1bf1162ecb01742f1d7ec0852 parent a3266a930450287e27a8a14ffe0484992941b9f7 author Antonino A. Daplas Thu, 27 Apr 2006 18:40:39 -0700 committer Linus Torvalds Fri, 28 Apr 2006 08:33:49 -0700 [PATCH] suspend: Documentation update for IBM Thinkpad X30 As reported in Bugzilla Bug 6406, resume from S3 results in a blank screen. For the IBM Thinkpad X30 using vesafb as the console driver, successful resume from S3 requires option acpi_sleep=s3_bios,s3_mode. Update documentation. I would presume that, in any hardware, using vesafb as the console driver will require as a minimum s3_mode. Signed-off-by: Antonino Daplas Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a3266a930450287e27a8a14ffe0484992941b9f7 tree 444264e89b39c4e36294710246d996eaa7af503e parent 3d052595423b4432f4d599c1aeb1949ac0da7314 author Martin Schwidefsky Thu, 27 Apr 2006 18:40:33 -0700 committer Linus Torvalds Fri, 28 Apr 2006 08:33:48 -0700 [PATCH] s390: new system calls Add sys_set_robust_list, sys_get_robust_list, sys_splice, sys_sync_file and sys_tee system calls. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3d052595423b4432f4d599c1aeb1949ac0da7314 tree 96e173dc99ab9aa4f362959b6334df6ddf6b2a6d parent 58268b97f679108d32a882a7fc029585da801975 author Horst Hummel Thu, 27 Apr 2006 18:40:28 -0700 committer Linus Torvalds Fri, 28 Apr 2006 08:33:48 -0700 [PATCH] s390: dasd device identifiers Generate new sysfs-attribute 'uid' that contains an device specific unique identifier. This can be used to identity multiple ALIASES of the same physical device (PAV). In addition the sysfs-attributes 'vendor' (containing the manufacturer of the device) and 'alias' (identify alias or base device) is added. This is first part of PAV support in LPAR (also valid on zVM). Signed-off-by: Horst Hummel Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 58268b97f679108d32a882a7fc029585da801975 tree 5b416785ab2fc75f5f26f56863b96329e274fe08 parent b73d40c6178f2c8b2d574db566b47f36e3d12072 author Christian Borntraeger Thu, 27 Apr 2006 18:40:24 -0700 committer Linus Torvalds Fri, 28 Apr 2006 08:33:48 -0700 [PATCH] s390: add read_mostly optimization Add a read_mostly section and define __read_mostly to prevent cache line pollution due to writes for mostly read variables. In addition fix the incorrect alignment of the cache_line_aligned data section. s390 has a cacheline size of 256 bytes. Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b73d40c6178f2c8b2d574db566b47f36e3d12072 tree 5f0f10ee010f06d359dbbf33dd2160f34d770ea2 parent 9b5dec1aa08b77c4217cd5fcaf1e4e177f659b2e author Heiko Carstens Thu, 27 Apr 2006 18:40:23 -0700 committer Linus Torvalds Fri, 28 Apr 2006 08:33:48 -0700 [PATCH] s390: instruction processing damage handling In case of an instruction processing damage (IPD) machine check in kernel mode the resulting action is always to stop the kernel. This is not necessarily the best solution since a retry of the failing instruction might succeed. Add logic to retry the instruction if no more than 30 instruction processing damage checks occured in the last 5 minutes. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b5dec1aa08b77c4217cd5fcaf1e4e177f659b2e tree 67dd2efc485f8c8aadf52cebf23f241777353776 parent 2cc924b8ba1e9493ed50f5b793974e2427a15748 author Gerald Schaefer Thu, 27 Apr 2006 18:40:22 -0700 committer Linus Torvalds Fri, 28 Apr 2006 08:33:48 -0700 [PATCH] s390: segment operation error codes Print a warning with the z/VM error code if segment_load, segment_type or segment_save fail to ease the problem determination. Signed-off-by: Gerald Schaefer Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2cc924b8ba1e9493ed50f5b793974e2427a15748 tree c6e682af72761ac6dbae3e63928e49170e6bdbff parent 3363fbdd6fb4992ffe6c17c0dd7388ffa22d99e6 author Stefan Bader Thu, 27 Apr 2006 18:40:16 -0700 committer Linus Torvalds Fri, 28 Apr 2006 08:33:48 -0700 [PATCH] s390: tape 3590 changes Added some changes that where proposed by Andrew Morton. Added 3592 device type. Signed-off-by: Stefan Bader Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3363fbdd6fb4992ffe6c17c0dd7388ffa22d99e6 tree 08b19130fce21aea84851bf294f563d3d9fe7cb5 parent 40ac6b204c20da09b64b6dcc10c68b6e7bd9fadd author Martin Schwidefsky Thu, 27 Apr 2006 18:40:12 -0700 committer Linus Torvalds Fri, 28 Apr 2006 08:33:48 -0700 [PATCH] s390: futex atomic operations Add support for atomic futex operations. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 40ac6b204c20da09b64b6dcc10c68b6e7bd9fadd tree 03a5968a6db56c3365c3440e2f5141c8677d47d2 parent 39ccf95e28765a08a9e01be614695d7c570b4e77 author Christian Borntraeger Thu, 27 Apr 2006 18:40:11 -0700 committer Linus Torvalds Fri, 28 Apr 2006 08:33:48 -0700 [PATCH] s390: fix slab debugging With CONFIG_SLAB_DEBUG=y networking over qeth doesn't work. The problem is that the qib structure embedded in the qeth_irq structure needs an alignment of 256 but kmalloc only guarantees an alignment of 8. When using SLAB debugging the alignment of qeth_irq is not sufficient for the embedded qib structure which causes all users of qdio (qeth and zfcp) to stop working. Allocate qeth_irq structure with __get_free_page. That wastes a small amount of memory (~2500 bytes) per online adapter. Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39ccf95e28765a08a9e01be614695d7c570b4e77 tree 9a381e8e8afcd3d6048aaae6a7635f137b6951da parent a3ae39c060be57a4936d2c1d970e4d0c7d320d9c author Horst Hummel Thu, 27 Apr 2006 18:40:10 -0700 committer Linus Torvalds Fri, 28 Apr 2006 08:33:48 -0700 [PATCH] s390: dasd ioctl never returns The dasd state machine is not designed to enable an unformatted device, since 'unformatted' is a final state. The BIODASDENABLE ioctl calls dasd_enable_device() which never returns if the device is in this special state. Return -EPERM in dasd_increase_state for unformatted devices to make dasd_enable_device terminate. Note: To get such an unformatted device online it has to be re-analyzed. This means that the device needs to be disabled prior to re-enablement. Signed-off-by: Horst Hummel Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a3ae39c060be57a4936d2c1d970e4d0c7d320d9c tree a8b0207d32f660fed21f55d0c4ab1c05f691ac39 parent 28f223782bca914ae65d08234c57c2175ecd7f5d author Andreas Herrmann Thu, 27 Apr 2006 18:40:09 -0700 committer Linus Torvalds Fri, 28 Apr 2006 08:33:47 -0700 [PATCH] s390: qdio memory allocations Avoid memory allocation with GFP_KERNEL in qdio_establish/qdio_shutdown. Use memory pool instead. (Otherwise this can lead to an I/O stall where qdio waits for a free page and zfcp waits for end of error recovery in low memory situations.) Signed-off-by: Andreas Herrmann Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 28f223782bca914ae65d08234c57c2175ecd7f5d tree 17100f49e1e1b0c11bfa6f817b412363407d20e3 parent 6dcfca78d4c036c9d012f913e2a622aae218827f author Laurent Meyer Thu, 27 Apr 2006 18:40:07 -0700 committer Linus Torvalds Fri, 28 Apr 2006 08:33:47 -0700 [PATCH] s390: alternate signal stack handling bug If a signal handler has been established with the SA_ONSTACK option but no alternate stack is provided with sigaltstack(), the kernel still tries to install the alternate stack. Also when setting an alternate stack with sigalstack() and the SS_DISABLE flag, the kernel tries to install the alternate stack on signal delivery. Use the correct conditions sas_ss_flags() to check if the alternate stack has to be used. Signed-off-by: Laurent Meyer Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6dcfca78d4c036c9d012f913e2a622aae218827f tree 945d38095f9302d5d3139be96a5466f2b6e12383 parent 329b785bcee5d001f97a33bdb80de014bb5020b0 author Stefan Bader Thu, 27 Apr 2006 18:40:04 -0700 committer Linus Torvalds Fri, 28 Apr 2006 08:33:47 -0700 [PATCH] s390: enable interrupts on error path Interrupts can stay disabled if an error occurred in _chp_add(). Use spin_unlock_irq on the error paths to reenable interrupts. Signed-off-by: Stefan Bader Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 329b785bcee5d001f97a33bdb80de014bb5020b0 tree 795cbbba999f83c3e61a87135dde088b574c7406 parent bcff5cd667da6eb3df9173626497e3e69b004e42 author Peter Oberparleiter Thu, 27 Apr 2006 18:40:02 -0700 committer Linus Torvalds Fri, 28 Apr 2006 08:33:47 -0700 [PATCH] s390: fix I/O termination race in cio Fix a race condition in the I/O termination logic. The race can cause I/O to a dasd device to fail with no retry left after turning one channel path to the device off and on multiple times. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bcff5cd667da6eb3df9173626497e3e69b004e42 tree 45ce6bc37eb285bfc426000362c8b26eee2408c1 parent bf661987da6f5131475dfe3f51a98de4e2589ed3 author Masami Hiramatsu Thu, 27 Apr 2006 18:39:55 -0700 committer Linus Torvalds Fri, 28 Apr 2006 08:33:47 -0700 [PATCH] kprobe: fix resume execution on i386 Fix resume_execution() to handle iret and absolute jump opcode correctly on i386. Signed-off-by: Masami Hiramatsu Cc: Ananth N Mavinakayanahalli Cc: "Keshavamurthy, Anil S" Cc: Prasanna S Panchamukhi Cc: Jim Keniston Cc: Yumiko Sugita Cc: Satoshi Oshima Cc: Hideo Aoki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bf661987da6f5131475dfe3f51a98de4e2589ed3 tree 4db8c9692e6517dfe8190e3ee9451b8b713116e8 parent 9539d4e79fae8482bc64ced03a46c7c6d711d19e author mao, bibo Thu, 27 Apr 2006 18:39:44 -0700 committer Linus Torvalds Fri, 28 Apr 2006 08:33:47 -0700 [PATCH] kprobe cleanup for VM_MASK judgement When trap happens in user space, kprobe_exceptions_notify() funtion will skip it. This patch deletes some unnecessary code for VM_MASK judgement in eflags. Signed-off-by: bibo, mao Cc: Masami Hiramatsu Cc: Ananth N Mavinakayanahalli Acked-by: "Keshavamurthy, Anil S" Acked-by: Prasanna S Panchamukhi Cc: Jim Keniston Cc: Yumiko Sugita Cc: Satoshi Oshima Cc: Hideo Aoki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9539d4e79fae8482bc64ced03a46c7c6d711d19e tree 10709a2d0eb1703a653fee62b08e4a055521235d parent 35076bdfa171cd83d89fcb96568e786f0da91d9f author Andi Kleen Thu, 27 Apr 2006 18:39:36 -0700 committer Linus Torvalds Fri, 28 Apr 2006 08:33:47 -0700 [PATCH] Mark VMSPLIT EMBEDDED Running abnormal VM splits causes weird problems - people can set non-standard splits by accident, then lots of time gets wasted diagnosing it - see the long "[stable] 2.6.16.6 breaks java... sort of" email thread. So we need to make this option harder to set. Use CONFIG_EMBEDDED for this. CONFIG_EMBEDDED isn't really the right thing to use, but there's nothing else obvious and avoiding these problems is more important than Kconfig purity. Signed-off-by: Andi Kleen Cc: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 35076bdfa171cd83d89fcb96568e786f0da91d9f tree 52057bed0ad54c5b6d10e0da56c56f1233d71a44 parent 7f5910ecabd3a36b9c06f73e33b673ccf150f3b4 author Ashok Raj Thu, 27 Apr 2006 18:39:30 -0700 committer Linus Torvalds Fri, 28 Apr 2006 08:33:47 -0700 [PATCH] enable X86_PC for HOTPLUG_CPU CPU_HOTPLUG has race conditions when we use broadcast mode IPI. - First we introduced no_broadcast option (see include/asm-i386/mach-default/mach_ipi.h) - x86_64 solved it by using physical flat mode (same as bigsmp on i386) since this will not use broadcast shortcuts for IPI. - We switched to use bigsmp on i386 so that we can have same handling as x86_64, but apparently this caused an error message, if kernel was compiled without X86_GENERICARCH, X86_BIGSMP. The message "You have >8 CPUS..." which was bogus and misleading, and only indicated one of the above ARCH wasnt selected. So we do not switch to automatic bigsmp for HOTPLUG_CPU support in i386 until the other related config dependencies for SMP_SUSPEND etc can be done right. Signed-off-by: Ashok Raj Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f5910ecabd3a36b9c06f73e33b673ccf150f3b4 tree 17887871973a1475e79680966c4f843f1b7173f3 parent 1d3d1d3e0356b583b642b016f874e2d1bd578453 author Dave Jones Thu, 27 Apr 2006 18:39:24 -0700 committer Linus Torvalds Fri, 28 Apr 2006 08:33:47 -0700 [PATCH] Avoid printing pointless tsc skew msgs These messages are kinda silly.. CPU#0 had 0 usecs TSC skew, fixed it up. CPU#1 had 0 usecs TSC skew, fixed it up. inspired from: http://bugzilla.kernel.org/attachment.cgi?id=7713&action=view Signed-off-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d3d1d3e0356b583b642b016f874e2d1bd578453 tree cf58f8dcb4d028ddb6c0fca250d5cdaaaf14c989 parent d698f1c72629ff43d0cb6b9f1d17c491c057a0d9 author Adrian Bunk Thu, 27 Apr 2006 18:39:21 -0700 committer Linus Torvalds Fri, 28 Apr 2006 08:33:46 -0700 [PATCH] re-add the OSS SOUND_CS4232 option A regression in the ALSA driver compared to the OSS driver was reported as ALSA bug #1520, so let's keep the OSS driver for now. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d698f1c72629ff43d0cb6b9f1d17c491c057a0d9 tree c9fb0ef3caaaf35bef346b5d0d8eb671e7ee071a parent 1ac3836ce689e594b20c7c9855f64a63751c2d10 author Eric Sesterhenn Thu, 27 Apr 2006 18:39:20 -0700 committer Linus Torvalds Fri, 28 Apr 2006 08:33:46 -0700 [PATCH] fix array overrun in drivers/char/mwave/mwavedd.c this fixes coverity id #489. Since the last element in the array is always ARRAY_SIZE-1 we have to check for ipcnum >= ARRAY_SIZE() Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1ac3836ce689e594b20c7c9855f64a63751c2d10 tree 6482a2b6f943a7e08e958428d3ddf6a4dde61ed1 parent 13e87ec68641fd54f3fa04eef3419d034ed2115a author Daniel Drake Thu, 27 Apr 2006 18:39:19 -0700 committer Linus Torvalds Fri, 28 Apr 2006 08:33:46 -0700 [PATCH] tipar oops fix If compiled into the kernel, parport_register_driver() is called before the parport driver has been initalised. This means that it is expected that tp_count is 0 after the parport_register_driver() call() - tipar's attach function will not be called until later during bootup. Signed-off-by: Daniel Drake Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 13e87ec68641fd54f3fa04eef3419d034ed2115a tree 6779da58d91af198401cc3c1f6f4c81b8d5a7bb6 parent 47bb789973fed504e4711ec34e63b84e6cbfb4e8 author Andrew Morton Thu, 27 Apr 2006 18:39:18 -0700 committer Linus Torvalds Fri, 28 Apr 2006 08:33:46 -0700 [PATCH] request_irq(): remove warnings from irq probing - Add new SA_PROBEIRQ which suppresses the new sharing-mismatch warning. Some drivers like to use request_irq() to find an unused interrupt slot. - Use it in i82365.c - Kill unused SA_PROBE. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 47bb789973fed504e4711ec34e63b84e6cbfb4e8 tree 2f617a73244a93d4b5b92236b6f809bf36912db5 parent 37e53db8aa233c65142d63b496277bf5be9c0ade author dean gaudet Thu, 27 Apr 2006 18:39:17 -0700 committer Linus Torvalds Fri, 28 Apr 2006 08:33:46 -0700 [PATCH] off-by-1 in kernel/power/main.c There's an off-by-1 in kernel/power/main.c:state_store() ... if your kernel just happens to have some non-zero data at pm_states[PM_SUSPEND_MAX] (i.e. one past the end of the array) then it'll let you write anything you want to /sys/power/state and in response the box will enter S5. Signed-off-by: dean gaudet Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 09b03b6c29638eb5c79b02e585cb1b20d91a8ea0 tree c6348427c9b785a90db7f87d55903c6b75804170 parent 4427d6bf966379304f77b7cc8c92421e6bb95483 author Vitaly Bordug Tue, 25 Apr 2006 20:26:46 +0400 committer Paul Mackerras Fri, 28 Apr 2006 21:11:33 +1000 [PATCH] ppc32 CPM_UART: Fixed odd address translations Current address translation methods can produce wrong results, because virt_to_bus and vice versa may not produce correct offsets on dma-allocated memory. The right way is, while tracking both phys and virt address of the window that has been allocated for boffer descriptors, and use those numbers to compute the offset and make translation properly. Signed-off-by: Vitaly Bordug Signed-off-by: Paul Mackerras commit 4427d6bf966379304f77b7cc8c92421e6bb95483 tree 9e881bd2123850d86d792c66bb94991ac11ecccd parent e27987cddd8db3a72a0f4734b5d94d06c7677323 author Vitaly Bordug Tue, 25 Apr 2006 20:26:43 +0400 committer Paul Mackerras Fri, 28 Apr 2006 21:11:30 +1000 [PATCH] ppc32: Update board-specific code of the CPM UART users This has the relevant updates/additions to the BSP code so that proper platform_info struct well be passed to the CPM UART drivers. The changes covered mpc866ads, mpc885ads and mpc8272ads. Signed-off-by: Vitaly Bordug Signed-off-by: Paul Mackerras commit e27987cddd8db3a72a0f4734b5d94d06c7677323 tree acc8df71f7cccd5ac24cb894cbf6ffabab4b0feb parent a73c87bfe98f4d54c919e920a6efb0a116115722 author Vitaly Bordug Tue, 25 Apr 2006 20:26:41 +0400 committer Paul Mackerras Fri, 28 Apr 2006 21:11:28 +1000 [PATCH] ppc32 CPM_UART: Convert to use platform devices This is intended to make the driver code more generic and flexible, to get rid of board-specific layouts within driver, and generic rehaul, yet keeping compatibility with the existing stuff utilizing it, being compatible with legacy behavior (but with complaints that legacy mode used). Signed-off-by: Vitaly Bordug Signed-off-by: Paul Mackerras commit a73c87bfe98f4d54c919e920a6efb0a116115722 tree 71aa6572fff1187133bd70e13e3dddd1a45c5859 parent 2833c28aa0d0326780acfa61149a2a02dcb2c9b4 author Vitaly Bordug Tue, 25 Apr 2006 20:26:33 +0400 committer Paul Mackerras Fri, 28 Apr 2006 21:05:16 +1000 [PATCH] ppc32: odd fixes and improvements in ppc_sys This consists of offsets fix in ..._devices.c, and update of ppc_sys_fixup_mem_resource() function to prevent subsequent fixups Signed-off-by: Vitaly Bordug Signed-off-by: Paul Mackerras commit 2833c28aa0d0326780acfa61149a2a02dcb2c9b4 tree d72d4efadf63dea4bdcbc100e8bfad9192f415a7 parent 30aacebed0f0619f23ce84df7c59ad033ca08d77 author Andreas Schwab Thu, 27 Apr 2006 15:46:42 +0200 committer Paul Mackerras Fri, 28 Apr 2006 21:04:59 +1000 [PATCH] powerpc: Wire up *at syscalls Wire up *at syscalls. This patch has been tested on ppc64 (using glibc's testsuite, both 32bit and 64bit), and compile-tested for ppc32 (I have currently no ppc32 system available, but I expect no problems). Signed-off-by: Andreas Schwab Signed-off-by: Paul Mackerras commit 30aacebed0f0619f23ce84df7c59ad033ca08d77 tree fb32292e6804fdab515227a0b7d9722e9595d532 parent 1269277a5e7c6d7ae1852e648a8bcdb78035e9fa author Eugene Surovegin Tue, 25 Apr 2006 01:22:44 -0700 committer Paul Mackerras Fri, 28 Apr 2006 21:04:56 +1000 [PATCH] ppc32: add 440GX erratum 440_43 workaround This patch adds workaround for PPC 440GX erratum 440_43. According to this erratum spurious MachineChecks (caused by L1 cache parity) can happen during DataTLB miss processing. We disable L1 cache parity checking for 440GX rev.C and rev.F Signed-off-by: Eugene Surovegin Signed-off-by: Paul Mackerras commit 1269277a5e7c6d7ae1852e648a8bcdb78035e9fa tree 77208bc4494519f6df0dc55834c6ceaac74643b6 parent f749edae5ebd339eaf22508572233600f717424f author David Woodhouse Mon, 24 Apr 2006 23:22:17 +0100 committer Paul Mackerras Fri, 28 Apr 2006 21:04:55 +1000 [PATCH] powerpc: Use check_legacy_ioport() on ppc32 too. Some people report that we die on some Macs when we are expecting to catch machine checks after poking at some random I/O address. I'd seen it happen on my dual G4 with serial ports until we fixed those to use OF, but now other users are reporting it with i8042. This expands the use of check_legacy_ioport() to avoid that situation even on 32-bit kernels. Signed-off-by: David Woodhouse Signed-off-by: Paul Mackerras commit f749edae5ebd339eaf22508572233600f717424f tree f2118ec27b0682ae9bb3d6c0605d7ccd08313a71 parent d882995c054ff90706cc339321bfb04b15c5581f author Alan Modra Mon, 24 Apr 2006 22:11:51 +0930 committer Paul Mackerras Fri, 28 Apr 2006 21:04:49 +1000 [PATCH] powerpc64: Fix loading of modules without a .toc section Normally, ppc64 module .ko files contain a table-of-contents (.toc) section, but if the module doesn't reference any static or external data or external procedures, it is possible for gcc/binutils to generate a .ko that doesn't have a .toc. Currently the module loader refuses to load such a module, since it needs the address of the .toc section to use in relocations. This patch fixes the problem by using the address of the .stubs section instead, which is an acceptable substitute in this situation. Signed-off-by: Paul Mackerras commit d882995c054ff90706cc339321bfb04b15c5581f tree 5e798e251f5ca45b668e428d72cda92ed4c03029 parent f709bfac48492e289ba78ea1e8c0b3daab264e90 author Andreas Schwab Sun, 23 Apr 2006 20:32:41 +0200 committer Paul Mackerras Fri, 28 Apr 2006 21:04:30 +1000 [PATCH] sound/ppc: snd_pmac_toonie_init should be __init snd_pmac_toonie_init is only called by __init code and calls __init code itself. Signed-off-by: Andreas Schwab Signed-off-by: Paul Mackerras commit f709bfac48492e289ba78ea1e8c0b3daab264e90 tree 3820f13761317bf0ac1844aff8b97e8022f5a8cc parent f10a04c034c7285a1b15dfa4a83d3e56578e34e8 author Paul Mackerras Fri, 28 Apr 2006 16:28:35 +1000 committer Paul Mackerras Fri, 28 Apr 2006 16:28:35 +1000 powerpc/pseries: Tell firmware our capabilities on new machines This adds code to call a new firmware method to tell the firmware what machines and capabilities (such as VMX/Altivec) we support. This will be needed on POWER5+ and POWER6 machines, and it has no effect on past and current machines. Signed-off-by: Paul Mackerras commit f10a04c034c7285a1b15dfa4a83d3e56578e34e8 tree ee6bd0c670b6606017cbd88b56a1247ff241e00e parent 37e53db8aa233c65142d63b496277bf5be9c0ade author David Gibson Fri, 28 Apr 2006 15:02:51 +1000 committer Paul Mackerras Fri, 28 Apr 2006 15:02:51 +1000 [PATCH] powerpc: Fix pagetable bloat for hugepages At present, ARCH=powerpc kernels can waste considerable space in pagetables when making large hugepage mappings. Hugepage PTEs go in PMD pages, but each PMD page maps 256M and so contains only 16 hugepage PTEs (128 bytes of data), but takes up a 1024 byte allocation. With CONFIG_PPC_64K_PAGES enabled (64k base page size), the situation is worse. Now hugepage PTEs are at the PTE page level (also mapping 256M), so we store 16 hugepage PTEs in a 64k allocation. The PowerPC MMU already means that any 256M region is either all hugepage, or all normal pages. Thus, with some care, we can use a different allocation for the hugepage PTE tables and only allocate the 128 bytes necessary. Signed-off-by: Paul Mackerras commit 37e53db8aa233c65142d63b496277bf5be9c0ade tree c4b7409825cc0497593e94dd7d6f874d22b0b3f0 parent 94b1661d08a27a8d2b1b0127c272987b0ab4ad6a parent 7384c8bd90a4932517872f9807d34979a6fd29c4 author Linus Torvalds Thu, 27 Apr 2006 17:01:37 -0700 committer Linus Torvalds Thu, 27 Apr 2006 17:01:37 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] update sn2 defconfig [IA64] Add mca recovery failure messages [IA64-SGI] fix SGI Altix tioce_reserve_m32() bug [IA64] enable dumps to capture second page of kernel stack [IA64-SGI] - Reduce overhead of reading sn_topology [IA64-SGI] - Fix discover of nearest cpu node to IO node [IA64] IOC4 config option ordering [IA64] Setup an IA64 specific reclaim distance [IA64] eliminate compile time warnings [IA64] eliminate compile time warnings [IA64-SGI] SN SAL call to inject memory errors [IA64] - Fix MAX_PXM_DOMAINS for systems with > 256 nodes [IA64] Remove unused variable in sn_sal.h [IA64] Remove redundant NULL checks before kfree [IA64] wire up compat_sys_adjtimex() commit 7384c8bd90a4932517872f9807d34979a6fd29c4 tree 48658381c5fdb76ee4a88c0217c36e0ad26e2b4e parent 189979619f90fd2eb168fbb9c262569176160624 author Jes Sorensen Thu, 27 Apr 2006 06:10:35 -0400 committer Tony Luck Thu, 27 Apr 2006 14:38:03 -0700 [IA64] update sn2 defconfig Update SN2 defconfig to latest kernel and add QLA FC drivers commonly found in SN2 boxes. Signed-off-by: Jes Sorensen Signed-off-by: Tony Luck commit 189979619f90fd2eb168fbb9c262569176160624 tree 8f274464ac1604d927351448d1e5148c199960b7 parent cda3d4a069b915cf46e640bb6872a9d9aefeaabe author Russ Anderson Thu, 27 Apr 2006 10:07:08 -0500 committer Tony Luck Thu, 27 Apr 2006 14:34:01 -0700 [IA64] Add mca recovery failure messages When the mca recovery code encounters a condition that makes the MCA non-recoverable, print the reason it could not recover. This will make it easier to identify why the recovery code did not recover. Signed-off-by: Russ Anderson Signed-off-by: Tony Luck commit cda3d4a069b915cf46e640bb6872a9d9aefeaabe tree f7022fceac378d444761da3f22e729d348482cf2 parent 1df57c0c21c92a6d4fcfe5304c84151ed9beb7a2 author Mike Habeck Wed, 26 Apr 2006 12:05:50 -0500 committer Tony Luck Thu, 27 Apr 2006 14:32:07 -0700 [IA64-SGI] fix SGI Altix tioce_reserve_m32() bug The following patch fixes a bug in the SGI Altix tioce_reserve_m32() code. The bug was that we could walking past the end of the CE ASIC 32/40bit PMU ATE Buffer, resulting in a PIO Reply Error. Signed-off-by: Mike Habeck Signed-off-by: Tony Luck commit 1df57c0c21c92a6d4fcfe5304c84151ed9beb7a2 tree 06a24df0fe9a149581d246aa547122b07dcb2dad parent dd4cb9f8ac9717c9db2b2afc5a82cb95a3d5dec3 author Cliff Wickman Tue, 25 Apr 2006 10:47:48 -0500 committer Tony Luck Thu, 27 Apr 2006 14:31:16 -0700 [IA64] enable dumps to capture second page of kernel stack In SLES10 (2.6.16) crash dumping (in my experience, LKCD) is unable to capture the second page of the 2-page task/stack allocation. This is particularly troublesome for dump analysis, as the stack traceback cannot be done. (A similar convention is probably needed throughout the kernel to make kernel multi-page allocations detectable for dumping) Multi-page kernel allocations are represented by the single page structure associated with the first page of the allocation. The page structures associated with the other pages are unintialized. If the dumper is selecting only kernel pages it has no way to identify any but the first page of the allocation. The fix is to make the task/stack allocation a compound page. Signed-off-by: Cliff Wickman Signed-off-by: Tony Luck commit dd4cb9f8ac9717c9db2b2afc5a82cb95a3d5dec3 tree 94725efb2f8c1fc9272d1599bd7764bab9023228 parent f0fe253c4719faf76d40f581cdc0e8aef77273bb author Jack Steiner Sat, 22 Apr 2006 09:37:19 -0500 committer Tony Luck Thu, 27 Apr 2006 14:29:05 -0700 [IA64-SGI] - Reduce overhead of reading sn_topology MPI programs using certain debug options have a long startup time. This was traced to a "vmalloc/vfree" in the code that reads /proc/sgi_sn/sn_topology. On large systems, vfree requires an IPI to all cpus to do TLB purging. Replace the vmalloc/vfree with kmalloc/kfree. Although the size of the structure being allocated is unknown, it will not not exceed 96 bytes. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit f0fe253c4719faf76d40f581cdc0e8aef77273bb tree 9ebccf6c03adb64f7fc6dbf444dfd1d705d5e697 parent c1311af12c7ca176a790a911a3fb6fed1f3bb387 author Jack Steiner Sat, 22 Apr 2006 09:36:07 -0500 committer Tony Luck Thu, 27 Apr 2006 14:28:37 -0700 [IA64-SGI] - Fix discover of nearest cpu node to IO node Fix a bug that causes discovery of the nearest node/cpu to a TIO (IO node) to fail. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 94b1661d08a27a8d2b1b0127c272987b0ab4ad6a tree 770f24b91cefd9bb689cf9af0df32fb0e92c34b2 parent 4e9a4b71f1eb23f35c394eb2b388dbe0389d316a parent 75cf7456dd87335f574dcd53c4ae616a2ad71a11 author Linus Torvalds Thu, 27 Apr 2006 14:26:03 -0700 committer Linus Torvalds Thu, 27 Apr 2006 14:26:03 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: [PATCH] PCI quirk: VIA IRQ fixup should only run for VIA southbridges [PATCH] PCI: fix potential resource leak in drivers/pci/msi.c [PATCH] PCI: Documentation: no more device ids [PATCH] PCI: fix via irq SATA patch commit 4e9a4b71f1eb23f35c394eb2b388dbe0389d316a tree ec11040e38f137f3fc0f17dfcd177bf8db9c6ae7 parent 2cb14596a03036bb8b9d3c60f9c4dbdf3a745c76 parent 7e0258fd28762c09b997edb56849ecfa29284b79 author Linus Torvalds Thu, 27 Apr 2006 14:25:46 -0700 committer Linus Torvalds Thu, 27 Apr 2006 14:25:46 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: [PATCH] USB: ftdi_sio: add support for ASK RDR 400 series card reader [PATCH] USB: ftdi_sio: Adds support for iPlus device. [PATCH] USB: ftdi_sio vendor code for RR-CirKits LocoBuffer USB [PATCH] USB: Use new PCI_CLASS_SERIAL_USB_* defines [PATCH] USB: net2280: set driver data before it is used [PATCH] USB: net2280: check for shared IRQs [PATCH] USB: net2280: send 0-length packets for ep0 [PATCH] USB: net2280: Handle STALLs for 0-length control-IN requests [PATCH] USB: storage: atmel unusual dev update [PATCH] USB: Storage: unusual devs update [PATCH] USB: add new iTegno usb CDMA 1x card support for pl2303 [PATCH] USB: Resource leak fix for whiteheat driver commit 2cb14596a03036bb8b9d3c60f9c4dbdf3a745c76 tree 9bb4fbc01ff4506b4ae85d25d37536f49354597a parent a9aa0e24f7ed5acf2e0e1799fb28daf928293ba1 parent 5bd982ed0f5ae73bfd9ff452b460a3b08108bfee author Linus Torvalds Thu, 27 Apr 2006 14:25:30 -0700 committer Linus Torvalds Thu, 27 Apr 2006 14:25:30 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6: [PATCH] Added URI of "linux kernel development process" [PATCH] Kobject: possible cleanups [PATCH] Fix OCFS2 warning when DEBUG_FS is not enabled [PATCH] Kobject: fix build error [PATCH] Frame buffer: remove cmap sysfs interface commit a9aa0e24f7ed5acf2e0e1799fb28daf928293ba1 tree 38782b91d531c8d98b81372a7c964fa2c924b90f parent 7c1c3eb855b5311118bed3b51c79d652d40148ec parent ee1cca1b0661fa33fd99f2d8ec7e2749432f9b1d author Linus Torvalds Thu, 27 Apr 2006 14:24:49 -0700 committer Linus Torvalds Thu, 27 Apr 2006 14:24:49 -0700 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Fix branch emulation for floating-point exceptions. [MIPS] Cleanup inode->r_dev usage. [MIPS] Update MIPS defconfigs. [MIPS] Get rid of CONFIG_ADVANCED. [MIPS] Kconfig: Clarify description of CROSSCOMPILE. [MIPS] 24K LV: Add core card id. [MIPS] Sparse: fix sparse for 64-bit kernels. [MIPS] Use __ffs() instead of ffs() in ip32_irq0(). [MIPS] Fix bitops for MIPS32/MIPS64 CPUs. [MIPS] Fix ip27 build. [MIPS] Oprofile: fix sparse warning. [MIPS] Fix oprofile module unloading commit 7c1c3eb855b5311118bed3b51c79d652d40148ec tree c1964e8d08318ccaaba8882d5eb38778311d7ead parent 6e5882cfa24e1456702e463f6920fc0ca3c3d2b8 parent eb20796bf6fdb95ccf51440ba2a827149bdc037f author Linus Torvalds Thu, 27 Apr 2006 14:24:20 -0700 committer Linus Torvalds Thu, 27 Apr 2006 14:24:20 -0700 Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block * 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block: [PATCH] splice: make the read-side do batched page lookups [PATCH] Add find_get_pages_contig(): contiguous variant of find_get_pages() [PATCH] splice: switch to using page_cache_readahead() commit 5bd982ed0f5ae73bfd9ff452b460a3b08108bfee tree 5529db56586dc5ec3599b5ee1920cb798d636d86 parent 5b3ef14e3e9d745a512d65fcb4ef9be541226d80 author Paolo Ciarrocchi Tue, 25 Apr 2006 22:47:51 +0200 committer Greg Kroah-Hartman Thu, 27 Apr 2006 13:08:57 -0700 [PATCH] Added URI of "linux kernel development process" Signed-off-by: Paolo Ciarrocchi Signed-off-by: Greg Kroah-Hartman commit 5b3ef14e3e9d745a512d65fcb4ef9be541226d80 tree 6b607eb4da11b5a18125ede156825550661e29d4 parent bde11d794206ae8d72defd0e8a481181200f7dc4 author Adrian Bunk Sat, 22 Apr 2006 12:14:44 +0200 committer Greg Kroah-Hartman Thu, 27 Apr 2006 13:08:56 -0700 [PATCH] Kobject: possible cleanups This patch contains the following possible cleanups: - #if 0 the following unused global function: - subsys_remove_file() - remove the following unused EXPORT_SYMBOL's: - kset_find_obj - subsystem_init - remove the following unused EXPORT_SYMBOL_GPL: - kobject_add_dir Signed-off-by: Adrian Bunk Signed-off-by: Greg Kroah-Hartman commit bde11d794206ae8d72defd0e8a481181200f7dc4 tree b5f4c07afd000365b557dcb81d176544d64ec384 parent 4d17ffda331ba6030bb8c233c73d6a87954d8ea7 author Jean Delvare Tue, 18 Apr 2006 21:30:22 -0700 committer Greg Kroah-Hartman Thu, 27 Apr 2006 13:08:56 -0700 [PATCH] Fix OCFS2 warning when DEBUG_FS is not enabled Fix the following warning which happens when OCFS2_FS is enabled but DEBUG_FS isn't: fs/ocfs2/dlmglue.c: In function `ocfs2_dlm_init_debug': fs/ocfs2/dlmglue.c:2036: warning: passing arg 5 of `debugfs_create_file' discards qualifiers from pointer target type Signed-off-by: Jean Delvare Cc: Arjan van de Ven Cc: Joel Becker Acked-by: Mark Fasheh Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 4d17ffda331ba6030bb8c233c73d6a87954d8ea7 tree 3de71893233afa664ad6419e37a02da7ccef327f parent 913e7ec545462b9a49fa308d0c81697236f7d29d author Kay Sievers Tue, 25 Apr 2006 15:37:26 +0200 committer Greg Kroah-Hartman Thu, 27 Apr 2006 13:08:56 -0700 [PATCH] Kobject: fix build error This fixes a build error for various odd combinations of CONFIG_HOTPLUG and CONFIG_NET. Signed-off-by: Kay Sievers Cc: Nigel Cunningham Cc: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 913e7ec545462b9a49fa308d0c81697236f7d29d tree a2cacb4c2536ce09f4c43032dabd54042e886bfc parent 2be4d50295e2b6f62c07b614e1b103e280dddb84 author Jon Smirl Wed, 12 Apr 2006 19:43:35 -0400 committer Greg Kroah-Hartman Thu, 27 Apr 2006 13:08:56 -0700 [PATCH] Frame buffer: remove cmap sysfs interface Remove it as it does not work properly due to sysfs core changes. Signed-off-by: Greg Kroah-Hartman commit 75cf7456dd87335f574dcd53c4ae616a2ad71a11 tree dc10189a566b0b192ed2edc2d49b100cf7dc3d3b parent f01f4182597a3bb4b6fbf92e041faf7a1016f4b6 author Chris Wedgwood Tue, 18 Apr 2006 23:57:09 -0700 committer Greg Kroah-Hartman Thu, 27 Apr 2006 13:00:51 -0700 [PATCH] PCI quirk: VIA IRQ fixup should only run for VIA southbridges Alan Cox pointed out that the VIA 'IRQ fixup' was erroneously running on my system which has no VIA southbridge (but I do have a VIA IEEE 1394 device). This should address that. I also changed "Via IRQ" to "VIA IRQ" (initially I read Via as a capitalized via (by way/means of). Signed-off-by: Chris Wedgwood Acked-by: Jeff Garzik Signed-off-by: Greg Kroah-Hartman commit f01f4182597a3bb4b6fbf92e041faf7a1016f4b6 tree 794a37798a20dd57737020fe5a550a2398fb1d9c parent 9b860b8c4bde5949b272968597d1426d53080532 author Jesper Juhl Mon, 17 Apr 2006 04:02:54 +0200 committer Greg Kroah-Hartman Thu, 27 Apr 2006 13:00:51 -0700 [PATCH] PCI: fix potential resource leak in drivers/pci/msi.c The coverity checker spotted (as entry #599) that we might leak `entry' in drivers/pci/msi.c::msix_capability_init() This patch should take care of that. Signed-off-by: Jesper Juhl Signed-off-by: Greg Kroah-Hartman commit 9b860b8c4bde5949b272968597d1426d53080532 tree 659005ad75c3fb4d2de40c289c81a01275cdb9a0 parent 8b4929e6a01620b55700e102e40e37ef02844849 author Ingo Oeser Tue, 18 Apr 2006 11:20:55 +0200 committer Greg Kroah-Hartman Thu, 27 Apr 2006 13:00:51 -0700 [PATCH] PCI: Documentation: no more device ids Document that we don't like to add more PCI device ids but are happy to accept PCI vendor ids for linux/include/pci_ids.h Original text from Jeff Garzik. Signed-off-by: Ingo Oeser Signed-off-by: Greg Kroah-Hartman commit 8b4929e6a01620b55700e102e40e37ef02844849 tree 5e60fc03032c46fbb359786f0c6e5fb3db946eb3 parent 2be4d50295e2b6f62c07b614e1b103e280dddb84 author Greg Kroah-Hartman Thu, 20 Apr 2006 15:50:55 +0900 committer Greg Kroah-Hartman Thu, 27 Apr 2006 13:00:51 -0700 [PATCH] PCI: fix via irq SATA patch This device id improperly got added to the VIA chipset list with a previous patch. Remove it as it is not correct. Cc: Grzegorz Janoszka Cc: Jeff Garzik Signed-off-by: Greg Kroah-Hartman commit a769577b3716c757e354a681aab3524ac6b651be tree 224ee7dda5ed913fa6c7192d8880fcb5f3c884e0 parent e0292bdd306a7e1ef7a681350cf0427688a2791d author Takashi Iwai Thu, 27 Apr 2006 16:56:07 +0200 committer Jaroslav Kysela Thu, 27 Apr 2006 21:10:52 +0200 [ALSA] via82xx - Use DXS_SRC as default for VIA8235/8237/8251 chips Use DXS_SRC as the default value for dxs_support option for VIA8235/8237/8251 chips. These new chips should work well with SRC. For VIA8233/A/C, the old default DXS_48K is still used to be sure. Signed-off-by: Takashi Iwai commit e0292bdd306a7e1ef7a681350cf0427688a2791d tree 9b5deb31a345f852492d9ea39378b829dfbd0e2d parent c93dd4451ef68a5494c376944bdff8d75a8625bc author Takashi Iwai Wed, 26 Apr 2006 17:44:18 +0200 committer Jaroslav Kysela Thu, 27 Apr 2006 21:10:50 +0200 [ALSA] hda-codec - Add model entry for ASUS Z62F Added a model entry 'laptop-eapd' for ASUS Z62F laptop with AD1986A codec. Signed-off-by: Takashi Iwai commit c93dd4451ef68a5494c376944bdff8d75a8625bc tree 3e49fc808433ecc4fc92805c49108231cb8bf6a6 parent d773781cee3e3003c4a77589d327de802b26e101 author Erik Mouw Tue, 25 Apr 2006 13:08:59 +0200 committer Jaroslav Kysela Thu, 27 Apr 2006 21:10:48 +0200 [ALSA] PCMCIA sound devices shouldn't depend on ISA The ALSA drivers for PCMCIA devices depend on ISA, but modern laptops can have PCMCIA support without ISA. This patch removes the dependency. Signed-off-by: Erik Mouw Signed-off-by: Takashi Iwai commit d773781cee3e3003c4a77589d327de802b26e101 tree 559616c49e5dcc7f7793f9e49a23cdb1ae4bd9d7 parent b7d90a356a43f4609bd6290fc2e1ca4ef79d4458 author Takashi Iwai Tue, 25 Apr 2006 13:05:43 +0200 committer Jaroslav Kysela Thu, 27 Apr 2006 21:10:46 +0200 [ALSA] hda-codec - Fix capture from line-in on VAIO SZ/FE laptops Added the missing line-in capture on VAIO SZ/FE laptops with STAC 7661 codec. Signed-off-by: Takashi Iwai commit b7d90a356a43f4609bd6290fc2e1ca4ef79d4458 tree d367d029a9d4894c9153c75384161758388c7f30 parent 61fb63c096a2e88b87742eaecfe88912b89f57cf author Takashi Iwai Tue, 25 Apr 2006 12:56:04 +0200 committer Jaroslav Kysela Thu, 27 Apr 2006 21:10:42 +0200 [ALSA] Fix Oops at rmmod with CONFIG_SND_VERBOSE_PROCFS=n Fixed Oops at rmmod with CONFIG_SND_VERBOSE_PROCFS=n. Add ifdef to struct fields for optimization and better compile checks. Signed-off-by: Takashi Iwai commit 61fb63c096a2e88b87742eaecfe88912b89f57cf tree 7cbc136c070079b41473feb26bcb60211e9f5d11 parent a2bbbc0c3c9554ac70e96ec3effae60124f0f009 author Jaroslav Kysela Mon, 24 Apr 2006 21:57:16 +0200 committer Jaroslav Kysela Thu, 27 Apr 2006 21:10:40 +0200 [ALSA] PCM core - introduce CONFIG_SND_PCM_XRUN_DEBUG This patch makes the XRUN (overrun/underrun) notification code optional. Signed-off-by: Jaroslav Kysela commit a2bbbc0c3c9554ac70e96ec3effae60124f0f009 tree 0d9221706e37f623056cb0cf2098c4ac0fe381ea parent 396c9b928d5c24775846a161a8191dcc1ea4971f author Kenrik Kretzschmar Mon, 24 Apr 2006 15:59:38 +0200 committer Jaroslav Kysela Thu, 27 Apr 2006 21:10:38 +0200 [ALSA] adding __devinitdata to pci_device_id Refering to /Documentation/pci.txt the struct pci_device_id can be released after loading the module. Signed-off-by: Kenrik Kretzschmar Signed-off-by: Takashi Iwai commit 396c9b928d5c24775846a161a8191dcc1ea4971f tree 447f4b28c2dd8e0026b96025fb94dbc654d6cade parent 71b2ccc3a2fd6c27e3cd9b4239670005978e94ce author Henrik Kretzschmar Mon, 24 Apr 2006 15:59:04 +0200 committer Jaroslav Kysela Thu, 27 Apr 2006 21:10:34 +0200 [ALSA] add __devinitdata to all pci_device_id Signed-off-by: Henrik Kretzschmar Signed-off-by: Takashi Iwai commit 71b2ccc3a2fd6c27e3cd9b4239670005978e94ce tree 2cc0a28d995b0191a469f2cac2f8a9baad114a8d parent 61a7454a229d3516492fc3ff3adddf9f5ac0d396 author Takashi Iwai Fri, 21 Apr 2006 16:09:31 +0200 committer Jaroslav Kysela Thu, 27 Apr 2006 21:10:30 +0200 [ALSA] hda-codec - Add codec id for AD1988B codec chip Add codec id for AD1988B codec chip. The functionality is identical with AD1988(A) chip. Signed-off-by: Takashi Iwai commit 61a7454a229d3516492fc3ff3adddf9f5ac0d396 tree 0db8f86e40f6d714e2649b97062ea0fe553c29f4 parent 711ee39bf3e2a69005d64f388441a6f883495f83 author Takashi Iwai Thu, 20 Apr 2006 16:42:34 +0200 committer Jaroslav Kysela Thu, 27 Apr 2006 21:10:28 +0200 [ALSA] hda-codec - Add model entry for ASUS M9 laptop Add a model entry to support ASUS M9 laptop with AD1986A codec. Signed-off-by: Takashi Iwai commit 711ee39bf3e2a69005d64f388441a6f883495f83 tree a2e4dc7b3d334ce7c71a2711fa6b4ab5891cc409 parent c6cc0e3b0c087d350bdc5912ecdfb17e796ae266 author Henrik Kretzschmar Thu, 20 Apr 2006 12:37:00 +0200 committer Jaroslav Kysela Thu, 27 Apr 2006 21:10:27 +0200 [ALSA] pcxhr - Fix a compiler warning on 64bit architectures The patch fixes a conpile warning on 64bit architectures, caused by different sizes of size_t . Since size_t is unsigned I permited myself to cange the format, too. Signed-off-by: Henrik Kretzschmar Signed-off-by: Takashi Iwai commit c6cc0e3b0c087d350bdc5912ecdfb17e796ae266 tree ba179f88b9b9d3818439727e5895b9e32715a2c1 parent 1a183131fe284e68194e66cc4ff49d5876501eb0 author Bastiaan Jacques Thu, 20 Apr 2006 12:27:09 +0200 committer Jaroslav Kysela Thu, 27 Apr 2006 21:10:25 +0200 [ALSA] via82xx: tweak VT8251 workaround Move the workaround for the VT8251 up a bit, and check for STAT_EOL rather than STAT_ACTIVE. This resolves issues some people were having with certain ALSA clients (and allows the STAT_ACTIVE check to do what it was intended to do). This change was suggested by Andrew Daviel. Signed-off-by: Bastiaan Jacques Signed-off-by: Takashi Iwai commit 1a183131fe284e68194e66cc4ff49d5876501eb0 tree edde195886c28576c4fd7c483576c79eb3e432f5 parent 8263c65fbee1347b2ab1d8c9380946808d09f579 author Takashi Iwai Tue, 18 Apr 2006 21:23:47 +0200 committer Jaroslav Kysela Thu, 27 Apr 2006 21:10:23 +0200 [ALSA] intel8x0 - Disable ALI5455 SPDIF-input Disable the SPDIF-input on ALI5455, which causes Oops. Signed-off-by: Takashi Iwai commit 8263c65fbee1347b2ab1d8c9380946808d09f579 tree 4b503b7ea92011bd6f3df65967268ef98c78a9f3 parent 5732e7a2cece461252bfcf2653bb09ab88ba36c5 author Bastiaan Jacques Tue, 18 Apr 2006 17:04:04 +0200 committer Jaroslav Kysela Thu, 27 Apr 2006 21:10:21 +0200 [ALSA] via82xx: add support for VIA VT8251 (AC'97) Add support for VIA VT8251 AC'97. Includes a workaround which ensures sound won't stop playing after one second of playback. Signed-off-by: Bastiaan Jacques Signed-off-by: Takashi Iwai commit 5732e7a2cece461252bfcf2653bb09ab88ba36c5 tree 7fcdda160e4affe37c56880635f5b288bd0faf18 parent c128b82cf4095bb64aec435cf58d67fb78272f2f author Charis Kouzinopoulos Tue, 18 Apr 2006 15:42:29 +0200 committer Jaroslav Kysela Thu, 27 Apr 2006 21:10:19 +0200 [ALSA] Fix typos and add information about Jack support to Audiophile-Usb.txt Signed-off-by: Charis Kouzinopoulos Signed-off-by: Thibault Le Meur Signed-off-by: Takashi Iwai commit c128b82cf4095bb64aec435cf58d67fb78272f2f tree 425a566d5c2a044effcd123f397ec83e1a4ddf3d parent 531213a93f0e75b934471bf5567babad4da1ff70 author Takashi Iwai Tue, 18 Apr 2006 15:01:23 +0200 committer Jaroslav Kysela Thu, 27 Apr 2006 21:10:17 +0200 [ALSA] Fix double free in error path of miro driver Fixed the double free in error path of miro driver. Signed-off-by: Takashi Iwai commit 531213a93f0e75b934471bf5567babad4da1ff70 tree c30dac1edbc00343a5de668398ac0f3aadd0aa2c parent 1d606f1ae5b9d83d8749f21bc04842596104bf55 author Takashi Iwai Tue, 18 Apr 2006 13:46:08 +0200 committer Jaroslav Kysela Thu, 27 Apr 2006 21:10:15 +0200 [ALSA] hda-codec - Add entry for Epox EP-5LDA+ GLi Added the SSID entry for Epox EP-5LDA+ GLi with ALC880 codec. Signed-off-by: Takashi Iwai commit 1d606f1ae5b9d83d8749f21bc04842596104bf55 tree 1948cef017f1410356ed82e7c431e2b40de47d97 parent 8970ccda1ae3c3b4ddd5ce366ca2cd88356d664e author Adrian Bunk Tue, 18 Apr 2006 13:37:08 +0200 committer Jaroslav Kysela Thu, 27 Apr 2006 21:10:12 +0200 [ALSA] sound/pci/: remove duplicate #include's There's no reason for #include'ing linux/dma-mapping.h more than once. Signed-off-by: Adrian Bunk Signed-off-by: Takashi Iwai commit 8970ccda1ae3c3b4ddd5ce366ca2cd88356d664e tree bbc720f9a42ae09398ec3647b95de0ea1ac930f9 parent a182ee9876c7826d0b8f7789cb5c38c5bfbec441 author Takashi Iwai Tue, 18 Apr 2006 12:50:40 +0200 committer Jaroslav Kysela Thu, 27 Apr 2006 21:10:10 +0200 [ALSA] hda-codec - Use model 'hp' for all HP laptops with AD1981HD Use model 'hp' for all HP laptops with AD1981HD codec. Signed-off-by: Takashi Iwai commit a182ee9876c7826d0b8f7789cb5c38c5bfbec441 tree 68862b25d3e70a8c294ec248d3473e30fb2aae94 parent 5c59e09d7e51f5781439aa6f1963076568fd1f4f author Rene Herman Thu, 13 Apr 2006 12:57:11 +0200 committer Jaroslav Kysela Thu, 27 Apr 2006 21:10:08 +0200 [ALSA] continue on IS_ERR from platform device registration I previously only concerned myself with sound/isa. When I now checked for more platform_device_register_simple() usages in ALSA I found a couple more drivers that needed the same patches as already submitted for all the ISA drivers. This first one is the continue-on-iserr patch for sound/drivers. This gets them all. Signed-off-by: Rene Herman Signed-off-by: Takashi Iwai commit 5c59e09d7e51f5781439aa6f1963076568fd1f4f tree 814d6aac2cfd5fa1b38721ae0ac1ac515a819e7a parent bc56eff1279d2f33a6afe74a673360ae1cd0d838 author Steven Finney Thu, 13 Apr 2006 12:49:31 +0200 committer Jaroslav Kysela Thu, 27 Apr 2006 21:10:06 +0200 [ALSA] Handle the error correctly in SNDCTL_DSP_SETFMT ioctl Handle the error returned from snd_pcm_oss_get_formats() correctly in SNDCTL_DSP_SETFMT ioctl handler of PCM OSS emulation. Signed-off-by: Steven Finney Signed-off-by: Takashi Iwai commit bc56eff1279d2f33a6afe74a673360ae1cd0d838 tree 0d354d51d85310b12e9a8eac2c7ed13c86849c03 parent 2be4d50295e2b6f62c07b614e1b103e280dddb84 author Clemens Ladisch Thu, 13 Apr 2006 10:16:08 +0200 committer Jaroslav Kysela Thu, 27 Apr 2006 21:10:04 +0200 [ALSA] add another Phase 26 quirk Add a quirk entry for the TerraTec Phase 26 with yet another product ID. Signed-off-by: Clemens Ladisch commit 6e5882cfa24e1456702e463f6920fc0ca3c3d2b8 tree 636800c0619ec3551f9a8a7da707d913937cf43d parent 2be4d50295e2b6f62c07b614e1b103e280dddb84 author Zachary Amsden Thu, 27 Apr 2006 11:32:29 -0700 committer Linus Torvalds Thu, 27 Apr 2006 12:00:59 -0700 [PATCH] x86/PAE: Fix pte_clear for the >4GB RAM case Proposed fix for ptep_get_and_clear_full PAE bug. Pte_clear had the same bug, so use the same fix for both. Turns out pmd_clear had it as well, but pgds are not affected. The problem is rather intricate. Page table entries in PAE mode are 64-bits wide, but the only atomic 8-byte write operation available in 32-bit mode is cmpxchg8b, which is expensive (at least on P4), and thus avoided. But it can happen that the processor may prefetch entries into the TLB in the middle of an operation which clears a page table entry. So one must always clear the P-bit in the low word of the page table entry first when clearing it. Since the sequence *ptep = __pte(0) leaves the order of the write dependent on the compiler, it must be coded explicitly as a clear of the low word followed by a clear of the high word. Further, there must be a write memory barrier here to enforce proper ordering by the compiler (and, in the future, by the processor as well). On > 4GB memory machines, the implementation of pte_clear for PAE was clearly deficient, as it could leave virtual mappings of physical memory above 4GB aliased to memory below 4GB in the TLB. The implementation of ptep_get_and_clear_full has a similar bug, although not nearly as likely to occur, since the mappings being cleared are in the process of being destroyed, and should never be dereferenced again. But, as luck would have it, it is possible to trigger bugs even without ever dereferencing these bogus TLB mappings, even if the clear is followed fairly soon after with a TLB flush or invalidation. The problem is that memory above 4GB may now be aliased into the first 4GB of memory, and in fact, may hit a region of memory with non-memory semantics. These regions include AGP and PCI space. As such, these memory regions are not cached by the processor. This introduces the bug. The processor can speculate memory operations, including memory writes, as long as they are committed with the proper ordering. Speculating a memory write to a linear address that has a bogus TLB mapping is possible. Normally, the speculation is harmless. But for cached memory, it does leave the falsely speculated cacheline unmodified, but in a dirty state. This cache line will be eventually written back. If this cacheline happens to intersect a region of memory that is not protected by the cache coherency protocol, it can corrupt data in I/O memory, which is generally a very bad thing to do, and can cause total system failure or just plain undefined behavior. These bugs are extremely unlikely, but the severity is of such magnitude, and the fix so simple that I think fixing them immediately is justified. Also, they are nearly impossible to debug. Signed-off-by: Zachary Amsden Signed-off-by: Linus Torvalds commit 7e0258fd28762c09b997edb56849ecfa29284b79 tree 8eb110558ac0a87f701f87dbf4674583cf7556b9 parent 69737dfaacd000b10fc4a1e9eb518b630b43c3ad author Ian Abbott Wed, 12 Apr 2006 15:20:35 +0100 committer Greg Kroah-Hartman Thu, 27 Apr 2006 10:28:59 -0700 [PATCH] USB: ftdi_sio: add support for ASK RDR 400 series card reader This patch adds support for an ASK RDR 400 series contactless card reader to the ftdi_sio driver's device ID table. The product ID was supplied by Adriano Couto on the ftdi-usb-sio-devel list. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit 69737dfaacd000b10fc4a1e9eb518b630b43c3ad tree 2e64888892df415af61cec686c99d607b600e6c9 parent cdd3b1565a8d563ed84cf1c2af6cabf461f3c317 author Luiz Fernando N. Capitulino Tue, 11 Apr 2006 15:52:41 -0300 committer Greg Kroah-Hartman Thu, 27 Apr 2006 10:28:59 -0700 [PATCH] USB: ftdi_sio: Adds support for iPlus device. Adds support in ftdi_sio usbserial driver for USB modems sold by Plus GSM Company in Poland. Signed-off-by: Luiz Fernando Capitulino Signed-off-by: Greg Kroah-Hartman commit cdd3b1565a8d563ed84cf1c2af6cabf461f3c317 tree 2ea4b9f59404f5353d186067aebebf3cd74ee2ff parent c67808eee61a01c3128298c5972426a1a67b9093 author Nathan Bronson Mon, 10 Apr 2006 00:05:09 -0400 committer Greg Kroah-Hartman Thu, 27 Apr 2006 10:28:59 -0700 [PATCH] USB: ftdi_sio vendor code for RR-CirKits LocoBuffer USB This patch adds recognition of the RR-CirKits LocoBuffer USB to the existing FTDI driver. http://www.rr-cirkits.com Signed-off-by: Nathan Bronson Signed-off-by: Greg Kroah-Hartman commit c67808eee61a01c3128298c5972426a1a67b9093 tree 3eb417f4e3a119f74d1e4c26f3c5ef794d9ed8db parent 9fb81ce63671f9743517f628dac935269f2581a9 author Jean Delvare Sun, 09 Apr 2006 20:07:35 +0200 committer Greg Kroah-Hartman Thu, 27 Apr 2006 10:28:59 -0700 [PATCH] USB: Use new PCI_CLASS_SERIAL_USB_* defines We could use the recently added PCI_CLASS_SERIAL_USB_UHCI, PCI_CLASS_SERIAL_USB_OHCI and PCI_CLASS_SERIAL_USB_EHCI defines in more places, for slightly shorter and clearer code. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 9fb81ce63671f9743517f628dac935269f2581a9 tree faa959f86a921202d71d6f8564677a6c6e81a1a5 parent 658ad5e001a17be5fadaa8d57d1aa7f7c62628c1 author Alan Stern Fri, 14 Apr 2006 16:46:28 -0400 committer Greg Kroah-Hartman Thu, 27 Apr 2006 10:28:58 -0700 [PATCH] USB: net2280: set driver data before it is used This patch (as671) fixes a bug in the error pathway for the net2280 probe routine. A failure during probe will cause the driver to call pci_get_drvdata before the corresponding pci_set_drvdata has been set. The patch also does a kzalloc conversion. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 658ad5e001a17be5fadaa8d57d1aa7f7c62628c1 tree e592a1b9fc5d87a3912ada621b76a4897804cd74 parent 317e83b842ba39776054219ae29844127876416a author Alan Stern Fri, 14 Apr 2006 16:44:11 -0400 committer Greg Kroah-Hartman Thu, 27 Apr 2006 10:28:58 -0700 [PATCH] USB: net2280: check for shared IRQs This patch (as670) adds a check for whether a shared IRQ was actually generated by the net2280 device. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 317e83b842ba39776054219ae29844127876416a tree d9822d60241beb2e432138db17ec05917f4278e1 parent a29fccd7993a3d411674e148cb0759a017be3e21 author Alan Stern Fri, 14 Apr 2006 16:42:03 -0400 committer Greg Kroah-Hartman Thu, 27 Apr 2006 10:28:58 -0700 [PATCH] USB: net2280: send 0-length packets for ep0 This patch (as669) fixes a bug in the net2280 driver. Now it will properly send zero-length packets on ep0 until the control status stage occurs. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit a29fccd7993a3d411674e148cb0759a017be3e21 tree 039df2f052693147739806ceb8b5f79da9b26710 parent f430c405ca23dd5a9389d1f62dcdeb1fd6ce6024 author Alan Stern Fri, 14 Apr 2006 16:40:00 -0400 committer Greg Kroah-Hartman Thu, 27 Apr 2006 10:28:58 -0700 [PATCH] USB: net2280: Handle STALLs for 0-length control-IN requests This patch (as668) fixes a typo in net2280. The handler for 0-length control-IN requests should check that the endpoint _isn't_ halted before sending a 0-length packet. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit f430c405ca23dd5a9389d1f62dcdeb1fd6ce6024 tree bd3914f591c90e7c05b73e1cc1f4f8b84cfd5d4b parent 2120638354a6881b9c442b10fc21f28ecadc7402 author Olivier Blondeau Sun, 16 Apr 2006 19:19:25 -0700 committer Greg Kroah-Hartman Thu, 27 Apr 2006 10:28:58 -0700 [PATCH] USB: storage: atmel unusual dev update Originally submitted by Olivier Blondeau , with re-diffing by me. Adds a new atmel unusual_dev entry. Signed-off-by: Phil Dibowitz commit 2120638354a6881b9c442b10fc21f28ecadc7402 tree 039c27c104b51f4ab5adf0c577fbc32e3ccc30b0 parent 58381719845d9ee19a321c2eb69cfa9b7886be9a author Phil Dibowitz Sun, 16 Apr 2006 19:18:36 -0700 committer Greg Kroah-Hartman Thu, 27 Apr 2006 10:28:57 -0700 [PATCH] USB: Storage: unusual devs update This patch removes the Protocol portion of the Iomega Click! device as it's not needed. Not-needed message reported by Kenneth Crudup Signed-off-by: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman commit 58381719845d9ee19a321c2eb69cfa9b7886be9a tree a06959b4a7b61983a1b9dadef851341b6cd811db parent 67ca0284f69992ad71ac12dc375f2b158d9d703d author Wang Jun Wed, 19 Apr 2006 16:32:07 +0800 committer Greg Kroah-Hartman Thu, 27 Apr 2006 10:28:57 -0700 [PATCH] USB: add new iTegno usb CDMA 1x card support for pl2303 Add new iTegno usb CDMA 1x card (usbid '0eba:2080') support to pl2303 driver Signed-off-by: Wang Jun Signed-off-by: Greg Kroah-Hartman commit 67ca0284f69992ad71ac12dc375f2b158d9d703d tree 4c26826c5bb23c651967dcefd8a466adb402314a parent 2be4d50295e2b6f62c07b614e1b103e280dddb84 author Jesper Juhl Sun, 23 Apr 2006 19:59:23 +0200 committer Greg Kroah-Hartman Thu, 27 Apr 2006 10:28:57 -0700 [PATCH] USB: Resource leak fix for whiteheat driver We may return from drivers/usb/serial/whiteheat.c::whiteheat_attach() without freeing `result' if we leave via the no_firmware: label. Spotted by the coverity checker as #670 Signed-off-by: Jesper Juhl Signed-off-by: Greg Kroah-Hartman commit ee1cca1b0661fa33fd99f2d8ec7e2749432f9b1d tree e4f2170990c4f387ccd245d6f88b9ea555a26e26 parent 79e55bcf24ad8f31c3021b6ef21c4ce054fe4e38 author Ralf Baechle Wed, 26 Apr 2006 21:33:03 +0100 committer Ralf Baechle Thu, 27 Apr 2006 15:13:50 +0100 [MIPS] Fix branch emulation for floating-point exceptions. In the branch emulation for floating-point exceptions, __compute_return_epc must determine for bc1f et al which condition code bit to test. This is based on bits <4:2> of the rt field. The switch statement to distinguish bc1f et al needs to use only the two low bits of rt, but the old code tests on the whole rt field. This patch masks off the proper bits. Signed-off-by: Win Treese Signed-off-by: Ralf Baechle commit 79e55bcf24ad8f31c3021b6ef21c4ce054fe4e38 tree 0ae54b1c72fb3f02013d0324e32c5693888e43c5 parent b775565952ab8f33a49bfcb2c6dcfaba1e82dee3 author Ralf Baechle Mon, 24 Apr 2006 17:15:10 +0100 committer Ralf Baechle Thu, 27 Apr 2006 15:13:50 +0100 [MIPS] Cleanup inode->r_dev usage. imajor()/iminor() should be used instead of accessing r_dev directly. Based on patch from Eric Sesterhenn (snakebyte@gmx.de). Signed-off-by: Ralf Baechle commit b775565952ab8f33a49bfcb2c6dcfaba1e82dee3 tree a4270df66dbc39fb09d6e6c984d724112702f266 parent f7062ddb23d7568c90821118f9b973b3069625c9 author Ralf Baechle Mon, 24 Apr 2006 15:00:59 +0100 committer Ralf Baechle Thu, 27 Apr 2006 15:13:50 +0100 [MIPS] Update MIPS defconfigs. Signed-off-by: Ralf Baechle commit f7062ddb23d7568c90821118f9b973b3069625c9 tree e3c9abdbdbe041e716a3de7bdf09294530d019e1 parent 3763120a316b04c29a2b9c6e817e0e4a72005dd4 author Ralf Baechle Mon, 24 Apr 2006 14:58:53 +0100 committer Ralf Baechle Thu, 27 Apr 2006 15:13:50 +0100 [MIPS] Get rid of CONFIG_ADVANCED. It's been a horrible source of confusion and let users to shoot themselves into both feet with uzis to no end. Signed-off-by: Ralf Baechle commit 3763120a316b04c29a2b9c6e817e0e4a72005dd4 tree f287de88b8700bf8d2b11db1b750d2a6f0a4dfdb parent 7a8341969fe0df4a1fffa141435e742456270ffd author Ralf Baechle Mon, 24 Apr 2006 13:08:41 +0100 committer Ralf Baechle Thu, 27 Apr 2006 15:13:50 +0100 [MIPS] Kconfig: Clarify description of CROSSCOMPILE. Signed-off-by: Ralf Baechle commit 7a8341969fe0df4a1fffa141435e742456270ffd tree accf4fa15fce1d32c4f57d5acd1a28a3bd49e1f4 parent 2a2c3e451965aca35c2d0d1b2db1dbd1d839c75e author Chris Dearman Sat, 15 Apr 2006 00:31:16 +0100 committer Ralf Baechle Thu, 27 Apr 2006 15:13:50 +0100 [MIPS] 24K LV: Add core card id. Signed-off-by: Ralf Baechle commit 2a2c3e451965aca35c2d0d1b2db1dbd1d839c75e tree 590ee400aee96cf8116e485bda0a35a4a1f52da7 parent 6f8782c4b2ed3cb652f1ad6b6d91890c7f2423ab author Atsushi Nemoto Sat, 15 Apr 2006 00:04:18 +0900 committer Ralf Baechle Thu, 27 Apr 2006 15:13:49 +0100 [MIPS] Sparse: fix sparse for 64-bit kernels. This commit breaks sparse for 64bit kernel. The -m64 option is required. Also, some macro values (such as _MIPS_TUNE, etc.) contain double-quote characters so it would be better quoting arguments by single-quote characters. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 6f8782c4b2ed3cb652f1ad6b6d91890c7f2423ab tree 772c02f21ccf4178681d3506888bdda3ff139f4f parent bc818247203a7bfc40296a3f5b760de84fb8e0d1 author Atsushi Nemoto Mon, 17 Apr 2006 21:24:49 +0900 committer Ralf Baechle Thu, 27 Apr 2006 15:13:49 +0100 [MIPS] Use __ffs() instead of ffs() in ip32_irq0(). With recent rewrite for generic bitops, ffs() is defined the same way as the libc and compiler built-in routines (returns int instead of unsigned long). Use __ffs() for 64bit value. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit bc818247203a7bfc40296a3f5b760de84fb8e0d1 tree e0e6248b181f0e5e89349a083e60fc3812b1bf94 parent c0858d82faf96ffc32b96e23927d10844d38e564 author Atsushi Nemoto Mon, 17 Apr 2006 21:19:12 +0900 committer Ralf Baechle Thu, 27 Apr 2006 15:13:49 +0100 [MIPS] Fix bitops for MIPS32/MIPS64 CPUs. With recent rewrite for generic bitops, fls() for 32bit kernel with MIPS64_CPU is broken. Also, ffs(), fls() should be defined the same way as the libc and compiler built-in routines (returns int instead of unsigned long). Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit c0858d82faf96ffc32b96e23927d10844d38e564 tree 83d073a639dd98202553db73293c90812f4a56b2 parent 5dac83030a3f4a3a4d1255b13bd0f7d08e824963 author Atsushi Nemoto Thu, 20 Apr 2006 00:12:05 +0900 committer Ralf Baechle Thu, 27 Apr 2006 15:13:49 +0100 [MIPS] Fix ip27 build. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 5dac83030a3f4a3a4d1255b13bd0f7d08e824963 tree 88840c71182068d8096943e759ca8e5d6aae210b parent 49e31ca8387227898710f99476f2217ea154aab0 author Ralf Baechle Mon, 24 Apr 2006 10:50:02 +0100 committer Ralf Baechle Thu, 27 Apr 2006 15:13:49 +0100 [MIPS] Oprofile: fix sparse warning. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 49e31ca8387227898710f99476f2217ea154aab0 tree 86fecdc0e3692c8e87c3a0eedc22eaf405b732e3 parent 2be4d50295e2b6f62c07b614e1b103e280dddb84 author Ralf Baechle Mon, 24 Apr 2006 10:48:54 +0100 committer Ralf Baechle Thu, 27 Apr 2006 15:13:49 +0100 [MIPS] Fix oprofile module unloading When unloading oprofile module with timer-mode, oprofile_arch_exit dereferences a NULL pointer. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit eb20796bf6fdb95ccf51440ba2a827149bdc037f tree 9443923cbd83f03e797891d12e18bb0e2d51927b parent ebf43500ef148a380bd132743c3fc530111ac620 author Jens Axboe Thu, 27 Apr 2006 11:05:22 +0200 committer Jens Axboe Thu, 27 Apr 2006 11:05:22 +0200 [PATCH] splice: make the read-side do batched page lookups Use the new find_get_pages_contig() to potentially look up the entire splice range in one single call. This speeds up generic_file_splice_read() quite a bit. Signed-off-by: Jens Axboe commit ebf43500ef148a380bd132743c3fc530111ac620 tree 01ddb60f5662cf92b96b0468bf9820518a611209 parent eb645a24de82496434cc81171d7f350edb327399 author Jens Axboe Thu, 27 Apr 2006 08:46:01 +0200 committer Jens Axboe Thu, 27 Apr 2006 08:59:48 +0200 [PATCH] Add find_get_pages_contig(): contiguous variant of find_get_pages() find_get_pages_contig() will break out if we hit a hole in the page cache. From Andrew Morton, small modifications and documentation by me. Signed-off-by: Jens Axboe commit eb645a24de82496434cc81171d7f350edb327399 tree 1cb104eb1123d42b001290c0480a9ad55af07051 parent 2be4d50295e2b6f62c07b614e1b103e280dddb84 author Jens Axboe Thu, 27 Apr 2006 08:44:27 +0200 committer Jens Axboe Thu, 27 Apr 2006 08:59:48 +0200 [PATCH] splice: switch to using page_cache_readahead() Avoids doing useless work, when the file is fully cached. Signed-off-by: Jens Axboe commit ddc5d3414593e4d7ad7fbd33e7f7517fcc234544 tree acf9620d1f4900568edbc4a645ad5bb435147195 parent 77426d7210430b70a7f5b21c05c4e7505528937d author Dmitry Torokhov Wed, 26 Apr 2006 00:14:19 -0400 committer Dmitry Torokhov Wed, 26 Apr 2006 00:14:19 -0400 Input: move input_device_id to mod_devicetable.h Signed-off-by: Dmitry Torokhov commit 77426d7210430b70a7f5b21c05c4e7505528937d tree 52b89cfd45b49cb6dbb7c993cec73ba803ef5b0f parent 1a0ccece05efb8a9c04b1130c24a2652239f3bea author Samuel Thibault Wed, 26 Apr 2006 00:14:10 -0400 committer Dmitry Torokhov Wed, 26 Apr 2006 00:14:10 -0400 Input: allow using several chords for braille For coping with bad keyboards, permit to type a braille pattern by pressing several chords. By default, only one chord is needed. Signed-off-by: Samuel Thibault Signed-off-by: Dmitry Torokhov commit 1a0ccece05efb8a9c04b1130c24a2652239f3bea tree 7af7ed40dec393a91f81d8942e9ffda1c936e0ec parent f11a7c0935637c15416679bd347bbc4eac1ca740 author Dmitry Torokhov Wed, 26 Apr 2006 00:13:57 -0400 committer Dmitry Torokhov Wed, 26 Apr 2006 00:13:57 -0400 Input: allow passing NULL to input_free_device() Many drivers rely on input_free_device() behaving like kfree(). Signed-off-by: Dmitry Torokhov commit f11a7c0935637c15416679bd347bbc4eac1ca740 tree a1eec89e1ad5ab3d4ff84f7f274435cf1867e468 parent d5b415c95f0e6510451f1446cea832c1f77bd7ea author Richard Purdie Wed, 26 Apr 2006 00:13:42 -0400 committer Dmitry Torokhov Wed, 26 Apr 2006 00:13:42 -0400 Input: spitzkbd - fix the reversed Address and Calender keys Signed-off-by: Richard Purdie Signed-off-by: Dmitry Torokhov commit d5b415c95f0e6510451f1446cea832c1f77bd7ea tree 39bd4140c5e80082c20a1a6a4a0bad1df83b63ca parent ae82d5ab05068fccef2329f4607670f24c41606f author Imre Deak Wed, 26 Apr 2006 00:13:18 -0400 committer Dmitry Torokhov Wed, 26 Apr 2006 00:13:18 -0400 Input: ads7846 - improve filtering for thumb press accuracy Providing more accurate coordinates for thumb press requires additional steps in the filtering logic: - Ignore samples found invalid by the debouncing logic, or the ones that have out of bound pressure value. - Add a parameter to repeat debouncing, so that more then two consecutive good readings are required for a valid sample. Signed-off-by: Imre Deak Acked-by: Juha Yrjola Signed-off-by: Dmitry Torokhov commit ae82d5ab05068fccef2329f4607670f24c41606f tree bff0d33646f317e08d6974cc4073601c3939d6e1 parent c9e617a563ad646239270fa2222cdb06966cf1fa author Imre Deak Wed, 26 Apr 2006 00:12:14 -0400 committer Dmitry Torokhov Wed, 26 Apr 2006 00:12:14 -0400 Input: ads7846 - report 0 pressure value along with pen up event X touchscreen drivers that don't interpret the designated pen up message assume a pen up event from a pressure value 0. For these we generate a pressure 0 message along with the pen up message. Signed-off-by: Imre Deak Acked-by: Juha Yrjola Signed-off-by: Dmitry Torokhov commit c1311af12c7ca176a790a911a3fb6fed1f3bb387 tree 031aaa768524d72a2863195a6b9d562e01af6d14 parent e5ecc192dfc5e0b325dd8c99ce4c755714c9acbf author Brent Casavant Thu, 20 Apr 2006 15:38:16 -0500 committer Tony Luck Fri, 21 Apr 2006 10:59:00 -0700 [IA64] IOC4 config option ordering SERIAL_SGI_IOC4 and BLK_DEV_SGIIOC4 depend upon SGI_IOC4, and SERIAL_SGI_IOC3 depends upon SGI_IOC3. Currently the definitions are out of order in the config sequence. Fix by including drivers/sn/Kconfig immediately after SGI_SN, upon which SGI_IOC4 and SGI_IOC3 depend. Signed-off-by: Brent Casavant Signed-off-by: Tony Luck commit e5ecc192dfc5e0b325dd8c99ce4c755714c9acbf tree 04b1d9d8936727a5b7dec4ee912b5509853cfec6 parent a72391e42f0a13116995045b3d492d660f96697d author Christoph Lameter Thu, 13 Apr 2006 18:23:53 -0700 committer Tony Luck Fri, 21 Apr 2006 10:57:40 -0700 [IA64] Setup an IA64 specific reclaim distance RECLAIM_DISTANCE is checked on bootup against the SLIT table distances. Zone reclaim is important for system that have higher latencies but not for systems that have multiple nodes on one motherboard and therefore low latencies. We found that on motherboard latencies are typically 1 to 1.4 of local memory access speed whereas multinode systems which benefit from zone reclaim have usually more than 1.5 times the latency of a local access. Set the reclaim distance for IA64 to 1.5 times. Signed-off-by: Christoph Lameter Signed-off-by: Tony Luck commit a72391e42f0a13116995045b3d492d660f96697d tree abfedbdf78e1ac5d0d876619993ccf8b0c878b9b parent ee6d4b6ef8df79893d6d4a653b16c99bdb6d2784 author Satoru Takeuchi Thu, 20 Apr 2006 18:49:48 +0900 committer Tony Luck Thu, 20 Apr 2006 17:06:54 -0700 [IA64] eliminate compile time warnings This patch removes following compile time warnings: drivers/pci/pci-sysfs.c: In function `pci_read_legacy_io': drivers/pci/pci-sysfs.c:257: warning: implicit declaration of function `ia64_pci_legacy_read' drivers/pci/pci-sysfs.c: In function `pci_write_legacy_io': drivers/pci/pci-sysfs.c:280: warning: implicit declaration of function `ia64_pci_legacy_write' It also fixes wrong definition of ia64_pci_legacy_write (type of `bus' is not `pci_dev', but `pci_bus'). Signed-Off-By: Satoru Takeuchi Signed-off-by: Tony Luck commit ee6d4b6ef8df79893d6d4a653b16c99bdb6d2784 tree 81554409513864f9bcd60965b20c9b421f104cb0 parent 86db2f4239e2556cd37b853c2307aa9d43041458 author Satoru Takeuchi Thu, 20 Apr 2006 18:49:41 +0900 committer Tony Luck Thu, 20 Apr 2006 17:06:35 -0700 [IA64] eliminate compile time warnings This is a trivial patch to remove following compile time warning: arch/ia64/ia32/../../../fs/binfmt_elf.c:508: warning: 'randomize_stack_top' defined but not used Signed-off-by: Satoru Takeuchi Signed-off-by: Tony Luck commit 86db2f4239e2556cd37b853c2307aa9d43041458 tree 5c2910e20bc35d46bd82fa7f0d1f4e4362b2a457 parent 0d9adec525b87d8ab7e64efeabffb5b3f293056e author Russ Anderson Thu, 20 Apr 2006 17:05:43 -0700 committer Tony Luck Thu, 20 Apr 2006 17:05:43 -0700 [IA64-SGI] SN SAL call to inject memory errors The SGI Altix SAL provides an interface for modifying the ECC on memory to create memory errors. The SAL call can be used to inject memory errors for testing MCA recovery code. Signed-off-by: Russ Anderson (rja@sgi.com) Signed-off-by: Tony Luck commit 0d9adec525b87d8ab7e64efeabffb5b3f293056e tree c257e02e298cb7ee072379f55242e13be8a163f9 parent 308a878210cde6ab19df9f392c24db53ad6f56bf author Jack Steiner Tue, 18 Apr 2006 15:00:45 -0500 committer Tony Luck Thu, 20 Apr 2006 10:16:11 -0700 [IA64] - Fix MAX_PXM_DOMAINS for systems with > 256 nodes Correctly size the PXM-related arrays for systems that have more than 256 nodes. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 308a878210cde6ab19df9f392c24db53ad6f56bf tree 091a5b8198dcb083adbd1d8e351cdf09094391df parent cbf283c048798ada7e062892b21de85fb5727243 author Russ Anderson Tue, 18 Apr 2006 11:26:34 -0500 committer Tony Luck Thu, 20 Apr 2006 10:14:56 -0700 [IA64] Remove unused variable in sn_sal.h cnodeid was being set but not used. The dead code was left over from a previous version that grabbed a per node lock. Signed-off-by: Russ Anderson (rja@sgi.com) Signed-off-by: Tony Luck commit cbf283c048798ada7e062892b21de85fb5727243 tree ff090ca3c3722d056df7953da19b629b82796560 parent c6180deb1da5d087341fb5a3c1a15e61492dcd6b author Jesper Juhl Thu, 20 Apr 2006 10:11:09 -0700 committer Tony Luck Thu, 20 Apr 2006 10:11:09 -0700 [IA64] Remove redundant NULL checks before kfree Signed-off-by: Jesper Juhl Signed-off-by: Tony Luck commit c6180deb1da5d087341fb5a3c1a15e61492dcd6b tree 484d9c3018a31b04bf52f2e0c29cbfeeab897a6b parent 402a26f0c040077ed6f941eefac5a6971f0d5f40 author Luck, Tony Tue, 18 Apr 2006 21:14:22 -0700 committer Tony Luck Thu, 20 Apr 2006 10:02:37 -0700 [IA64] wire up compat_sys_adjtimex() Signed-off-by: Andrew Morton Signed-off-by: Tony Luck commit c9e617a563ad646239270fa2222cdb06966cf1fa tree 7598f9bc96914b4540b1d682eb2e9876343c272a parent 7de90a8cb9c51145d7f60d8db17ce0fa07d1b281 author Imre Deak Tue, 11 Apr 2006 23:44:05 -0400 committer Dmitry Torokhov Tue, 11 Apr 2006 23:44:05 -0400 Input: ads7846 - handle IRQs that were latched during disabled IRQs The pen down IRQ will toggle during each X,Y,Z measurement cycle. Even though the IRQ is disabled it will be latched and delivered when after enable_irq. Thus in the IRQ handler we must avoid starting a new measurement cycle when such an "unwanted" IRQ happens. Add a get_pendown_state platform function, which will probably determine this by reading the current GPIO level of the pen IRQ pin. Move the IRQ reenabling from the SPI RX function to the timer. After the last power down message the pen IRQ pin is still active for a while and get_pendown_state would report incorrectly a pen down state. When suspending we should check the ts->pending flag instead of ts->pendown, since the timer can be pending regardless of ts->pendown. Also if ts->pending is set we can be sure that the timer is running, so no need to rearm it. Similarly if ts->pending is not set we can be sure that the IRQ is enabled (and the timer is not). Signed-off-by: Imre Deak Signed-off-by: David Brownell Signed-off-by: Dmitry Torokhov commit 7de90a8cb9c51145d7f60d8db17ce0fa07d1b281 tree 81e2c0a54974c0a552474f5c5cc66d6082a8bfdd parent c4febb94dae915da4423b81c487eabed9cef5cba author Imre Deak Tue, 11 Apr 2006 23:43:55 -0400 committer Dmitry Torokhov Tue, 11 Apr 2006 23:43:55 -0400 Input: ads7846 - miscellaneous fixes - Add disable attribute to support device locking mode where unintentional touch event shouldn't wake up the system; - Update comments; - Add missing spin_lock_init; - Do device resume with the lock held; - Do cleanup calls / free memory in the reverse order of initialization. Signed-off-by: Imre Deak Signed-off-by: David Brownell Signed-off-by: Dmitry Torokhov commit c4febb94dae915da4423b81c487eabed9cef5cba tree 243d1b9d27308cd50fac24f8ac0ff785097b5495 parent 0b7018aae7e1798f55f736b9a77c201708aa0e33 author Juha Yrjola Tue, 11 Apr 2006 23:42:25 -0400 committer Dmitry Torokhov Tue, 11 Apr 2006 23:42:25 -0400 Input: ads7846 - use msleep() instead of udelay() in suspend Sometimes a polling loop had a hard time changing state without pre-emption enabled. Use msleep instead, it's better anyway. Signed-off-by: Juha Yrjola Signed-off-by: David Brownell Signed-off-by: Dmitry Torokhov commit 0b7018aae7e1798f55f736b9a77c201708aa0e33 tree b561dbcdb07540ffc76616894dddfa8f787f9202 parent 53a0ef89e95c725f3faab98573770aeb7429c1a3 author Imre Deak Tue, 11 Apr 2006 23:42:03 -0400 committer Dmitry Torokhov Tue, 11 Apr 2006 23:42:03 -0400 Input: ads7846 - debouncing and rudimentary sample filtering Some touchscreens seem to oscillate heavily for a while after touching the screen.  Implement support for sampling the screen until we get two consecutive values that are close enough. Signed-off-by: Imre Deak Signed-off-by: Juha Yrjola Signed-off-by: David Brownell Signed-off-by: Dmitry Torokhov commit 53a0ef89e95c725f3faab98573770aeb7429c1a3 tree 66d9258d53621f86ac686f768d17885404edced6 parent 438f2a7401ec5d8f85923a7c3e6da444f097a3a1 author Imre Deak Tue, 11 Apr 2006 23:41:49 -0400 committer Dmitry Torokhov Tue, 11 Apr 2006 23:41:49 -0400 Input: ads7846 - power down ADC a bit later Submit a seperate request for powering down the ADC in ads7846, doing it after the last read request. Otherwise some of the read values are incorrect. Signed-off-by: Imre Deak Signed-off-by: Juha Yrjola Signed-off-by: David Brownell Signed-off-by: Dmitry Torokhov commit 438f2a7401ec5d8f85923a7c3e6da444f097a3a1 tree 831ee631c1fa3809ece325d8ec6892ef94babd84 parent e2aa507a837cbaa376faa3d9f8448ff569d34ccf author Imre Deak Tue, 11 Apr 2006 23:41:32 -0400 committer Dmitry Torokhov Tue, 11 Apr 2006 23:41:32 -0400 Input: ads7846 - add pen_down sysfs attribute It's handy for userspace diagnostics to see the pen down status, to see whether the touchscreen is "stuck" (shortcircuited). Signed-off-by: Imre Deak Signed-off-by: Juha Yrjola Signed-off-by: David Brownell Signed-off-by: Dmitry Torokhov commit e2aa507a837cbaa376faa3d9f8448ff569d34ccf tree 789ecdc8cb62cd05ffdd17ba5f4fff20a3decbd5 parent 8a1b170898cd827b24cbf02c43c57f8489e9ccce author John Reed Riley Wed, 05 Apr 2006 00:40:01 -0400 committer Dmitry Torokhov Wed, 05 Apr 2006 00:40:01 -0400 Input: wistron - add support for Fujitsu N3510 Signed-off-by: Dmitry Torokhov commit 8a1b170898cd827b24cbf02c43c57f8489e9ccce tree e2525fc327ddcc2180510fda13cdc1091371dc2a parent b9ec4e109d7a342e83e1210e05797222e36555c3 author Stefan Rompf Wed, 05 Apr 2006 00:39:20 -0400 committer Dmitry Torokhov Wed, 05 Apr 2006 00:39:20 -0400 Input: wistron - add signature for Amilo M7400 Signed-off-by: Dmitry Torokhov