commit 120bda20c6f64b32e8bfbdd7b34feafaa5f5332e Author: Linus Torvalds Date: Wed Jul 5 21:09:49 2006 -0700 Linux 2.6.18-rc1 It's all good. commit 4fe683f50d3fc8e36d4749277631dfc711393aa0 Author: Thomas Graf Date: Wed Jul 5 20:47:28 2006 -0700 [PKT_SCHED]: Fix error handling while dumping actions "return -err" and blindly inheriting the error code in the netlink failure exception handler causes errors codes to be returned as positive value therefore making them being ignored by the caller. May lead to sending out incomplete netlink messages. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit d152b4e1e9a18f332ecd9e66492d706edc083345 Author: Thomas Graf Date: Wed Jul 5 20:45:57 2006 -0700 [PKT_SCHED]: Return ENOENT if action module is unavailable Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 26dab8930b408d5e5eb9ef496d68364dc955e249 Author: Thomas Graf Date: Wed Jul 5 20:45:06 2006 -0700 [PKT_SCHED]: Fix illegal memory dereferences when dumping actions The TCA_ACT_KIND attribute is used without checking its availability when dumping actions therefore leading to a value of 0x4 being dereferenced. The use of strcmp() in tc_lookup_action_n() isn't safe when fed with string from an attribute without enforcing proper NUL termination. Both bugs can be triggered with malformed netlink message and don't require any privileges. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 37e64e5ae1a9554762b6ec494871adcf48be20cf Author: Mikael Pettersson Date: Wed Jul 5 20:42:58 2006 -0700 [SPARC64]: Fix stack overflow checking in modular non-SMP kernels. The sparc64 kernel's EXPORT_SYMBOL(_mcount) is inside an #ifdef CONFIG_SMP. This breaks modules in non-SMP kernels built with stack overflow checking (CONFIG_STACK_DEBUG=y), as modules_install reports: WARNING: /lib/modules/2.6.17/kernel/drivers/ide/ide-cd.ko needs unknown symbol _mcount Trivially fixed by moving EXPORT_SYMBOL(_mcount) outside of the #ifdef CONFIG_SMP. Signed-off-by: Mikael Pettersson Signed-off-by: David S. Miller commit 7233589d77fdb593b482a8b7ee867e901f54b593 Author: Randy Dunlap Date: Wed Jul 5 20:18:39 2006 -0700 [SPARC64]: Fix sparc64 build errors when CONFIG_PCI=n. Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 309bade002e9226781c2d7a015340d0089e399b5 Author: Jeff Garzik Date: Wed Jul 5 23:02:48 2006 -0400 [PCI] Add JMicron PCI ID constants They will be used in several IDE/libata files. Signed-off-by: Jeff Garzik commit 9545b5781cfa822ea1528bc65965dbace0c39a5d Author: root Date: Wed Jul 5 22:58:20 2006 -0400 [PATCH] ahci: Ensure that we don't grab both functions When we force the chip into dual fn mode so we get PATA and AHCI we must be sure we don't then do anything dumb like try and grab both with the AHCI driver. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 5afc81427f79193ed55edd7184ba2b6ce119a649 Author: Borislav Petkov Date: Tue Jun 27 14:51:25 2006 +0200 [PATCH] libata-core.c: restore configuration boot messages in ata_dev_configure(), v2 This one looks better, IMHO. This restores the default libata configuration messages printed during booting. Signed-off-by: Signed-off-by: Jeff Garzik commit d2298dca9a2ec8a8ff23e251d8aaab00e9d229f9 Author: Tejun Heo Date: Mon Jul 3 16:07:27 2006 +0900 [PATCH] sata_sil24: add suspend/sleep support Add suspend/sleep support. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 2a41a6108d93a62910d1c36913d83a79b550b40a Author: Tejun Heo Date: Mon Jul 3 16:07:27 2006 +0900 [PATCH] sata_sil24: separate out sil24_init_controller() Separate out controller initialization from sil24_init_one() into sil24_init_controller(). This will be used by resume. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit afb5a7cb84b1ea8b6045945e3d288303e6b71336 Author: Tejun Heo Date: Mon Jul 3 16:07:27 2006 +0900 [PATCH] sata_sil: add suspend/sleep support Add suspend/sleep support. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 3d8ec91352099b32a400f1952112dc076da28106 Author: Tejun Heo Date: Mon Jul 3 16:07:27 2006 +0900 [PATCH] sata_sil: separate out sil_init_controller() Separate out controller initialization from sil_init_one() into sil_init_controller(). This will be used by resume. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 500530f652f9e5dabe7571b018dec47742ce0f16 Author: Tejun Heo Date: Mon Jul 3 16:07:27 2006 +0900 [PATCH] libata: reimplement controller-wide PM Reimplement controller-wide PM. ata_host_set_suspend/resume() are defined to suspend and resume a host_set. While suspended, EHs for all ports in the host_set are pegged using ATA_FLAG_SUSPENDED and frozen. Because SCSI device hotplug is done asynchronously against the rest of libata EH and the same mutex is used when adding new device, suspend cannot wait for hotplug to complete. So, if SCSI device hotplug is in progress, suspend fails with -EBUSY. In most cases, host_set resume is followed by device resume. As each resume operation requires a reset, a single host_set-wide resume operation may result in multiple resets. To avoid this, resume waits upto 1 second giving PM to request resume for devices. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit d6f26d1f1f1128a896f38a7f8426daed0a1205a2 Author: Tejun Heo Date: Mon Jul 3 16:07:26 2006 +0900 [PATCH] libata: reimplement per-dev PM Reimplement per-dev PM. The original implementation directly put the device into suspended mode and didn't synchronize w/ EH operations including hotplug. This patch reimplements ata_scsi_device_suspend() and ata_scsi_device_resume() such that they request EH to perform the respective operations. Both functions synchronize with hotplug such that it doesn't operate on detached devices. Suspend waits for completion but resume just issues request and returns. This allows parallel wake up of devices and thus speeds up system resume. Due to sdev detach synchronization, it's not feasible to separate out EH requesting from sdev handling; thus, ata_device_suspend/resume() are removed and everything is implemented in the respective libata-scsi functions. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 02670bf379267f55a43aa57f6895689697e90eb3 Author: Tejun Heo Date: Mon Jul 3 16:07:26 2006 +0900 [PATCH] libata: implement PM EH actions Implement two PM per-dev EH actions - ATA_EH_SUSPEND and ATA_EH_RESUME. Each action puts the target device into suspended mode and resumes from it respectively. Once a device is put to suspended mode, no EH operations other than RESUME is allowed on the device. The device will stay suspended till it gets resumed and thus reset and revalidated. To implement this, a new device state helper - ata_dev_ready() - is implemented and used in EH action implementations to make them operate only on attached & running devices. If all possible devices on a port are suspended, reset is skipped too. This prevents spurious events including hotplug events from disrupting suspended devices. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit c0b6c0377c32fe3f6a2cf1e018db6da8a3b78379 Author: Tejun Heo Date: Mon Jul 3 16:07:26 2006 +0900 [PATCH] libata: separate out __ata_ehi_hotplugged() Separate out __ata_ehi_hotplugged() from ata_ehi_hotplugged(). The underscored version doesn't set AC_ERR_ATA_BUS. This will be used for resume which is a hotplug event but not an ATA bus error. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 1cdaf534f829b8759ba30f97d5e8dceb2ab77ba4 Author: Tejun Heo Date: Mon Jul 3 16:07:26 2006 +0900 [PATCH] libata: implement ATA_EHI_NO_AUTOPSY and QUIET Implement ATA_EHI_NO_AUTOPSY and QUIET. These used to be implied by ATA_PFLAG_LOADING, but new power management and PMP support need to use these separately. e.g. Suspend/resume operations shouldn't print full EH messages and resume shouldn't be recorded as an error. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit e9c839142d698086d3fe33a0daafde55ddd00c4e Author: Tejun Heo Date: Mon Jul 3 16:07:26 2006 +0900 [PATCH] libata: clean up debounce parameters and improve parameter selection The names of predefined debounce timing parameters didn't exactly match their usages. Rename to more generic names and implement param selection helper sata_ehc_deb_timing() which uses EHI_HOTPLUGGED to select params. Combined with the previous EHI_RESUME_LINK differentiation, this makes parameter selection accurate. e.g. user scan resumes link but normal deb param is used instead of hotplug param. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 28324304350e23db24d679c55de3f06a5b1e40aa Author: Tejun Heo Date: Mon Jul 3 16:07:26 2006 +0900 [PATCH] libata: implement ATA_EHI_RESUME_LINK Implement ATA_EHI_RESUME_LINK, which indicates that the link needs to be resumed. This used to be implied by ATA_EHI_HOTPLUGGED. However, hotplug isn't the only event which requires link resume and separating this out allows other places to request link resume. This differentiation also allows better debounce timing selection. This patch converts user scan to use ATA_EHI_RESUME_LINK. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit e30349d27e093f32ef517b5416d9dce1998d4676 Author: Tejun Heo Date: Mon Jul 3 03:02:15 2006 +0900 [PATCH] libata: replace ap_lock w/ ap->lock in ata_scsi_error() ap_lock was used because &ap->host_set->lock was too long and used a lot. Now that &ap->host_set->lock is replaced with ap->lock, there's no reason to keep ap_lock. [ed. note: that's not entirely true. ap_lock is a local variable, caching the results of a de-ref. In theory, if the compiler is smart enough, this patch is cosmetic. However, since this is not a fast path (it is the error path), this patch is nonetheless acceptable, even though it _may_ introduce a performance regression.] Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 0662c58b3265f52f708a6d59476bc7862b01f9c0 Author: Tejun Heo Date: Mon Jul 3 02:54:58 2006 +0900 [PATCH] libata: fix ehc->i.action setting in ata_eh_autopsy() ata_eh_autopsy() used to directly assign determined action mask to ehc->i.action thus overriding actions set by some of nested analyze functions. This patch makes ata_eh_autopsy() add action masks just as it's done in other places. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit b51e9e5db0e36239f786692f1cac6e435ed30c66 Author: Tejun Heo Date: Thu Jun 29 01:29:30 2006 +0900 [PATCH] libata: add ap->pflags and move core dynamic flags to it ap->flags is way too clamped. Separate out core dynamic flags to ap->pflags. ATA_FLAG_DISABLED is a dynamic flag but left alone as it's referenced by a lot of LLDs and it's gonna be removed once all LLDs are converted to new EH. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit e6d902a3bfd53da375588e498251f4f4f6cd9650 Author: Brian King Date: Wed Jun 28 08:30:31 2006 -0500 [PATCH] libata: Conditionally set host->max_cmd_len In preparation for SAS attached SATA devices, which will not have a libata scsi_host, only setup host->max_cmd_len if ap->host exists. Signed-off-by: Brian King Signed-off-by: Jeff Garzik commit a93620b860434a19820072e656f4933e101ea6d4 Author: Martin Hicks Date: Wed Jun 28 12:17:47 2006 -0400 [PATCH] sata_vsc: data_xfer should use mmio Hi, sata_vsc is an MMIO device, and should use the correct data_xfer function. This problem was introduced by: commit a6b2c5d4754dc539a560fdf0d3fb78a14174394a Author: Alan Cox Date: Mon May 22 16:59:59 2006 +0100 [PATCH] PATCH: libata. Add ->data_xfer method Signed-off-by: Martin Hicks Signed-off-by: Jeff Garzik commit 2c1a108890c5b57cf3f7d7909f55c4fae0f52f19 Author: Brice Goglin Date: Mon Jul 3 18:16:46 2006 -0400 [PATCH] myri10ge - Export more parameters to ethtool Add the IRQ line, the tx_boundary, and whether Write-combining and MSI are enabled to the list of parameters that are exported to ethtool. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit d6020787488e837d3c2b24eb1b8cf9849058d340 Author: Brice Goglin Date: Mon Jul 3 18:41:30 2006 -0400 [PATCH] myri10ge - Use dev_info() when printing parameters after probe Displaying the interface name when listing the device parameters at the end of myri10ge_probe is not a good idea since udev might rename the interface soon afterwards. Print the bus id instead, using dev_info(). Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit 18ac544306855aa366d34d29755f4596acd7a58d Author: brice@myri.com Date: Mon Jul 3 18:02:32 2006 -0400 [PATCH] myri10ge - Drop ununsed nvidia chipset id The workaround for the AER capability of the nVidia chipset has been removed, we don't need this PCI id anymore. Drop it. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit ec590970f0f45a11c06b9525cd718dbdde22b4a3 Author: brice@myri.com Date: Mon Jul 3 18:02:31 2006 -0400 [PATCH] myri10ge - Drop unused pm_state The pm_state field in the myri10ge_priv structure is unused. Drop it. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit b07db75a9f542c1a1745fcb047fd743843db8daa Author: Ralf Baechle Date: Fri Jun 30 13:56:13 2006 +0100 [PATCH] Fix freeing of net device Plus optical sugar. Signed-off-by: Ralf Baechle Signed-off-by: Jeff Garzik commit 22db99bd32646aa33051e23420ff3517cc70cad5 Author: Paul Fulghum Date: Fri Jun 30 02:27:19 2006 -0700 [PATCH] remove dead entry in net wan Kconfig Remove dead entry from net wan Kconfig and net wan Makefile.. This entry is left over from 2.4 where synclink used syncppp driver directly. synclink drivers now use generic HDLC Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 5b552b16420d11ec59d301494477713ab5cc1f43 Author: Andreas Mohr Date: Fri Jun 30 02:25:07 2006 -0700 [PATCH] NI5010 netcard cleanup - updated MAINTAINERS entry to new format - updated Jan-Pascal's (ACKed) and my email address - driver cleanup/modernization (runtime-, not hardware-tested) [bunk@stusta.de: build fix] Signed-off-by: Andreas Mohr Cc: Jeff Garzik Cc: Jan-Pascal van Best Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 3a10ccebe928691d16a001687552228d32ff7910 Author: Ingo Molnar Date: Fri Jun 30 02:25:06 2006 -0700 [PATCH] lock validator: fix ns83820.c irq-flags bug Barry K. Nathan reported the following lockdep warning: [ 197.343948] BUG: warning at kernel/lockdep.c:1856/trace_hardirqs_on() [ 197.345928] [] show_trace_log_lvl+0x5b/0x105 [ 197.346359] [] show_trace+0x1b/0x20 [ 197.346759] [] dump_stack+0x1f/0x24 [ 197.347159] [] trace_hardirqs_on+0xfb/0x185 [ 197.348873] [] _spin_unlock_irq+0x24/0x2d [ 197.350620] [] do_tx_done+0x171/0x179 [ns83820] [ 197.350895] [] ns83820_irq+0x149/0x20b [ns83820] [ 197.351166] [] handle_IRQ_event+0x1d/0x52 [ 197.353216] [] handle_level_irq+0x97/0xe1 [ 197.355157] [] do_IRQ+0x8b/0xac [ 197.355612] [] common_interrupt+0x25/0x2c this is caused because the ns83820 driver re-enables irq flags in hardirq context. While legal in theory, in practice it should only be done if the hardware is really old and has some very high overhead in its ISR. (such as PIO IDE) For modern hardware, running ISRs with irqs enabled is discouraged, because 1) new hardware is fast enough to not cause latency problems 2) allowing the nesting of hardware interrupts only 'spreads out' the handling of the current ISR, causing extra cachemisses that would otherwise not happen. Furthermore, on architectures where ISRs share the kernel stacks, enabling interrupts in ISRs introduces a much higher kernel-stack-nesting and thus kernel-stack-overflow risk. 3) not managing irq-flags via the _irqsave / _irqrestore variants is dangerous: it's easy to forget whether one function nests inside another, and irq flags might be mismanaged. In the few cases where re-enabling interrupts in an ISR is considered useful (and unavoidable), it has to be taught to the lock validator explicitly (because the lock validator needs the "no ISR ever enables hardirqs" artificial simplification to keep the IRQ/softirq locking dependencies manageable). This teaching is done via the explicit use local_irq_enable_in_hardirq(). On a stock kernel this maps to local_irq_enable(). If the lock validator is enabled then this does not enable interrupts. Now, the analysis of drivers/net/ns83820.c's irq flags use: the irq-enabling in irq context seems intentional, but i dont think it's justified. Furthermore, the driver suffers from problem #3 above too, in ns83820_tx_timeout() it disables irqs via local_irq_save(), but then it calls do_tx_done() which does a spin_unlock_irq(), re-enabling for a function that does not expect it! While currently this bug seems harmless (only some debug printout seems to be affected by it), it's nevertheless something to be fixed. So this patch makes the ns83820 ISR irq-flags-safe, and cleans up do_tx_done() use and locking to avoid the ns83820_tx_timeout() bug. From: Arjan van de Ven ns83820_mib_isr takes the misc_lock in IRQ context. All other places that do this in the ISR already use _irqsave versions, make this consistent at least. At some point in the future someone should audit the driver to see if all _irqsave's in the ISR can go away, this is generally an iffy/fragile proposition though; for now get it safe, simple and consistent. From: Arjan van de Ven ok this is a real driver deadlock: The ns83820 driver enabled interrupts (by unlocking the misc_lock with _irq) while still holding the rx_info.lock, which is required to be irq safe since it's used in the ISR like this: writel(1, dev->base + IER); spin_unlock_irq(&dev->misc_lock); kick_rx(ndev); spin_unlock_irq(&dev->rx_info.lock); This is can cause a deadlock if an irq was pending at the first spin_unlock_irq already, or if one would hit during kick_rx(). Simply remove the first _irq solves this Signed-off-by: Ingo Molnar Cc: Benjamin LaHaise Cc: Jeff Garzik Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit ac5bfe40f94cc8df512d247a5588897b0bc6dbea Author: Don Fry Date: Thu Jun 29 13:55:27 2006 -0700 [PATCH] pcnet32: Cleanup rx buffers after loopback test. More cleanup to pcnet32_loopback_test to release receive buffers if device is not up. Created common routine to free rx buffers. Tested ia32 and ppc64 Signed-off-by: Don Fry Signed-off-by: Jeff Garzik commit df27f4a610e22e8c8c740286368cc13e0600f22c Author: Don Fry Date: Thu Jun 29 13:55:02 2006 -0700 [PATCH] pcnet32: Suspend the chip rather than restart when changing multicast/promisc Suspend the chip if possible rather than stop and discard all tx and rx frames, when changing the mcast list or entering/leaving promiscuous mode. Created common pcnet32_suspend routine. Tested ia32 and ppc64 Signed-off-by: Don Fry Signed-off-by: Jeff Garzik commit 06c878500893c315795fcf944ecbd85c3d023040 Author: Don Fry Date: Thu Jun 29 13:54:38 2006 -0700 [PATCH] pcnet32: Handle memory allocation failures cleanly when resizing tx/rx rings Fix pcnet32_set_ringparam to handle memory allocation errors without leaving the adapter in an inoperative state and null pointers waiting to be dereferenced. Tested ia32 and ppc64. Signed-off-by: Don Fry Signed-off-by: Jeff Garzik commit 12fa30f35b52e85b4c37a2ef3c3320c158d510fa Author: Don Fry Date: Thu Jun 29 13:53:48 2006 -0700 [PATCH] pcnet32: Use kcalloc instead of kmalloc and memset On 2006-03-08 Eric Sesterhenn wrote: converts drivers/net to kzalloc usage. Don Fry modified it to use netif_msg_drv. Tested ia32 and ppc64. Signed-off-by: Eric Sesterhenn Signed-off-by: Don Fry Signed-off-by: Jeff Garzik commit 6dcd60c2c78ca87163730472ddea6aa1a7754b61 Author: Don Fry Date: Thu Jun 29 13:53:23 2006 -0700 [PATCH] pcnet32: Fix off-by-one in get_ringparam Fix off-by-one in pcnet32_get_ringparam Signed-off-by: Don Fry Signed-off-by: Jeff Garzik commit f2622a2b16f27d0087c913115dc15ee70797d58b Author: Don Fry Date: Thu Jun 29 13:52:58 2006 -0700 [PATCH] pcnet32: Use PCI_DEVICE macro Jon Mason wrote on Thu, 12 Jan 2006 17:07:49 -0600: This patch adds the PCI_DEVICE macro to the pcnet32 driver. This has been tested on my opteron with my "trident" adapter. Don Fry modified it slightly and tested on ia32 and ppc64. Signed-off-by: Jon Mason Signed-off-by: Don Fry Signed-off-by: Jeff Garzik commit dcaf9769801ff49268f5a7a8376045e251700dcf Author: Don Fry Date: Thu Jun 29 13:52:29 2006 -0700 [PATCH] pcnet32: Fix Section mismatch error Fix Section mismatch error. Tested ia32 and ppc64. Signed-off-by: Don Fry Signed-off-by: Jeff Garzik commit 0c639b31068e8e111ec330a3634d95e20c11aab6 Author: Kim Phillips Date: Wed Jun 28 21:13:23 2006 -0500 [PATCH] Add support for the Cicada 8201 PHY Add support for the Cicada 8201 PHY, a.k.a Vitesse VSC8201. This PHY is present on the MPC8349mITX. Signed-off-by: Kim Phillips Signed-off-by: Andy Fleming Signed-off-by: Jeff Garzik commit c9a4b35df9a5e24065e2dd80aa18a381da62339d Author: Daniel Drake Date: Sun Jun 11 23:18:54 2006 +0100 [PATCH] zd1211rw: disable TX queue during stop This avoids some potential races. Signed-off-by: Daniel Drake Signed-off-by: John W. Linville commit e85d0918b54fbd9b38003752f7d665416b06edd8 Author: Daniel Drake Date: Fri Jun 2 17:11:32 2006 +0100 [PATCH] ZyDAS ZD1211 USB-WLAN driver There are 60+ USB wifi adapters available on the market based on the ZyDAS ZD1211 chip. Unlike the predecessor (ZD1201), ZD1211 does not have a hardware MAC, so most data operations are coordinated by the device driver. The ZD1211 chip sits alongside an RF transceiver which is also controlled by the driver. Our driver currently supports 2 RF types, we know of one other available in a few marketed products which we will be supporting soon. Our driver also supports the newer revision of ZD1211, called ZD1211B. The initialization and RF operations are slightly different for the new revision, but the main difference is 802.11e support. Our driver does not support the QoS features yet, but we think we know how to use them. This driver is based on ZyDAS's own GPL driver available from www.zydas.com.tw. ZyDAS engineers have been responsive and supportive of our efforts, so thumbs up to them. Additionally, the firmware is redistributable and they have provided device specs. This driver has been written primarily by Ulrich Kunitz and myself. Graham Gower, Greg KH, Remco and Bryan Rittmeyer have also contributed. The developers of ieee80211 and softmac have made our lives so much easier- thanks! We maintain a small info-page: http://zd1211.ath.cx/wiki/DriverRewrite If there is enough time for review, we would like to aim for inclusion in 2.6.18. The driver works nicely as a STA, and can connect to both open and encrypted networks (we are using software-based encryption for now). We will work towards supporting more advanced features in the future (ad-hoc, master mode, 802.11a, ...). Signed-off-by: Daniel Drake Signed-off-by: John W. Linville commit 4a232e725b5cc1bc7fc5b177424a9ff8313b23ad Author: John W. Linville Date: Mon Jun 26 16:34:29 2006 -0400 [PATCH] softmac: fix build-break from 881ee6999d66c8fc903b429b73bbe6045b38c549 Signed-off-by: John W. Linville commit 8f7eb40749f4b0cf9d3892d9680c97b1bfce6de6 Author: Horms Date: Mon Jun 26 17:44:38 2006 +0900 [PATCH] CONFIG_WIRELESS_EXT is neccessary after all WARNING: /lib/modules/2.6.17-mm2/kernel/net/ieee80211/ieee80211.ko needs unknown symbol wireless_spy_update Someone removed the `#ifdef CONFIG_WIRELESS_EXT' from around the callsite in net/ieee80211/ieee80211_rx.c and didn't update Kconfig appropriately. The offending patchset seems to be 35c14b855f52c49e4f3d078b9532b056005ed321 which is tittled [PATCH] ieee80211: remove unnecessary CONFIG_WIRELESS_EXT checking After a quick look it seems that wireless_spy_update() lives in net/core/wirless.c, and that file is only compiled if CONFIG_WIRELESS_EXT is set. Perhaps this is Kconig work, but in the mean time here is a reversal of the recent change. Signed-Off-By: Horms Signed-off-by: John W. Linville commit 9f101fc5e5a4810a2560841e4292a782b250cb02 Author: Joseph Jezak Date: Sun Jun 11 12:01:03 2006 -0400 [PATCH] SoftMAC: Add network to ieee80211softmac_call_events when associate times out The ieee80211softmac_call_events function, when called with event type IEEE80211SOFTMAC_EVENT_ASSOCIATE_TIMEOUT should pass the network as the third parameter. This patch does that. Signed-off-by: Joseph Jezak Signed-off-by: John W. Linville commit cb74c432e321ed645b6cd88b77edc15f9478efbd Author: Joseph Jezak Date: Sun Jun 11 12:00:37 2006 -0400 [PATCH] SoftMAC: Prevent multiple authentication attempts on the same network This patch addresses the "No queue exists" messages commonly seen during authentication and associating. These appear due to scheduling multiple authentication attempts on the same network. To prevent this, I added a flag to stop multiple authentication attempts by the association layer. I also added a check to the wx handler to see if we're connecting to a different network than the one already in progress. This scenario was causing multiple requests on the same network because the network BSSID was not being updated despite the fact that the ESSID changed. Signed-off-by: Joseph Jezak Signed-off-by: John W. Linville commit 4359219425a0918a72775480e125fbb077de338d Author: Daniel Drake Date: Fri Jun 16 20:50:22 2006 +0100 [PATCH] bcm43xx: enable shared key authentication I recently patched softmac to enable shared key authentication. This small patch will enable crazy or unfortunate bcm43xx users to use this new capability. Signed-off-by: Daniel Drake Signed-off-by: John W. Linville commit 6d41e2651080c717c1b48389fe4171180388f042 Author: Larry Finger Date: Tue Jun 20 09:19:18 2006 -0500 [PATCH] 2.6.17 missing a call to ieee80211softmac_capabilities from ieee80211softmac_assoc_req In commit ba9b28d19a3251bb1dfe6a6f8cc89b96fb85f683, routine ieee80211softmac_capabilities was added to ieee80211softmac_io.c. As denoted by its name, it completes the capabilities IE that is needed in the associate and reassociate requests sent to the AP. For at least one AP, the Linksys WRT54G V5, the capabilities field must set the 'short preamble' bit or the AP refuses to associate. In the commit noted above, there is a call to the new routine from ieee80211softmac_reassoc_req, but not from ieee80211softmac_assoc_req. This patch fixes that oversight. As noted in the subject, v2.6.17 is affected. My bcm43xx card had been unable to associate since I was forced to buy a new AP. I finally was able to get a packet dump and traced the problem to the capabilities info. Although I had heard that a patch was "floating around", I had not seen it before 2.6.17 was released. As this bug does not affect security and I seem to have the only AP affected by it, there should be no problem in leaving it for 2.6.18. Signed-Off-By: Larry Finger Signed-off-by: John W. Linville commit fc8fd3400b716615933a47be453839d190b235bd Author: Larry Finger Date: Sun Jun 25 21:32:21 2006 -0500 [PATCH] Convert bcm43xx-softmac to use the ieee80211_is_valid_channel routine The current version of bcm43xx-softmac uses local routines to check if a channel is valid. As noted in the comments, these routines do not take any regulatory information into account. This patch converts the code to use the equivalent routine in ieee80211, which is being converted to know about regulatory information. Signed-Off-By: Larry Finger Signed-off-by: John W. Linville commit 60d48f1e23c25d09dbe7025ff179b808d72704b3 Author: Eric Sesterhenn Date: Wed Jun 21 21:05:58 2006 +0200 [PATCH] skb used after passing to netif_rx in net/ieee80211/ieee80211_rx.c this patch fixes coverity id #913. ieee80211_monitor_rx() passes the skb to netif_rx() and we should not reference it any longer. Signed-off-by: Eric Sesterhenn Signed-off-by: John W. Linville commit 4b301536694facb93f597281580f5ad907d36050 Author: Hong Liu Date: Wed Jun 21 11:35:08 2006 +0800 [PATCH] ieee80211: fix not allocating IV+ICV space when usingencryption in ieee80211_tx_frame We should preallocate IV+ICV space when encrypting the frame. Currently no problem shows up just because dev_alloc_skb aligns the data len to SMP_CACHE_BYTES which can be used for ICV. Signed-off-by: Hong Liu Signed-off-by: John W. Linville commit a1d79aaaa564abc19b7bf3a024bb371fa7648a15 Author: Michael Buesch Date: Sat Jun 17 15:19:05 2006 +0200 [PATCH] bcm43xx: workaround init_board vs. IRQ race Place the Init-vs-IRQ workaround before any card register access, because we might not have the wireless core mapped at all times in init. So this will result in a Machine Check caused by a bus error. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit e8d596972221aea55ae7f5c2bb7d5895039f664d Author: Daniel Drake Date: Wed Jun 14 17:51:14 2006 +0200 [PATCH] bcm43xx: use softmac-suggested TX rate Use Softmac-suggested TX ratecode: ieee80211softmac_suggest_txrate() Signed-off-by: Daniel Drake Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit d3cef4ee2207033b9f231da308d966f357af34da Author: Faidon Liambotis Date: Sat Jun 10 20:54:58 2006 +0300 [PATCH] Add two PLX device IDs This patch adds device IDs for Symbol LA-4123 and Global Sun Tech GL24110P to the HostAP PLX driver. This is not tested with real hardware, but there is no reason why it shouldn't work. Please test. Signed-off-by: Faidon Liambotis Signed-off-by: John W. Linville commit 9b91cf9daac41eeaaea57ecfe68dc13bb0305fa9 Author: Jeff Garzik Date: Tue Jun 27 11:39:50 2006 -0400 [netdrvr] use dev_xxx() printk helpers, rather than dev_printk(KERN_xxx, ... Suggested by Jiri Slaby. Signed-off-by: Jeff Garzik commit 2e8a538d865de0eb9813c8a0f2284e920299c0cc Author: Jeff Garzik Date: Tue Jun 27 10:47:51 2006 -0400 [netdrvr] Use dev_printk() when ethernet interface isn't available For messages prior to register_netdev(), prefer dev_printk() because that prints out both our driver name and our [PCI | whatever] bus id. Updates: 8139{cp,too}, b44, bnx2, cassini, {eepro,epic}100, fealnx, hamachi, ne2k-pci, ns83820, pci-skeleton, r8169. Signed-off-by: Jeff Garzik commit cabb7667dc150320ccd9d6f64fbd7a34766bc775 Author: Jeff Garzik Date: Tue Jun 27 09:25:28 2006 -0400 [netdrvr] via-velocity: remove io_size struct member, it is invariant Replace io_size struct members with VELOCITY_IO_SIZE constant. Also, constify chip_info_table[]. Signed-off-by: Jeff Garzik commit e54f48933f414fa447c26d16524a4c9a8e2facc6 Author: Jeff Garzik Date: Tue Jun 27 09:20:08 2006 -0400 [netdrvr] via-velocity: misc. cleanups - const-ify pci_device_id table - clean up pci_device_id table with PCI_DEVICE() - don't store internal pointer in pci_device_id table, use pci_device_id::driver_data as an integer index - use dev_printk() for messages where eth%d prefix is unavailable - formatting fixes Signed-off-by: Jeff Garzik commit 46009c8bcd5d7c9fcbfc17d0455a471bea5be4d4 Author: Jeff Garzik Date: Tue Jun 27 09:12:38 2006 -0400 [netdrvr] minor cleanups in Becker-derived drivers - fealnx: convert #define to enum - fealnx, sundance: mark chip info table __devinitdata - fealnx: use dev_printk() during probe - fealnx: formatting cleanups - starfire: remove obsolete comment - sundance, via-rhine: add some whitespace where useful, in tables - sundance: prefer "{ }" table terminator - via-rhine: mark PCI probe table const Signed-off-by: Jeff Garzik commit 8ab6f3f706f5cb91bc0793afc95c8809837ece05 Author: Jeff Garzik Date: Tue Jun 27 08:56:23 2006 -0400 [netdrvr] via-velocity: use netdev_priv() where appropriate Signed-off-by: Jeff Garzik commit c3d8e682b7d10f57d13c86ecbb15806781d6e953 Author: Jeff Garzik Date: Tue Jun 27 08:54:34 2006 -0400 [netdrvr] Remove Becker-template 'io_size' member, when invariant Becker-derived drivers often have the 'io_size' member in their chip info struct, indicating the minimum required size of the I/O resource (usually a PCI BAR). For many situations, this number is either constant or irrelevant (due to pci_iomap convenience behavior). This change removes the io_size invariant member, and replaces it with a compile-time constant. Drivers updated: fealnx, gt96100eth, winbond-840, yellowfin Additionally, - gt96100eth: unused 'drv_flags' removed from gt96100eth - winbond-840: unused struct match_info removed - winbond-840: mark pci_id_tbl[] const, __devinitdata Signed-off-by: Jeff Garzik commit 03a8c6611aa18f919f8700b18f925e9008b616a8 Author: Jeff Garzik Date: Tue Jun 27 07:57:22 2006 -0400 [netdrvr] Remove Linux-specific changelogs from several Becker template drivers When in-kernel net drivers branched from Donald Becker's vanilla driver set, in the days before BitKeeper and git, a driver changelog was maintained in the driver source code. These days, the kernel's changelog is far superior and much more accurate, so the in-driver changelogs are removed. Another relic of the Becker/kernel split was version numbering, using "foo-LKx.y.z" notation, resulting in weird version numbers like "1.17b-LK1.1.9". These drivers are for older hardware, and see few changes these days, so the version numbers were all bumped to something more simple. Finally, in xircom_tulip_cb specifically, an additional cleanup removes the always-enabled CARDBUS cpp macro. Signed-off-by: Jeff Garzik commit 36e1e84768b1123eb632aff153104855c71684cc Author: Jeff Garzik Date: Tue Jun 27 07:38:33 2006 -0400 [netdrvr] epic100: minor cleanups - Remove in-source changelog, it's in the global kernel history. - convert silly and useless version to useful one - replace invariant pci_id_tbl[]::io_size uses with EPIC_TOTAL_SIZE - remove now-unused io_size member from pci_id_tbl[] - current kernel style prefers dev_printk() for the rare ethernet driver messages that cannot print an 'eth%d' prefix. Signed-off-by: Jeff Garzik commit 4e0641a7ad98fca5646a6be17605bc80f6c4ebde Author: Trond Myklebust Date: Wed Jul 5 13:05:13 2006 -0400 NFS: Optimise away an excessive GETATTR call when a file is symlinked In the case when compiling via a symlink tree, we want to ensure that the close-to-open GETATTR call is applied only to the final file, and not to the symlink. Signed-off-by: Trond Myklebust commit bce3481c91801665e17f8daf59ede946129f3d3f Author: Trond Myklebust Date: Wed Jul 5 13:17:12 2006 -0400 This fixes a panic doing the first READDIR or READDIRPLUS call when: * the client is ia64 or any platform that actually implements flush_dcache_page(), and * the server returns fsinfo.dtpref >= client's PAGE_SIZE, and * the server does *not* return post-op attributes for the directory in the READDIR reply. Problem diagnosed by Greg Banks Signed-off-by: Trond Myklebust commit 83715ad54fad5a7ed330110f83e31ae92630e9d9 Author: Trond Myklebust Date: Wed Jul 5 13:17:12 2006 -0400 NFS: Fix NFS page_state usage The introduction of the FLUSH_INVALIDATE argument to nfs_sync_inode_wait() does not clear the nr_unstable page state counter for pages that are being released. Also fix a longstanding similar bug when nfs_commit_list() fails. Signed-off-by: Trond Myklebust commit 01c3b861cd77b28565a2d18c7caa3ce7f938e35c Author: Trond Myklebust Date: Thu Jun 29 16:38:39 2006 -0400 NLM,NFSv4: Wait on local locks before we put RPC calls on the wire Use FL_ACCESS flag to test and/or wait for local locks before we try requesting a lock from the server Signed-off-by: Trond Myklebust commit f07f18dd6f29f11887b8d9cf7ecb736bf2f7dc62 Author: Trond Myklebust Date: Thu Jun 29 16:38:37 2006 -0400 VFS: Add support for the FL_ACCESS flag to flock_lock_file() Signed-off-by: Trond Myklebust commit 42a2d13eee3c895d22e9d1a52b96d15ca49adabc Author: Trond Myklebust Date: Thu Jun 29 16:38:36 2006 -0400 NFSv4: Ensure nfs4_lock_expired() caches delegated locks Signed-off-by: Trond Myklebust commit 9b07357490e5c7a1c3c2b6f4679d7ee4b4185ecd Author: Trond Myklebust Date: Thu Jun 29 16:38:34 2006 -0400 NLM,NFSv4: Don't put UNLOCK requests on the wire unless we hold a lock Use the new behaviour of {flock,posix}_file_lock(F_UNLCK) to determine if we held a lock, and only send the RPC request to the server if this was the case. Signed-off-by: Trond Myklebust commit f475ae957db66650db66916c62604ac27409d884 Author: Trond Myklebust Date: Thu Jun 29 16:38:32 2006 -0400 VFS: Allow caller to determine if BSD or posix locks were actually freed Change posix_lock_file_conf(), and flock_lock_file() so that if called with an F_UNLCK argument, and the FL_EXISTS flag they will indicate whether or not any locks were actually freed by returning 0 or -ENOENT. Signed-off-by: Trond Myklebust commit e340221acda6bc0bf05a0ff6e6114902c4307670 Author: Andreas Schwab Date: Wed Jul 5 18:57:48 2006 +0200 [PATCH] Makefile typo Fix a typo in the toplevel makefile. Signed-off-by: Andreas Schwab Signed-off-by: Linus Torvalds commit a8e0c51c71fc973b400f6502382063553b82af5a Author: David Woodhouse Date: Wed Jul 5 11:24:26 2006 +0100 [PATCH] powerpc: implement missing jiffies64_to_cputime64() asm-powerpc/cputime.h doesn't declare jiffies64_to_cputime64() or cputime64_sub(), and due to CONFIG_VIRT_CPU_ACCOUNTING it's not picking up the definition from asm-generic like x86-64 & friends do. Cc: Dave Jones Cc: Andrew Morton Signed-off-by: David Woodhouse Signed-off-by: Linus Torvalds commit ba1826e5eced176cc9ec0033ad8ee0f1cd5ad2e4 Author: Benjamin Herrenschmidt Date: Wed Jul 5 15:36:15 2006 +1000 [PATCH] powerpc: Fix loss of interrupts with MPIC With the new interrupt rework, an interrupt "host" map() callback can be called after the interrupt is already active. It's called again for an already mapped interrupt to allow changing the trigger setup, and currently this is not guarded with a test of wether the interrupt is requested or not. I plan to change some of this logic to be a bit less lenient against random reconfiguring of live interrupts but just not yet. The ported MPIC driver has a bug where when that happens, it will mask the interrupt. This changes it to preserve the previous masking of the interrupt instead. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit ba854e18413d2d827f050984edeb8286c3335895 Author: Andrew Victor Date: Wed Jul 5 17:22:52 2006 +0100 [ARM] 3711/1: AT91 timer update Patch from Andrew Victor The AIC interrupt controller is the same on the Atmel AT91RM9200, AT91SAM9261 and AT91SAM9260 processors. This patch removes any RM9200-specific naming from the IRQ driver, and moves the AT91RM9200's default IRQ priority table into at91rm9200.c. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 5904a7f9167cdeb95569799e0be652c2ce6d3298 Author: Vitaly Wool Date: Wed Jul 5 14:47:20 2006 +0100 [ARM] 3709/1: pnx4008: convert to generic irq subsystem Patch from Vitaly Wool Convert pnx4008 chip support to use generic irq subsystem Signed-off-by: Vitaly Wool Signed-off-by: Russell King commit 20e652761cbf6983fd067aef2f0242c262057737 Author: Andrew Victor Date: Wed Jul 5 14:31:13 2006 +0100 [ARM] 3710/1: AT91 Serial: Use GPIO API Patch from Andrew Victor The AT91RM9200 errata work-around should be using the GPIO API and not accessing the PIO registers directly. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 7ad7153b051d9628ecd6a336b543ea6ef099bd2c Author: Linus Torvalds Date: Tue Jul 4 14:00:06 2006 -0700 Fix up headers_install wrt devfs removal No devfs_fs.h header any more.. Signed-off-by: Linus Torvalds commit c6482dde1c2811afba289b2344268f850595f350 Author: Arjan van de Ven Date: Tue Jul 4 03:07:22 2006 -0700 [PATCH] fix AB-BA deadlock inversion at cs46xx_dsp_remove_scb There is a code sequence where the locking is substream->self_group.lock -> ins->scbs[index].lock substream->self_group.lock is interrupt safe, and taken from irq context as well (trace is snipped for brevity) so what can happen is cpu 0 cpu 1 user context user context take ins->scbs[index].lock without disabling interrupts get substream->self_group.lock (irqsafe) try to get ins->scbs[index].lock (spins) interrupt happens try to get substream->self_group.lock (spins) which is an obvious AB-BA deadlock fix is to just take the lock with _irqsafe Signed-off-by: Arjan van de Ven Cc: Jaroslav Kysela Acked-by: Takashi Iwai Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a46f9484f8926aacb2e79a0e1676de3a6a6fbae8 Author: Zach Brown Date: Tue Jul 4 02:57:52 2006 -0700 [PATCH] mthca: initialize send and receive queue locks separately mthca: initialize send and receive queue locks separately lockdep identifies a lock by the call site of its initialization. By initializing the send and receive queue locks in mthca_wq_init() we confuse lockdep. It warns that that the ordered acquiry of both locks in mthca_modify_qp() is recursive acquiry of one lock: ============================================= [ INFO: possible recursive locking detected ] --------------------------------------------- modprobe/1192 is trying to acquire lock: (&wq->lock){....}, at: [] mthca_modify_qp+0x60/0xa7b [ib_mthca] but task is already holding lock: (&wq->lock){....}, at: [] mthca_modify_qp+0x53/0xa7b [ib_mthca] Initializing the locks separately in mthca_alloc_qp_common() stops the warning and will let lockdep enforce proper ordering on paths that acquire both locks. Signed-off-by: Zach Brown Cc: Roland Dreier Cc: Arjan van de Ven Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd8041f16b117f63f40fb844d6cdebe8b03514d2 Author: Yasunori Goto Date: Tue Jul 4 02:57:51 2006 -0700 [PATCH] Fix copying of pgdat array on each node for ia64 memory hotplug I found a bug in memory hot-add code for ia64. IA64's code has copies of pgdat's array on each node to reduce memory access over crossing node. This array is used by NODE_DATA() macro. When new node is hot-added, this pgdat's array should be updated and copied on new node too. However, I used for_each_online_node() in scatter_node_data() to copy it. This meant its array is not copied on new node. Because initialization of structures for new node was halfway, so online_node_map couldn't be set at this time. To copy arrays on new node, I changed it to check value of pgdat_list[] which is source array of copies. I tested this patch with my Memory Hotadd emulation on Tiger4. This patch is for 2.6.17-git20. Signed-off-by: Yasunori Goto Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 31304c909e6945b005af62cd55a582e9c010a0b4 Author: Greg Ungerer Date: Tue Jul 4 15:04:39 2006 +1000 [PATCH] uclinux: fix proc_task()/get_proc-task() naming Fix changed name of proc_task() to get_proc_task(). Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit d8cb7c1ded6e5a80a7335716dde60784a0d51c1d Author: Andrew Morton Date: Mon Jul 3 17:32:22 2006 -0700 [PATCH] revert "kthread: convert stop_machine into a kthread" Jiri reports that the stop_machin kthread conversion caused his machine to hang when suspending. Hyperthreading is apparently involved. I don't see why that would be and I can't reproduce it. Revert to the 2.6.17 code. Cc: "Serge E. Hallyn" Cc: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 38c54ee8d5338f49aca986081ea41a987c15cf9d Author: Heiko Carstens Date: Mon Jul 3 17:32:21 2006 -0700 [PATCH] zfcp: fix incorrect usage of fsf_req_list_lock ================================= [ INFO: inconsistent lock state ] --------------------------------- inconsistent {in-hardirq-W} -> {hardirq-on-W} usage. swapper/0 [HC0[0]:SC1[1]:HE1:SE0] takes: (&adapter->fsf_req_list_lock){++..}, at: [<0000000000274486>] zfcp_qdio_reqid_check+0x46/0x178 {in-hardirq-W} state was registered at: [<000000000005fb0c>] __lock_acquire+0xad8/0xed0 [<00000000000604ae>] lock_acquire+0x9a/0xc8 [<000000000035a326>] _spin_lock+0x4e/0x68 [<0000000000274486>] zfcp_qdio_reqid_check+0x46/0x178 [<000000000027469e>] zfcp_qdio_response_handler+0xe6/0x430 [<0000000000219dd4>] tiqdio_thinint_handler+0xd20/0x213c [<000000000020229a>] do_adapter_IO+0xb2/0xc0 [<0000000000206f32>] do_IRQ+0x136/0x16c [<0000000000020462>] io_no_vtime+0x16/0x1c [<0000000000019432>] cpu_idle+0x222/0x250 irq event stamp: 129220 hardirqs last enabled at (129220): [<00000000000411e6>] tasklet_hi_action+0x5a/0x19c hardirqs last disabled at (129219): [<00000000000411c0>] tasklet_hi_action+0x34/0x19c softirqs last enabled at (129212): [<0000000000040b62>] __do_softirq+0x13a/0x180 softirqs last disabled at (129217): [<000000000001fd58>] do_softirq+0xec/0xf0 other info that might help us debug this: no locks held by swapper/0. stack backtrace: 00000000012bb670 0000000000000002 0000000000000000 00000000012bb780 00000000012bb6e8 0000000000399122 0000000000399122 0000000000016b0a 0000000000000000 0000000000000000 0000000000000000 00000000004660e8 0000000000000000 000000000000000d 00000000012bb6e0 00000000012bb758 0000000000368b90 0000000000016b0a 00000000012bb6e0 00000000012bb730 Call Trace: ([<0000000000016a26>] show_trace+0x76/0xdc) [<0000000000016b2c>] show_stack+0xa0/0xd0 [<0000000000016b8a>] dump_stack+0x2e/0x3c [<000000000005e3da>] print_usage_bug+0x27e/0x290 [<000000000005ea9c>] mark_lock+0x6b0/0x6c0 [<000000000005f33e>] __lock_acquire+0x30a/0xed0 [<00000000000604ae>] lock_acquire+0x9a/0xc8 [<000000000035a326>] _spin_lock+0x4e/0x68 [<0000000000274486>] zfcp_qdio_reqid_check+0x46/0x178 [<000000000027469e>] zfcp_qdio_response_handler+0xe6/0x430 [<0000000000217bd2>] tiqdio_tl+0xd02/0x2120 [<000000000004123a>] tasklet_hi_action+0xae/0x19c [<0000000000040ae4>] __do_softirq+0xbc/0x180 [<000000000001fd58>] do_softirq+0xec/0xf0 [<0000000000040c38>] irq_exit+0x90/0xa8 [<0000000000206f40>] do_IRQ+0x144/0x16c [<0000000000020462>] io_no_vtime+0x16/0x1c [<0000000000019432>] cpu_idle+0x222/0x250 ([<0000000000019416>] cpu_idle+0x206/0x250) [<000000000001405a>] rest_init+0x5a/0x68 [<0000000000536998>] start_kernel+0x39c/0x3dc [<0000000000013046>] _stext+0x46/0x1000 Fix incorrect usage of fsf_req_list_lock. It's used in tasklet context (irqs on) as well as in irq context. Therefore use the spin_lock_irqsave variant to avoid deadlocks. Acked-by: Andreas Herrmann Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9f09c548e185b63a3567498b96783f897b5f0399 Author: Heiko Carstens Date: Mon Jul 3 17:32:20 2006 -0700 [PATCH] zfcp: fix incorrect usage of erp_lock ================================= [ INFO: inconsistent lock state ] --------------------------------- inconsistent {hardirq-on-W} -> {in-hardirq-W} usage. swapper/0 [HC1[1]:SC0[0]:HE0:SE1] takes: (&adapter->erp_lock){+-..}, at: [<000000000026c7f8>] zfcp_erp_async_handler+0x3c/0x70 {hardirq-on-W} state was registered at: [<000000000005f33e>] __lock_acquire+0x30a/0xed0 [<00000000000604ae>] lock_acquire+0x9a/0xc8 [<000000000035a7ae>] _write_lock+0x4e/0x68 [<000000000026d822>] zfcp_erp_adapter_strategy_generic+0x286/0xd94 [<000000000026fd72>] zfcp_erp_strategy_do_action+0x91e/0x1a94 [<0000000000271a3a>] zfcp_erp_thread+0x21a/0x1568 [<0000000000019096>] kernel_thread_starter+0x6/0xc [<0000000000019090>] kernel_thread_starter+0x0/0xc irq event stamp: 12078 hardirqs last enabled at (12077): [<0000000000019416>] cpu_idle+0x206/0x250 hardirqs last disabled at (12078): [<0000000000020458>] io_no_vtime+0xc/0x1c softirqs last enabled at (12072): [<0000000000040b62>] __do_softirq+0x13a/0x180 softirqs last disabled at (12059): [<000000000001fd58>] do_softirq+0xec/0xf0 other info that might help us debug this: no locks held by swapper/0. stack backtrace: 00000000012bb648 0000000000000002 0000000000000000 00000000012bb758 00000000012bb6c0 0000000000399122 0000000000399122 0000000000016b0a 0000000000000000 0000000000000001 0000000000000000 00000000004660e8 0000000000000000 000000000000000d 00000000012bb6b8 00000000012bb730 0000000000368b90 0000000000016b0a 00000000012bb6b8 00000000012bb708 Call Trace: ([<0000000000016a26>] show_trace+0x76/0xdc) [<0000000000016b2c>] show_stack+0xa0/0xd0 [<0000000000016b8a>] dump_stack+0x2e/0x3c [<000000000005e3da>] print_usage_bug+0x27e/0x290 [<000000000005e934>] mark_lock+0x548/0x6c0 [<000000000005fb0c>] __lock_acquire+0xad8/0xed0 [<00000000000604ae>] lock_acquire+0x9a/0xc8 [<000000000035a662>] _write_lock_irqsave+0x62/0x80 [<000000000026c7f8>] zfcp_erp_async_handler+0x3c/0x70 [<0000000000279178>] zfcp_fsf_req_dispatch+0xd8/0x1fa8 [<000000000027e538>] zfcp_fsf_req_complete+0x104/0xe4c [<0000000000274534>] zfcp_qdio_reqid_check+0xf4/0x178 [<000000000027469e>] zfcp_qdio_response_handler+0xe6/0x430 [<0000000000219dd4>] tiqdio_thinint_handler+0xd20/0x213c [<000000000020229a>] do_adapter_IO+0xb2/0xc0 [<0000000000206f32>] do_IRQ+0x136/0x16c [<0000000000020462>] io_no_vtime+0x16/0x1c [<0000000000019432>] cpu_idle+0x222/0x250 ([<0000000000019416>] cpu_idle+0x206/0x250) [<000000000001405a>] rest_init+0x5a/0x68 [<0000000000536998>] start_kernel+0x39c/0x3dc [<0000000000013046>] _stext+0x46/0x1000 Fix incorrect usage of erp_lock. Using the write_lock() variant is wrong, since this might lead to deadlocks. Acked-by: Andreas Herrmann Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6a7c79a52939513ef043d6eb9fcf12a056c010e Author: OGAWA Hirofumi Date: Mon Jul 3 17:32:20 2006 -0700 [PATCH] Fix modular cpuid.ko With recent change, if CONFIG_HOTPLUG_CPU is disabled, register_cpu_notifier() is not exported. And it breaked moduler msr/cpuid (msr.c was already fixed). We need to use register_hotcpu_notifier() now in module, instead of register_cpu_notifier(). Signed-off-by: OGAWA Hirofumi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 300b93974ff64f1bef1ac8294547c573954f0300 Author: Marcel Holtmann Date: Mon Jul 3 10:37:55 2006 +0200 [Bluetooth] Add RFCOMM role switch support This patch adds the support for RFCOMM role switching before the connection is fully established. Signed-off-by: Marcel Holtmann commit 7c2660b00fae0575dd4ce5c7b6bf30762b632045 Author: Marcel Holtmann Date: Mon Jul 3 10:02:51 2006 +0200 [Bluetooth] Allow disabling of credit based flow control This patch adds the module parameter disable_cfc which can be used to disable the credit based flow control. The credit based flow control was introduced with the Bluetooth 1.1 specification and devices can negotiate its support, but for testing purpose it is helpful to allow disabling of it. Signed-off-by: Marcel Holtmann commit 0139418c943c3389cf75afc4f4d2b2fa52bbf7c9 Author: Marcel Holtmann Date: Mon Jul 3 10:02:46 2006 +0200 [Bluetooth] Small cleanup of the L2CAP source code This patch is a small cleanup of the L2CAP source code. It makes some coding style changes and moves some functions around to avoid forward declarations. Signed-off-by: Marcel Holtmann commit a91f2e396f5b32b21d842b4757bc8de5e88eac66 Author: Marcel Holtmann Date: Mon Jul 3 10:02:41 2006 +0200 [Bluetooth] Use real devices for host controllers This patch converts the Bluetooth class devices into real devices. The Bluetooth class is kept and the driver core provides the appropriate symlinks for backward compatibility. Signed-off-by: Marcel Holtmann commit 27d35284258c596900e0e41c46932ec4abe6a7b1 Author: Marcel Holtmann Date: Mon Jul 3 10:02:37 2006 +0200 [Bluetooth] Add platform device for virtual and serial devices This patch adds a generic Bluetooth platform device that can be used as parent device by virtual and serial devices. Signed-off-by: Marcel Holtmann commit 04837f6447c7f3ef114cda1ad761822dedbff8cf Author: Marcel Holtmann Date: Mon Jul 3 10:02:33 2006 +0200 [Bluetooth] Add automatic sniff mode support This patch introduces the automatic sniff mode feature. This allows the host to switch idle connections into sniff mode to safe power. Signed-off-by: Ulisses Furquim Signed-off-by: Marcel Holtmann commit da1f519851d1c66331363253f364bdb5d924ea96 Author: Marcel Holtmann Date: Mon Jul 3 10:02:29 2006 +0200 [Bluetooth] Correct SCO buffer size on request This patch introduces a quirk that allows the drivers to tell the host to correct the SCO buffer size values. Signed-off-by: Olivier Galibert Signed-off-by: Marcel Holtmann commit dcdcf63ef12dc3fbaa17a6d04f16ada8e63bb4d0 Author: Marcel Holtmann Date: Mon Jul 3 10:02:24 2006 +0200 [Bluetooth] Add suspend/resume support to the HCI USB driver This patch implements the suspend/resume methods for the HCI USB driver by killing all outstanding URBs on suspend, and re-issuing them on resume. Signed-off-by: Johannes Berg Signed-off-by: Marcel Holtmann commit 2b86ad21deec4c47a1f0089298f12e4038c2aa68 Author: Marcel Holtmann Date: Mon Jul 3 10:02:18 2006 +0200 [Bluetooth] Use raw mode for the Frontline sniffer device The Frontline sniffer device looks like a normal H:2 Bluetooth device, but it is not and so mark it as raw mode device. Signed-off-by: Marcel Holtmann commit 69ee20a58fa0cad6520c2a9538100a87ef0abd7d Author: Andrey Savochkin Date: Mon Jul 3 19:50:14 2006 -0700 [BRIDGE]: br_dump_ifinfo index fix Fix for inability of br_dump_ifinfo to handle non-zero start index: loop index never increases when entered with non-zero start. Spotted by Kirill Korotaev. Signed-off-by: Andrey Savochkin Signed-off-by: David S. Miller commit 3c6b377321678c649f9b3c66da0149975c614102 Author: Randy Dunlap Date: Mon Jul 3 19:48:25 2006 -0700 [ATM]: add+use poison defines ATM: add and use POISON define values. Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 4bdbf6c033ba05bff65f69989baccd7103c5a530 Author: Randy Dunlap Date: Mon Jul 3 19:47:27 2006 -0700 [NET]: add+use poison defines Add and use poison defines in net/. Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 6508871eddbbd3e62799f3b6182a6a4fd3ef31d5 Author: Randy Dunlap Date: Mon Jul 3 19:45:31 2006 -0700 [IOAT]: fix kernel-doc in source files Fix kernel-doc warnings in drivers/dma/: - use correct function & parameter names - add descriptions where omitted Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit fe4ada2d6f0b746246e9b5bf0f4f2e4d3a07d26e Author: Randy Dunlap Date: Mon Jul 3 19:44:51 2006 -0700 [IOAT]: fix header file kernel-doc Fix kernel-doc problems in include/linux/dmaengine.h: - add some fields/parameters - expand some descriptions - fix typos Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit b0026624f1aa3e38a887cb483de61f104d600b97 Author: Michael Chan Date: Mon Jul 3 19:42:14 2006 -0700 [TG3]: Add ipv6 TSO feature Enable ipv6 TSO feature on chips that support it. Update version to 3.61. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 6703931c546e6dec0431776fa616d5accd3e7162 Author: Michael Chan Date: Mon Jul 3 19:41:11 2006 -0700 [IPV6]: Fix ipv6 GSO payload length Fix ipv6 GSO payload length calculation. The ipv6 payload length excludes the ipv6 base header length and so must be subtracted. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 863fae666acb87b150f4634e6e79476ebe274f43 Author: Allan Stephens Date: Mon Jul 3 19:39:36 2006 -0700 [TIPC] Fixed sk_buff panic caused by tipc_link_bundle_buf (REVISED) The recent change to direct inspection of bundle buffer tailroom did not account for the possiblity of unrequested tailroom added by skb_alloc(), thereby allowing a bundle to be created that exceeds the current link MTU. An additional check now ensures that bundling works correctly no matter if the bundle buffer is smaller, larger, or equal to the link MTU. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit bbcf467dab42ea3c85f368df346c82af2fbba665 Author: Herbert Xu Date: Mon Jul 3 19:38:35 2006 -0700 [NET]: Verify gso_type too in gso_segment We don't want nasty Xen guests to pass a TCPv6 packet in with gso_type set to TCPv4 or even UDP (or a packet that's both TCP and UDP). Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 6ce1669fdb6b0a0faf9b2e2ba08048b520c57841 Author: Horms Date: Mon Jul 3 19:35:40 2006 -0700 [IPVS]: Add sysctl documentation * Derived from http://www.linuxvirtualserver.org/docs/sysctl.html, v1.4 maintained by Wensong Zhang * Adjusted preample to match ip-sysctl.txt * Sorted options into alphabetical order * Added expire_quiescent_template * Removed timeout_* which are no longer present * Incoporated doc/debug-levels.txt from IPVS source tree into description of ipvs_debug * Minor spelling fixes * Further editing more than welcome Signed-Off-By: Horms Signed-off-by: David S. Miller commit d85838c55d836c33077344fab424f200f2827d84 Author: Ralf Baechle Date: Mon Jul 3 19:32:23 2006 -0700 [ROSE]: Try all routes when establishing a ROSE connections. From Jean-Paul F6FBB ROSE will only try to establish a route using the first route in its routing table. Fix to iterate through all additional routes if a connection attempt has failed. Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit 18601a7d30c8340af4d786793ee52828471d2630 Author: Ralf Baechle DL5RB Date: Mon Jul 3 19:31:14 2006 -0700 [NETROM]: Use socket helpers instead of direct fiddling with struct sock Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller commit 006f68b84fe19fc5015a8cf838a10d75f91f0218 Author: Ralf Baechle DL5RB Date: Mon Jul 3 19:30:18 2006 -0700 [AX.25]: Reference counting for AX.25 routes. In the past routes could be freed even though the were possibly in use ... Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller commit 8dc22d2b642f8a6f14ef8878777a05311e5d1d7e Author: Ralf Baechle Date: Mon Jul 3 19:29:15 2006 -0700 [ROSE]: Fix dereference of skb pointer after free. If rose_route_frame return success we'll dereference a stale pointer. Likely this is only going to result in bad statistics for the ROSE interface. This fixes coverity 946. Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit 518d1c9679f644811adaa22d853f43a83fbdae84 Author: Benoit Boissinot Date: Mon Jul 3 19:28:13 2006 -0700 [IOAT]: Fix a warning in ioatdma drivers/dma/ioatdma.c: In function 'ioat_init_module': drivers/dma/ioatdma.c:830: warning: control reaches end of non-void function Signed-off-by: Benoit Boissinot Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 56e0873b7b146564a0c36e225624f5a9b2d63791 Author: Adrian Bunk Date: Mon Jul 3 19:27:20 2006 -0700 [IOAT]: drivers/dma/iovlock.c: make num_pages_spanned() static This patch makes the needlessly global num_pages_spanned() static. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 882d02d6fb040a246b005305ffeb790bb5ce80ad Author: Andrew Morton Date: Mon Jul 3 19:26:15 2006 -0700 [AF_UNIX]: datagram getpeersec fix The unix_get_peersec_dgram() stub should have been inlined so that it disappears. Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit c1b4df5d2a5b1a9c037fe3b2e42804cf1267c750 Author: Randy Dunlap Date: Mon Jul 3 19:24:19 2006 -0700 [IOAT]: fix sparse ulong warning Fix sparse warning: drivers/dma/ioatdma.c:444:32: warning: constant 0xFFFFFFFFFFFFFFC0 is so big it is unsigned long Also needs a MAINTAINERS entry. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 70b97a7f0b19cf1f2619deb5cc41e8b78c591aa7 Author: Ingo Molnar Date: Mon Jul 3 00:25:42 2006 -0700 [PATCH] sched: cleanup, convert sched.c-internal typedefs to struct convert: - runqueue_t to 'struct rq' - prio_array_t to 'struct prio_array' - migration_req_t to 'struct migration_req' I was the one who added these but they are both against the kernel coding style and also were used inconsistently at places. So just get rid of them at once, now that we are flushing the scheduler patch-queue anyway. Conversion was mostly scripted, the result was reviewed and all secondary whitespace and style impact (if any) was fixed up by hand. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 36c8b586896f60cb91a4fd526233190b34316baf Author: Ingo Molnar Date: Mon Jul 3 00:25:41 2006 -0700 [PATCH] sched: cleanup, remove task_t, convert to struct task_struct cleanup: remove task_t and convert all the uses to struct task_struct. I introduced it for the scheduler anno and it was a mistake. Conversion was mostly scripted, the result was reviewed and all secondary whitespace and style impact (if any) was fixed up by hand. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 48f24c4da1ee7f3f22289cb85e8b8a73e4df4db5 Author: Ingo Molnar Date: Mon Jul 3 00:25:40 2006 -0700 [PATCH] sched: clean up fallout of recent changes Clean up some of the impact of recent (and not so recent) scheduler changes: - turning macros into nice inline functions - sanitizing and unifying variable definitions - whitespace, style consistency, 80-lines, comment correctness, spelling and curly braces police Due to the macro hell and variable placement simplifications there's even 26 bytes of .text saved: text data bss dec hex filename 25510 4153 192 29855 749f sched.o.before 25484 4153 192 29829 7485 sched.o.after [akpm@osdl.org: build fix] Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 829035fd709119d9def124a6d40b94d317573e6f Author: Paul Mackerras Date: Mon Jul 3 00:25:40 2006 -0700 [PATCH] lockdep: irqtrace subsystem, move account_system_vtime() calls into kernel/softirq.c At the moment, powerpc and s390 have their own versions of do_softirq which include local_bh_disable() and __local_bh_enable() calls. They end up calling __do_softirq (in kernel/softirq.c) which also does local_bh_disable/enable. Apparently the two levels of disable/enable trigger a warning from some validation code that Ingo is working on, and he would like to see the outer level removed. But to do that, we have to move the account_system_vtime calls that are currently in the arch do_softirq() implementations for powerpc and s390 into the generic __do_softirq() (this is a no-op for other archs because account_system_vtime is defined to be an empty inline function on all other archs). This patch does that. Signed-off-by: Paul Mackerras Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8688cfcebf09b84385b5e2c461ae08fcde8a5d18 Author: Ingo Molnar Date: Mon Jul 3 00:25:39 2006 -0700 [PATCH] lockdep: annotate forcedeth.c disable_irq() nv_do_nic_poll() is called from timer softirqs, which has interrupts enabled, but np->lock might also be taken by some other interrupt context. The driver does disable_irq() to get around this problem, so annotate the disable_irq()/enable_irq() calls for lockdep. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: Ayaz Abdulla Cc: Manfred Spraul Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 479ceddd7baf3b387665c4d69a7398918b201ad0 Author: Andrew Morton Date: Mon Jul 3 00:25:37 2006 -0700 [PATCH] forcedeth: typecast cleanup Someone went nuts in there. Cc: Ayaz Abdulla Cc: Manfred Spraul Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd11acdd8542cb0c0fa7cd86590b1ba79d7e263a Author: Arjan van de Ven Date: Mon Jul 3 00:25:36 2006 -0700 [PATCH] lockdep: annotate hostap netdev ->xmit_lock On Fri, 2006-06-30 at 15:45 -0700, Miles Lane wrote: > Okay, I rebuilt my kernel with your combo patch applied. > Then, I inserted my US Robotics USR2210 PCMCIA wifi card, > ran "pccardutil eject", popped out the card and then inserted > a Compaq iPaq wifi card. This triggered the following. > > [ INFO: possible circular locking dependency detected ] > ------------------------------------------------------- > syslogd/1886 is trying to acquire lock: > (&dev->queue_lock){-+..}, at: [] dev_queue_xmit+0x120/0x24b > > but task is already holding lock: > (&dev->_xmit_lock){-+..}, at: [] dev_queue_xmit+0x183/0x24b > > which lock already depends on the new lock. ok this appears to be hostap playing games... it has 2 network devices for one piece of hardware and one calls the other via the networking layer; there is thankfully a natural ordering between the two, so just making the slave one a separate type ought to make this work. Signed-off-by: Ingo Molnar Cc: Arjan van de Ven Cc: "John W. Linville" Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a5b5bb9a053a973c23b867738c074acb3e80c0a0 Author: Ingo Molnar Date: Mon Jul 3 00:25:35 2006 -0700 [PATCH] lockdep: annotate sk_locks Teach sk_lock semantics to the lock validator. In the softirq path the slock has mutex_trylock()+mutex_unlock() semantics, in the process context sock_lock() case it has mutex_lock()/mutex_unlock() semantics. Thus we treat sock_owned_by_user() flagged areas as an exclusion area too, not just those areas covered by a held sk_lock.slock. Effect on non-lockdep kernels: minimal, sk_lock_sock_init() has been turned into an inline function. Signed-off-by: Ingo Molnar Cc: Arjan van de Ven Cc: "David S. Miller" Cc: Herbert Xu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0afffc723c8041a005134099847ac2a2fd0316a0 Author: Ingo Molnar Date: Mon Jul 3 00:25:35 2006 -0700 [PATCH] lockdep: annotate on-stack completions, mmc lockdep needs to have the waitqueue lock initialized for on-stack waitqueues implicitly initialized by DECLARE_COMPLETION(). Annotate mmc_wait_for_req()'s on-stack completion accordingly. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Cc: Arjan van de Ven Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5dd8d1e9eb8b51041505966fe96d081ecbe86efe Author: Arjan van de Ven Date: Mon Jul 3 00:25:33 2006 -0700 [PATCH] lockdep: annotate vlan net device as being a special class vlan network devices have devices nesting below it, and are a special "super class" of normal network devices; split their locks off into a separate class since they always nest. [deweerdt@free.fr: fix possible null-pointer deref] Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Signed-off-by: Frederik Deweerdt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 663d440eaa496db903cc58be04b9b602ba45e43b Author: Ingo Molnar Date: Mon Jul 3 00:25:33 2006 -0700 [PATCH] lockdep: annotate blkdev nesting Teach special (recursive) locking code to the lock validator. Effects on non-lockdep kernels: - the introduction of the following function variants: extern struct block_device *open_partition_by_devnum(dev_t, unsigned); extern int blkdev_put_partition(struct block_device *); static int blkdev_get_whole(struct block_device *bdev, mode_t mode, unsigned flags); which on non-lockdep are the same as open_by_devnum(), blkdev_put() and blkdev_get(). - a subclass parameter to do_open(). [unused on non-lockdep] - a subclass parameter to __blkdev_put(), which is a new internal function for the main blkdev_put*() functions. [parameter unused on non-lockdep kernels, except for two sanity check WARN_ON()s] these functions carry no semantical difference - they only express object dependencies towards the lockdep subsystem. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2b2d5493e10051694ae3a57ea6a153e3cb4d4488 Author: Ingo Molnar Date: Mon Jul 3 00:25:28 2006 -0700 [PATCH] lockdep: annotate SLAB code Teach special (recursive) locking code to the lock validator. Has no effect on non-lockdep kernels. Fix initialize-locks-via-memcpy assumptions. Effects on non-lockdep kernels: the subclass nesting parameter is passed into cache_free_alien() and __cache_free(), and turns one internal kmem_cache_free() call into an open-coded __cache_free() call. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: Pekka Enberg Cc: Christoph Lameter Cc: Manfred Spraul Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 897c6ff9568bcb102ffc6b465ebe1def0cba829d Author: Arjan van de Ven Date: Mon Jul 3 00:25:28 2006 -0700 [PATCH] lockdep: annotate sb ->s_umount The s_umount rwsem needs to be classified as per-superblock since it's perfectly legit to keep multiple of those recursively in the VFS locking rules. Has no effect on non-lockdep kernels. Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cf51624999e56c88154b5f7d451a265db6aabff7 Author: Ingo Molnar Date: Mon Jul 3 00:25:27 2006 -0700 [PATCH] lockdep: annotate ->s_lock Teach special (per-filesystem) locking code to the lock validator. Minimal effect on non-lockdep kernels: one extra parameter to alloc_super(). Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 91ebe2a9320db7195d1e25152b5d158fc66dc133 Author: Heiko Carstens Date: Mon Jul 3 00:25:26 2006 -0700 [PATCH] lockdep: annotate qeth driver Annotate the qeth driver which uses a private skb-queue-head that is safely used in hardirq context too. Has no effect on non-lockdep kernels. Signed-off-by: Heiko Carstens Acked-by: Ingo Molnar Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 60be6b9a41cb0da0df7a9f11486da56baebf04cd Author: Ingo Molnar Date: Mon Jul 3 00:25:26 2006 -0700 [PATCH] lockdep: annotate on-stack completions lockdep needs to have the waitqueue lock initialized for on-stack waitqueues implicitly initialized by DECLARE_COMPLETION(). Annotate on-stack completions accordingly. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 366c7f554e888e51b8395f9b07b273fe775c7ff3 Author: Ingo Molnar Date: Mon Jul 3 00:25:25 2006 -0700 [PATCH] lockdep: annotate enable_in_hardirq() Make use of local_irq_enable_in_hardirq() API to annotate places that enable hardirqs in hardirq context. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0a9da4bd8eb30fb3f36e841c2cc72e426a17bbe2 Author: Ingo Molnar Date: Mon Jul 3 00:25:24 2006 -0700 [PATCH] lockdep: annotate 3c59x.c disable_irq() 3c59x.c's vortex_timer() function knows that vp->lock can only be used by an irq context that it disabled - and can hence take the vp->lock without disabling hardirqs. Teach lockdep about this. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e745165c6d235c03e9fa0e57984ca6fd3d3b2c50 Author: Ingo Molnar Date: Mon Jul 3 00:25:23 2006 -0700 [PATCH] lockdep: annotate 8390.c disable_irq() 8390.c knows that ei_local->page_lock can only be used by an irq context that it disabled - and can hence take the ->page_lock without disabling hardirqs. Teach lockdep about this. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Cc: Arjan van de Ven Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 933a2efc59513551dcfa7b814752dc581bd3c60b Author: Arjan van de Ven Date: Mon Jul 3 00:25:22 2006 -0700 [PATCH] lockdep: annotate sound/core/seq/seq_device.c The ops structure has complex locking rules, where not all ops are equal, some are subordinate on others for some complex sound cards. This requires for lockdep checking that each individual reg_mutex is considered in separation for its locking rules. Has no effect on non-lockdep kernels. Signed-off-by: Arjan van de Ven Cc: Ingo Molnar Cc: Takashi Iwai Cc: Jaroslav Kysela Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d8371f0481fd1ad2701081d37815b0bb5d236b92 Author: Ingo Molnar Date: Mon Jul 3 00:25:21 2006 -0700 [PATCH] lockdep: annotate sound/core/seq/seq_ports.c Teach special (recursive) locking code to the lock validator. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: Takashi Iwai Cc: Jaroslav Kysela Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8e7795ef6b5fd117b22b87ea7d501de2526a25f7 Author: Arjan van de Ven Date: Mon Jul 3 00:25:21 2006 -0700 [PATCH] lockdep: annotate USBFS In usbfs's fs_remove_file() function, the aim is to remove a file or directory from usbfs. This is done by first taking the i_mutex of the parent directory of this file/dir via mutex_lock(&parent->d_inode->i_mutex); and then to call either usbfs_rmdir() for a directory or usbfs_unlink() for a file. Both these functions then take the i_mutex for the to-be-removed object themselves: mutex_lock(&inode->i_mutex); This is a classical parent->child locking order relationship that the VFS uses all over the place; the VFS locking rule is "you need to take the parent first". This patch annotates the usbfs code to make this explicit and thus informs the lockdep code that those two locks indeed have this relationship. The rules for unlink that we already use in the VFS for unlink are to use I_MUTEX_PARENT for the parent directory, and a normal mutex for the file itself; this patch follows that convention. Has no effect on non-lockdep kernels. Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c81a4197de38411fe3e27f8593fff73a5d6b868 Author: Arjan van de Ven Date: Mon Jul 3 00:25:20 2006 -0700 [PATCH] lockdep: annotate the quota code The quota code plays interesting games with the lock ordering; to quote Jan: | i_mutex of inode containing quota file is acquired after all other | quota locks. i_mutex of all other inodes is acquired before quota | locks. Quota code makes sure (by resetting inode operations and | setting special flag on inode) that noone tries to enter quota code | while holding i_mutex on a quota file... The good news is that all of this special case i_mutex grabbing happens in the (per filesystem) low level quota write function. For this special case we need a new I_MUTEX_* nesting level, since this just entirely outside any of the regular VFS locking rules for i_mutex. I trust Jan on his blue eyes that this is not ever going to deadlock; and based on that the patch below is what it takes to inform lockdep of these very interesting new locking rules. The new locking rule for the I_MUTEX_QUOTA nesting level is that this is the deepest possible level of nesting for i_mutex, and that this only should be used in quota write (and possibly read) function of filesystems. This makes the lock ordering of the I_MUTEX_* levels: I_MUTEX_PARENT -> I_MUTEX_CHILD -> I_MUTEX_NORMAL -> I_MUTEX_QUOTA Has no effect on non-lockdep kernels. Signed-off-by: Arjan van de Ven Acked-by: Ingo Molnar Cc: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 59345374742ee6673c2d04b0fa8c888e881b7209 Author: Ingo Molnar Date: Mon Jul 3 00:25:18 2006 -0700 [PATCH] lockdep: annotate NTFS locking rules NTFS uses lots of type-opaque objects which acquire their true identity runtime - so the lock validator needs to be helped in a couple of places to figure out object types. Many thanks to Anton Altaparmakov for giving lots of explanations about NTFS locking rules. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Anton Altaparmakov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c6573c2904231279de0584787d6214f19a128d0b Author: Arjan van de Ven Date: Mon Jul 3 00:25:16 2006 -0700 [PATCH] lockdep: annotate sunrpc code Add i_mutex ordering annotations to the sunrpc rpc_pipe code. This code has 3 levels of i_mutex hierarchy in some cases: parent dir, client dir and file inside client dir; the i_mutex ordering is I_MUTEX_PARENT -> I_MUTEX_CHILD -> I_MUTEX_NORMAL This patch applies this ordering annotation to the various functions. This is in line with the VFS expected ordering where it is always OK to lock a child after locking a parent; the sunrpc code is very diligent in doing this correctly. Has no effect on non-lockdep kernels. Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Cc: Trond Myklebust Cc: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad33945175bed649ca5fe0881269db005bbb449a Author: Ingo Molnar Date: Mon Jul 3 00:25:15 2006 -0700 [PATCH] lockdep: annotate ->mmap_sem Teach special (recursive) locking code to the lock validator. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d378834840907326ac9d448056d957d13cc3718f Author: Ingo Molnar Date: Mon Jul 3 00:25:14 2006 -0700 [PATCH] lockdep: annotate ieee1394 skb-queue-head locking ieee1394 reuses the skb infrastructure of the networking code, and uses two skb-head queues: ->pending_packet_queue and hpsbpkt_queue. The latter is used in the usual fashion: processed from a kernel thread. The other one, ->pending_packet_queue is also processed from hardirq context (f.e. in hpsb_bus_reset()), which is not what the networking code usually does (which completes from softirq or process context). This locking assymetry can be totally correct if done carefully, but it can also be dangerous if networking helper functions are reused, which could assume traditional networking use. It would probably be more robust to push this completion into a workqueue - but technically the code can be 100% correct, and lockdep has to be taught about it. The solution is to split the ->pending_packet_queue skb-head->lock class from the networking lock-class by using a private lock-validator key. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Cc: Stefan Richter Cc: Jody McIntyre Cc: Ben Collins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c63661848581a9842dfc72d9a400285dd284fc47 Author: Ingo Molnar Date: Mon Jul 3 00:25:13 2006 -0700 [PATCH] lockdep: annotate bh_lock_sock() Teach special (recursive) locking code to the lock validator. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a09785a2414afb261d9f719d544742af4300df22 Author: Ingo Molnar Date: Mon Jul 3 00:25:12 2006 -0700 [PATCH] lockdep: annotate af_unix locking Teach special (recursive) locking code to the lock validator. Also splits af_unix's sk_receive_queue.lock class from the other networking skb-queue locks. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da21f24dd73954c2ed0cd39a698e2c9916c05d71 Author: Ingo Molnar Date: Mon Jul 3 00:25:12 2006 -0700 [PATCH] lockdep: annotate sock_lock_init() Teach special (multi-initialized, per-address-family) locking code to the lock validator. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 543655244866b8ec648fea1eb9c32a35ffba5721 Author: Ingo Molnar Date: Mon Jul 3 00:25:11 2006 -0700 [PATCH] lockdep: annotate hrtimer base locks Teach special (recursive) locking code to the lock validator. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fcb993712f231a4faea8393513d1276170679107 Author: Ingo Molnar Date: Mon Jul 3 00:25:10 2006 -0700 [PATCH] lockdep: annotate scheduler runqueue locks Teach per-CPU runqueue locks and recursive locking code to the lock validator. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d730e882a15c38de02b63a063be636b2ff9e9ed1 Author: Ingo Molnar Date: Mon Jul 3 00:25:10 2006 -0700 [PATCH] lockdep: annotate timer base locks Split the per-CPU timer base locks up into separate lock classes, because they are used recursively. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 06825ba3553151eea24206bc53d4fc3de49e0ab1 Author: Ingo Molnar Date: Mon Jul 3 00:25:09 2006 -0700 [PATCH] lockdep: annotate skb_queue_head_init Teach special (multi-initialized) locking code to the lock validator. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3aceafc1e2596f1c2c4e053126561f00b68e3a1a Author: Arjan van de Ven Date: Mon Jul 3 00:25:08 2006 -0700 [PATCH] lockdep: annotate serio The PS/2 code has a natural device order and there is a one level recursion in this device order in terms of the cmd_mutex; annotate this explicit recursion as ok. Has no effect on non-lockdep kernels. Signed-off-by: Arjan van de Ven Cc: Dmitry Torokhov Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f20dc5f7c1adf1c4b68b7672d6f2002cb824e636 Author: Ingo Molnar Date: Mon Jul 3 00:25:08 2006 -0700 [PATCH] lockdep: annotate mm Teach special (recursive) locking code to the lock validator. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eb4542b98c81e22e08587b747b21986a45360999 Author: Ingo Molnar Date: Mon Jul 3 00:25:07 2006 -0700 [PATCH] lockdep: annotate waitqueues Create one lock class for all waitqueue locks in the kernel. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 243c7621aac4ed1aa79524c9a1cecf7c05a28124 Author: Ingo Molnar Date: Mon Jul 3 00:25:06 2006 -0700 [PATCH] lockdep: annotate genirq Teach special (recursive) locking code to the lock validator. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b8f319fc7f4ab59f567d6a401a62659b3d37007 Author: Ingo Molnar Date: Mon Jul 3 00:25:05 2006 -0700 [PATCH] lockdep: annotate futex Teach special (recursive) locking code to the lock validator. Introduces double_lock_hb() to unify double- hash-bucket-lock taking. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2eace23e924bd3f05aedea4fc505eb5508d2d93 Author: Ingo Molnar Date: Mon Jul 3 00:25:05 2006 -0700 [PATCH] lockdep: annotate i_mutex Teach special (recursive) locking code to the lock validator. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a90b9c05df3c1e58eaedc28795d0f5abd896c098 Author: Ingo Molnar Date: Mon Jul 3 00:25:04 2006 -0700 [PATCH] lockdep: annotate dcache Teach special (recursive) locking code to the lock validator. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 13e83599d282ddfd544600df9db5ab343ac4662f Author: Ingo Molnar Date: Mon Jul 3 00:25:03 2006 -0700 [PATCH] lockdep: annotate serial Teach special (dual-initialized) locking code to the lock validator. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d8aa905b429700e8b6b6b301a8ac2d4a24f2c19b Author: Ingo Molnar Date: Mon Jul 3 00:25:02 2006 -0700 [PATCH] lockdep: annotate direct io Teach special (rwsem-in-irq) locking code to the lock validator. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2b105ff9cccea5533ad518bb37dc9b43a322f7b1 Author: Ingo Molnar Date: Mon Jul 3 00:25:02 2006 -0700 [PATCH] lockdep: enable on s390 Enable LOCKDEP_SUPPORT on s390. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e9505279a8a2303d8feef4e464e6f48ea644f03 Author: Ingo Molnar Date: Mon Jul 3 00:25:01 2006 -0700 [PATCH] lockdep: enable on x86_64 Enable LOCKDEP_SUPPORT on x86_64. Signed-off-by: Ingo Molnar Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cbbf437a8de3192739334eb8cae7c9acee38590f Author: Ingo Molnar Date: Mon Jul 3 00:25:00 2006 -0700 [PATCH] lockdep: enable on i386 Enable LOCKDEP_SUPPORT on i386. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8e9ccae6ee2bb19b7752b7d412e1bbbaf28e7fe1 Author: Heiko Carstens Date: Mon Jul 3 00:25:00 2006 -0700 [PATCH] lockdep: s390 turn validator off in machine-check handler Machine checks on s390 are always enabled (except in the machine check handler itself). Therefore use lockdep_off()/on() in the machine check handler to avoid deadlocks in the lock validator. Signed-off-by: Heiko Carstens Acked-by: Ingo Molnar Cc: Martin Schwidefsky Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6205120044bb75ca06019491d1aa0e727fdd35be Author: Ingo Molnar Date: Mon Jul 3 00:24:59 2006 -0700 [PATCH] lockdep: fix RT_HASH_LOCK_SZ On lockdep we have a quite big spinlock_t, so keep the size down. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a0f1ccfd8d37457a6d8a9e01acebeefcdfcc306e Author: Ingo Molnar Date: Mon Jul 3 00:24:58 2006 -0700 [PATCH] lockdep: do not recurse in printk Make printk()-ing from within the lock validation code safer by using the lockdep-recursion counter. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3047e99ede366298c6233d1870d12a520d4d92f3 Author: Ingo Molnar Date: Mon Jul 3 00:24:57 2006 -0700 [PATCH] lockdep: x86 smp alternatives workaround Disable SMP alternatives fixups (the patching in of NOPs on 1-CPU systems) if the lock validator is enabled: there is a binutils section handling bug that causes corrupted instructions when UP instructions are patched in. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2148270cd2ebe0d05e4289b7c77b1435c45481bf Author: Ingo Molnar Date: Mon Jul 3 00:24:57 2006 -0700 [PATCH] lockdep: x86_64 early init x86_64 uses spinlocks very early - earlier than start_kernel(). So call lockdep_init() from the arch setup code. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c64580d522542e50f2ba689316128b7fbae497b Author: Ingo Molnar Date: Mon Jul 3 00:24:56 2006 -0700 [PATCH] lockdep: print all lock classes on SysRQ-D Print all lock-classes on SysRq-D. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4d9f34ad366a7935be3d6e7cca90805e6b7a692d Author: Ingo Molnar Date: Mon Jul 3 00:24:55 2006 -0700 [PATCH] lockdep: kconfig Offer the following lock validation options: CONFIG_PROVE_LOCKING Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ef5d4707b9065c0cf8a69fa3716893f3b75201ba Author: Ingo Molnar Date: Mon Jul 3 00:24:55 2006 -0700 [PATCH] lockdep: prove mutex locking correctness Use the lock validator framework to prove mutex locking correctness. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8a25d5debff2daee280e83e09d8c25d67c26a972 Author: Ingo Molnar Date: Mon Jul 3 00:24:54 2006 -0700 [PATCH] lockdep: prove spinlock rwlock locking correctness Use the lock validator framework to prove spinlock and rwlock locking correctness. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ea2176dfa714882e88180b474e4cbcd888b70af Author: Ingo Molnar Date: Mon Jul 3 00:24:53 2006 -0700 [PATCH] lockdep: prove rwsem locking correctness Use the lock validator framework to prove rwsem locking correctness. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a8f24a3978c5f82419e1c90dc90460731204f46f Author: Ingo Molnar Date: Mon Jul 3 00:24:52 2006 -0700 [PATCH] lockdep: procfs Lock validator /proc/lockdep and /proc/lockdep_stats support. (FIXME: should go into debugfs) Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f3e97da38e1d69d24195d76f96b912323f5ee30c Author: Ingo Molnar Date: Mon Jul 3 00:24:52 2006 -0700 [PATCH] lockdep: design docs Lock validator design documentation. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c9076ec9cd448f43bbda871352a7067f456ee26 Author: Ingo Molnar Date: Mon Jul 3 00:24:51 2006 -0700 [PATCH] lockdep: allow read_lock() recursion of same class From: Ingo Molnar lockdep so far only allowed read-recursion for the same lock instance. This is enough in the overwhelming majority of cases, but a hostap case triggered and reported by Miles Lane relies on same-class different-instance recursion. So we relax the restriction on read-lock recursion. (This change does not allow rwsem read-recursion, which is still forbidden.) Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fbb9ce9530fd9b66096d5187fa6a115d16d9746c Author: Ingo Molnar Date: Mon Jul 3 00:24:50 2006 -0700 [PATCH] lockdep: core Do 'make oldconfig' and accept all the defaults for new config options - reboot into the kernel and if everything goes well it should boot up fine and you should have /proc/lockdep and /proc/lockdep_stats files. Typically if the lock validator finds some problem it will print out voluminous debug output that begins with "BUG: ..." and which syslog output can be used by kernel developers to figure out the precise locking scenario. What does the lock validator do? It "observes" and maps all locking rules as they occur dynamically (as triggered by the kernel's natural use of spinlocks, rwlocks, mutexes and rwsems). Whenever the lock validator subsystem detects a new locking scenario, it validates this new rule against the existing set of rules. If this new rule is consistent with the existing set of rules then the new rule is added transparently and the kernel continues as normal. If the new rule could create a deadlock scenario then this condition is printed out. When determining validity of locking, all possible "deadlock scenarios" are considered: assuming arbitrary number of CPUs, arbitrary irq context and task context constellations, running arbitrary combinations of all the existing locking scenarios. In a typical system this means millions of separate scenarios. This is why we call it a "locking correctness" validator - for all rules that are observed the lock validator proves it with mathematical certainty that a deadlock could not occur (assuming that the lock validator implementation itself is correct and its internal data structures are not corrupted by some other kernel subsystem). [see more details and conditionals of this statement in include/linux/lockdep.h and Documentation/lockdep-design.txt] Furthermore, this "all possible scenarios" property of the validator also enables the finding of complex, highly unlikely multi-CPU multi-context races via single single-context rules, increasing the likelyhood of finding bugs drastically. In practical terms: the lock validator already found a bug in the upstream kernel that could only occur on systems with 3 or more CPUs, and which needed 3 very unlikely code sequences to occur at once on the 3 CPUs. That bug was found and reported on a single-CPU system (!). So in essence a race will be found "piecemail-wise", triggering all the necessary components for the race, without having to reproduce the race scenario itself! In its short existence the lock validator found and reported many bugs before they actually caused a real deadlock. To further increase the efficiency of the validator, the mapping is not per "lock instance", but per "lock-class". For example, all struct inode objects in the kernel have inode->inotify_mutex. If there are 10,000 inodes cached, then there are 10,000 lock objects. But ->inotify_mutex is a single "lock type", and all locking activities that occur against ->inotify_mutex are "unified" into this single lock-class. The advantage of the lock-class approach is that all historical ->inotify_mutex uses are mapped into a single (and as narrow as possible) set of locking rules - regardless of how many different tasks or inode structures it took to build this set of rules. The set of rules persist during the lifetime of the kernel. To see the rough magnitude of checking that the lock validator does, here's a portion of /proc/lockdep_stats, fresh after bootup: lock-classes: 694 [max: 2048] direct dependencies: 1598 [max: 8192] indirect dependencies: 17896 all direct dependencies: 16206 dependency chains: 1910 [max: 8192] in-hardirq chains: 17 in-softirq chains: 105 in-process chains: 1065 stack-trace entries: 38761 [max: 131072] combined max dependencies: 2033928 hardirq-safe locks: 24 hardirq-unsafe locks: 176 softirq-safe locks: 53 softirq-unsafe locks: 137 irq-safe locks: 59 irq-unsafe locks: 176 The lock validator has observed 1598 actual single-thread locking patterns, and has validated all possible 2033928 distinct locking scenarios. More details about the design of the lock validator can be found in Documentation/lockdep-design.txt, which can also found at: http://redhat.com/~mingo/lockdep-patches/lockdep-design.txt [bunk@stusta.de: cleanups] Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cae2ed9aa573415c6e5de9a09b7ff0d74af793bc Author: Ingo Molnar Date: Mon Jul 3 00:24:48 2006 -0700 [PATCH] lockdep: locking API self tests Introduce DEBUG_LOCKING_API_SELFTESTS, which uses the generic lock debugging code's silent-failure feature to run a matrix of testcases. There are 210 testcases currently: +----------------------- | Locking API testsuite: +------------------------------+------+------+------+------+------+------+ | spin |wlock |rlock |mutex | wsem | rsem | -------------------------------+------+------+------+------+------+------+ A-A deadlock: ok | ok | ok | ok | ok | ok | A-B-B-A deadlock: ok | ok | ok | ok | ok | ok | A-B-B-C-C-A deadlock: ok | ok | ok | ok | ok | ok | A-B-C-A-B-C deadlock: ok | ok | ok | ok | ok | ok | A-B-B-C-C-D-D-A deadlock: ok | ok | ok | ok | ok | ok | A-B-C-D-B-D-D-A deadlock: ok | ok | ok | ok | ok | ok | A-B-C-D-B-C-D-A deadlock: ok | ok | ok | ok | ok | ok | double unlock: ok | ok | ok | ok | ok | ok | bad unlock order: ok | ok | ok | ok | ok | ok | --------------------------------------+------+------+------+------+------+ recursive read-lock: | ok | | ok | --------------------------------------+------+------+------+------+------+ non-nested unlock: ok | ok | ok | ok | --------------------------------------+------+------+------+ hard-irqs-on + irq-safe-A/12: ok | ok | ok | soft-irqs-on + irq-safe-A/12: ok | ok | ok | hard-irqs-on + irq-safe-A/21: ok | ok | ok | soft-irqs-on + irq-safe-A/21: ok | ok | ok | sirq-safe-A => hirqs-on/12: ok | ok | ok | sirq-safe-A => hirqs-on/21: ok | ok | ok | hard-safe-A + irqs-on/12: ok | ok | ok | soft-safe-A + irqs-on/12: ok | ok | ok | hard-safe-A + irqs-on/21: ok | ok | ok | soft-safe-A + irqs-on/21: ok | ok | ok | hard-safe-A + unsafe-B #1/123: ok | ok | ok | soft-safe-A + unsafe-B #1/123: ok | ok | ok | hard-safe-A + unsafe-B #1/132: ok | ok | ok | soft-safe-A + unsafe-B #1/132: ok | ok | ok | hard-safe-A + unsafe-B #1/213: ok | ok | ok | soft-safe-A + unsafe-B #1/213: ok | ok | ok | hard-safe-A + unsafe-B #1/231: ok | ok | ok | soft-safe-A + unsafe-B #1/231: ok | ok | ok | hard-safe-A + unsafe-B #1/312: ok | ok | ok | soft-safe-A + unsafe-B #1/312: ok | ok | ok | hard-safe-A + unsafe-B #1/321: ok | ok | ok | soft-safe-A + unsafe-B #1/321: ok | ok | ok | hard-safe-A + unsafe-B #2/123: ok | ok | ok | soft-safe-A + unsafe-B #2/123: ok | ok | ok | hard-safe-A + unsafe-B #2/132: ok | ok | ok | soft-safe-A + unsafe-B #2/132: ok | ok | ok | hard-safe-A + unsafe-B #2/213: ok | ok | ok | soft-safe-A + unsafe-B #2/213: ok | ok | ok | hard-safe-A + unsafe-B #2/231: ok | ok | ok | soft-safe-A + unsafe-B #2/231: ok | ok | ok | hard-safe-A + unsafe-B #2/312: ok | ok | ok | soft-safe-A + unsafe-B #2/312: ok | ok | ok | hard-safe-A + unsafe-B #2/321: ok | ok | ok | soft-safe-A + unsafe-B #2/321: ok | ok | ok | hard-irq lock-inversion/123: ok | ok | ok | soft-irq lock-inversion/123: ok | ok | ok | hard-irq lock-inversion/132: ok | ok | ok | soft-irq lock-inversion/132: ok | ok | ok | hard-irq lock-inversion/213: ok | ok | ok | soft-irq lock-inversion/213: ok | ok | ok | hard-irq lock-inversion/231: ok | ok | ok | soft-irq lock-inversion/231: ok | ok | ok | hard-irq lock-inversion/312: ok | ok | ok | soft-irq lock-inversion/312: ok | ok | ok | hard-irq lock-inversion/321: ok | ok | ok | soft-irq lock-inversion/321: ok | ok | ok | hard-irq read-recursion/123: ok | soft-irq read-recursion/123: ok | hard-irq read-recursion/132: ok | soft-irq read-recursion/132: ok | hard-irq read-recursion/213: ok | soft-irq read-recursion/213: ok | hard-irq read-recursion/231: ok | soft-irq read-recursion/231: ok | hard-irq read-recursion/312: ok | soft-irq read-recursion/312: ok | hard-irq read-recursion/321: ok | soft-irq read-recursion/321: ok | --------------------------------+-----+---------------- Good, all 210 testcases passed! | --------------------------------+ Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1f194a4c393103ac925001d7e04b05fbb122580d Author: Heiko Carstens Date: Mon Jul 3 00:24:46 2006 -0700 [PATCH] lockdep: irqtrace subsystem, s390 support irqtrace support for s390. Signed-off-by: Heiko Carstens Signed-off-by: Ingo Molnar Cc: Martin Schwidefsky Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6375e2b74c620794e1a27a26e4338aec2e41346a Author: Ingo Molnar Date: Mon Jul 3 00:24:45 2006 -0700 [PATCH] lockdep: irqtrace cleanup of include/asm-x86_64/irqflags.h Clean up the x86-64 irqflags.h file: - macro => inline function transformation - simplifications - style fixes Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: Andi Kleen Cc: Jan Beulich Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2601e64d262ee5ed4d4a5737345803800d9c4db3 Author: Ingo Molnar Date: Mon Jul 3 00:24:45 2006 -0700 [PATCH] lockdep: irqtrace subsystem, x86_64 support Add irqflags-tracing support to x86_64. [akpm@osdl.org: build fix] Signed-off-by: Ingo Molnar Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c8558fcdecb1f920df8050be4f2d5f499060030e Author: Ingo Molnar Date: Mon Jul 3 00:24:44 2006 -0700 [PATCH] lockdep: irqtrace cleanup of include/asm-i386/irqflags.h Clean up the x86 irqflags.h file: - macro => inline function transformation - simplifications - style fixes Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55f327fa9e876758491a82af7491104f1cc3fc4d Author: Ingo Molnar Date: Mon Jul 3 00:24:43 2006 -0700 [PATCH] lockdep: irqtrace subsystem, i386 support Add irqflags-tracing support to i386. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55df314fbdb44c20fa7a5112d16546ee970c1d76 Author: Ingo Molnar Date: Mon Jul 3 00:24:43 2006 -0700 [PATCH] lockdep: irqtrace subsystem, docs Add Documentation/irqflags-tracing.txt. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit de30a2b355ea85350ca2f58f3b9bf4e5bc007986 Author: Ingo Molnar Date: Mon Jul 3 00:24:42 2006 -0700 [PATCH] lockdep: irqtrace subsystem, core Accurate hard-IRQ-flags and softirq-flags state tracing. This allows us to attach extra functionality to IRQ flags on/off events (such as trace-on/off). Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5bdc9b447c0076f494a56fdcd93ee8c5e78a2afd Author: Heiko Carstens Date: Mon Jul 3 00:24:41 2006 -0700 [PATCH] lockdep: stacktrace subsystem, s390 support stacktrace interface for s390 as needed by lock validator. [clg@fr.ibm.com: build fix] Signed-off-by: Heiko Carstens Acked-by: Ingo Molnar Cc: Martin Schwidefsky Cc: Arjan van de Ven Signed-off-by: Cedric Le Goater Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 21b32bbff950771f196da91011249fa05fa83b32 Author: Ingo Molnar Date: Mon Jul 3 00:24:40 2006 -0700 [PATCH] lockdep: stacktrace subsystem, x86_64 support Framework to generate and save stacktraces quickly, without printing anything to the console. x86_64 support. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4a7c7197817e7180f56110334d961f4aa6ac69cb Author: Ingo Molnar Date: Mon Jul 3 00:24:39 2006 -0700 [PATCH] lockdep: stacktrace subsystem, i386 support Framework to generate and save stacktraces quickly, without printing anything to the console. i386 support. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cbbd1fa72d22896332301ca7e6b7164284be105c Author: Heiko Carstens Date: Mon Jul 3 00:24:38 2006 -0700 [PATCH] lockdep: s390 CONFIG_FRAME_POINTER support CONFIG_FRAME_POINTER support for s390. Signed-off-by: Heiko Carstens Acked-by: Ingo Molnar Cc: Martin Schwidefsky Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8637c09901049f061b94f684915d4f18ecf91d79 Author: Ingo Molnar Date: Mon Jul 3 00:24:38 2006 -0700 [PATCH] lockdep: stacktrace subsystem, core Framework to generate and save stacktraces quickly, without printing anything to the console. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f0a5c315eb266edc608a29971bb4ff1a3025c58f Author: Ingo Molnar Date: Mon Jul 3 00:24:37 2006 -0700 [PATCH] lockdep: i386 remove multi entry backtraces Remove CONFIG_STACK_BACKTRACE_COLS. This feature didnt work out: instead of making kernel debugging more efficient, it produces much harder to read stacktraces! Check out this trace for example: http://static.flickr.com/47/158326090_35d0129147_b_d.jpg That backtrace could have been printed much nicer as a one-entry-per-line thing, taking the same amount of screen real-estate. Plus we remove 30 lines of kernel code as well. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c9ca1ba5bde45839cdc4f8ab93730cb68e6ee8a6 Author: Ingo Molnar Date: Mon Jul 3 00:24:36 2006 -0700 [PATCH] lockdep: x86_64 document stack frame internals Document stack frame nesting internals some more. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3ac94932a2c859e8c57a8af091fa39334e1c3f23 Author: Ingo Molnar Date: Mon Jul 3 00:24:36 2006 -0700 [PATCH] lockdep: beautify x86_64 stacktraces Beautify x86_64 stacktraces to be more readable. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e4d919188554a77c798a267e098059bc9aa39726 Author: Ingo Molnar Date: Mon Jul 3 00:24:34 2006 -0700 [PATCH] lockdep: locking init debugging improvement Locking init improvement: - introduce and use __SPIN_LOCK_UNLOCKED for array initializations, to pass in the name string of locks, used by debugging Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9cebb5526833059f327d237a032422c762378b2a Author: Ingo Molnar Date: Mon Jul 3 00:24:33 2006 -0700 [PATCH] lockdep: mutex section binutils workaround Work around weird section nesting build bug causing smp-alternatives failures under certain circumstances. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a11b49a805665e13a56aa067afaf81d43ec1514 Author: Ingo Molnar Date: Mon Jul 3 00:24:33 2006 -0700 [PATCH] lockdep: better lock debugging Generic lock debugging: - generalized lock debugging framework. For example, a bug in one lock subsystem turns off debugging in all lock subsystems. - got rid of the caller address passing (__IP__/__IP_DECL__/etc.) from the mutex/rtmutex debugging code: it caused way too much prototype hackery, and lockdep will give the same information anyway. - ability to do silent tests - check lock freeing in vfree too. - more finegrained debugging options, to allow distributions to turn off more expensive debugging features. There's no separate 'held mutexes' list anymore - but there's a 'held locks' stack within lockdep, which unifies deadlock detection across all lock classes. (this is independent of the lockdep validation stuff - lockdep first checks whether we are holding a lock already) Here are the current debugging options: CONFIG_DEBUG_MUTEXES=y CONFIG_DEBUG_LOCK_ALLOC=y which do: config DEBUG_MUTEXES bool "Mutex debugging, basic checks" config DEBUG_LOCK_ALLOC bool "Detect incorrect freeing of live mutexes" Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fb7e42413a098cc45b3adf858da290033af62bae Author: Ingo Molnar Date: Mon Jul 3 00:24:31 2006 -0700 [PATCH] lockdep: remove mutex deadlock checking code With the lock validator we detect mutex deadlocks (and more), the mutex deadlock checking code is both redundant and slower. So remove it. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 36596243daf7e1d795c647de04af95e835b8c5b4 Author: Ingo Molnar Date: Mon Jul 3 00:24:31 2006 -0700 [PATCH] lockdep: remove DEBUG_BUG_ON() cleanup: remove unused DEBUG_BUG_ON() defines. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9e7f4d451e99b7592a96ad0efaf8bcc1e7b2f854 Author: Ingo Molnar Date: Mon Jul 3 00:24:30 2006 -0700 [PATCH] lockdep: rename DEBUG_WARN_ON() Rename DEBUG_WARN_ON() to the less generic DEBUG_LOCKS_WARN_ON() name, so that it's clear that this is a lock-debugging internal mechanism. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 61f4c3d6db3ecbdd4e1a2a7a1710c1410d085dd1 Author: Ingo Molnar Date: Mon Jul 3 00:24:29 2006 -0700 [PATCH] lockdep: remove RWSEM_DEBUG remnants RWSEM_DEBUG used to be a printk based 'tracing' facility, probably used for very early prototypes of the rwsem code. Remove it. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c4e05116a2c4d8187127dbf77ab790aa57a47388 Author: Ingo Molnar Date: Mon Jul 3 00:24:29 2006 -0700 [PATCH] lockdep: clean up rwsems Clean up rwsems. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b3db9c542e18b71d4820da4dd9401ee030feacb Author: Ingo Molnar Date: Mon Jul 3 00:24:28 2006 -0700 [PATCH] lockdep: add DECLARE_COMPLETION_ONSTACK() API lockdep needs to have the waitqueue lock initialized for on-stack waitqueues implicitly initialized by DECLARE_COMPLETION(). Introduce the API. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d7e9629de051bb4b1d104588cd97673ad770809e Author: Ingo Molnar Date: Mon Jul 3 00:24:27 2006 -0700 [PATCH] lockdep: add local_irq_enable_in_hardirq() API Introduce local_irq_enable_in_hardirq() API. It is currently aliased to local_irq_enable(), hence has no functional effects. This API will be used by lockdep, but even without lockdep this will better document places in the kernel where a hardirq context enables hardirqs. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c01d403b2e3e3f231b18ebd07ad64ecbe6a258a5 Author: Ingo Molnar Date: Mon Jul 3 00:24:27 2006 -0700 [PATCH] lockdep: add disable/enable_irq_lockdep() API lockdep wants to use the disable_irq()/enable_irq() prototypes before they are provied by the platform's asm/irq.h. So move them out of the CONFIG_GENERIC_HARDIRQS define - all architectures have a common prototype for this anyway. Add special lockdep variants of irq line disabling/enabling. These should be used for locking constructs that know that a particular irq context which is disabled, and which is the only irq-context user of a lock, that it's safe to take the lock in the irq-disabled section without disabling hardirqs. [akpm@osdl.org: build fix] Signed-off-by: Ingo Molnar Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a875a69f8b00a38b4f40d9632a4fc71a159f0e0d Author: Ingo Molnar Date: Mon Jul 3 00:24:26 2006 -0700 [PATCH] lockdep: add per_cpu_offset() Add the per_cpu_offset() generic method. (used by the lock validator) Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d8fdf5c76816e5263073008f03f097ffc713db3 Author: Heiko Carstens Date: Mon Jul 3 00:24:25 2006 -0700 [PATCH] lockdep: add print_ip_sym() Provide a common print_ip_sym() function that prints the passed instruction pointer as well as the symbol belonging to it. Avoids adding a bunch of #ifdef CONFIG_64BIT in order to get the printk format right on 32/64 bit platforms. Acked-by: Ingo Molnar Cc: Arjan van de Ven Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4d435f9d8ff01ae726a2a84edb9c2457787a337e Author: Ingo Molnar Date: Mon Jul 3 00:24:24 2006 -0700 [PATCH] lockdep: add is_module_address() Add is_module_address() method - to be used by lockdep. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 93e028148fce0be9787de7fb097fa4c8582b78c1 Author: Heiko Carstens Date: Mon Jul 3 00:24:24 2006 -0700 [PATCH] lockdep: console_init after local_irq_enable() s390's console_init must enable interrupts, but early_boot_irqs_on() gets called later. To avoid problems move console_init() after local_irq_enable(). Signed-off-by: Heiko Carstens Acked-by: Ingo Molnar Cc: Martin Schwidefsky Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e541a4ae534a7e59ad464af9abea382b3035724 Author: Ingo Molnar Date: Mon Jul 3 00:24:23 2006 -0700 [PATCH] lockdep: floppy.c irq release fix The lock validator triggered a number of bugs in the floppy driver, all related to the floppy driver allocating and freeing irq and dma resources from interrupt context. The initial solution was to use schedule_work() to push this into process context, but this caused further problems: for example the current floppy driver in -mm2 is totally broken and all floppy commands time out with an error. (as reported by Barry K. Nathan) This patch tries another solution: simply get rid of all that dynamic IRQ and DMA allocation/freeing. I doubt it made much sense back in the heydays of floppies (if two devices raced for DMA or IRQ resources then we didnt handle those cases too gracefully anyway), and today it makes near zero sense. So the new code does the simplest and most straightforward thing: allocate IRQ and DMA resources at module init time, and free them at module removal time. Dont try to release while the driver is operational. This, besides making the floppy driver functional again has an added bonus, floppy IRQ stats are finally persistent and visible in /proc/interrupts: 6: 63 XT-PIC-level floppy Besides normal floppy IO i have also tested IO error handling, motor-off timeouts, etc. - and everything seems to be working fine. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5863aa651bd79a6bb15972894306923db088e71c Author: Andrew Morton Date: Mon Jul 3 00:24:22 2006 -0700 [PATCH] sparc: resource warning fix sound/sparc/amd7930.c: In function 'amd7930_attach_common': sound/sparc/amd7930.c:1040: warning: format '%08lx' expects type 'long unsigned int', but argument 5 has type 'resource_size_t' sound/sparc/cs4231.c:2043: warning: format '%016lx' expects type 'long unsigned int', but argument 5 has type 'resource_size_t' sound/sparc/dbri.c: In function 'dbri_attach': sound/sparc/dbri.c:2650: warning: format '%016lx' expects type 'long unsigned int', but argument 5 has type 'resource_size_t' Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6b8f3ef454d60e0c7ec42400400dc0fe7b5a4f7d Author: Andrew Morton Date: Mon Jul 3 00:24:21 2006 -0700 [PATCH] sparc i8042 build fix drivers/input/serio/i8042-sparcio.h:91: error: '__mod_of_device_table' aliased to undefined symbol 'i8042_match' Cc: Dmitry Torokhov DESC sparc: resource warning fix EDESC From: Andrew Morton sound/sparc/amd7930.c: In function 'amd7930_attach_common': sound/sparc/amd7930.c:1040: warning: format '%08lx' expects type 'long unsigned int', but argument 5 has type 'resource_size_t' Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 62322d2554d2f9680c8ace7bbf1f97d8fa84ad1a Author: Arjan van de Ven Date: Mon Jul 3 00:24:21 2006 -0700 [PATCH] make more file_operation structs static Mark the static struct file_operations in drivers/char as const. Making them const prevents accidental bugs, and moves them to the .rodata section so that they no longer do any false sharing; in addition with the proper debug option they are then protected against corruption.. [akpm@osdl.org: build fix] Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d459ec0baa5d22e111dfb139c46d6d788a9eac20 Author: Antonino A. Daplas Date: Mon Jul 3 00:24:20 2006 -0700 [PATCH] vt: Decrement ref count of the VT backend on deallocation When a VT is newly allocated, the module reference count of the backend will be incremented. This should be balanced by a module_put() when this VT is deallocated. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 36c9366efd63e4bab82d46e166140bddf3acc4cf Author: Vitaly Wool Date: Mon Jul 3 00:24:19 2006 -0700 [PATCH] fbdev: Add framebuffer and display update module support for pnx4008 Add support for Display Update Module and RGB framebuffer device on Philips PNX4008 ARM board. Signed-off-by: Grigory Tolstolytkin Signed-off-by: Vitaly Wool Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8320204ab495c858da7b6501f49a71b53d828e74 Author: Michael Krufky Date: Mon Jul 3 00:24:18 2006 -0700 [PATCH] add Mike Isely as pvrusb2 maintainer Update MAINTAINERS with contact info for Mike Isely, the PVRUSB2 maintainer, while also adding the pvrusb2 mailing list and web site. Signed-off-by: Mike Isely Signed-off-by: Michael Krufky Cc: Mauro Carvalho Chehab Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f40efbdf49913cad50edce5aa9756896c30424f Author: Randy Dunlap Date: Mon Jul 3 00:24:15 2006 -0700 [PATCH] kernel-doc MAINTAINERS Martin says that I can add self to MAINTAINERS. Signed-off-by: Randy Dunlap Cc: Martin Waitz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ce51059be56f63762089412b3ece348067afda85 Author: Chuck Ebbert <76306.1226@compuserve.com> Date: Mon Jul 3 00:24:14 2006 -0700 [PATCH] binfmt_elf: fix checks for bad address Fix check for bad address; use macro instead of open-coding two checks. Taken from RHEL4 kernel update. From: Ernie Petrides For background, the BAD_ADDR() macro should return TRUE if the address is TASK_SIZE, because that's the lowest address that is *not* valid for user-space mappings. The macro was correct in binfmt_aout.c but was wrong for the "equal to" case in binfmt_elf.c. There were two in-line validations of user-space addresses in binfmt_elf.c, which have been appropriately converted to use the corrected BAD_ADDR() macro in the patch you posted yesterday. Note that the size checks against TASK_SIZE are okay as coded. The additional changes that I propose are below. These are in the error paths for bad ELF entry addresses once load_elf_binary() has already committed to exec'ing the new image (following the tearing down of the task's original address space). The 1st hunk deals with the interp-side of the outer "if". There were two problems here. The printk() should be removed because this path can be triggered at will by a bogus interpreter image created and used by a malicious user. Further, the error code should not be ENOEXEC, because that causes the loop in search_binary_handler() to continue trying other exec handlers (twice, in fact). But it's too late for this to work correctly, because the user address space has already been torn down, and an exec() failure cannot be returned to the user code because the code no longer exists. The only recovery is to force a SIGSEGV, but it's best to terminate the search loop immediately. I somewhat arbitrarily chose EINVAL as a fallback error code, but any error returned by load_elf_interp() will override that (but this value will never be seen by user-space). The 2nd hunk deals with the non-interp-side of the outer "if". There were two problems here as well. The SIGSEGV needs to be forced, because a prior sigaction() syscall might have set the associated disposition to SIG_IGN. And the ENOEXEC should be changed to EINVAL as described above. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Ernie Petrides Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9614634fe6a138fd8ae044950700d2af8d203f97 Author: Christoph Lameter Date: Mon Jul 3 00:24:13 2006 -0700 [PATCH] ZVC/zone_reclaim: Leave 1% of unmapped pagecache pages for file I/O It turns out that it is advantageous to leave a small portion of unmapped file backed pages if all of a zone's pages (or almost all pages) are allocated and so the page allocator has to go off-node. This allows recently used file I/O buffers to stay on the node and reduces the times that zone reclaim is invoked if file I/O occurs when we run out of memory in a zone. The problem is that zone reclaim runs too frequently when the page cache is used for file I/O (read write and therefore unmapped pages!) alone and we have almost all pages of the zone allocated. Zone reclaim may remove 32 unmapped pages. File I/O will use these pages for the next read/write requests and the unmapped pages increase. After the zone has filled up again zone reclaim will remove it again after only 32 pages. This cycle is too inefficient and there are potentially too many zone reclaim cycles. With the 1% boundary we may still remove all unmapped pages for file I/O in zone reclaim pass. However. it will take a large number of read and writes to get back to 1% again where we trigger zone reclaim again. The zone reclaim 2.6.16/17 does not show this behavior because we have a 30 second timeout. [akpm@osdl.org: rename the /proc file and the variable] Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cb6358eb69d9854f65f2979c0ce9280eee041828 Author: Bjorn Helgaas Date: Mon Jul 3 00:24:12 2006 -0700 [PATCH] SERIAL: allow shared 8250_pnp interrupts PNP devices can use shared interrupts, so check to see whether we'll need SA_SHIRQ for request_irq(). The builtin PDH UART on the HP rx8640 is an example of an ACPI/PNP device that uses a shareable level-triggered, active-low interrupt. The interrupt can be shared in very large I/O configurations or by artificially lowering IA64_DEF_LAST_DEVICE_VECTOR. Signed-off-by: Bjorn Helgaas Cc: Adam Belay Cc: Matthieu Castet Cc: Li Shaohua Cc: Len Brown Acked-by: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c32928c579d88acd43981b59e86900da65f40762 Author: Bjorn Helgaas Date: Mon Jul 3 00:24:10 2006 -0700 [PATCH] PNPACPI: support shareable interrupts ACPI supplies a "shareable" indication, but PNPACPI ignores it. If a PNP device uses a shared interrupt, request_irq() fails because the PNP driver can't tell whether to supply SA_SHIRQ. This patch allows PNP drivers to test (pnp_irq_flags(dev, 0) & IORESOURCE_IRQ_SHAREABLE) Signed-off-by: Bjorn Helgaas Cc: Adam Belay Cc: Matthieu Castet Cc: Li Shaohua Cc: Len Brown Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c61a8416ed3db84481651270032696a4781cac17 Author: Theodore Tso Date: Mon Jul 3 00:24:09 2006 -0700 [PATCH] uml build fix This is needed to fix UML compilation given that alternatives_smp_module_add and alternatives_smp_module_del are null inline functions if !CONFIG_SMP. Signed-off-by: "Theodore Ts'o" Cc: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6abd219c6eab92172038e4719e02905acb7b68d4 Author: Arjan van de Ven Date: Mon Jul 3 00:24:07 2006 -0700 [PATCH] bcm43xx: netlink deadlock fix reported by Jure Repinc: > > http://bugzilla.kernel.org/show_bug.cgi?id=6773 > > checked out dmesg output and found the message > > > > ====================================================== > > [ BUG: hard-safe -> hard-unsafe lock order detected! ] > > ------------------------------------------------------ > > > > starting at line 660 of the dmesg.txt that I will attach. The patch below should fix the deadlock, albeit I suspect it's not the "right" fix; the right fix may well be to move the rx processing in bcm43xx to softirq context. [it's debatable, ipw2200 hit this exact same bug; at some point it's better to bite the bullet and move this to the common layer as my patch below does] Make the nl_table_lock irq-safe; it's taken for read in various netlink functions, including functions that several wireless drivers (ipw2200, bcm43xx) want to call from hardirq context. The deadlock was found by the lock validator. Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Signed-off-by: Herbert Xu Cc: Michael Buesch Cc: "John W. Linville" Cc: Jeff Garzik Acked-by: "David S. Miller" Cc: jamal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b02454f43578b24bc8b8ab54a239156841f56f6d Author: Heiko Carstens Date: Mon Jul 3 00:24:06 2006 -0700 [PATCH] lockdep: special s390 print_symbol() version Have a special version of print_symbol() for s390 which clears the most significant bit of addr before calling __print_symbol(). This seems to be better than checking/changing each place in the kernel that saves an instruction pointer. Without this the output would look like: hardirqs last enabled at (30907): [<80018c6a>] 0x80018c6a hardirqs last disabled at (30908): [<8001e48c>] 0x8001e48c softirqs last enabled at (30904): [<8001dc96>] 0x8001dc96 softirqs last disabled at (30897): [<8001dc50>] 0x8001dc50 instead of this: hardirqs last enabled at (19421): [<80018c72>] cpu_idle+0x176/0x1c4 hardirqs last disabled at (19422): [<8001e494>] io_no_vtime+0xa/0x1a softirqs last enabled at (19418): [<8001dc9e>] do_softirq+0xa6/0xe8 softirqs last disabled at (19411): [<8001dc58>] do_softirq+0x60/0xe8 Acked-by: Ingo Molnar Cc: Arjan van de Ven Cc: Martin Schwidefsky Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dada0769b95602ae791b9c4cd1cbecfc367f00a9 Author: Andrew Morton Date: Mon Jul 3 00:24:05 2006 -0700 [PATCH] genirq ia64 cleanup Remove duplicate/redundant/wrong IRQF_PERCPU definition. Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 88fecaa27f398d95db6c405a1908292c6f0bc3ef Author: john stultz Date: Mon Jul 3 00:24:04 2006 -0700 [PATCH] time initialisation fix We're not reay to take a timer interrupt until timekeeping_init() has run. But time_init() will start the time interrupt and if it is called with local interrupts enabled we'll immediately take an interrupt and die. Fix that by running timekeeping_init() prior to time_init(). We don't know _why_ local interrupts got enabled on Jesse Brandeburg's machine. That's a separate as-yet-unsolved problem. THe patch adds a little bit of debugging to detect that. This whole requirement that local interrupts be held off during early boot keeps on biting us. Signed-off-by: John Stultz Cc: Jesse Brandeburg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0fbfb036adee72cbfff170075e84ffd9e54f1938 Author: Benjamin Herrenschmidt Date: Tue Jul 4 07:31:37 2006 +1000 [POWERPC] Actually copy over i8259.c to arch/ppc/syslib this time Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 63104eec234bdecb55fd9c15467ae00d0a3f42ac Author: Sam Ravnborg Date: Mon Jul 3 23:30:54 2006 +0200 kbuild: introduce utsrelease.h include/linux/version.h contained both actual KERNEL version and UTS_RELEASE that contains a subset from git SHA1 for when kernel was compiled as part of a git repository. This had the unfortunate side-effect that all files including version.h would be recompiled when some git changes was made due to changes SHA1. Split it out so we keep independent parts in separate files. Also update checkversion.pl script to no longer check for UTS_RELEASE. Signed-off-by: Sam Ravnborg commit 913b83944b9e13c60ca4ef95cf262547ff6bf93b Author: Kim Phillips Date: Fri Jun 30 18:41:29 2006 -0500 powerpc: add defconfig for Freescale MPC8349E-mITX board Provide default configuration for the Freescale MPC8349E-mITX board, including the on-board 16MB flash. Signed-off-by: Kim Phillips Signed-off-by: Timur Tabi Signed-off-by: Kumar Gala commit 00280166993af8469dbfee24b779b61d3dd326c3 Author: Kim Phillips Date: Fri Jun 30 18:41:20 2006 -0500 powerpc: Add base support for the Freescale MPC8349E-mITX eval board Added support for the Freescale MPC8343e-mITX board. Currently based on the 8343 SYS code. The 2nd PHY (5-port switch) and SATA are untested (work in progress). Signed-off-by: Kim Phillips Signed-off-by: Timur Tabi Signed-off-by: Kumar Gala commit cbdb54d3ca986e30d0b8c1f755c3910b5573baae Author: Kim Phillips Date: Mon Jul 3 15:10:14 2006 -0500 Documentation: correct values in MPC8548E SEC example node Signed-off-by: Kim Phillips Signed-off-by: Kumar Gala commit 0f1482fdd7e5efc473335b92f350027b8f1519fb Author: Russell King Date: Mon Jul 3 15:32:47 2006 +0100 [ARM] Fix lh7a40x_udc.c In 3ae5eaec1d2d9c0cf53745352e7d4b152810ba24, I broke this driver by missing a comma. Replace the missing comma. Signed-off-by: Russell King commit 61a116ef29e712147d7ee7a6738886e6f91df5f5 Author: Russell King Date: Mon Jul 3 15:22:35 2006 +0100 [SERIAL] Ensure 8250_pci quirks are not marked __devinit The 8250_pci quirks must not be marked __devinit since they may be used from parport_serial. We only really need to mark those which might be used by cards recognised by parport_serial, but that wouldn't allow static checking. Signed-off-by: Russell King commit 67f3a58856b6a41a46e9256a79a8ca3809f47cc6 Author: Russell King Date: Mon Jul 3 13:30:52 2006 +0100 [ARM] Fix warning in consistent.c No need for 'cr' to be a local variable, which is unused in the SMP case, and only used once in the UP case. Just call get_cr() directly. Signed-off-by: Russell King commit 4e19025bc7be18e4d1dc8d1fde06c2d23927eb4d Author: Russell King Date: Mon Jul 3 13:29:38 2006 +0100 [ARM] Fix warnings in arch/arm/kernel/setup.c cr_alignment is unsigned long, so should be the format string. Signed-off-by: Russell King commit c9e4143c4df08f7b54ba2099480266a6a1303f17 Author: Russell King Date: Mon Jul 3 13:29:03 2006 +0100 [ARM] Fix ecard.c resource warnings. Platforms which use ecard.c always have 32-bit resources, so might as well lose the "long" format strings. Signed-off-by: Russell King commit 020732ad9add86b71e9d90d5fa7687d51f58ef49 Author: Russell King Date: Mon Jul 3 13:18:04 2006 +0100 [ARM] Fix ISA IRQ resources The ISA IRQ code was not using named initialisers, so merging the 64-bit resource code (which re-ordered the struct members) broke this. Fix it up to use named initialisers. Signed-off-by: Russell King commit 906243d07b8bfebeaa05b5aeaa0e5ab2d4034954 Author: Russell King Date: Mon Jul 3 12:44:30 2006 +0100 [ARM] Fix bad asm instruction in proc-arm925.S Signed-off-by: Russell King commit 00eb0f6b6595107dd8be80d1af2220cedb71130d Author: Russell King Date: Mon Jul 3 12:36:07 2006 +0100 [ARM] More missing proc-macros.S includes Signed-off-by: Russell King commit 0ebfff1491ef85d41ddf9c633834838be144f69f Author: Benjamin Herrenschmidt Date: Mon Jul 3 21:36:01 2006 +1000 [POWERPC] Add new interrupt mapping core and change platforms to use it This adds the new irq remapper core and removes the old one. Because there are some fundamental conflicts with the old code, like the value of NO_IRQ which I'm now setting to 0 (as per discussions with Linus), etc..., this commit also changes the relevant platform and driver code over to use the new remapper (so as not to cause difficulties later in bisecting). This patch removes the old pre-parsing of the open firmware interrupt tree along with all the bogus assumptions it made to try to renumber interrupts according to the platform. This is all to be handled by the new code now. For the pSeries XICS interrupt controller, a single remapper host is created for the whole machine regardless of how many interrupt presentation and source controllers are found, and it's set to match any device node that isn't a 8259. That works fine on pSeries and avoids having to deal with some of the complexities of split source controllers vs. presentation controllers in the pSeries device trees. The powerpc i8259 PIC driver now always requests the legacy interrupt range. It also has the feature of being able to match any device node (including NULL) if passed no device node as an input. That will help porting over platforms with broken device-trees like Pegasos who don't have a proper interrupt tree. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 7cddc397027ddf80b2d916f6e8fb15a21e9791c5 Author: Lennert Buytenhek Date: Mon Jul 3 12:26:02 2006 +0100 [ARM] 3708/2: fix SMP build after section ioremap changes Patch from Lennert Buytenhek Commit ff0daca525dde796382b9ccd563f169df2571211 broke the SMP build, this patch fixes it up again. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit f63e115fb50db39706b955b81e3375ef6bab2268 Author: Benjamin Herrenschmidt Date: Mon Jul 3 19:36:30 2006 +1000 [POWERPC] Copy i8259 code back to arch/ppc This copies the i8259 interrupt controller driver from arch/powerpc to arch/ppc. It's currently shared by both architectures, but the upcoming arch/powerpc interrupt changes will break the arch/ppc builds. The changes are too important to just use #ifdef's in the driver. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit cc9fd71c62f542233c412b5fabc1bbe0c4d5ad08 Author: Benjamin Herrenschmidt Date: Mon Jul 3 19:35:17 2006 +1000 [POWERPC] New device-tree interrupt parsing code Adds new routines to prom_parse to walk the device-tree for interrupt information. This includes both direct mapping of interrupts and low level parsing functions for use with partial trees. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit b9e5b4e6a991a5a6d521f2e20a65835404b4169f Author: Benjamin Herrenschmidt Date: Mon Jul 3 19:32:51 2006 +1000 [POWERPC] Use the genirq framework This adapts the generic powerpc interrupt handling code, and all of the platforms except for the embedded 6xx machines, to use the new genirq framework. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 5a43a066b11ac2fe84cf67307f20b83bea390f83 Author: Benjamin Herrenschmidt Date: Mon Jul 3 19:54:59 2006 +1000 [PATCH] genirq: Allow fasteoi handler to retrigger disabled interrupts Make the fasteoi handler mark disabled interrupts as pending if they happen anyway. This allow implementation of a delayed disable scheme with the fasteoi handler. Signed-off-by: Benjamin Herrenschmidt Acked-by: Thomas Gleixner Acked-by: Ingo Molnar Signed-off-by: Paul Mackerras commit 3e9a69275f23baec86b54febc5dad0b2fc7fb200 Author: Benjamin Herrenschmidt Date: Mon Jul 3 17:25:26 2006 +1000 [POWERPC] Update the SWIM3 (powermac) floppy driver Port the PowerMac floppy driver (swim3) to use the macio device infrastructure. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 7c6efda5996c26c468eaba178af9bac8b70dbdcb Author: Benjamin Herrenschmidt Date: Mon Jul 3 17:24:15 2006 +1000 [POWERPC] Fix error handling in detecting legacy serial ports Previously we weren't checking for failures in translating device addresses from the firmware. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 980a65136569b841cebaad524a34482b0b1627a9 Author: Benjamin Herrenschmidt Date: Mon Jul 3 17:22:05 2006 +1000 [POWERPC] Fix booting on Momentum "Apache" board (a Maple derivative) This extends the maple device-tree workarounds to work on the Apache board as well, and extends the maple platform probing code to recognize the Apache board. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit ab13446616118dc61c00ea50cc49919400717dd0 Author: Benjamin Herrenschmidt Date: Mon Jul 3 17:19:48 2006 +1000 [POWERPC] Fix various offb and BootX-related issues This patch fixes various issues with offb (the default fbdev used on powerpc when no proper fbdev is supported). It was broken when using BootX under some circumstances and would fail to properly get the framebuffer base address in others. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 4ce631e7a229a0e073078a197ed37d437cabcde0 Author: Paul Mackerras Date: Mon Jul 3 16:36:17 2006 +1000 [POWERPC] Add a default config for 32-bit CHRP machines Signed-off-by: Paul Mackerras commit 29454dde27d8e340bb1987bad9aa504af7081eba Author: Thomas Gleixner Date: Mon Jul 3 02:22:22 2006 +0200 [PATCH] genirq: Fixup ARM devel merge ARM devel merge introduced new machine functionality which was not covered by the ARM -> genirq patches. Fix it up and make it compile again. Signed-off-by: Thomas Gleixner Signed-off-by: Linus Torvalds commit bb8d5a55a523869ebcdd004a08ed5fab86b474e3 Author: Thomas Gleixner Date: Mon Jul 3 02:21:18 2006 +0200 [PATCH] ARM: Fixup missing includes in arch/arm/mm/proc-.S For several proc-.S files the include of proc-macros.S is missing. Make it compile and work again. Signed-off-by: Thomas Gleixner Signed-off-by: Linus Torvalds commit 284c66806eb6df7f5c66d298681f1abe81a5a9ab Author: Thomas Gleixner Date: Mon Jul 3 02:20:32 2006 +0200 [PATCH] genirq:fixup missing SA_PERCPU replacement The irqflags consolidation converted SA_PERCPU_IRQ to IRQF_PERCPU but did not define the new constant. Signed-off-by: Thomas Gleixner Signed-off-by: Linus Torvalds commit 52e405eaa9806968e88b35d65e57acad954a5ab5 Author: Thomas Gleixner Date: Mon Jul 3 02:20:05 2006 +0200 [PATCH] ARM: fixup irqflags breakage after ARM genirq merge The irgflags consolidation did conflict with the ARM to generic IRQ conversion and was not applied for ARM. Fix it up. Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Signed-off-by: Linus Torvalds commit d061daa0e3abdddc28e21a37c8ac4536dedbf239 Author: Thomas Gleixner Date: Mon Jul 3 02:18:48 2006 +0200 [PATCH] genirq: ARM dyntick cleanup Linus: "The hacks in kernel/irq/handle.c are really horrid. REALLY horrid." They are indeed. Move the dyntick quirks to ARM where they belong. Signed-off-by: Thomas Gleixner Signed-off-by: Linus Torvalds commit 609c9991b193f99a9a9e941beffcdb540752f761 Author: Dave Jones Date: Thu Jun 29 16:52:53 2006 -0400 [POWERPC] fix implicit declaration on cell. (Only fails with -Werror-implicit-function-declaration, but it should still be fixed). arch/powerpc/platforms/cell/setup.c:145: error: implicit declaration of function 'udbg_init_rtas_console' Signed-off-by: Dave Jones Signed-off-by: Paul Mackerras commit a1af5b2fd49eb24ab8c024da5d853b09841d1f8f Author: Jeremy Kerr Date: Thu Jun 29 20:28:18 2006 +1000 [POWERPC] change get_property to return void * Change the get_property() function to return a void *. This allows us to later remove the cast done in the majority of callers. Built for pseries, iseries, pmac32, cell, cbesim, g5, systemsim, maple, and mpc* defconfigs Signed-off-by: Jeremy Kerr Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 4ebd9ab387b39c44165cd296a6637082a4f0f66a Author: Dominik Hackl Date: Sun Jul 2 17:29:26 2006 +0200 [PATCH] nfs: non-procfs build fix This fixes a bug in fs/nfs which makes it impossible to build nfs without having procfs enabled. Signed-off-by: Dominik Hackl Signed-off-by: Linus Torvalds commit 6ce6c7faf2d0fede5e1530b0f731a90f138fd69e Author: Thomas Gleixner Date: Sat Jul 1 19:29:47 2006 -0700 [PATCH] irq-flags: documentation: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: "Randy.Dunlap" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 65ca68b30073473583f6ca2f463cbd94ade43ddb Author: Thomas Gleixner Date: Sat Jul 1 19:29:46 2006 -0700 [PATCH] irq-flags: sound: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Jaroslav Kysela Cc: Takashi Iwai Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 63a43399db67d6f94364f933f68f38f58387737a Author: Thomas Gleixner Date: Sat Jul 1 19:29:45 2006 -0700 [PATCH] irq-flags: video: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d54b5caa832caa3715a458115b6ea79ad17c4f31 Author: Thomas Gleixner Date: Sat Jul 1 19:29:44 2006 -0700 [PATCH] irq-flags: usb: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 40663cc7f1c1ccf515d8af9470925a0cb2f59b5d Author: Thomas Gleixner Date: Sat Jul 1 19:29:43 2006 -0700 [PATCH] irq-flags: serial: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d6f359a2e06296418481239f8054a878f36e819 Author: Thomas Gleixner Date: Sat Jul 1 19:29:42 2006 -0700 [PATCH] irq-flags: scsi: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d8c8a2e8edc63d8aef7656678f41c6c603f0443 Author: Thomas Gleixner Date: Sat Jul 1 19:29:41 2006 -0700 [PATCH] irq-flags: rio: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6b4486e2e3b1044f157af44920b520f3593e3923 Author: Thomas Gleixner Date: Sat Jul 1 19:29:41 2006 -0700 [PATCH] irq-flags: pci: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c56e7214effd2fa50359e58832ad9c3eb51a3de Author: Thomas Gleixner Date: Sat Jul 1 19:29:40 2006 -0700 [PATCH] irq-flags: PARISC: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Kyle McMartin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1fb9df5d3069064c037c81c0ab8bf783ffa5e373 Author: Thomas Gleixner Date: Sat Jul 1 19:29:39 2006 -0700 [PATCH] irq-flags: drivers/net: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dace145374b8e39aeb920304c358ab5e220341ab Author: Thomas Gleixner Date: Sat Jul 1 19:29:38 2006 -0700 [PATCH] irq-flags: misc drivers: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8076fe32a7db9a6628589ffa372808e4ba25d222 Author: Thomas Gleixner Date: Sat Jul 1 19:29:37 2006 -0700 [PATCH] irq-flags: media: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ba02bec3888d391bad0fb0a8dd584f88eed6c8d Author: Thomas Gleixner Date: Sat Jul 1 19:29:36 2006 -0700 [PATCH] irq-flags: isdn: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 272ee69c653d4b4f15049ed956554085d4bdaa44 Author: Thomas Gleixner Date: Sat Jul 1 19:29:35 2006 -0700 [PATCH] irq-flags: firewire: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Jody McIntyre Cc: Ben Collins Cc: Stefan Richter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 362537b9abf02458967fc2bd9aa7cd18e3ef576a Author: Thomas Gleixner Date: Sat Jul 1 19:29:34 2006 -0700 [PATCH] irq-flags: ide: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Alan Cox Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 935f6e3abc76e868de1acbd76cf9b760e66cf237 Author: Thomas Gleixner Date: Sat Jul 1 19:29:34 2006 -0700 [PATCH] irq-flags: drivers/drm: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Dave Airlie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f2ed4c6bae23d2b7ef0ea2d272377e3de700c0c Author: Thomas Gleixner Date: Sat Jul 1 19:29:33 2006 -0700 [PATCH] irq-flags: drivers/char: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 69ab3912d1b4dbf27ea1a383cb5731251fc0e109 Author: Thomas Gleixner Date: Sat Jul 1 19:29:32 2006 -0700 [PATCH] irq-flags: drivers/block Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3cca53b02a5bab0f407b1add2f84c22c20243a79 Author: Thomas Gleixner Date: Sat Jul 1 19:29:31 2006 -0700 [PATCH] irq-flags: generic irq: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 85ac3ab254405edcc7bef7d61b03930247882efc Author: Thomas Gleixner Date: Sat Jul 1 19:29:31 2006 -0700 [PATCH] irq-flags: XTENSA: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b1e05aa2303e48b16e850c4be2513e60a3495238 Author: Thomas Gleixner Date: Sat Jul 1 19:29:29 2006 -0700 [PATCH] irq-flags: x86_64: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b91fbb8338bae702f5a6c984fb05f1a01f6590c Author: Thomas Gleixner Date: Sat Jul 1 19:29:28 2006 -0700 [PATCH] irq-flags: V850: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Miles Bader Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd6aa6502e7f82c39090aea29e4b644c29e720bd Author: Thomas Gleixner Date: Sat Jul 1 19:29:27 2006 -0700 [PATCH] irq-flags: UM: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6741320247fbf147ab8aa41b2a7201425ac1e1df Author: Thomas Gleixner Date: Sat Jul 1 19:29:26 2006 -0700 [PATCH] irq-flags: SPARC: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d356d7f4f2761b1391ec41404eefe280e4f11f76 Author: Thomas Gleixner Date: Sat Jul 1 19:29:26 2006 -0700 [PATCH] irq-flags: SPARC64: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6d20819f8050092d40e9c99c55d82c8e26d42599 Author: Thomas Gleixner Date: Sat Jul 1 19:29:25 2006 -0700 [PATCH] irq-flags: SH: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Paul Mundt Cc: Kazumoto Kojima Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5fb55ae955cee254f9e3b45636266a4855bb88a5 Author: Thomas Gleixner Date: Sat Jul 1 19:29:24 2006 -0700 [PATCH] irq-flags: SH64: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dacdb3b23a918d52ff52708b25d6d45dab7ea14b Author: Thomas Gleixner Date: Sat Jul 1 19:29:23 2006 -0700 [PATCH] irq-flags: S390: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Martin Schwidefsky Cc: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bc59d2800d535ff36dc9e6c5328b4a075076bbaa Author: Thomas Gleixner Date: Sat Jul 1 19:29:22 2006 -0700 [PATCH] irq-flags: PPC: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6714465e83e784d65d0f4dbab7f2238574febfce Author: Thomas Gleixner Date: Sat Jul 1 19:29:22 2006 -0700 [PATCH] irq-flags: POWERPC: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 733ea869e5756e0fd0333728cc1ed7c42e6ddfc0 Author: Thomas Gleixner Date: Sat Jul 1 19:29:21 2006 -0700 [PATCH] irq-flags: PARISC: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Kyle McMartin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f40298fddcc3c8115c6135c9733f5a0de52dcea9 Author: Thomas Gleixner Date: Sat Jul 1 19:29:20 2006 -0700 [PATCH] irq-flags: MIPS: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b0b9fdc123cf0f1b671ac3f593d77af325ad4cf3 Author: Thomas Gleixner Date: Sat Jul 1 19:29:19 2006 -0700 [PATCH] irq-flags: M68K: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Roman Zippel Cc: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f6f238875c93d020efb4d51cbca464dff31ec1f9 Author: Thomas Gleixner Date: Sat Jul 1 19:29:18 2006 -0700 [PATCH] irq-flags: M68KNOMMU: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Greg Ungerer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aff60147049c0be346909ee2e1dbe600a5c7aa91 Author: Thomas Gleixner Date: Sat Jul 1 19:29:18 2006 -0700 [PATCH] irq-flags: M32R: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 121a4226e89aae6654d667d58ab72df740b97b92 Author: Thomas Gleixner Date: Sat Jul 1 19:29:17 2006 -0700 [PATCH] irq-flags: IA64: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4879d77c4c2fdc81ba1ff0ad56fa41b3676d0472 Author: Thomas Gleixner Date: Sat Jul 1 19:29:16 2006 -0700 [PATCH] irq-flags: i386: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b98d3396f69f047163b3a1dc2ffabb7402a244b2 Author: Thomas Gleixner Date: Sat Jul 1 19:29:15 2006 -0700 [PATCH] irq-flags: H8300: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Yoshinori Sato Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bc2e2635bd814dc893e45e866774883a0a66cd36 Author: Thomas Gleixner Date: Sat Jul 1 19:29:15 2006 -0700 [PATCH] irq-flags: FRV: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aa7135ff33bf697196f2a3104d93837096c63ff0 Author: Thomas Gleixner Date: Sat Jul 1 19:29:14 2006 -0700 [PATCH] irq-flags: CRIS: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Mikael Starvik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit af0f4d3609d97dc5edbed759456ae568f6ac9ca1 Author: Thomas Gleixner Date: Sat Jul 1 19:29:12 2006 -0700 [PATCH] irq-flags: ARM26: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d18ecedc021351ca432a5b7e28d8f91c00957dc7 Author: Thomas Gleixner Date: Sat Jul 1 19:29:11 2006 -0700 [PATCH] irq-flags: ALPHA: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Ivan Kokshaysky Cc: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e21361619328751e2637b004e14cf360aafbddc Author: Thomas Gleixner Date: Sat Jul 1 19:29:03 2006 -0700 [PATCH] irq-flags: consolidate flags for request_irq The recent interrupt rework introduced bit value conflicts with sparc. Instead of introducing new architecture flags mess, move the interrupt SA_ flags out of the signal namespace and replace them by interrupt related flags. This allows to remove the obsolete SA_INTERRUPT flag and clean up the bit field values. This patch: Move the interrupt related SA_ flags out of linux/signal.h and rename them to IRQF_ . This moves the interrupt related flags out of the signal namespace and allows to remove the architecture dependencies. SA_INTERRUPT is not needed by userspace and glibc so it can be removed safely. The existing SA_ constants are kept for easy transition and will be removed after a 6 month grace period. Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: "Randy.Dunlap" Cc: Jaroslav Kysela Cc: Takashi Iwai Cc: "Antonino A. Daplas" Cc: Greg KH Cc: Russell King Cc: James Bottomley Cc: Kyle McMartin Cc: Jeff Garzik Cc: Mauro Carvalho Chehab Cc: Karsten Keil Cc: Jody McIntyre Cc: Ben Collins Cc: Stefan Richter Cc: Alan Cox Cc: Bartlomiej Zolnierkiewicz Cc: Dave Airlie Cc: Jens Axboe Cc: Chris Zankel Cc: Andi Kleen Cc: Miles Bader Cc: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Cc: Paul Mundt Cc: Kazumoto Kojima Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: Ralf Baechle Cc: Roman Zippel Cc: Geert Uytterhoeven Cc: Greg Ungerer Cc: "Luck, Tony" Cc: Yoshinori Sato Cc: David Howells Cc: Mikael Starvik Cc: Russell King Cc: Ivan Kokshaysky Cc: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 947deee8904b3c2edc7f59ab6e6242499e4dc434 Author: Russell King Date: Sun Jul 2 20:45:51 2006 +0100 [SERIAL] Convert fifosize to an unsigned int Some UARTs have more than 255 bytes of FIFO, which can't be represented by an unsigned char. Change the kernel's internal structure to be an unsigned int, but still export an unsigned char via the TIOCGSERIAL ioctl. If the TIOCSSERIAL ioctl provides a fifo size of 0, assume this means "don't change" otherwise we'll corrupt the larger fifo sizes. Signed-off-by: Russell King commit 34c162f79e374556dd1384437f0dab558b5dc657 Author: Sam Ravnborg Date: Sun Jul 2 20:21:49 2006 +0200 kbuild: explicit turn off gcc stack-protector Ubuntu has enabled -fstack-protector per default in gcc breaking kernel build. Explicit turn it off for now. Later we may decide to make it configurable if the kernel starts to support it. Signed-off-by: Sam Ravnborg commit 4cca56c50427eecfa2428cdee722848cd82f443c Author: Pierre Ossman Date: Fri Jun 30 02:22:34 2006 -0700 [MMC] sdhci: remove duplicate error message When there is remaining blocks untransferred, we get two error messages saying almost the same thing. Make sure at most one is shown. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 98608076a21914ab12f1c858a0cdf55366260f12 Author: Pierre Ossman Date: Fri Jun 30 02:22:34 2006 -0700 [MMC] sdhci: force DMA on some controllers Some controllers incorrectly report that the cannot do DMA. Forcefully enable it for those that we know it works fine on. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 645289dca5021224279e67b4655796cafdfdad00 Author: Pierre Ossman Date: Fri Jun 30 02:22:33 2006 -0700 [MMC] sdhci: quirk for broken reset Some controllers fail to complete a reset unless you touch the clock register first. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 067da0f4faea4cc077a346d7848eec39a58870b4 Author: Pierre Ossman Date: Fri Jun 30 02:22:32 2006 -0700 [MMC] sdhci: Add SDHCI controller ids Add ids for SDHCI controllers so that they can be identified for quirks. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit d6b0c53723753fc0cfda63f56735b225c43e1e9a Author: James Bottomley Date: Sun Jul 2 10:06:28 2006 -0500 [SCSI] fix error handling in scsi_io_completion There was a logic fault in scsi_io_completion() where zero transfer commands that complete successfully were sent to the block layer as not up to date. This patch removes the if (good_bytes > 0) gate around the successful completion, since zero transfer commands do have good_bytes == 0. Signed-off-by: James Bottomley commit 2c5f394025df6e54a9c09afda03855f3877b9afa Author: Pierre Ossman Date: Fri Jun 30 02:22:32 2006 -0700 [MMC] sdhci: version bump sdhci New version number for sdhci driver. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit df673b227ce08a7706b30fd2bf6512393d9c3c29 Author: Pierre Ossman Date: Fri Jun 30 02:22:31 2006 -0700 [MMC] sdhci: support controller specific quirks As some specific controllers will have bugs, we need a way to map special behaviour to certain hardware. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 6743527441430586aa82a0dee1b2700a2a974ebc Author: Pierre Ossman Date: Fri Jun 30 02:22:31 2006 -0700 [MMC] sdhci: more DMA capabilities tests Properly test for controller interface to see if it's DMA capable. As many controllers are misconfigured in this regard, also add debug parameters to force DMA support either way. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit d96649ed5ace812ffc8d86252d7c663326ca47f8 Author: Pierre Ossman Date: Fri Jun 30 02:22:30 2006 -0700 [MMC] sdhci: reset sdhci controller early The specification states that the capabilities register might need a reset to get correct values after boot up. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 4a9655051fb1efa568e53baf5dfb21e33bad6bf6 Author: Pierre Ossman Date: Fri Jun 30 02:22:29 2006 -0700 [MMC] sdhci: check controller version Check the interface version of the controller and bail out if it's an unknown version. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit fd2208d7c72ef5995b730f1e23b082261499e334 Author: Pierre Ossman Date: Fri Jun 30 02:22:28 2006 -0700 [MMC] sdhci: check only relevant inhibit bits Conform to the sdhci specification as to which inhibit bits should be checked at different times. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 1d676e02970d9e511c9b96101501da90954ee265 Author: Pierre Ossman Date: Sun Jul 2 16:52:10 2006 +0100 [MMC] sdhci: Test for invalid block size The controller has an upper limit on the block size. Make sure we do not cross it. Signed-off-by: Pierre Ossman Signed-off-by: Russell King commit bab7696184bbf0ea48d56902bd1f9ac983079ad2 Author: Pierre Ossman Date: Sun Jul 2 16:51:35 2006 +0100 [MMC] sdhci: Avoid sdhci DMA boundaries The sdhci controllers will issue an interrupt when a configurable number of bytes have been transfered using DMA. The purpose is to handle multiple, scattered memory pages. Unfortunately, it requires that all transfers are completely aligned to memory pages, which we cannot guarantee. So we just disable the function. Signed-off-by: Pierre Ossman Signed-off-by: Russell King commit a406f5a3b68ee1db2306a2ba1c9b00dbd3505d05 Author: Pierre Ossman Date: Sun Jul 2 16:50:59 2006 +0100 [MMC] Fix sdhci PIO routines The sdhci controllers operate with blocks, not bytes. The PIO routines must therefore make sure that the minimum unit transfered is a complete block. Signed-off-by: Pierre Ossman Signed-off-by: Russell King commit 3192a28f7d34ea8f1d0fef8ca5bc0314b5b5bb19 Author: Pierre Ossman Date: Fri Jun 30 02:22:26 2006 -0700 [MMC] sdhci: fix interrupt handling The specification says that interrupts should be cleared before the source is removed. We should also not set unknown bits. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit c7fa9963ee6317b54e85b260791d603ea2feb8e3 Author: Pierre Ossman Date: Fri Jun 30 02:22:25 2006 -0700 [MMC] sdhci: correct register order The sdhci specification states that some registers must be written to in a specific order. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 1c8cde92fa5c57daa9ff58d970ca6374f8d484a2 Author: Pierre Ossman Date: Fri Jun 30 02:22:25 2006 -0700 [MMC] sdhci: proper timeout handling Use the give timeout clock and calculate a proper timeout instead of using the maximum at all times. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit e16514d8d86ecbde18a2a7495cf028861b34c157 Author: Pierre Ossman Date: Fri Jun 30 02:22:24 2006 -0700 [MMC] sdhci: fix sdhci reset timeout The reset register is automatically cleared when the reset has completed. Hence, we should busy wait and not have a fixed delay. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 7cb2c76fa2251474e42d55b75163c9d7ed11741e Author: Pierre Ossman Date: Fri Jun 30 02:22:23 2006 -0700 [MMC] sdhci: fix timeout loops in sdhci The current timeout loop assume that jiffies are updated. This might not be the case depending on locks and if the kernel is compiled without preemption. Change the system to use a counter and fixed delays. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 146ad66eac836c0b976c98f428d73e1f6a75270d Author: Pierre Ossman Date: Fri Jun 30 02:22:23 2006 -0700 [MMC] sdhci: support for multiple voltages The sdhci controllers can support up to three voltage levels. Detect which and report back to the MMC layer. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 51f82bc07a9673d790c2a17de8e3fa8046543f04 Author: Pierre Ossman Date: Fri Jun 30 02:22:22 2006 -0700 [MMC] sdhci: print device id As sdhci is a generic driver, it is helpful to see some more specific identification of the actual hardware in dmesg. PCI vendor, device and revision is sufficient in most cases. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 8ef1a14379e105c1419d21e96ffac53202bc0501 Author: Pierre Ossman Date: Fri Jun 30 02:22:21 2006 -0700 [MMC] sdhci: check SDHCI base clock A base clock value of 0 means that the driver must get the base clock through some other means. As we have no other way of getting it, we must abort. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit c7afb0f97700e73109564f83c35bfeeb14cb653b Author: KaiGai Kohei Date: Sun Jul 2 15:13:46 2006 +0100 [JFFS2][XATTR] Fix memory leak in POSIX-ACL support jffs2_clear_acl() which releases acl caches allocated by kmalloc() was defined but it was never called. Thus, we faced to the risk of memory leaking. This patch plugs jffs2_clear_acl() into jffs2_do_clear_inode(). It ensures to release acl cache when inode is cleared. Signed-off-by: KaiGai Kohei Signed-off-by: David Woodhouse commit d63fb6c55f5f9eb3032fc5c3ab6eb9a26dd67cdc Author: Benjamin Herrenschmidt Date: Sun Jul 2 11:55:03 2006 +1000 [PATCH] powermac: Fix some 64b resource damage The 64 bits resource patches did a bit of damage on PowerMac causing a buffer overflow in macio_asic and a warning in a sound driver. The former is fixed by reverting the sprintf of the bus_id to %08x as it was before. The bus_id used for macio devices is always a 32 bits value (macio always sits in 32 bits space) and since it's exposed to userland, the format of the string shouldn't be changed like that anyway. The second by using the proper type for printk. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 07d265dd59456f702b7d2a1ac471f06ee4adc9ef Author: Thomas Gleixner Date: Sat Jul 1 23:01:50 2006 +0100 [ARM] 3683/2: ARM: Convert at91rm9200 to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit 698dfe2b4513f8a13c0e082d141e8b64e63e0313 Author: Thomas Gleixner Date: Sat Jul 1 23:01:49 2006 +0100 [ARM] 3682/2: ARM: Convert ixp4xx to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit ae71c426ba4b5214b75bb0e624d73a4abcffbe57 Author: Thomas Gleixner Date: Sat Jul 1 22:32:42 2006 +0100 [ARM] 3702/1: ARM: Convert ixp23xx to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit 418ca1f0a0d3405c5f674d005363ab1ef850c367 Author: Thomas Gleixner Date: Sat Jul 1 22:32:41 2006 +0100 [ARM] 3701/1: ARM: Convert plat-omap to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit c75c625df7e2395d09a1aa33cdc2212d75928de6 Author: Thomas Gleixner Date: Sat Jul 1 22:32:40 2006 +0100 [ARM] 3700/1: ARM: Convert lh7a40x to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit 544b46de259c8be67c042bcdfaf81f0bc6fa2e6d Author: Thomas Gleixner Date: Sat Jul 1 22:32:39 2006 +0100 [ARM] 3699/1: ARM: Convert s3c2410 to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit 119c641c9e665718f080ccde3422dd97259e0fc8 Author: Thomas Gleixner Date: Sat Jul 1 22:32:38 2006 +0100 [ARM] 3698/1: ARM: Convert sa1100 to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit 5a67b777bc4dd1d02c1381ba07e9965cfa9346e8 Author: Thomas Gleixner Date: Sat Jul 1 22:32:37 2006 +0100 [ARM] 3697/1: ARM: Convert shark to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit 6f77dde8915638003bc038a18074e84b13aba39d Author: Thomas Gleixner Date: Sat Jul 1 22:32:37 2006 +0100 [ARM] 3696/1: ARM: Convert clps711x to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit 33e39f1d5b910e37d73815d7cb856786880c60e0 Author: Thomas Gleixner Date: Sat Jul 1 22:32:36 2006 +0100 [ARM] 3694/1: ARM: Convert ecard driver to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit d533c1289e87cc16b0590077a182f06e4d6ad8aa Author: Thomas Gleixner Date: Sat Jul 1 22:32:35 2006 +0100 [ARM] 3693/1: ARM: Convert omap1 to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit a6284acbe429d6afa7746530098ea1b1bbf9f6fe Author: Thomas Gleixner Date: Sat Jul 1 22:32:34 2006 +0100 [ARM] 3691/1: ARM: Convert imx to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit cb03f87c98526d88f457f1ae4587142842f7e12e Author: Thomas Gleixner Date: Sat Jul 1 22:32:33 2006 +0100 [ARM] 3688/1: ARM: Convert clps7500 to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit a03d4d2765a047914c1f278c11e98aee44dd10bb Author: Thomas Gleixner Date: Sat Jul 1 22:32:32 2006 +0100 [ARM] 3687/1: ARM: Convert integrator to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit 1623dee87b4b244099eb79adc87e71e3961b86d7 Author: Thomas Gleixner Date: Sat Jul 1 22:32:20 2006 +0100 [ARM] 3685/1: ARM: Convert pxa to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit 427923d10c2998f05ce06c5683a0f80c8be5b744 Author: Thomas Gleixner Date: Sat Jul 1 22:32:19 2006 +0100 [ARM] 3684/1: ARM: Convert l7200 to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit 64ffae8a32b8e5a5753527860a0aeca2b17724d6 Author: Thomas Gleixner Date: Sat Jul 1 22:32:18 2006 +0100 [ARM] 3681/1: ARM: Convert ixp2000 to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit 55e8698931c514becdc2e225c87bbbbb0f64ca1b Author: Thomas Gleixner Date: Sat Jul 1 22:32:17 2006 +0100 [ARM] 3680/1: ARM: Convert footbridge to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit ff632054ced5e1a8a28e7196c013e5af37895f7b Author: Thomas Gleixner Date: Sat Jul 1 22:32:16 2006 +0100 [ARM] 3695/1: ARM drivers/pcmcia: Fixup includes Patch from Thomas Gleixner From: Thomas Gleixner Include the generic header file instead of the ARM specific one. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit e6e3c3be8add9167c36c27f54954dfd8d7533543 Author: Thomas Gleixner Date: Sat Jul 1 22:32:15 2006 +0100 [ARM] 3689/1: ARM drivers/input/touchscreen: Fixup includes Patch from Thomas Gleixner From: Thomas Gleixner Include the generic header file instead of the ARM specific one. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit c4bfa28aec58c588de55babe99f4c172ec534704 Author: Thomas Gleixner Date: Sat Jul 1 22:32:14 2006 +0100 [ARM] 3686/1: ARM: arm/common: convert irq handling Patch from Thomas Gleixner From: Thomas Gleixner Convert the files in arch/arm/common to use the generic irq handling functions. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit 4a2581a080098ca3a0c4e416d7a282e96c75ebf8 Author: Thomas Gleixner Date: Sat Jul 1 22:30:09 2006 +0100 [ARM] 3692/1: ARM: coswitch irq handling to the generic implementation Patch from Thomas Gleixner From: Thomas Gleixner Switch the ARM irq core handling to the generic implementation. The ARM specific header files now contain mostly migration stubs and helper macros. Note that each machine type must be converted after this step seperately. This was seperated out from the patch for easier review. The main changes for the machine type code is the conversion of the type handlers to a 'type flow' and 'chip' model. This affects only the multiplex interrupt handlers. A conversion macro needs to be added to those implementations, which defines the data structure which is registered by the set_irq_chained_handler() macro. Some minor fixups of include files and the conversion of data structure access is necessary all over the place. The mostly macro based conversion was provided to allow an easy migration of the existing implementations. The code compiles on all defconfigs available in arch/arm/configs except those which were broken also before applying the conversion patches. The code has been boot and runtime tested on most ARM platforms. The results of an extensive testing and bugfixing series can be found at: http://www.linutronix.de/index.php?page=testing Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit f8b5473fcbddbfde827ecf82aa0e81fa2a878220 Author: Thomas Gleixner Date: Sat Jul 1 22:30:08 2006 +0100 [ARM] 3690/1: genirq: Introduce and make use of dummy irq chip Patch from Thomas Gleixner From: Thomas Gleixner ARM has a couple of really dumb interrupt controllers. Implement a generic one and fixup the ARM migration. ARM reused the no_irq_chip for this purpose, but this does not work out for platforms which are not converted to the new interrupt type handling model. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit a2166abd06e7a9fd34eb18b7b27da18c6146e6ef Author: Thomas Gleixner Date: Sat Jul 1 22:30:07 2006 +0100 [ARM] 3679/1: ARM: Make ARM dyntick implementation work with genirq Patch from Thomas Gleixner From: Thomas Gleixner Make the ARM dyntick implementation work with the generic irq code. This hopefully goes away once we consolidated the dyntick implementations. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit 635227ee89929a6e2920fc8aa1cd48f7225d3d93 Author: Len Brown Date: Sat Jul 1 16:48:23 2006 -0400 ACPI: remove function tracing macros from drivers/acpi/*.c a few invocations appeared due to the SBS and other patches. Signed-off-by: Len Brown commit 3f86b83243d59bb50caf5938d284d22e10d082a4 Author: Rich Townsend Date: Sat Jul 1 11:36:54 2006 -0400 ACPI: add support for Smart Battery Most batteries today are ACPI "Control Method" batteries, but some models ship with the older "Smart Battery" that requires this code. Rich Townsend and Bruno Ducrot were the original authors. Vladimir Lebedev updated to run on latest kernel. http://bugzilla.kernel.org/show_bug.cgi?id=3734 Signed-off-by: Len Brown commit 2dc7667b9d0674db6572723356fe3857031101a4 Author: Nicolas Pitre Date: Sat Jul 1 21:29:32 2006 +0100 [ARM] 3541/2: workaround for PXA27x erratum E7 Patch from Nicolas Pitre According to the Intel PXA27x Processor Family Specification Update document (doc.nr. 280071-009) erratum E7, some care must be taken to locate the disabling and re-enabling of the MMU to the beginning of a cache line to avoid problems in some circumstances. Credits to Simon Vogl for bringing this up. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 9becf5b91ec7b600a3cfea12724165aaaf4d4527 Author: Karol Kozimor Date: Fri Jun 30 19:15:00 2006 -0400 ACPI: asus_acpi: correct M6N/M6R display nodes This patch switches back the display nodes for M6R and M6N -- this happened a while ago when a patch was misapplied (only the in-tree version was affected). Signed-off-by: Karol Kozimor Signed-off-by: Len Brown commit a069c896d0d6c028581089da7a9a9037a63c2803 Author: Lennert Buytenhek Date: Sat Jul 1 19:58:20 2006 +0100 [ARM] 3705/1: add supersection support to ioremap() Patch from Lennert Buytenhek Analogous to the previous patch that allows ioremap() to use section mappings, this patch allows ioremap() to use supersection mappings. Original patch by Deepak Saxena. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit ae95bfbb2b67eba5d67a0478a8715682a87e2616 Author: Lennert Buytenhek Date: Sat Jul 1 19:56:48 2006 +0100 [ARM] 3707/1: iwmmxt: use the generic thread notifier infrastructure Patch from Lennert Buytenhek This patch makes the iWMMXt context switch hook use the generic thread notifier infrastructure that was recently merged in commit d6551e884cf66de072b81f8b6d23259462c40baf. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 9b8417556cca8d56467fd47a39667a4cf3ae21f3 Author: Lennert Buytenhek Date: Sat Jul 1 19:56:47 2006 +0100 [ARM] 3706/2: ep93xx: add cirrus logic edb9315a support Patch from Lennert Buytenhek This patch adds support for the Cirrus Logic EDB9315A, an evaluation board based on the Cirrus Logic EP9315 SoC, with 64M RAM, two USB host ports, audio in/out, three serial ports, 10/100 ethernet, and IDE, VGA, and LCD interfaces. The EDB9315A is a low-cost version of the EDB9315, and has only 16M of NOR flash, while the EDB9315 has 32M. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 179d1c6ac98a46c57e08a96a6f7f44e3a4d169da Author: Martin Michlmayr Date: Sat Jul 1 19:56:46 2006 +0100 [ARM] 3704/1: format IOP Kconfig with tabs, create more consistency Patch from Martin Michlmayr Some cosmetic changes to increase the consistency of the IOP Kconfig file. Change some space into tabs and add a dot at the end of a help description. Signed-off-by: Martin Michlmayr Signed-off-by: Russell King commit 34e00cef810d0350d3ec17345786b73ccd1287ef Author: Martin Michlmayr Date: Sat Jul 1 19:56:45 2006 +0100 [ARM] 3703/1: Add help description for ARCH_EP80219 Patch from Martin Michlmayr Add a brief help description for ARCH_EP80219. Signed-off-by: Martin Michlmayr Signed-off-by: Russell King commit ce9c1a8388e16f2a158491ceb5c58a6101b905f6 Author: Tony Lindgren Date: Sat Jul 1 19:56:44 2006 +0100 [ARM] 3678/1: MMC: Make OMAP MMC work Patch from Tony Lindgren This patch makes OMAP MMC work again: - Fix compile errors - Do not ioremap base as it is already statically mapped - Clean-up platform device handling - Fix compile warnings Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 0d1bca1602fb9996a3730e0e882945d7361507b1 Author: Tony Lindgren Date: Sat Jul 1 19:56:43 2006 +0100 [ARM] 3677/1: OMAP: Update H2 defconfig Patch from Tony Lindgren Update OMAP H2 defconfig and leave out hw random for now until it's been updated. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 35912c799722f0c63b8c2c49c7650d4516a5fe8a Author: Tony Lindgren Date: Sat Jul 1 19:56:42 2006 +0100 [ARM] 3676/1: ARM: OMAP: Fix dmtimers and timer32k to compile on OMAP1 Patch from Tony Lindgren Fixes compilation errors on OMAP1. Patch from Timo Teras. Signed-off-by: Timo Teras Signed-off-by: Juha Yrjola Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 0cadaf45bd7c19f0bef49d1eebfff38a046b9ba4 Author: Andrew Morton Date: Sat Jul 1 04:36:37 2006 -0700 [PATCH] pnp: suppress request_irq() warning Suppress the "setup_irq: irq handler mismatch" coming out of pnp_check_irq(): failures are expected here. Cc: Cc: Santiago Garcia Mantinan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9c7a41691f37a1538a88e5eb9b0b73df1f834542 Author: Ingo van Lil Date: Sat Jul 1 04:36:36 2006 -0700 [PATCH] drivers/block/nbd.c compile fix The Network Block Device driver doesn't compile if NDEBUG is defined. Signed-off-by: Ingo van Lil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f47634b276db6956998350e5fc26a0673fdb125c Author: Randy Dunlap Date: Sat Jul 1 04:36:36 2006 -0700 [PATCH] kernel-doc: make man/text mode function output same Make output of function descriptions in text mode match contents of 'man' mode by adding Name: plus function-short-description ("purpose") and changing Function: to Synopsis:. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit faab17ba06d86adf5568f3e9ff914e124546d19e Author: Alan Cox Date: Sat Jul 1 04:36:34 2006 -0700 [PATCH] Fix problem with ATAPI DMA on IT8212 in Linux Missing variable initialisation would mean it would sometimes not put ATAPI devices into DMA by default. Signed-off-by: Alan Cox Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d7e1d4517f11ebeb80f92e227c8fdbc3215385c Author: Randy.Dunlap Date: Sat Jul 1 04:36:34 2006 -0700 [PATCH] kernel-doc: consistent text/man mode output Add a space between data type and struct field name in man-mode bitfield struct output so that they don't run together. For text-mode struct output, print the struct 'purpose' or short description (as done in man-mode output). For text-mode enum output, print the enum 'purpose' or short description (as done in man-mode output). For text-mode typedef output, print the typedef 'purpose' or short description (as done in man-mode output). Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd535a5965cef7551da34aef5cec47f46e97b6d9 Author: Vladimir Saveliev Date: Sat Jul 1 04:36:32 2006 -0700 [PATCH] reiserfs: update ctime and mtime on expanding truncate Reiserfs does not update ctime and mtime on expanding truncate via truncate(). This patch fixes it. Signed-off-by: Vladimir Saveliev Cc: Hans Reiser Cc: Michael Kerrisk Cc: Chris Mason Cc: Jeff Mahoney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d882b172512758703ff8d9efb96505eaaee48d2e Author: Heiko Carstens Date: Sat Jul 1 04:36:31 2006 -0700 [PATCH] s390: put sys_call_table into .rodata section and write protect it Put s390's syscall tables into .rodata section and write protect this section to prevent misuse of it. Suggested by Arjan van de Ven . Cc: Arjan van de Ven Cc: Martin Schwidefsky Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a581c2a4697ee264699b364399b73477af408e00 Author: Heiko Carstens Date: Sat Jul 1 04:36:30 2006 -0700 [PATCH] add __[start|end]_rodata sections to asm-generic/sections.h Add __start_rodata and __end_rodata to sections.h to avoid extern declarations. Needed by s390 code (see following patch). [akpm@osdl.org: update architectures] Cc: Arjan van de Ven Cc: Martin Schwidefsky Signed-off-by: Heiko Carstens Cc: Andi Kleen Acked-by: Kyle McMartin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e2c2770096b686b4d2456173f53cb50e01aa635c Author: Andrew Morton Date: Sat Jul 1 04:36:30 2006 -0700 [PATCH] hotcpu_notifier-fixes Always use do {} while (0). Failing to do so can cause subtle compile failures or bugs. Cc: Chandra Seetharaman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1add6781c85d7e2ee512315113a16193b3e3937d Author: Ben Dooks Date: Sat Jul 1 04:36:26 2006 -0700 [PATCH] RTC: class driver for Samsung S3C series SoC This is a renamed and tested version of the previous S3C24XX RTC class driver. The driver has been renamed from the original s3c2410-rtc, which is now too narrow for the range of devices supported. The rtc-s3c has been chosen as there is the distinct possibility of this driver being carried forward into newer Samsung SoC silicon. Signed-off-by: Ben Dooks Cc: Alessandro Zummo Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fa79837d5b562766a3e3cfad4753a3df8e0a1319 Author: Ralf Baechle Date: Sat Jul 1 04:36:25 2006 -0700 [PATCH] Fix IS_ERR Threshold Value o Raise the maximum error number in IS_ERR_VALUE to 4095. o Make that number available as a new constant MAX_ERRNO. Signed-off-by: Ralf Baechle Cc: "H. Peter Anvin" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 10e5dce07e6f8f9cea1b54161a888bb099484f88 Author: Evgeniy Dushistov Date: Sat Jul 1 04:36:24 2006 -0700 [PATCH] ufs: truncate should allocate block for last byte This patch fixes buggy behaviour of UFS in such kind of scenario: open(, O_TRUNC...) ftruncate(, 1024) ftruncate(, 0) Such a scenario causes ufs_panic and remount read-only. This happen because of according to specification UFS should always allocate block for last byte, and many parts of our implementation rely on this, but `ufs_truncate' doesn't care about this. To make possible return error code and to know about old size, this patch removes `truncate' from ufs inode_operations and uses `setattr' method to call ufs_truncate. Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eb28931e4a2c89e53d2b0c1a02a843240bff0806 Author: Paolo 'Blaisorblade' Giarrusso Date: Sat Jul 1 04:36:24 2006 -0700 [PATCH] uml: rename and improve actually_do_remove() Rename actually_do_remove() to remove_files_and_dir(), make it call closedir(), make it ignore ENOENT (I see it frequently enough). ENOENT is probably due to multiple threads calling the exitcall functions together*, but fixing that is non-trivial; and ignoring it is perfectly ok in any case. * it can surely happen: last_ditch_exit() is installed as SIGTERM handler at boot, and it's not removed on thread creation. So killall vmlinux (which I do) surely causes that. I've seen also a crash which seems to do the same. Installing the handler on only the main thread would make UML do no cleanup when another thread exits, and we're not sure we want that. And mutual exclusion in that context is tricky - we can't use spinlock in code not on a kernel stack (spinlock debugging uses "current" a lot). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 912ad92220038b0bb67e3310b8447e4d8802d581 Author: Paolo 'Blaisorblade' Giarrusso Date: Sat Jul 1 04:36:23 2006 -0700 [PATCH] uml: fix not_dead_yet when directory is in bad state The bug occurred to me when a UML left an empty ~/.uml/Sarge-norm folder - when trying to reuse not_dead_yet() failed one of its check. The comment says that's ok and means that we can take the directory, but while normally not_dead_yet() removes it and returns 0 (i.e. go on, use this), on failure it returns 0 but forgets to remove it. The fix is to remove it anytime we're going to return 0. But since "not_dead_yet" didn't make the interface so clear, causing this bug, and I couldn't find a convenient name for the mix of things it did, I split it into two parts: is_umdir_used() - returns a boolean, contains all checks of not_dead_yet() umdir_take_if_dead - tries to remove the dir unless it's used - returns whether it removed it, that is we now own it. With this changes the control flow is IMHO a bit clearer and needs less comment for control flow. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 47e5243afe0bd2a1aca1e1f05dfbcc214267fbc9 Author: Paolo 'Blaisorblade' Giarrusso Date: Sat Jul 1 04:36:19 2006 -0700 [PATCH] uml: make copy_*_user atomic Make __copy_*_user_inatomic really atomic to avoid "Sleeping function called in atomic context" warnings, especially from futex code. This is made by adding another kmap_atomic slot and making copy_*_user_skas use kmap_atomic; also copy_*_user() becomes atomic, but that's true and is not a problem for i386 (and we can always add might_sleep there as done elsewhere). For TT mode kmap is not used, so there's no need for this. I've had to use another slot since both KM_USER0 and KM_USER1 are used elsewhere and could cause conflicts. Till now we reused the kmap_atomic slot list from the subarch, but that's not needed as that list must contain the common ones (used by generic code) + the ones used in architecture specific code (and Uml till now used none); so I've taken the i386 one after comparing it with ones from other archs, and added KM_UML_USERCOPY. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8ec4d41f88872e6a5980558e362c0174dce54e40 Author: Gerd Hoffmann Date: Sat Jul 1 04:36:18 2006 -0700 [PATCH] SMP alternatives: skip with UP kernels Hide the magic in alternative.h and provide some dummy inline functions for the UP case (gcc should manage to optimize away these calls). No changes in module.c. Cc: Dave Jones Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 27b678dd04a636f2c351816f4b3042c8815d4e9d Author: Bryan O'Sullivan Date: Sat Jul 1 04:36:17 2006 -0700 [PATCH] IB/ipath: namespace cleanup: replace ips with ipath Remove ips namespace from infinipath drivers. This renames ips_common.h to ipath_common.h. Definitions, data structures, etc. that were not used by kernel modules have moved to user-only headers. All names including ips have been renamed to ipath. Some names have had an ipath prefix added. Signed-off-by: Christian Bell Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 357b552ff3d82a2e6b97c63c6394f748cb217cf8 Author: Bryan O'Sullivan Date: Sat Jul 1 04:36:16 2006 -0700 [PATCH] IB/ipath: ignore receive queue size if SRQ is specified The receive work queue size should be ignored if the QP is created to use a shared receive queue according to the IB spec. Signed-off-by: Ralph Campbell Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e0018bc74275ab99d223fb5dca0b65067a5ffc1 Author: Bryan O'Sullivan Date: Sat Jul 1 04:36:15 2006 -0700 [PATCH] IB/ipath: remove some #if 0 code related to lockable memory Signed-off-by: Dave Olson Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 35783ec07c3f7f6902abe4433e7be1b664d0bbaf Author: Bryan O'Sullivan Date: Sat Jul 1 04:36:15 2006 -0700 [PATCH] IB/ipath: fix a bug that results in addresses near 0 being written via DMA We can't tell for sure if any packets are in the infinipath receive buffer when we shut down a chip port. Normally this is taken care of by orderly shutdown, but when processes are terminated, or sending process has a bug, we can continue to receive packets. So rather than writing zero to the address registers for the closing port, we point it at a dummy memory. Signed-off-by: Dave Olson Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6d8e9dd050ea78862b6c5e2c873ad6407f9b2428 Author: Bryan O'Sullivan Date: Sat Jul 1 04:36:14 2006 -0700 [PATCH] IB/ipath: read/write correct sizes through diag interface We must increment uaddr by size we are reading or writing, since it's passed as a char *, not a pointer to the appropriate size. Signed-off-by: Dave Olson Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8307c28eecea917c4754075fbb85eb398a3bc516 Author: Bryan O'Sullivan Date: Sat Jul 1 04:36:13 2006 -0700 [PATCH] IB/ipath: support more models of InfiniPath hardware We do a few more explicit checks for specific models, and now also support the old PathScale serial number style, or new QLogic style. This is backwards compatible with previous versions of software and hardware. That is, older software will see a plausible serial number and correct GUID when used with a new board, while newer software will correctly handle an older board. Signed-off-by: Mike Albaugh Signed-off-by: Dave Olson Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 46bbeac922906559ec46454cbc76caf03bc57353 Author: Bryan O'Sullivan Date: Sat Jul 1 04:36:12 2006 -0700 [PATCH] IB/ipath: drop the "stats" sysfs attribute group This attribute group made it into the original driver, but should not have. Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1eb68b990aab4c007e520acae39c74d8116693bc Author: Bryan O'Sullivan Date: Sat Jul 1 04:36:11 2006 -0700 [PATCH] IB/ipath: purge sps_lid and sps_mlid arrays The two arrays only had space for 4 units. Also changed from ipath_set_sps_lid() to ipath_set_lid(); the sps was leftover. Signed-off-by: Dave Olson Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12eef41f8b72b6e11e36b48c78849c17e49781c8 Author: Bryan O'Sullivan Date: Sat Jul 1 04:36:10 2006 -0700 [PATCH] IB/ipath: rC receive interrupt performance changes This patch separates QP state used for sending and receiving RC packets so the processing in the receive interrupt handler can be done mostly without locks being held. ACK packets are now sent without requiring synchronization with the send tasklet. Signed-off-by: Ralph Campbell Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fba75200ad92892bf32d8d6f1443c6f1e4f48676 Author: Bryan O'Sullivan Date: Sat Jul 1 04:36:09 2006 -0700 [PATCH] IB/ipath: fixes to performance get counters for IB compliance This patch fixes some problems uncovered during IB compliance testing to return the right values for error counters returned by the Performance Get Counters packet. Signed-off-by: Ralph Campbell Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 85322947d761d08bd84165500f35b93c702aaaf3 Author: Bryan O'Sullivan Date: Sat Jul 1 04:36:08 2006 -0700 [PATCH] IB/ipath: check for valid LID and multicast LIDs Signed-off-by: Ralph Campbell Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7cd658cd2bca48d3a0e747b4525c72eb8855278e Author: Bryan O'Sullivan Date: Sat Jul 1 04:36:08 2006 -0700 [PATCH] IB/ipath: removed redundant statements The tail register read became redundant as the result of earlier receive interrupt bug fixes. Drop another unneeded register read. And another line that got duplicated. Signed-off-by: Dave Olson Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c100f622fd9e529e0f4e4324b93f66d105dde61d Author: Bryan O'Sullivan Date: Sat Jul 1 04:36:07 2006 -0700 [PATCH] IB/ipath: don't confuse the max message size with the MTU Signed-off-by: Ralph Campbell Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4faba98a1a11a6129cbcc772422c9ffc0c11dd2e Author: Bryan O'Sullivan Date: Sat Jul 1 04:36:06 2006 -0700 [PATCH] IB/ipath: disallow send of invalid packet sizes over UD Signed-off-by: Ralph Campbell Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 57abad25f844e760082c0b1ab2b176dad682ea16 Author: Bryan O'Sullivan Date: Sat Jul 1 04:36:05 2006 -0700 [PATCH] IB/ipath: fix lost interrupts on HT-400 Do an extra check to see if in-memory tail changed while processing packets, and if so, going back through the loop again (but only once per call to ipath_kreceive()). In practice, this seems to be enough to guarantee that if we crossed the clearing of an interrupt at start of ipath_intr with a scheduled tail register update, that we'll process the "extra" packet that lost the interrupt because we cleared it just as it was about to arrive. Signed-off-by: Dave Olson Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f5f99929ac584126ef3f47d805dc619abc54768c Author: Bryan O'Sullivan Date: Sat Jul 1 04:36:05 2006 -0700 [PATCH] IB/ipath: fixed bug 9776 for real The problem was that I was updating the head register multiple times in the rcvhdrq processing loop, and setting the counter on each update. Since that meant that the tail register was ahead of head for all but the last update, we would get extra interrupts. The fix was to not write the counter value except on the last update. I also changed to update rcvhdrhead and rcvegrindexhead at most every 16 packets, if there were lots of packets in the queue (and of course, on the last packet, regardless). I also made some small cleanups while debugging this. With these changes, xeon/monty typically sees two openib packets per interrupt on sdp and ipoib, opteron/monty is about 1.25 pkts/intr. I'm seeing about 3800 Mbit/s monty/xeon, and 5000-5100 opteron/monty with netperf sdp. Netpipe doesn't show as good as that, peaking at about 4400 on opteron/monty sdp. Plain ipoib xeon is about 2100+ netperf, opteron 2900+, at 128KB Signed-off-by: olson@eng-12.pathscale.com Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 13aef4942c291742064c1d5ac71df6493c4a00a9 Author: Bryan O'Sullivan Date: Sat Jul 1 04:36:04 2006 -0700 [PATCH] IB/ipath: reduce overhead on receive interrupts Also count the number of interrupts where that works (fastrcvint). On any interrupt where the port0 head and tail registers are not equal, just call the ipath_kreceive code without reading the interrupt status, thus saving the approximately 0.25usec processor stall waiting for the read to return. If any other interrupt bits are set, or head==tail, take the normal path, but that has been reordered to handle read ahead of pioavail. Also no longer call ipath_kreceive() from ipath_qcheck(), because that just seems to make things worse, and isn't really buying us anything, these days. Also no longer loop in ipath_kreceive(); better to not hold things off too long (I saw many cases where we would loop 4-8 times, and handle thousands (up to 3500) in a single call). Signed-off-by: Dave Olson Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f37bda92461313ad3bbfbf5660adc849c69718bf Author: Bryan O'Sullivan Date: Sat Jul 1 04:36:03 2006 -0700 [PATCH] IB/ipath: memory management cleanups Made in-memory rcvhdrq tail update be in dma_alloc'ed memory, not random user or special kernel (needed for ppc, also "just the right thing to do"). Some cleanups to make unexpected link transitions less likely to produce complaints about packet errors, and also to not leave SMA packets stuck and unable to go out. A few other random debug and comment cleanups. Always init rcvhdrq head/tail registers to 0, to avoid race conditions (should have been that way some time ago). Signed-off-by: Dave Olson Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 06993ca6bc46419027b45198a58447f4f05c14f6 Author: Bryan O'Sullivan Date: Sat Jul 1 04:36:02 2006 -0700 [PATCH] IB/ipath: use vmalloc to allocate struct ipath_devdata This is not a DMA target, so no need to use dma_alloc_coherent on it. Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0ed9a4a0b6df0548f9ccadb62add2c0155d5262c Author: Bryan O'Sullivan Date: Sat Jul 1 04:36:01 2006 -0700 [PATCH] IB/ipath: use more appropriate gfp flags This helps us to survive better when memory is fragmented. Signed-off-by: Dave Olson Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a40f55fc333cc20d85af92887334f41f7844e0c2 Author: Bryan O'Sullivan Date: Sat Jul 1 04:36:00 2006 -0700 [PATCH] IB/ipath: enable freeze mode when shutting down device Signed-off-by: Dave Olson Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b1d8865a2075934158af41bea5fde725efb70408 Author: Bryan O'Sullivan Date: Sat Jul 1 04:35:59 2006 -0700 [PATCH] IB/ipath: print better debug info when handling 32/64-bit DMA mask problems Signed-off-by: Dave Olson Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b35f004dd3276fc43f242d9a52b4cf74877137c3 Author: Bryan O'Sullivan Date: Sat Jul 1 04:35:59 2006 -0700 [PATCH] IB/ipath: removed unused field ipath_kregvirt from struct ipath_devdata Signed-off-by: Dave Olson Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fe62546a6afa141c4ab9aef65f5978a1b36cb523 Author: Bryan O'Sullivan Date: Sat Jul 1 04:35:58 2006 -0700 [PATCH] IB/ipath: enforce device resource limits These limits are somewhat artificial in that we don't actually have any device limits. However, the verbs layer expects that such limits exist and are enforced, so we make up arbitrary (but sensible) limits. Signed-off-by: Robert Walsh Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e8a88f09f21c55a7e7f570290ecde570e2c37771 Author: Bryan O'Sullivan Date: Sat Jul 1 04:35:57 2006 -0700 [PATCH] IB/ipath: report correct device identification information in /sys Signed-off-by: Robert Walsh Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9edbd990bb60dd7678f7f4f8ca3d92e03a1f0e67 Author: Bryan O'Sullivan Date: Sat Jul 1 04:35:56 2006 -0700 [PATCH] IB/ipath: return an error for unknown multicast GID Signed-off-by: Robert Walsh Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 60460dfd425e3d301831d8dd6398620d67bbda2b Author: Bryan O'Sullivan Date: Sat Jul 1 04:35:55 2006 -0700 [PATCH] IB/ipath: fix some memory leaks on failure paths Signed-off-by: Robert Walsh Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4a45b7d4ece0e6dc425e9f66fa8b501b72d846db Author: Bryan O'Sullivan Date: Sat Jul 1 04:35:55 2006 -0700 [PATCH] IB/ipath: don't allow resources to be created with illegal values Signed-off-by: Robert Walsh Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6665ddee85bfc336d691ea5132a2c20a1d0e8053 Author: Bryan O'Sullivan Date: Sat Jul 1 04:35:54 2006 -0700 [PATCH] IB/ipath: remove some duplicate code Signed-off-by: Robert Walsh Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 685f97e81b5510cfcbeccf6ae0400d3664ba8ea3 Author: Bryan O'Sullivan Date: Sat Jul 1 04:35:53 2006 -0700 [PATCH] IB/ipath: update some comments and fix typos Signed-off-by: Robert Walsh Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a2acb2ff36876fdfa5f7a8bf811765aadc74c1c1 Author: Bryan O'Sullivan Date: Sat Jul 1 04:35:52 2006 -0700 [PATCH] IB/ipath: allow diags on any unit There is no longer a /dev/ipath_diag file; instead, there's /dev/ipath_diag0, 1, etc. It's still not possible to have diags run on more than one unit at a time, but that's easy to fix at some point. Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6700efdfc06d2dc9ef77988a00182c2ede0f1be0 Author: Bryan O'Sullivan Date: Sat Jul 1 04:35:51 2006 -0700 [PATCH] IB/ipath: fix shared receive queues for RC Signed-off-by: Ralph Campbell Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7bbb15ea8543e2e49476a27b507be3b02828a124 Author: Bryan O'Sullivan Date: Sat Jul 1 04:35:51 2006 -0700 [PATCH] IB/ipath: fix an indenting problem Signed-off-by: Ralph Campbell Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ddd4bb22108417fdc5c35324bd13a3265581ae76 Author: Bryan O'Sullivan Date: Sat Jul 1 04:35:50 2006 -0700 [PATCH] IB/ipath: share more common code between RC and UC protocols Signed-off-by: Ralph Campbell Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 759d57686dab8169ca68bbf938ce8e965d1e107a Author: Bryan O'Sullivan Date: Sat Jul 1 04:35:49 2006 -0700 [PATCH] IB/ipath: update copyrights and other strings to reflect new company name Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 443a64abbcb130caa315eb1110d7146365846235 Author: Bryan O'Sullivan Date: Sat Jul 1 04:35:48 2006 -0700 [PATCH] IB/ipath: name zero counter offsets so it's clear they aren't counters Signed-off-by: Ralph Campbell Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 345a6e6aea43cd544c682601926bbd11c09c999b Author: Jae-hyeon Park Date: Sat Jul 1 04:35:47 2006 -0700 [PATCH] ACPI: fix not power-manageable device message Fix typo in message. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 929a40ec324e947d4ad14cc1ced785c104c560e2 Author: Doug Thompson Date: Sat Jul 1 04:35:45 2006 -0700 [PATCH] EDAC: fix module names quoted in sysfs Fix the quoted module name in the sysfs for EDAC modules and reported by several people. Instead of ../_edac_e752x_/ now the following will be presented, like other modules: ../edac_e752x/ Signed-off-by: Doug Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e8c4b9d003e72199a705fb5a40fcd2487fa16933 Author: Bjorn Helgaas Date: Sat Jul 1 04:35:45 2006 -0700 [PATCH] IRQ: warning message cleanup Make warnings more consistent. Signed-off-by: Bjorn Helgaas Cc: Thomas Gleixner Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 17311c03c3e2c16d64d9e8cb2a3f45be2e2f8d3b Author: Bjorn Helgaas Date: Sat Jul 1 04:35:44 2006 -0700 [PATCH] IRQ: Use SA_PERCPU_IRQ, not IRQ_PER_CPU, for irqaction.flags IRQ_PER_CPU is a bit in the struct irq_desc "status" field, not in the struct irqaction "flags", so the previous code checked the wrong bit. SA_PERCPU_IRQ is only used by drivers/char/mmtimer.c for SGI ia64 boxes. Signed-off-by: Bjorn Helgaas Acked-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ed6f7b10e657b98b4ba89385d02852c8bdf3980e Author: Ingo Molnar Date: Sat Jul 1 04:35:46 2006 -0700 [PATCH] pi-futex: futex_wake() lockup fix Fix futex_wake() exit condition bug when handling the robust-list with PI futexes on them. (reported by Ulrich Drepper, debugged by the lock validator.) Signed-off-by: Ingo Molnar Cc: Ulrich Drepper Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a99e4e413e1ab9f3c567b5519f5557afd786dc62 Author: Vernon Mauery Date: Sat Jul 1 04:35:42 2006 -0700 [PATCH] pi-futex: fix mm_struct memory leak lock_queue was getting called essentially twice in a row and was continually incrementing the mm_count ref count, thus causing a memory leak. Dinakar Guniguntala provided a proper fix for the problem that simply grabs the spinlock for the hash bucket queue rather than calling lock_queue. The second time we do a queue_lock in futex_lock_pi, we really only need to take the hash bucket lock. Signed-off-by: Dinakar Guniguntala Signed-off-by: Vernon Mauery Acked-by: Paul E. McKenney Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9fdae727645215d4dbb88912b9a176ef87911a05 Author: Vladimir Lebedev Date: Tue Jun 27 04:49:00 2006 -0400 ACPI: handle battery notify event on broken BIOS http://bugzilla.kernel.org/show_bug.cgi?id=3241 Signed-off-by: Vladimir Lebedev Signed-off-by: Len Brown commit 03d782524e2d0511317769521c8d5daadbab8482 Author: Christian Lupien Date: Thu Aug 19 01:26:00 2004 -0400 ACPI: handle AC notify event on broken BIOS http://bugzilla.kernel.org/show_bug.cgi?id=3241 updated by Vladimir Lebedev Signed-off-by: Len Brown commit 701842e3bdd7db09db6af43fc5906ee19b61338d Author: Dustin Kirkland Date: Tue May 23 15:57:23 2006 -0500 kbuild: documentation change on allowing checkers besides sparse Minor documentation change on allowing checkers besides sparse This patch cleans up a couple of mentions of sparse in the inline toplevel Makefile documentation such that it's clear that other checkers besides sparse can override CHECK and CHECKFLAGS. Signed-off-by: Dustin Kirkland Signed-off-by: Sam Ravnborg commit b915543b46a2aa599fdd2169e51bcfd88812a12b Author: Al Viro Date: Sat Jul 1 03:56:16 2006 -0400 [PATCH] audit syscall classes Allow to tie upper bits of syscall bitmap in audit rules to kernel-defined sets of syscalls. Infrastructure, a couple of classes (with 32bit counterparts for biarch targets) and actual tie-in on i386, amd64 and ia64. Signed-off-by: Al Viro commit c96fca213737a5b4bc569e1d9a0ef6adeff661e9 Author: Sam Ravnborg Date: Sat Jul 1 11:44:23 2006 +0200 kbuild: warn when a moduled uses a symbol marked UNUSED We now have infrastructure in place to mark an EXPORTed symbol as unused. So the natural next step is to warn during buildtime when a module uses a symbol marked UNUSED. Signed-off-by: Sam Ravnborg commit 6e5a2d1d32596850a0ebf7fb3e54c0d69901dabd Author: Darrel Goeddel Date: Thu Jun 29 16:57:08 2006 -0500 [PATCH] audit: support for object context filters This patch introduces object audit filters based on the elements of the SELinux context. Signed-off-by: Darrel Goeddel Acked-by: Stephen Smalley kernel/auditfilter.c | 25 +++++++++++++++++++++++++ kernel/auditsc.c | 40 ++++++++++++++++++++++++++++++++++++++++ security/selinux/ss/services.c | 18 +++++++++++++++++- 3 files changed, 82 insertions(+), 1 deletion(-) Signed-off-by: Al Viro commit 3a6b9f85c641a3b89420b0c8150ed377526a1fe1 Author: Darrel Goeddel Date: Thu Jun 29 16:56:39 2006 -0500 [PATCH] audit: rename AUDIT_SE_* constants This patch renames some audit constant definitions and adds additional definitions used by the following patch. The renaming avoids ambiguity with respect to the new definitions. Signed-off-by: Darrel Goeddel include/linux/audit.h | 15 ++++++++---- kernel/auditfilter.c | 50 ++++++++++++++++++++--------------------- kernel/auditsc.c | 10 ++++---- security/selinux/ss/services.c | 32 +++++++++++++------------- 4 files changed, 56 insertions(+), 51 deletions(-) Signed-off-by: Al Viro commit 5adc8a6adc91c4c85a64c75a70a619fffc924817 Author: Amy Griffis Date: Wed Jun 14 18:45:21 2006 -0400 [PATCH] add rule filterkey Add support for a rule key, which can be used to tie audit records to audit rules. This is useful when a watched file is accessed through a link or symlink, as well as for general audit log analysis. Because this patch uses a string key instead of an integer key, there is a bit of extra overhead to do the kstrdup() when a rule fires. However, we're also allocating memory for the audit record buffer, so it's probably not that significant. I went ahead with a string key because it seems more user-friendly. Note that the user must ensure that filterkeys are unique. The kernel only checks for duplicate rules. Signed-off-by: Amy Griffis commit 534b89a9f6a86a28300cd71619112c4bbca7c0ae Author: Sam Ravnborg Date: Sat Jul 1 10:10:19 2006 +0200 kbuild: fix segv in modpost Parsing an old Modules.symvers file casued modpost to SEGV. Signed-off-by: Sam Ravnborg commit 66392c4f2246641c13b5dc60d15b09a71e09276f Author: Samuel Thibault Date: Fri Jun 30 02:18:50 2006 -0700 kconfig: enhancing accessibility of lxdialog Some fix that I forgot for good accessibility of lxdialog (the cursor should always be left at the focus location): Have the checklist display the currently highlighted entry last, for having the cursor left on it (rather than on the last line of the list). Signed-off-by: Samuel Thibault Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit 5e8d780d745c1619aba81fe7166c5a4b5cad2b84 Author: Sam Ravnborg Date: Sat Jul 1 09:58:02 2006 +0200 kbuild: fix ia64 breakage after introducing make -rR kbuild used $¤(*F to get filename of target without extension. This was used in several places all over kbuild, but introducing make -rR broke his for all cases where we specified full path to target/prerequsite. It is assumed that make -rR disables old style suffix-rules which is why is suddenly failed. ia64 was impacted by this change because several div* routines in arch/ia64/lib are build using explicit paths and then kbuild failed. Thanks to David Mosberger-Tang for an explanation what was the root-cause and for testing on ia64. This patch also fixes two uses of $(*F) in arch/um Signed-off-by: Sam Ravnborg commit f58f8313a6f552d1e7889926a29f0cf91c02f55d Author: Randy Dunlap Date: Fri Jun 30 02:33:14 2006 -0700 [SCSI] qla1280: fix section mismatch warnings Fix section mismatch warnings: WARNING: drivers/scsi/qla1280.o - Section mismatch: reference to .init.data: from .text between 'qla1280_get_token' (at offset 0x2a16) and 'qla1280_probe_one' WARNING: drivers/scsi/qla1280.o - Section mismatch: reference to .init.data: from .text between 'qla1280_get_token' (at offset 0x2a3c) and 'qla1280_probe_one' Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 2686de27a356914e098329463d5a8cd7aa6f29a4 Author: James Bottomley Date: Fri Jun 30 12:54:02 2006 -0500 [SCSI] mptsas: eliminate ghost devices One of the current problems the mptsas driver has is that of "ghost" devices (these are devices the firmware reports as existing, but what they actually represent are the parents of a lower device), so for example in my dual expander configuration, three expanders actually show up, two for the real expanders but a third is created because the firmware reports that the lower expander also has another expander connected (which is simply the port going back to the upper expander). The attached patch eliminates all these ghosts by not allocating any devices for them if the SAS address is the SAS address of the parent. Signed-off-by: James Bottomley commit 413975a0f1a43a896490fc5c589d05c95624c6d2 Author: Adrian Bunk Date: Fri Jun 30 02:33:06 2006 -0700 [SCSI] qla2xxx: make some more functions static Make some needlessly global functions static. Signed-off-by: Adrian Bunk Acked-by: Andrew Vasquez Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 900d9f98737b502fbd0303cfcab2773b465bb1f8 Author: Jesper Juhl Date: Fri Jun 30 02:33:07 2006 -0700 [SCSI] small whitespace cleanup for qlogic driver Add a few spaces to MODULE_PARM_DESC() text for qla2xxx. Without these spaces text runs together when modinfo prints the text. Signed-off-by: Jesper Juhl Acked-by: Andrew Vasquez Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 3e00a5b28782d65b7ac91e1e9812c281c2ec7af0 Author: Eric Moore Date: Thu Jun 29 17:38:43 2006 -0600 [SCSI] mptbase: mpt_interrupt should return IRQ_NONE The way mpt_interrupt() was coded, it was impossible for the unhandled interrupt detection logic to ever trigger. All interrupt handlers should return IRQ_NONE when they have nothing to do. Signed-off-by: Jan Beulich Signed-off-by: Andrew Morton Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit 376ac8307868f93a0b9aa277f43dee0f63c41c1b Author: Eric Moore Date: Thu Jun 29 17:36:26 2006 -0600 [SCSI] mptsas: make two functions static Make two needlessly global functions static. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit 454e8957eb60841016deb319dbbf83042fb32a39 Author: Ishai Rabinovitz Date: Thu Jun 29 16:39:54 2006 +0300 [SCSI] sg.c: Fix bad error handling in I got a NULL derefrence in cdev_del+1 when called from sg_remove. By looking at the code of sg_add, sg_alloc and sg_remove (all in drivers/scsi/sg.c) I found out that sg_add is calling sg_alloc but if it fails afterwards it does not deallocate the space that was allocated in sg_alloc and the redundant entry has NULL in cdev. When sg_remove is being called, it tries to perform cdev_del to this NULL cdev and fails. Signed-off-by: Ishai Rabinovitz Acked-by: Douglas Gilbert Signed-off-by: James Bottomley commit 2df8386cec47520b76822cb39d96709f5d353cf8 Author: Karol Kozimor Date: Fri Jun 30 19:15:00 2006 -0400 ACPI: asus_acpi: add S1N WLED control This patch switches back the display nodes for M6R and M6N -- this happened a while ago when a patch was misapplied (only the in-tree version was affected). Signed-off-by: Karol Kozimor Signed-off-by: Len Brown commit 96d1142084281ae4601fab02be061e1267e431a3 Author: Karol Kozimor Date: Fri Jun 30 19:13:00 2006 -0400 ACPI: asus_acpi: add S1N WLED control This small patch adds back WLED control for S1N models, this was accidentally removed a while ago. Signed-off-by: Karol Kozimor Signed-off-by: Len Brown commit ffab0d9507dc527ff6d704ec5e7e7ccfee119fb1 Author: Karol Kozimor Date: Fri Jun 30 19:11:00 2006 -0400 ACPI: asus_acpi: rework model detection This patch reworks laptop model detection. This addresses the Samsung P30 issue, where the INIT method would return no object, but the implicit return in the AML interpreter would confuse the driver. It also accounts for a newer batch of Asus models whose INIT returns ACPI_TYPE_BUFFER instead of STRING. The handling is now much leaner, if we get a buffer or a string, we check against known values, in every other case we use a different path (currently DSDT signatures). The bulk of this patch is separating the string matching from asus_hotk_get_info() into a separate function. This patch properly fixes http://bugme.osdl.org/show_bug.cgi?id=5067 and http://bugme.osdl.org/show_bug.cgi?id=5092 and makes the driver fully functional again with acpi=strict on all machines. Signed-off-by: Karol Kozimor Signed-off-by: Len Brown commit ebccb84810729f0e86a83a65681ba2de45ff84d8 Author: Karol Kozimor Date: Fri Jun 30 19:08:00 2006 -0400 ACPI: asus_acpi: support L5D This patch adds support for Asus L5D and thus fixes http://bugme.osdl.org/show_bug.cgi?id=4695 Signed-off-by: Karol Kozimor Signed-off-by: Len Brown commit e067aaa7612c273d4bfd70d1bd8d80313a57685c Author: Karol Kozimor Date: Fri Jun 30 19:07:00 2006 -0400 ACPI: asus_acpi: handle internal Bluetooth / support W5A This patch creates a new file named "bluetooth" under /proc/acpi/asus/. This file controls both the internal Bluetooth adapter's presence on the USB bus and the associated LED. echo 1 > /proc/acpi/asus/bluetooth to enable, 0 to disable. Additionally, the patch add support for Asus W5A, the first model that uses this feature. Patch originally by Fernando A. P. Gomes. Signed-off-by: Karol Kozimor Signed-off-by: Len Brown commit f78c589d108f4b06a012817536c9ced37f473eae Author: Karol Kozimor Date: Fri Jun 30 19:06:00 2006 -0400 ACPI: asus_acpi: support A4G This patch adds support for Asus A4G. Originally by Giuseppe Rota. Signed-off-by: Karol Kozimor Signed-off-by: Len Brown commit c067a7899790ed4c03b00ed186c6e3b6a3964379 Author: Karol Kozimor Date: Fri Jun 30 19:05:00 2006 -0400 ACPI: asus_acpi: support W3400N This patch adds support for Asus W3400N. Signed-off-by: Karol Kozimor Signed-off-by: Len Brown commit 42cb891295795ed9b3048c8922d93f7a71f63968 Author: Karol Kozimor Date: Fri Jun 30 19:04:00 2006 -0400 ACPI: asus_acpi: LED display support This patch adds handling for front LED displays found on W1N and the like. Additionally, W1N is given its own model_data instance. Patch originally by Éric Burghard. Signed-off-by: Karol Kozimor Signed-off-by: Len Brown commit ed2cb07b2bb04f14793cdeecb0b384374e979525 Author: Karol Kozimor Date: Fri Jun 30 19:03:00 2006 -0400 ACPI: asus_acpi: support A3G This patch adds support for Asus A3G. Signed-off-by: Karol Kozimor Signed-off-by: Len Brown commit a170a5317c0298538deb170028376ec1631acc2f Author: Karol Kozimor Date: Fri Jun 30 19:03:00 2006 -0400 ACPI: asus_acpi: misc cleanups This patch updates the version string, copyright notices and does whitespace cleanup (it looks weird, blame Lindent). Signed-off-by: Karol Kozimor Signed-off-by: Len Brown commit 6e990b50ed0b45d506ff6809034508d3e210497d Author: David S. Miller Date: Fri Jun 30 00:07:40 2006 -0700 [SPARC64]: Kill sun4v virtual device layer. Replace with a simple IRQ translater in the PROM device tree builder. Signed-off-by: David S. Miller commit 93872ba21d1087cde1d5f9603f3265c1c54d471c Author: David S. Miller Date: Fri Jun 30 00:00:22 2006 -0700 [SERIAL] sunhv: Convert to of_driver layer. Signed-off-by: David S. Miller commit 1815aed5edbc79c6f3de6f022efb0af30dd0a70d Author: David S. Miller Date: Thu Jun 29 19:58:28 2006 -0700 [SPARC64]: Mask out top 8-bits in physical address when building resources. These top 8-bits are supposed to be ignored in the ranges and top-level reg properties on this platform. Signed-off-by: David S. Miller commit a1d22d3258aed732e1778ecb2e840e6c95cb668e Author: David S. Miller Date: Thu Jun 29 19:40:19 2006 -0700 [SERIAL] sunsu: Missing return statement in su_probe(). If we have a keyboard/mouse port, don't drop through to calling sunsu_autoconfig(). Signed-off-by: David S. Miller commit f83ef8c0b58dac17211a4c0b6df0e2b1bd6637b1 Author: Herbert Xu Date: Fri Jun 30 13:37:03 2006 -0700 [IPV6]: Added GSO support for TCPv6 This patch adds GSO support for IPv6 and TCPv6. This is based on a patch by Ananda Raju . His original description is: This patch enables TSO over IPv6. Currently Linux network stacks restricts TSO over IPv6 by clearing of the NETIF_F_TSO bit from "dev->features". This patch will remove this restriction. This patch will introduce a new flag NETIF_F_TSO6 which will be used to check whether device supports TSO over IPv6. If device support TSO over IPv6 then we don't clear of NETIF_F_TSO and which will make the TCP layer to create TSO packets. Any device supporting TSO over IPv6 will set NETIF_F_TSO6 flag in "dev->features" along with NETIF_F_TSO. In case when user disables TSO using ethtool, NETIF_F_TSO will get cleared from "dev->features". So even if we have NETIF_F_TSO6 we don't get TSO packets created by TCP layer. SKB_GSO_TCPV4 renamed to SKB_GSO_TCP to make it generic GSO packet. SKB_GSO_UDPV4 renamed to SKB_GSO_UDP as UFO is not a IPv4 feature. UFO is supported over IPv6 also The following table shows there is significant improvement in throughput with normal frames and CPU usage for both normal and jumbo. -------------------------------------------------- | | 1500 | 9600 | | ------------------|-------------------| | | thru CPU | thru CPU | -------------------------------------------------- | TSO OFF | 2.00 5.5% id | 5.66 20.0% id | -------------------------------------------------- | TSO ON | 2.63 78.0 id | 5.67 39.0% id | -------------------------------------------------- Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit bcd76111178ebccedd46a9b3eaff65c78e5a70af Author: Herbert Xu Date: Fri Jun 30 13:36:35 2006 -0700 [NET]: Generalise TSO-specific bits from skb_setup_caps This patch generalises the TSO-specific bits from sk_setup_caps by adding the sk_gso_type member to struct sock. This makes sk_setup_caps generic so that it can be used by TCPv6 or UFO. The only catch is that whoever uses this must provide a GSO implementation for their protocol which I think is a fair deal :) For now UFO continues to live without a GSO implementation which is OK since it doesn't use the sock caps field at the moment. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit adcfc7d0b4d7bc3c7edac6fdde9f3ae510bd6054 Author: Herbert Xu Date: Fri Jun 30 13:36:15 2006 -0700 [IPV6]: Added GSO support for TCPv6 This patch adds GSO support for IPv6 and TCPv6. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 2889139a6acd2945f6143eb85f7dc2a22a352e1a Author: Herbert Xu Date: Fri Jun 30 13:35:46 2006 -0700 [IPV6]: Remove redundant length check on input We don't need to check skb->len when we're just about to call pskb_may_pull since that checks it for us. Signed-off-by: Herbert Xu Acked-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit dd7271feba61d5dc0fab1cb5365db9926d35ea3a Author: Patrick McHardy Date: Thu Jun 29 21:40:23 2006 -0700 [NETFILTER]: SCTP conntrack: fix crash triggered by packet without chunks When a packet without any chunks is received, the newconntrack variable in sctp_packet contains an out of bounds value that is used to look up an pointer from the array of timeouts, which is then dereferenced, resulting in a crash. Make sure at least a single chunk is present. Problem noticed by George A. Theall Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 2c6059bca8cf5e7f722d909f2e5edda0491ac604 Author: Michael Chan Date: Thu Jun 29 20:16:28 2006 -0700 [TG3]: Update version and reldate Update version to 3.61. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 52c0fd834ea0e7c6ef8616ce0a1f85bac4233ed7 Author: Michael Chan Date: Thu Jun 29 20:15:54 2006 -0700 [TG3]: Add TSO workaround using GSO Use GSO to workaround a rare TSO bug on some chips. This hardware bug may be triggered when the TSO header size is greater than 80 bytes. When this condition is detected in a TSO packet, the driver will use GSO to segment the packet to workaround the hardware bug. Thanks to Juergen Kreileder for reporting the problem and collecting traces to help debug the problem. And thanks to Herbert Xu for providing the GSO mechanism that happens to be the perfect workaround for this problem. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 1661394e78b3b2cc868cd0e89c1066974302aaca Author: Michael Chan Date: Thu Jun 29 20:15:13 2006 -0700 [TG3]: Turn on hw fix for ASF problems Clear a bit to enable a hardware fix for some ASF related problem. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit f92905deb9bc89834dac247ca1a0d905ebcf629b Author: Michael Chan Date: Thu Jun 29 20:14:29 2006 -0700 [TG3]: Add rx BD workaround Add workaround to limit the burst size of rx BDs being DMA'ed to the chip. This works around hardware errata on a number of 5750, 5752, and 5755 chips. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 29315e8770c20cbfe607ad962d87867115a44555 Author: Michael Chan Date: Thu Jun 29 20:12:30 2006 -0700 [TG3]: Add tg3_netif_stop() in vlan functions Add tg3_netif_stop() when changing the vlgrp (vlan group) pointer. It is necessary to quiesce the device before changing that pointer. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 3820c3f3e41786322c0bb225b9c77b8deff869d1 Author: Herbert Xu Date: Thu Jun 29 20:11:25 2006 -0700 [TCP]: Reset gso_segs if packet is dodgy I wasn't paranoid enough in verifying GSO information. A bogus gso_segs could upset drivers as much as a bogus header would. Let's reset it in the per-protocol gso_segment functions. I didn't verify gso_size because that can be verified by the source of the dodgy packets. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 0d8fdfd71bc871ffc07fe4429db8d4934185a8ec Author: Sean Hefty Date: Fri Jun 30 14:10:14 2006 -0700 IB/core: Set alternate port number when initializing QP attributes Set alternate port number when initializing QP attributes. This bug is OpenFabrics bugzilla bug #160. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 146d26b2bf167f831d3b7442a01cfdc2b183cb0b Author: Roland Dreier Date: Fri Jun 30 13:40:13 2006 -0700 IB/uverbs: Set correct user handle for user SRQs Store away the user handle passed in from userspace when creating an SRQ, so that the kernel can return the correct handle when an SRQ asynchronous event occurs. (A 0 was incorrectly stored as the user handle as part of the changes in 9ead190b, "IB/uverbs: Don't serialize with ib_uverbs_idr_mutex") Signed-off-by: Roland Dreier commit 4b7a89a3c1cf545b03470416aa821fc2ff826b91 Author: Arjan van de Ven Date: Fri Jun 30 10:31:13 2006 +0200 [PATCH] pcmcia: fix deadlock in pcmcia_parse_events The PCMCIA layer calls pcmcia_parse_events both from user context and IRQ context; the lock thus needs to be irqsave to avoid deadlocks Signed-off-by: Arjan van de Ven Signed-off-by: Dominik Brodowski commit 6bb1c39a43d23e4cecc7e815491b6964c6758a29 Author: Marc Sowen Date: Sun Jun 25 01:56:24 2006 -0700 [PATCH] com20020_cs: more device support Enable the com20020_cs arcnet driver to see the SoHard (now Mercury Computer Systems Inc.) SH ARC-PCMCIA card. Signed-off-by: Andrew Morton Signed-off-by: Dominik Brodowski commit 0973ddddca72bc8aee8a273c232060b9608d1793 Author: Domen Puncer Date: Fri Jun 23 12:06:56 2006 +0100 [PATCH] au1xxx: pcmcia: fix __init called from non-init This must not be marked __init, as it is called from au1x00_drv_pcmcia_probe. Signed-off-by: Domen Puncer Signed-off-by: Dominik Brodowski commit a2bcce8ede4fbda0c2a5f2132115715dff056b9c Author: Al Viro Date: Thu Jun 15 12:26:55 2006 +0100 [PATCH] kill open-coded offsetof in cm4000_cs.c ZERO_DEV() ... to make sure that it doesn't break again when a field changes (see "[PATCH] pcmcia: fix zeroing of cm4000_cs.c data" for recent example). Signed-off-by: Al Viro Signed-off-by: Dominik Brodowski commit 1da9ab7389b8a0789a1b3ad43d3efe80b4c57c03 Author: Serge E. Hallyn Date: Wed Jun 14 08:01:26 2006 -0500 [PATCH] pcmcia: convert pcmcia_cs to kthread Convert pcmcia_cs to use kthread instead of the deprecated kernel_thread. Signed-off-by: Serge E. Hallyn Signed-off-by: Dominik Brodowski commit 66005216074337e3925514456175b202f17e23ef Author: Randy Dunlap Date: Tue Jun 6 12:06:41 2006 -0700 [PATCH] pcmcia: fix kernel-doc function name Fix kernel-doc function name spello. Signed-off-by: Randy Dunlap Signed-off-by: Dominik Brodowski commit fd99ddd0701385344eadaf2daa6abbc5fb086750 Author: Komuro Date: Mon Apr 17 21:41:21 2006 +0900 [PATCH] pcmcia: hostap_cs.c - 0xc00f,0x0000 conflicts with pcnet_cs Comment out the ID 0xc00f,0x0000 in hostap_cs.c, as it conflicts with the pcnet_cs driver. Signed-off-by: komurojun-mbn@nifty.com Signed-off-by: Dominik Brodowski commit 0db6095d4ff8918350797dfe299d572980e82fa0 Author: David Brownell Date: Wed Apr 19 06:37:48 2006 -0700 [PATCH] pcmcia: at91_cf suspend/resume/wakeup AT91 CF updates, mostly for power management: - Add suspend/resume methods to the AT91 CF driver, disabling non-wakeup IRQs during system suspend. The card detect IRQ serves as a wakeup event source. - Convert the driver to the more-current "platform_driver" style. So inserting or removing a CF card will wake the system, unless that has been disabled by updating the sysfs file; and there will be no more warnings about spurious IRQs during suspend/resume cycles. Signed-off-by: David Brownell Signed-off-by: Dominik Brodowski commit 5040cb8b7e61b7a03e8837920b9eb2c839bb1947 Author: Thomas Kleffel Date: Sun May 14 15:16:30 2006 +0200 [PATCH] pcmcia: Make ide_cs work with the memory space of CF-Cards if IO space is not available This patch enables ide_cs to access CF-cards via their common memory rather than via their IO space. Signed-off-by: Thomas Kleffel Signed-off-by: Dominik Brodowski commit 59e35ba1257903eaff5203f62f77554da02f5b63 Author: Alex Williamson Date: Mon May 8 23:22:07 2006 -0600 [PATCH] pcmcia: TI PCIxx12 CardBus controller support The patch below adds support for the TI PCIxx12 CardBus controllers. This seems to be sufficient to detect the cardbus bridge on an HP nc6320 and works with an orinoco wifi card. Signed-off-by: Alex Williamson Signed-off-by: Dominik Brodowski commit c533120b8da215dc02310c535fa87c5c480d0f14 Author: Alan Cox Date: Tue May 16 16:16:44 2006 +0100 [PATCH] pcmcia: warn if driver requests exclusive, but gets a shared IRQ The patch below cleans up the pcmcia code a bit on the IRQ side (I did this while debugging the problem just so I could read wtf it was doing), and also adds a warning and passes back the correct information when a device asks for exclusive but gets given shared. This at least means the dmesg dump of a problem triggered by this will have a signature to find. Signed-off-by: Alan Cox Signed-off-by: Dominik Brodowski commit d29693bf10f376870d9bfd34bde80dd061cc4575 Author: Randy Dunlap Date: Sun May 21 20:57:42 2006 -0700 [PATCH] pcmcia: expose tool in pcmcia/Documentation/pcmcia/ Expose example and tool source files in the Documentation/ directory in their own files instead of being buried (almost hidden) in readme/txt files. This will make them more visible/usable to users who may need to use them, to developers who may need to test with them, and to janitors who would update them if they were more visible. Also, if any of these possibly should not be in the kernel tree at all, it will be clearer that they are here and we can discuss if they should be removed. Signed-off-by: Randy Dunlap Signed-off-by: Dominik Brodowski commit fec21889cd6ef5e604b410c08b50a8c1522d74d4 Author: Dominik Brodowski Date: Wed Apr 26 19:57:32 2006 +0200 [PATCH] pcmcia: another ID for serial_cs.c Add an ID for "GlobeTrotter" cards which need a CIS override Signed-off-by: Dominik Brodowski commit b435261b1e09bb2bb6acc4abbc7f6e3d885f9e62 Author: Bernhard Kaindl Date: Tue May 30 18:00:34 2006 +0200 [PATCH] yenta: fix hidden PCI bus numbers Fixup the subordinate number parent bridge of yenta Cardbus Bridges before the PCI bus scan starts to make the cardbus cards which are otherwise hidden for PCI scans work. Signed-off-by: Bernhard Kaindl Signed-off-by: Dominik Brodowski commit d250a4810402ec68f64802b66340a0e70c61cbd3 Author: Daniel Ritz Date: Mon Mar 6 17:37:04 2006 +0100 [PATCH] yenta: do power-up only after socket is configured Power-up the card only after the socket is configured. power-down in the old place. The point is not to power-up the card before the interrupt routing is set up correctly. Signed-off-by: Daniel Ritz Signed-off-by: Dominik Brodowski commit 00819f87d883bb4aff97aecc7cc722ba27bd183a Author: Hans Verkuil Date: Fri Jun 30 13:41:26 2006 -0300 V4L/DVB (4290): Add support for the TCL M2523_3DB_E tuner. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 91a079196fba6918bdf785533dcdfca5361577cb Author: Eric Sesterhenn Date: Fri Jun 30 11:51:11 2006 -0300 V4L/DVB (4289): Missing statement in drivers/media/dvb/frontends/cx22700.c Stumbled over this because of coverity (id #492), seems like we are missing a return statement here and fail to do proper bounds checking. If this assumption is false we should at least change the identation to make it clear Signed-off-by: Eric Sesterhenn Signed-off-by: Mauro Carvalho Chehab commit a0fd1cb171e8b17339a9a18ae7cf09c50022010f Author: Mike Isely Date: Fri Jun 30 11:35:28 2006 -0300 V4L/DVB (4288): Clean out a zillion sparse warnings in pvrusb2 Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 07e337eeab3660559cbe1fee6907d1092037aea7 Author: Adrian Bunk Date: Fri Jun 30 11:30:20 2006 -0300 V4L/DVB (4287): Pvrusb2/: possible cleanups This patch contains the following possible cleanups: - make needlessly global code static - #if 0 unused global functions Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab commit c02a34f4e3e65a7b1fb64507ec5c093e8328335e Author: Saqeb Akhter Date: Thu Jun 29 20:29:33 2006 -0300 V4L/DVB (4285): Cx88: add support for Geniatech Digistar / Digiwave 103g This patch adds support for the Geniatech Digistar, aka Digiwave 103g DVB-S card. Acked-by: Andrew de Quincey Signed-off-by: Saqeb Akhter Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit ccd214b27341485bd471e4e031c33d2ba1a9aaac Author: Saqeb Akhter Date: Thu Jun 29 20:29:29 2006 -0300 V4L/DVB (4284): Cx24123: fix set_voltage function according to the specs The set_voltage function in cx24123.c was corrected to match how it is described in the CX24123 specs, producing the correct behaviour for cards that require it. Acked-by: Andrew de Quincey Signed-off-by: Saqeb Akhter Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 70d906354fd7fe3956366ade15ab36d6b7aed971 Author: Manu Abraham Date: Thu Jun 29 22:05:23 2006 -0300 V4L/DVB (4282): Fix: use swzigzag for swalgo Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 00e158d52a8107ebcb0eaee6442267927f149b3b Author: Hans Verkuil Date: Thu Jun 29 16:30:51 2006 -0300 V4L/DVB (4281): TDA9887_SET_CONFIG should only be handled by the tda9887. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit c5e768a1ec281926e3a3a2b804d5004a2693d7e8 Author: Andrew de Quincey Date: Thu Jun 29 13:16:11 2006 -0300 V4L/DVB (4277): Fix CI interface on PRO KNC1 cards The original driver had a restriction that if a card as an saa7113 chip, then it cannot have a CI interface. This is not the case. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit fd6decfbb86a73f3bdf3df2281191e7a978d8b77 Author: Andrew de Quincey Date: Thu Jun 29 13:16:07 2006 -0300 V4L/DVB (4276): Fix CI on old KNC1 DVBC cards These cards do not need the tda10021 configuration change when data is streamed through a CAM module. This disables it for these ones. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 1b172e0c4e44151cd239c1e9260c7822a4eecdbf Author: Trent Piepho Date: Thu Jun 29 13:16:04 2006 -0300 V4L/DVB (4275): The FE_SET_FRONTEND_TUNE_MODE ioctl always returns EOPNOTSUPP When someone added the front-end ioctl FE_SET_FRONTEND_TUNE_MODE, they forgot to set the return value to 0. It always returns EOPNOTSUPP, causing problems for programmers who actually check for error conditions. Signed-off-by: Trent Piepho Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 591b631f030cee5f4c6cf016dd71d565a5a4eff6 Author: Mike Isely Date: Thu Jun 29 09:26:57 2006 -0300 V4L/DVB (4274): Eliminate use of tda9887 from pvrusb2 driver Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 47ed3bc6cf03d11207ab219945fbc556885743f4 Author: Mike Isely Date: Thu Jun 29 09:26:43 2006 -0300 V4L/DVB (4273): Always log pvrusb2 device register / unregister events Previously the pvrusb2 driver was conditionalizing printing of the device register / unregister messages against a debug mask. This sort of information should always appear, thus this patch. Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 3407e387c8144e08fafcc3287bcf9452d14f1d38 Author: Mauro Carvalho Chehab Date: Wed Jun 28 18:17:44 2006 -0300 V4L/DVB (4272): Fix tveeprom supported standards The supported standards by the tuner on tveeprom were too restricted. It were showing just the main format, instead of the format family. Signed-off-by: Mauro Carvalho Chehab commit ba8fc39954bf3bc51f502e8a02f959d45edd096c Author: Hans Verkuil Date: Sun Jun 25 15:34:39 2006 -0300 V4L/DVB (4270): Add tda9887-specific tuner configuration Many tda9887 settings depend on the chosen tuner. Expand the tuner parameters to include these tda9887 settings. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 0a1153736f97db48e6bc9ab27e90b51ab50729c7 Author: Randy Dunlap Date: Wed Jun 28 15:05:11 2006 -0300 V4L/DVB (4269): Subject: videocodec: make 1-bit fields unsigned Make 1-bit bitfields unsigned. Removes 68 sparse errors like these: drivers/media/video/videocodec.h:225:17: error: dubious one-bit signed bitfield drivers/media/video/msp3400-driver.h:93:32: error: dubious one-bit signed bitfield Acked-by: Hans Verkuil Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 4987abed29247063bb70374e60916584a43975ef Author: Michael Krufky Date: Tue Jun 27 00:35:41 2006 -0300 V4L/DVB (4267): Remove all instances of request_module("tda9887") We should no longer try to load the tda9887 module, because it no longer exists. The tda9887 driver has been merged into the tuner module. This patch removes all instances of request_module("tda9887") from the following video4linux drivers: bttv, cx88, em28xx and saa7134. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 38a2713ada91d5e7e4c0a1a0b12e45e2ec7079c3 Author: Michael Krufky Date: Mon Jun 26 23:42:39 2006 -0300 V4L/DVB (4264): Cx88-blackbird: implement VIDIOC_QUERYCTRL and VIDIOC_QUERYMENU This patch implements the newer v4l2 control features to make the standard user controls and mpeg encoder controls of cx88-blackbird video encoder boards available to userspace. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 55910b28f7ca80af8fdfac84ddd6ece201a5928b Author: Andrew Morton Date: Fri Jun 30 05:15:00 2006 -0400 ACPI: Kconfig: ACPI_SRAT depends on ACPI arch/i386/kernel/srat.c won't compile without CONFIG_ACPI. Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 9e5289f4dd2326fb8c0a3af23a954158ca99c354 Author: Adrian Bunk Date: Fri Jun 30 05:15:00 2006 -0400 ACPI: drivers/acpi/scan.c: make acpi_bus_type static Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 598736c55622f7ea65b98f93c825ff95c433877c Author: Andrew Morton Date: Fri Jun 30 01:56:20 2006 -0700 [PATCH] i2c-801: 64bit resource fix drivers/i2c/busses/i2c-i801.c: In function 'i801_probe': drivers/i2c/busses/i2c-i801.c:496: warning: format '%lx' expects type 'long unsigned int', but argument 5 has type 'resource_size_t' Cc: Greg KH Cc: Vivek Goyal Cc: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cfa7b0d46964300c849243d1a38a138b870bdc13 Author: Andrew Morton Date: Fri Jun 30 01:56:20 2006 -0700 [PATCH] infiniband: devfs fix Remove devfs leftovers. Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7c9fdcfb1b64c47ed618c103b617af3f86e1239c Author: J. Bruce Fields Date: Fri Jun 30 01:56:19 2006 -0700 [PATCH] knfsd: svcrpc: gss: server-side implementation of rpcsec_gss privacy Server-side implementation of rpcsec_gss privacy, which enables encryption of the payload of every rpc request and response. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c04c46aec16b3267d8fe03af886f2d41e448cd0 Author: J. Bruce Fields Date: Fri Jun 30 01:56:19 2006 -0700 [PATCH] knfsd: nfsd: mark rqstp to prevent use of sendfile in privacy case Add a rq_sendfile_ok flag to svc_rqst which will be cleared in the privacy case so that the wrapping code will get copies of the read data instead of real page cache pages. This makes life simpler when we encrypt the response. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e142ede8e064cb1ae9c2bfb17f36ab145b95ccd2 Author: J. Bruce Fields Date: Fri Jun 30 01:56:18 2006 -0700 [PATCH] knfsd: svcrpc: Simplify nfsd rpcsec_gss integrity code Pull out some of the integrity code into its own function, otherwise svcauth_gss_release() is going to become very ungainly after the addition of privacy code. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ecb6a08d84d0e795648d5add64f154bc406914b Author: J. Bruce Fields Date: Fri Jun 30 01:56:17 2006 -0700 [PATCH] knfsd: nfsd4: fix open flag passing Since nfsv4 actually keeps around the file descriptors it gets from open (instead of just using them for a single read or write operation), we need to make sure that we can do RDWR opens and not just RDONLY/WRONLY. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba5a6a19d83babe00be3711db3deee5c57587b8f Author: J. Bruce Fields Date: Fri Jun 30 01:56:16 2006 -0700 [PATCH] knfsd: nfsd4: fix some open argument tests These tests always returned true; clearly that wasn't what was intended. In keeping with kernel style, make them functions instead of macros while we're at it. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1df0cada03644e37ae6fefd7c0267d9a531991e2 Author: J. Bruce Fields Date: Fri Jun 30 01:56:16 2006 -0700 [PATCH] knfsd: svcrpc: gss: simplify rsc_parse() Adopt a simpler convention for gss_mech_put(), to simplify rsc_parse(). Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 270d56e536dcd37cc819a6adb51d918185411048 Author: David M. Richter Date: Fri Jun 30 01:56:15 2006 -0700 [PATCH] knfsd: nfsd: fix misplaced fh_unlock() in nfsd_link() In the event that lookup_one_len() fails in nfsd_link(), fh_unlock() is skipped and locks are held overlong. Patch was tested on 2.6.17-rc2 by causing lookup_one_len() to fail and verifying that fh_unlock() gets called appropriately. Signed-off-by: David M. Richter Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e46d8a9ccbcd3273bdb6902ca2b6da62c253e73 Author: J. Bruce Fields Date: Fri Jun 30 01:56:14 2006 -0700 [PATCH] knfsd: nfsd4: remove superfluous grace period checks We're checking nfs_in_grace here a few times when there isn't really any reason to--bad_stateid is probably the more sensible return value anyway. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7fc90ec93a5eb71f4b08403baf5ba7176b3ec6b1 Author: J. Bruce Fields Date: Fri Jun 30 01:56:14 2006 -0700 [PATCH] knfsd: nfsd: call nfsd_setuser() on fh_compose(), fix nfsd4 permissions problem In the typical v2/v3 case the only new filehandles used as arguments to operations are filehandles taken directly off the wire, which don't get dentries until fh_verify() is called. But in v4 the filehandles that are arguments to operations were often created by previous operations (putrootfh, lookup, etc.) using fh_compose, which sets the dentry in the filehandle without calling nfsd_setuser(). This also means that, for example, if filesystem B is mounted on filesystem A, and filesystem A is exported without root-squashing, then a client can bypass the rootsquashing on B using a compound that starts at a filehandle in A, crosses into B using lookups, and then does stuff in B. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a8cddc5dfc1d03a91885ef27eb91418e665577ce Author: J. Bruce Fields Date: Fri Jun 30 01:56:13 2006 -0700 [PATCH] knfsd: nfsd4: fix open_confirm locking Fix an improper unlock in an error path. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7e4053645a67097fa9bec2794d685b1d3928757a Author: NeilBrown Date: Fri Jun 30 01:56:12 2006 -0700 [PATCH] knfsd: ignore ref_fh when crossing a mountpoint nfsd tries to return to a client the same sort of filehandle as was used by the client. This removes some filehandle aliasing issues and means that a server upgrade followed by a downgrade will not confused clients not restarted during that time. However when crossing a mountpoint, the filehandle used for one filesystem doesn't provide any useful information on what sort of filehandle should be used on the other, and can provide misleading information. So if the reference filehandle is on a different filesystem to the one being generated, ignore it. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c9608b2f2f51e84eba72f4bf061d360259ce656 Author: NeilBrown Date: Fri Jun 30 01:56:11 2006 -0700 [PATCH] knfsd: remove noise about filehandle being uptodate There is a perfectly valid situation where fh_update gets called on an already uptodate filehandle - in nfsd_create_v3 where a CREATE_UNCHECKED finds an existing file and wants to just set the size. We could possible optimise out the call in that case, but the only harm involved is that fh_update prints a warning, so it is easier to remove the warning. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4bdff8c0950afa6a3f2efec6cd15159d97fac1e6 Author: Frank Filz Date: Fri Jun 30 01:56:11 2006 -0700 [PATCH] knfsd: fixing missing 'expkey' support for fsid type 3 Type '3' is used for the fsid in filehandles when the device number of the device holding the filesystem has more than 8 bits in either major or minor. Unfortunately expkey_parse doesn't recognise type 3. Fix this. (Slighty modified from Frank's original) Signed-off-by: Frank Filz Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a56f39375a7bd183149c18286389e4a58ac9bc95 Author: NeilBrown Date: Fri Jun 30 01:56:10 2006 -0700 [PATCH] knfsd: improve the test for cross-device-rename in nfsd Just testing the i_sb isn't really enough, at least the vfsmnt must be the same. Thanks Al. Cc: Al Viro Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c2a6a40902323b739e4e740ebf91ee357a5de5b Author: Doug Thompson Date: Fri Jun 30 01:56:09 2006 -0700 [PATCH] EDAC: maintainers update Removed Dave Peterson as per his request as co-maintainer of EDAC Thanks Dave. Added Mark Gross as maintainer of edac-e752x driver Thanks Mark Signed-off-by: Doug Thompson Signed-off-by: Dave Peterson Signed-off-by: Mark Gross Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1318952514d5651c453d89989595a9df3b37267b Author: Doug Thompson Date: Fri Jun 30 01:56:08 2006 -0700 [PATCH] EDAC: probe1 cleanup 1-of-2 - Add lower-level functions that handle various parts of the initialization done by the xxx_probe1() functions. Some of the xxx_probe1() functions are much too long and complicated (see "Chapter 5: Functions" in Documentation/CodingStyle). - Cleanup of probe1() functions in EDAC Signed-off-by: Doug Thompson Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d7bbb91c8df26c60d223205a087507430024177 Author: Doug Thompson Date: Fri Jun 30 01:56:08 2006 -0700 [PATCH] EDAC: mc numbers refactor 1-of-2 Remove add_mc_to_global_list(). In next patch, this function will be reimplemented with different semantics. 1 Reimplement add_mc_to_global_list() with semantics that allow the caller to determine the ID number for a mem_ctl_info structure. Then modify edac_mc_add_mc() so that the caller specifies the ID number for the new mem_ctl_info structure. Platform-specific code should be able to assign the ID numbers in a platform-specific manner. For instance, on Opteron it makes sense to have the ID of the mem_ctl_info structure match the ID of the node that the memory controller belongs to. 2 Modify callers of edac_mc_add_mc() so they use the new semantics. Signed-off-by: Doug Thompson Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 37f04581abac20444e5b7106c1e1f28bec5b989c Author: Doug Thompson Date: Fri Jun 30 01:56:07 2006 -0700 [PATCH] EDAC: PCI device to DEVICE cleanup Change MC drivers from using CVS revision strings for their version number, Now each driver has its own local string. Remove some PCI dependencies from the core EDAC module. Made the code 'struct device' centric instead of 'struct pci_dev' Most of the code changes here are from a patch by Dave Jiang. It may be best to eventually move the PCI-specific code into a separate source file. Signed-off-by: Doug Thompson Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc474c891c1993c4d608bed00c425b6db93d088d Author: Matt LaPlante Date: Fri Jun 30 01:56:06 2006 -0700 [PATCH] Documentation/IPMI typos Two typos in Documentation/IPMI. Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f04ac062e92a37bb0fa3313405597244b4702c1 Author: Josh Triplett Date: Fri Jun 30 01:56:05 2006 -0700 [PATCH] rcu: Add lock annotations to RCU locking primitives Add __acquire annotations to rcu_read_lock and rcu_read_lock_bh, and add __release annotations to rcu_read_unlock and rcu_read_unlock_bh. This allows sparse to detect improperly paired calls to these functions. Signed-off-by: Josh Triplett Acked-by: Paul E. McKenney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7adc28ae75854d9d0940668404a14d1f006f80c0 Author: Adrian Bunk Date: Fri Jun 30 01:56:04 2006 -0700 [PATCH] drivers/cdrom/cm206.c: cleanups - make __cm206_init() __init (required since it calls the __init cm206_init()) - make the needlessly global bcdbin() static - remove a comment with an obsolete compile command Signed-off-by: Adrian Bunk Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7b2baa1f8a82d0940db6fbbaa00e5b829a99b2c9 Author: Adrian Bunk Date: Fri Jun 30 01:56:02 2006 -0700 [PATCH] show Acorn-specific block devices menu only when required Don't show a menu that can't be entered due to lack of contents on arm (the options are only available on arm26). Signed-off-by: Adrian Bunk Acked-by: Ian Molton Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 304228e29ae212952726e91511eddc0ba551bd31 Author: Andrew Victor Date: Fri Jun 30 01:56:01 2006 -0700 [PATCH] Correct rtc_wkalrm comments This corrects the comments describing the 'enabled' and 'pending' flags in struct rtc_wkalrm of include/linux/rtc.h. Signed-off-by: Andrew Victor Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e7b384043e27bed4f23b108481b99c518dd01a01 Author: Andrew Morton Date: Fri Jun 30 01:56:00 2006 -0700 [PATCH] cond_resched() fix Fix a bug identified by Zou Nan hai : If the system is in state SYSTEM_BOOTING, and need_resched() is true, cond_resched() returns true even though it didn't reschedule. Consequently need_resched() remains true and JBD locks up. Fix that by teaching cond_resched() to only return true if it really did call schedule(). cond_resched_lock() and cond_resched_softirq() have a problem too. If we're in SYSTEM_BOOTING state and need_resched() is true, these functions will drop the lock and will then try to call schedule(), but the SYSTEM_BOOTING state will prevent schedule() from being called. So on return, need_resched() will still be true, but cond_resched_lock() has to return 1 to tell the caller that the lock was dropped. The caller will probably lock up. Bottom line: if these functions dropped the lock, they _must_ call schedule() to clear need_resched(). Make it so. Also, uninline __cond_resched(). It's largeish, and slowpath. Acked-by: Ingo Molnar Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 92fe15a3d24fa53e7e961c549c488d0bb642d895 Author: Jeff Dike Date: Fri Jun 30 01:55:59 2006 -0700 [PATCH] uml: add __raw_writeq definition The x86_64 build requires a definition for __raw_writeq. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ff23db5373f66a818c296f4d58adaaa10f515fd3 Author: Jeff Dike Date: Fri Jun 30 01:55:58 2006 -0700 [PATCH] uml: fix biarch gcc build on x86_64 I run an x86_64 kernel with i386 userspace (Ubuntu Dapper) and decided to try out UML today. I found that UML wasn't quite aware of biarch compilers (which Ubuntu i386 ships). A fix similar to what was done for x86_64 should probably be committed (see http://marc.theaimsgroup.com/?l=linux-kernel&m=113425940204010&w=2). Without the FLAGS changes, the build will fail at a number of places and without the LINK change, the final link will fail. Signed-off-by: Nishanth Aravamudan Cc: Paolo 'Blaisorblade' Giarrusso Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d115ec0f0f094683dc2588818cb28134dd75e6d1 Author: Jeff Dike Date: Fri Jun 30 01:55:57 2006 -0700 [PATCH] uml: remove stray file Forgot to remove arch/um/kernel/time.c when it was mostly moved to arch/um/os-Linux. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 30df49191cf8c7a3d86ccea956ba0de911c1dc36 Author: Jeff Dike Date: Fri Jun 30 01:55:57 2006 -0700 [PATCH] uml: remove unneeded time definitions Remove um_time() and um_stime() syscalls since they are identical to system-wide ones. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 572e614750c3ed27da1ec6b75dc486066a11fffd Author: Jeff Dike Date: Fri Jun 30 01:55:56 2006 -0700 [PATCH] uml: add locking to xtime accesses do_timer must be called with xtime_lock held. I'm not sure boot_timer_handler needs this, however I don't think it hurts: it simply disables irq and takes a spinlock. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6edb08620fbeeeba81ab63c7129a51cdb3acd8b3 Author: Jeff Dike Date: Fri Jun 30 01:55:55 2006 -0700 [PATCH] uml: unregister useless console when it's not needed -mm in combination with an FC5 init started dying with 'stderr=1' because init didn't like the lack of /dev/console and exited. The problem was that the stderr console, which is intended to dump printk output to the terminal before the regular console is initialized, isn't a tty, and so can't make /dev/console operational. However, since it is registered first, the normal console, when it is registered, doesn't become the preferred console, and isn't attached to /dev/console. Thus, /dev/console is never operational. This patch makes the stderr console unregister itself in an initcall, which is late enough that the normal console is registered. When that happens, the normal console will become the preferred console and will be able to run /dev/console. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 190f4939222b8c07cd62a20e1ce0c7a97fffde99 Author: Jeff Dike Date: Fri Jun 30 01:55:55 2006 -0700 [PATCH] uml: fix off-by-one bug in VM file creation Fix an off-by-one bug in temp file creation. Seeking to the desired length and writing a byte resulted in the file being one byte longer than expected. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c2b7a4bb30008dc256d63802e02b6fb950958443 Author: Jeff Dike Date: Fri Jun 30 01:55:54 2006 -0700 [PATCH] uml: fix /proc/mounts parsing boundary condition When parsing /proc/mounts looking for a tmpfs mount on /dev/shm, if a string that we are looking for if split across reads, then it won't be recognized. Fix this by refilling the buffer whenever we advance the cursor. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd673bca474a199fb8d1b6a311832592977ecb5f Author: Adrian Bunk Date: Fri Jun 30 01:55:51 2006 -0700 [PATCH] UML: fix the INIT_ENV_ARG_LIMIT dependencies Fix the INIT_ENV_ARG_LIMIT dependencies to what seems to have been intended. Spotted by Jean-Luc Leger. Signed-off-by: Adrian Bunk Acked-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 033ab7f8e5c655f49ec8039930b2efd412abbbd7 Author: Andrew Morton Date: Fri Jun 30 01:55:50 2006 -0700 [PATCH] add smp_setup_processor_id() Presently, smp_processor_id() isn't necessarily set up until setup_arch(). But it's used in boot_cpu_init() and printk() and perhaps in other places, prior to setup_arch() being called. So provide a new smp_setup_processor_id() which is called before anything else, wire it up for Voyager (which boots on a CPU other than #0, and broke). Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a1836a42daf5ddfe9a891973734bd9a7d62eb504 Author: David Quigley Date: Fri Jun 30 01:55:49 2006 -0700 [PATCH] SELinux: Add security hook definition for getioprio and insert hooks Add a new security hook definition for the sys_ioprio_get operation. At present, the SELinux hook function implementation for this hook is identical to the getscheduler implementation but a separate hook is introduced to allow this check to be specialized in the future if necessary. This patch also creates a helper function get_task_ioprio which handles the access check in addition to retrieving the ioprio value for the task. Signed-off-by: David Quigley Acked-by: Stephen Smalley Signed-off-by: James Morris Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a01955f99b65622a00ba5c8b39202ddc6fa65f8 Author: David Quigley Date: Fri Jun 30 01:55:48 2006 -0700 [PATCH] SELinux: update USB code with new kill_proc_info_as_uid This patch updates the USB core to save and pass the sending task secid when sending signals upon AIO completion so that proper security checking can be applied by security modules. Signed-off-by: David Quigley Signed-off-by: James Morris Cc: Stephen Smalley Cc: Chris Wright Signed-off-by: Greg Kroah-Hartman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f95dc58d0505516f5cc212a966aea2f2cdb5e44 Author: David Quigley Date: Fri Jun 30 01:55:47 2006 -0700 [PATCH] SELinux: add security hook call to kill_proc_info_as_uid This patch adds a call to the extended security_task_kill hook introduced by the prior patch to the kill_proc_info_as_uid function so that these signals can be properly mediated by security modules. It also updates the existing hook call in check_kill_permission. Signed-off-by: David Quigley Signed-off-by: James Morris Cc: Stephen Smalley Cc: Chris Wright Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f9008e4c5c525941967b67777945aa6266ab6326 Author: David Quigley Date: Fri Jun 30 01:55:46 2006 -0700 [PATCH] SELinux: extend task_kill hook to handle signals sent by AIO completion This patch extends the security_task_kill hook to handle signals sent by AIO completion. In this case, the secid of the task responsible for the signal needs to be obtained and saved earlier, so a security_task_getsecid() hook is added, and then this saved value is passed subsequently to the extended task_kill hook for use in checking. Signed-off-by: David Quigley Signed-off-by: James Morris Cc: Stephen Smalley Cc: Chris Wright Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ed11d9eb2228acc483c819ab353e3c41bcb158fa Author: Christoph Lameter Date: Fri Jun 30 01:55:45 2006 -0700 [PATCH] slab: consolidate code to free slabs from freelist Post and discussion: http://marc.theaimsgroup.com/?t=115074342800003&r=1&w=2 Code in __shrink_node() duplicates code in cache_reap() Add a new function drain_freelist that removes slabs with objects that are already free and use that in various places. This eliminates the __node_shrink() function and provides the interrupt holdoff reduction from slab_free to code that used to call __node_shrink. [akpm@osdl.org: build fixes] Signed-off-by: Christoph Lameter Cc: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f8891e5e1f93a128c3900f82035e8541357896a7 Author: Christoph Lameter Date: Fri Jun 30 01:55:45 2006 -0700 [PATCH] Light weight event counters The remaining counters in page_state after the zoned VM counter patches have been applied are all just for show in /proc/vmstat. They have no essential function for the VM. We use a simple increment of per cpu variables. In order to avoid the most severe races we disable preempt. Preempt does not prevent the race between an increment and an interrupt handler incrementing the same statistics counter. However, that race is exceedingly rare, we may only loose one increment or so and there is no requirement (at least not in kernel) that the vm event counters have to be accurate. In the non preempt case this results in a simple increment for each counter. For many architectures this will be reduced by the compiler to a single instruction. This single instruction is atomic for i386 and x86_64. And therefore even the rare race condition in an interrupt is avoided for both architectures in most cases. The patchset also adds an off switch for embedded systems that allows a building of linux kernels without these counters. The implementation of these counters is through inline code that hopefully results in only a single instruction increment instruction being emitted (i386, x86_64) or in the increment being hidden though instruction concurrency (EPIC architectures such as ia64 can get that done). Benefits: - VM event counter operations usually reduce to a single inline instruction on i386 and x86_64. - No interrupt disable, only preempt disable for the preempt case. Preempt disable can also be avoided by moving the counter into a spinlock. - Handling is similar to zoned VM counters. - Simple and easily extendable. - Can be omitted to reduce memory use for embedded use. References: RFC http://marc.theaimsgroup.com/?l=linux-kernel&m=113512330605497&w=2 RFC http://marc.theaimsgroup.com/?l=linux-kernel&m=114988082814934&w=2 local_t http://marc.theaimsgroup.com/?l=linux-kernel&m=114991748606690&w=2 V2 http://marc.theaimsgroup.com/?t=115014808400007&r=1&w=2 V3 http://marc.theaimsgroup.com/?l=linux-kernel&m=115024767022346&w=2 V4 http://marc.theaimsgroup.com/?l=linux-kernel&m=115047968808926&w=2 Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ca889e6c45e0b112cb2ca9d35afc66297519b5d5 Author: Christoph Lameter Date: Fri Jun 30 01:55:44 2006 -0700 [PATCH] Use Zoned VM Counters for NUMA statistics The numa statistics are really event counters. But they are per node and so we have had special treatment for these counters through additional fields on the pcp structure. We can now use the per zone nature of the zoned VM counters to realize these. This will shrink the size of the pcp structure on NUMA systems. We will have some room to add additional per zone counters that will all still fit in the same cacheline. Bits Prior pcp size Size after patch We can add ------------------------------------------------------------------ 64 128 bytes (16 words) 80 bytes (10 words) 48 32 76 bytes (19 words) 56 bytes (14 words) 8 (64 byte cacheline) 72 (128 byte) Remove the special statistics for numa and replace them with zoned vm counters. This has the side effect that global sums of these events now show up in /proc/vmstat. Also take the opportunity to move the zone_statistics() function from page_alloc.c into vmstat.c. Discussions: V2 http://marc.theaimsgroup.com/?t=115048227000002&r=1&w=2 Signed-off-by: Christoph Lameter Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bab1846a0582f627f5ec22aa2dc5f4f3e82e8176 Author: Andrew Morton Date: Fri Jun 30 01:55:43 2006 -0700 [PATCH] zoned-vm-counters: remove read_page_state() No callers. Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c24f21bda88df4574de0a32a2a1558a23adae1b8 Author: Christoph Lameter Date: Fri Jun 30 01:55:42 2006 -0700 [PATCH] zoned vm counters: remove useless struct wbs Remove writeback state We can remove some functions now that were needed to calculate the page state for writeback control since these statistics are now directly available. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d2c5e30c9a1420902262aa923794d2ae4e0bc391 Author: Christoph Lameter Date: Fri Jun 30 01:55:41 2006 -0700 [PATCH] zoned vm counters: conversion of nr_bounce to per zone counter Conversion of nr_bounce to a per zone counter nr_bounce is only used for proc output. So it could be left as an event counter. However, the event counters may not be accurate and nr_bounce is categorizing types of pages in a zone. So we really need this to also be a per zone counter. [akpm@osdl.org: bugfix] Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fd39fc8561be33065306bdac0e30414e1e8ac8e1 Author: Christoph Lameter Date: Fri Jun 30 01:55:40 2006 -0700 [PATCH] zoned vm counters: conversion of nr_unstable to per zone counter Conversion of nr_unstable to a per zone counter We need to do some special modifications to the nfs code since there are multiple cases of disposition and we need to have a page ref for proper accounting. This converts the last critical page state of the VM and therefore we need to remove several functions that were depending on GET_PAGE_STATE_LAST in order to make the kernel compile again. We are only left with event type counters in page state. [akpm@osdl.org: bugfixes] Signed-off-by: Christoph Lameter Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ce866b34ae1b7f1ce60234cf65855886ac7e7d30 Author: Christoph Lameter Date: Fri Jun 30 01:55:40 2006 -0700 [PATCH] zoned vm counters: conversion of nr_writeback to per zone counter Conversion of nr_writeback to per zone counter. This removes the last page_state counter from arch/i386/mm/pgtable.c so we drop the page_state from there. [akpm@osdl.org: bugfix] Signed-off-by: Christoph Lameter Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b1e7a8fd854d2f895730e82137400012b509650e Author: Christoph Lameter Date: Fri Jun 30 01:55:39 2006 -0700 [PATCH] zoned vm counters: conversion of nr_dirty to per zone counter This makes nr_dirty a per zone counter. Looping over all processors is avoided during writeback state determination. The counter aggregation for nr_dirty had to be undone in the NFS layer since we summed up the page counts from multiple zones. Someone more familiar with NFS should probably review what I have done. [akpm@osdl.org: bugfix] Signed-off-by: Christoph Lameter Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit df849a1529c106f7460e51479ca78fe07b07dc8c Author: Christoph Lameter Date: Fri Jun 30 01:55:38 2006 -0700 [PATCH] zoned vm counters: conversion of nr_pagetables to per zone counter Conversion of nr_page_table_pages to a per zone counter [akpm@osdl.org: bugfix] Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a865ffa34b6117a5e0b67640a084d8c2e198c93 Author: Christoph Lameter Date: Fri Jun 30 01:55:38 2006 -0700 [PATCH] zoned vm counters: conversion of nr_slab to per zone counter - Allows reclaim to access counter without looping over processor counts. - Allows accurate statistics on how many pages are used in a zone by the slab. This may become useful to balance slab allocations over various zones. [akpm@osdl.org: bugfix] Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34aa1330f9b3c5783d269851d467326525207422 Author: Christoph Lameter Date: Fri Jun 30 01:55:37 2006 -0700 [PATCH] zoned vm counters: zone_reclaim: remove /proc/sys/vm/zone_reclaim_interval The zone_reclaim_interval was necessary because we were not able to determine how many unmapped pages exist in a zone. Therefore we had to scan in intervals to figure out if any pages were unmapped. With the zoned counters and NR_ANON_PAGES we now know the number of pagecache pages and the number of mapped pages in a zone. So we can simply skip the reclaim if there is an insufficient number of unmapped pages. We use SWAP_CLUSTER_MAX as the boundary. Drop all support for /proc/sys/vm/zone_reclaim_interval. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f3dbd34460ff54962d3e3244b6bcb7f5295356e6 Author: Christoph Lameter Date: Fri Jun 30 01:55:36 2006 -0700 [PATCH] zoned vm counters: split NR_ANON_PAGES off from NR_FILE_MAPPED The current NR_FILE_MAPPED is used by zone reclaim and the dirty load calculation as the number of mapped pagecache pages. However, that is not true. NR_FILE_MAPPED includes the mapped anonymous pages. This patch separates those and therefore allows an accurate tracking of the anonymous pages per zone. It then becomes possible to determine the number of unmapped pages per zone and we can avoid scanning for unmapped pages if there are none. Also it may now be possible to determine the mapped/unmapped ratio in get_dirty_limit. Isnt the number of anonymous pages irrelevant in that calculation? Note that this will change the meaning of the number of mapped pages reported in /proc/vmstat /proc/meminfo and in the per node statistics. This may affect user space tools that monitor these counters! NR_FILE_MAPPED works like NR_FILE_DIRTY. It is only valid for pagecache pages. Signed-off-by: Christoph Lameter Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bf02cf4b6cf931d060ad5c6ce9b960af6faefd2d Author: Christoph Lameter Date: Fri Jun 30 01:55:36 2006 -0700 [PATCH] zoned vm counters: remove NR_FILE_MAPPED from scan control structure We can now access the number of pages in a mapped state in an inexpensive way in shrink_active_list. So drop the nr_mapped field from scan_control. [akpm@osdl.org: bugfix] Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 347ce434d57da80fd5809c0c836f206a50999c26 Author: Christoph Lameter Date: Fri Jun 30 01:55:35 2006 -0700 [PATCH] zoned vm counters: conversion of nr_pagecache to per zone counter Currently a single atomic variable is used to establish the size of the page cache in the whole machine. The zoned VM counters have the same method of implementation as the nr_pagecache code but also allow the determination of the pagecache size per zone. Remove the special implementation for nr_pagecache and make it a zoned counter named NR_FILE_PAGES. Updates of the page cache counters are always performed with interrupts off. We can therefore use the __ variant here. Signed-off-by: Christoph Lameter Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 65ba55f500a37272985d071c9bbb35256a2f7c14 Author: Christoph Lameter Date: Fri Jun 30 01:55:34 2006 -0700 [PATCH] zoned vm counters: convert nr_mapped to per zone counter nr_mapped is important because it allows a determination of how many pages of a zone are not mapped, which would allow a more efficient means of determining when we need to reclaim memory in a zone. We take the nr_mapped field out of the page state structure and define a new per zone counter named NR_FILE_MAPPED (the anonymous pages will be split off from NR_MAPPED in the next patch). We replace the use of nr_mapped in various kernel locations. This avoids the looping over all processors in try_to_free_pages(), writeback, reclaim (swap + zone reclaim). [akpm@osdl.org: bugfix] Signed-off-by: Christoph Lameter Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2244b95a7bcf8d24196f8a3a44187ba5dfff754c Author: Christoph Lameter Date: Fri Jun 30 01:55:33 2006 -0700 [PATCH] zoned vm counters: basic ZVC (zoned vm counter) implementation Per zone counter infrastructure The counters that we currently have for the VM are split per processor. The processor however has not much to do with the zone these pages belong to. We cannot tell f.e. how many ZONE_DMA pages are dirty. So we are blind to potentially inbalances in the usage of memory in various zones. F.e. in a NUMA system we cannot tell how many pages are dirty on a particular node. If we knew then we could put measures into the VM to balance the use of memory between different zones and different nodes in a NUMA system. For example it would be possible to limit the dirty pages per node so that fast local memory is kept available even if a process is dirtying huge amounts of pages. Another example is zone reclaim. We do not know how many unmapped pages exist per zone. So we just have to try to reclaim. If it is not working then we pause and try again later. It would be better if we knew when it makes sense to reclaim unmapped pages from a zone. This patchset allows the determination of the number of unmapped pages per zone. We can remove the zone reclaim interval with the counters introduced here. Futhermore the ability to have various usage statistics available will allow the development of new NUMA balancing algorithms that may be able to improve the decision making in the scheduler of when to move a process to another node and hopefully will also enable automatic page migration through a user space program that can analyse the memory load distribution and then rebalance memory use in order to increase performance. The counter framework here implements differential counters for each processor in struct zone. The differential counters are consolidated when a threshold is exceeded (like done in the current implementation for nr_pageache), when slab reaping occurs or when a consolidation function is called. Consolidation uses atomic operations and accumulates counters per zone in the zone structure and also globally in the vm_stat array. VM functions can access the counts by simply indexing a global or zone specific array. The arrangement of counters in an array also simplifies processing when output has to be generated for /proc/*. Counters can be updated by calling inc/dec_zone_page_state or _inc/dec_zone_page_state analogous to *_page_state. The second group of functions can be called if it is known that interrupts are disabled. Special optimized increment and decrement functions are provided. These can avoid certain checks and use increment or decrement instructions that an architecture may provide. We also add a new CONFIG_DMA_IS_NORMAL that signifies that an architecture can do DMA to all memory and therefore ZONE_NORMAL will not be populated. This is only currently set for IA64 SGI SN2 and currently only affects node_page_state(). In the best case node_page_state can be reduced to retrieving a single counter for the one zone on the node. [akpm@osdl.org: cleanups] [akpm@osdl.org: export vm_stat[] for filesystems] Signed-off-by: Christoph Lameter Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f6ac2354d791195ca40822b84d73d48a4e8b7f2b Author: Christoph Lameter Date: Fri Jun 30 01:55:32 2006 -0700 [PATCH] zoned vm counters: create vmstat.c/.h from page_alloc.c/.h NOTE: ZVC are *not* the lightweight event counters. ZVCs are reliable whereas event counters do not need to be. Zone based VM statistics are necessary to be able to determine what the state of memory in one zone is. In a NUMA system this can be helpful for local reclaim and other memory optimizations that may be able to shift VM load in order to get more balanced memory use. It is also useful to know how the computing load affects the memory allocations on various zones. This patchset allows the retrieval of that data from userspace. The patchset introduces a framework for counters that is a cross between the existing page_stats --which are simply global counters split per cpu-- and the approach of deferred incremental updates implemented for nr_pagecache. Small per cpu 8 bit counters are added to struct zone. If the counter exceeds certain thresholds then the counters are accumulated in an array of atomic_long in the zone and in a global array that sums up all zone values. The small 8 bit counters are next to the per cpu page pointers and so they will be in high in the cpu cache when pages are allocated and freed. Access to VM counter information for a zone and for the whole machine is then possible by simply indexing an array (Thanks to Nick Piggin for pointing out that approach). The access to the total number of pages of various types does no longer require the summing up of all per cpu counters. Benefits of this patchset right now: - Ability for UP and SMP configuration to determine how memory is balanced between the DMA, NORMAL and HIGHMEM zones. - loops over all processors are avoided in writeback and reclaim paths. We can avoid caching the writeback information because the needed information is directly accessible. - Special handling for nr_pagecache removed. - zone_reclaim_interval vanishes since VM stats can now determine when it is worth to do local reclaim. - Fast inline per node page state determination. - Accurate counters in /sys/devices/system/node/node*/meminfo. Current counters are counting simply which processor allocated a page somewhere and guestimate based on that. So the counters were not useful to show the actual distribution of page use on a specific zone. - The swap_prefetch patch requires per node statistics in order to figure out when processors of a node can prefetch. This patch provides some of the needed numbers. - Detailed VM counters available in more /proc and /sys status files. References to earlier discussions: V1 http://marc.theaimsgroup.com/?l=linux-kernel&m=113511649910826&w=2 V2 http://marc.theaimsgroup.com/?l=linux-kernel&m=114980851924230&w=2 V3 http://marc.theaimsgroup.com/?l=linux-kernel&m=115014697910351&w=2 V4 http://marc.theaimsgroup.com/?l=linux-kernel&m=115024767318740&w=2 Performance tests with AIM7 did not show any regressions. Seems to be a tad faster even. Tested on ia64/NUMA. Builds fine on i386, SMP / UP. Includes fixes for s390/arm/uml arch code. This patch: Move counter code from page_alloc.c/page-flags.h to vmstat.c/h. Create vmstat.c/vmstat.h by separating the counter code and the proc functions. Move the vm_stat_text array before zoneinfo_show. [akpm@osdl.org: s390 build fix] [akpm@osdl.org: HOTPLUG_CPU build fix] Signed-off-by: Christoph Lameter Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 672b2714ae57af16fe7d760dc4e0918a7a6cb0fa Author: Adrian Bunk Date: Fri Jun 30 01:55:30 2006 -0700 [PATCH] fix ISTALLION=y drivers/char/istallion.c: In function ‘stli_initbrds’: drivers/char/istallion.c:4150: error: implicit declaration of function ‘stli_parsebrd’ drivers/char/istallion.c:4150: error: ‘stli_brdsp’ undeclared (first use in this function) drivers/char/istallion.c:4150: error: (Each undeclared identifier is reported only once drivers/char/istallion.c:4150: error: for each function it appears in.) drivers/char/istallion.c:4164: error: implicit declaration of function ‘stli_argbrds’ While I was at it, I also removed the #ifdef MODULE around the initialation code to allow it to perhaps work when built into the kernel and made a needlessly global function static. Signed-off-by: Adrian Bunk Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e09793bb9182115e6f5d15fd6571ac2b72d7a08a Author: Andrew Morton Date: Fri Jun 30 01:55:29 2006 -0700 [PATCH] msr.c: use register_hotcpu_notifier() register_cpu_notifier() cannot do anything in a module, in a !CONFIG_HOTPLUG_CPU kernel. Cc: Chandra Seetharaman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1017f6afd578fe519d316d7148356703c04e8f03 Author: Ingo Molnar Date: Fri Jun 30 01:55:29 2006 -0700 [PATCH] fix platform_device_put/del mishaps This fixes drivers/char/pc8736x_gpio.c and drivers/char/scx200_gpio.c to use the platform_device_del/put ops correctly. Signed-off-by: Ingo Molnar Cc: Jim Cromie Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 491d525ff19ead83b5e27ae4096b5c3e27805601 Author: Ingo Molnar Date: Fri Jun 30 01:55:27 2006 -0700 [PATCH] fix drivers/video/imacfb.c compilation Fix build error on x86_64. There's nothing even remotely close to imacmp_seg in the kernel, so I removed the whole line. Signed-off-by: Ingo Molnar Cc: Edgar Hucek Cc: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ab3d5624e172c553004ecc862bfeac16d9d68b7 Author: Jörn Engel Date: Fri Jun 30 19:25:36 2006 +0200 Remove obsolete #include Signed-off-by: Jörn Engel Signed-off-by: Adrian Bunk commit e02169b682bc448ccdc819dc8639ed34a23cedd8 Author: Pavel Machek Date: Fri Jun 30 18:59:59 2006 +0200 remove obsolete swsusp_encrypt Remove SWSUSP_ENCRYPT config option; it is no longer implemented. Signed-off-by: Pavel Machek Signed-off-by: Adrian Bunk commit fcb4ee8852e2e9326e102f0910c029de45afabba Author: Matt LaPlante Date: Fri Jun 30 18:57:59 2006 +0200 arch/arm26/Kconfig typos Signed-off-by: Adrian Bunk commit 590abf09d62841677ac9676574f1017b7f5235e1 Author: Matt LaPlante Date: Fri Jun 30 18:56:29 2006 +0200 Documentation/IPMI typos Acked-by: Alan Cox Signed-off-by: Adrian Bunk commit 3539c272f18d54dc1e4c109d336d33d6a5c94b93 Author: Matt LaPlante Date: Fri Jun 30 18:53:46 2006 +0200 Kconfig: Typos in net/sched/Kconfig Signed-off-by: Adrian Bunk commit 779cbf0bbc75629ecffd480d2f261af42ea80bbe Author: Paul Collins Date: Fri Jun 30 18:50:03 2006 +0200 v9fs: do not include linux/version.h I noticed that part of v9fs was being rebuilt when version.h changed. Signed-off-by: Paul Collins Signed-off-by: Adrian Bunk commit 741c80c24b20b5ce1903d767a13caeac0fef62c6 Author: Patrick Pletscher Date: Fri Jun 30 18:35:56 2006 +0200 Documentation/DocBook/mtdnand.tmpl: typo fixes Signed-off-by: Adrian Bunk commit d254c8f70abcb560d941e68c8c1f3b816c44a020 Author: Adrian Bunk Date: Fri Jun 30 18:29:51 2006 +0200 typo fixes: specfic -> specific Signed-off-by: Adrian Bunk commit d0f19d82173e46bd7f7544d0207aec7d467b3fe4 Author: Adrian Bunk Date: Fri Jun 30 18:28:43 2006 +0200 typo fixes in Documentation/networking/pktgen.txt Three typos in only one line... Signed-off-by: Adrian Bunk commit 80f7228b59e4bbe9d840af3ff0f2fe480d6e7c79 Author: Adrian Bunk Date: Fri Jun 30 18:27:16 2006 +0200 typo fixes: occuring -> occurring Signed-off-by: Adrian Bunk commit 47bdd718c6547d84c8e140cd0f495c016f13b08b Author: Adrian Bunk Date: Fri Jun 30 18:25:18 2006 +0200 typo fixes: infomation -> information Signed-off-by: Adrian Bunk commit fd245f00695cbcf0f8430f35841c216559d243df Author: Adrian Bunk Date: Fri Jun 30 18:23:39 2006 +0200 typo fixes: disadvantadge -> disadvantage Signed-off-by: Adrian Bunk commit 0418726bb5c7b5a70c7e7e82e860d5979d0c78cf Author: Adrian Bunk Date: Fri Jun 30 18:23:04 2006 +0200 typo fixes: aquire -> acquire Signed-off-by: Adrian Bunk Acked-by: Mauro Carvalho Chehab commit b3c2ffd5343645fc9b46f67e8c0eaac1e2dde7b4 Author: Adrian Bunk Date: Fri Jun 30 18:20:44 2006 +0200 typo fixes: mecanism -> mechanism Signed-off-by: Adrian Bunk commit 9aaeded72f923212e6d9d7b6b8e3830e983f323e Author: Adrian Bunk Date: Fri Jun 30 18:19:55 2006 +0200 typo fixes: bandwith -> bandwidth Signed-off-by: Adrian Bunk commit 27ae4104b69bd5e3d9006ba31b39fc186020f38e Author: Adrian Bunk Date: Fri Jun 30 18:18:41 2006 +0200 fix a typo in the RTC_CLASS help text This patch fixes a typo spotted by Matt LaPlante . This patch fixes kernel Bugzilla #6704. Signed-off-by: Adrian Bunk commit 9c4d3ef7b5f61625651304eb848b9be95c6c7c9a Author: Adrian Bunk Date: Fri Jun 30 18:17:39 2006 +0200 smb is no longer maintained The smb filesystem in the Linux kernel is unmaintained for years. Signed-off-by: Adrian Bunk commit 0a1f1ab8de815cb63a48d24450f6b5fbb1b1f89c Author: akpm@osdl.org Date: Fri Jun 30 03:15:00 2006 -0400 ACPI: fixup memhotplug debug message Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 02438d8771ae6a4b215938959827692026380bf9 Author: Len Brown Date: Fri Jun 30 03:19:10 2006 -0400 ACPI: delete acpi_os_free(), use kfree() directly Signed-off-by: Len Brown commit d07a8577f695c807977af003b6e75f996e01a15f Author: Patrick Mochel Date: Fri May 19 16:54:52 2006 -0400 ACPI: video: Remove unneeded acpi_handle from driver. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 8a4444bf5a3fd890441e6cbd5022a3c24edbe69a Author: Patrick Mochel Date: Fri May 19 16:54:51 2006 -0400 ACPI: thermal: Remove unneeded acpi_handle from driver. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 14747204055d4b8fb2f8517beca91985ac617c17 Author: Patrick Mochel Date: Fri May 19 16:54:51 2006 -0400 ACPI: power: Remove unneeded acpi_handle from driver. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 432bfaba7d4e70483fc5af164e020066f4921bff Author: Patrick Mochel Date: Fri May 19 16:54:51 2006 -0400 ACPI: pci_root: Remove unneeded acpi_handle from driver. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit e0e4e117d4c898b0df749d5b88c86955151abf53 Author: Patrick Mochel Date: Fri May 19 16:54:50 2006 -0400 ACPI: pci_link: Remove unneeded acpi_handle from driver. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 579c896cc91434e4feb938f780eba580c93fa0da Author: Patrick Mochel Date: Fri May 19 16:54:50 2006 -0400 ACPI: fan: Remove unneeded acpi_handle from driver. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 6c689537726ec665246d2f60c48475be2efac2d0 Author: Patrick Mochel Date: Fri May 19 16:54:50 2006 -0400 ACPI: button: Remove unneeded acpi_handle from driver. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 39cb61e26771891f843cb433ee6febd9159bce73 Author: Patrick Mochel Date: Fri May 19 16:54:49 2006 -0400 ACPI: battery: Remove unneeded acpi_handle from driver. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 9453ece92688fedd7755d2ea54b2efe88822a91b Author: Patrick Mochel Date: Fri May 19 16:54:49 2006 -0400 ACPI: acpi_memhotplug: Remove unneeded acpi_handle from driver. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 1b5b8b81bddd1c5dcf690f43422e20b0e964c349 Author: Patrick Mochel Date: Fri May 19 16:54:49 2006 -0400 ACPI: ac: Remove unneeded acpi_handle from driver. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 901302688cb85b49a9551ec1f6aa86fb081ae49e Author: Patrick Mochel Date: Fri May 19 16:54:48 2006 -0400 ACPI: video: Use acpi_device's handle instead of driver's Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 38ba7c9ed2e1a222103332031f76c28b726573f5 Author: Patrick Mochel Date: Fri May 19 16:54:48 2006 -0400 ACPI: thermal: Use acpi_device's handle instead of driver's Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 5fbc19efdbedf9c9125774f66f80d6a6ccce4566 Author: Patrick Mochel Date: Fri May 19 16:54:43 2006 -0400 ACPI: power: Use acpi_device's handle instead of driver's Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 2d1e0a02f16f84c2358843d91d6ca0131a0587ce Author: Patrick Mochel Date: Fri May 19 16:54:43 2006 -0400 ACPI: pci_root: Use acpi_device's handle instead of driver's Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 67a7136573b24a0d1f85a4aab131558a02910d25 Author: Patrick Mochel Date: Fri May 19 16:54:42 2006 -0400 ACPI: pci_link: Use acpi_device's handle instead of driver's Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit dc8c2b2744f8563aa5feb07488e4cc207a70ac70 Author: Patrick Mochel Date: Fri May 19 16:54:42 2006 -0400 ACPI: fan: Use acpi_device's handle instead of driver's Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 27b1d3e85b1dfd9037d3fbb98b2e2aacca01da39 Author: Patrick Mochel Date: Fri May 19 16:54:42 2006 -0400 ACPI: button: Use acpi_device's handle instead of driver's Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 3b073ec3667ee63e35b66752a30eeedef1e1e772 Author: Patrick Mochel Date: Fri May 19 16:54:41 2006 -0400 ACPI: battery: Use acpi_device's handle instead of driver's Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit b863278523f7adbacb9e34133f4b6397cdab9977 Author: Patrick Mochel Date: Fri May 19 16:54:41 2006 -0400 ACPI: acpi_memhotplug: Use acpi_device's handle instead of driver's Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit a6ba5ebef91a59fabd45962e576c02468dbcd33f Author: Patrick Mochel Date: Fri May 19 16:54:41 2006 -0400 ACPI: ac: Use acpi_device's handle instead of driver's Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit e6afa0de1476290a876dfd1237a97cce7735581c Author: Patrick Mochel Date: Fri May 19 16:54:40 2006 -0400 ACPI: video: add struct acpi_device to struct acpi_video_bus. - Use it instead of acpi_bus_get_device() in acpi_video_bus_notify() and use the one from struct acpi_video_device in acpi_video_device_notify(). Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 415985728895ba3127116bc4f999caf94420ed85 Author: Patrick Mochel Date: Fri May 19 16:54:40 2006 -0400 ACPI: power: add struct acpi_device to struct acpi_power_resource - Use it instead of acpi_bus_get_device() where we can.. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 8348e1b19a06b1932f65e84e1d59be29e1626c2b Author: Patrick Mochel Date: Fri May 19 16:54:40 2006 -0400 ACPI: thermal: add struct acpi_device to struct acpi_thermal. - Use it instead of acpi_bus_get_device() where we can.. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 32917e5b589d813c9dc0f2d140d8c52898ddb6fb Author: Patrick Mochel Date: Fri May 19 16:54:39 2006 -0400 ACPI: pci root: add struct acpi_device to struct acpi_pci_root. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 74b142e0fe039fcde42030c064763577e11ca004 Author: Patrick Mochel Date: Fri May 19 16:54:39 2006 -0400 ACPI: fan: add struct acpi_device to struct acpi_fan. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 145def84a177c01cf3cc6cfbb67a029f39a8ac35 Author: Patrick Mochel Date: Fri May 19 16:54:39 2006 -0400 ACPI: battery: add struct acpi_device to struct acpi_battery. - Use it instead of acpi_bus_get_device().. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 3b74863df5d46f794052b5ee010cfc8fd66819dd Author: Patrick Mochel Date: Fri May 19 16:54:38 2006 -0400 ACPI: acpi_memhotplug: add struct acpi_device to struct acpi_memory_device. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit af96179a8298832cc58be212d0e4988d8a1e11bf Author: Patrick Mochel Date: Fri May 19 16:54:32 2006 -0400 ACPI: ac: Add struct acpi_device to struct acpi_ac. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit ae90dd5dbee461652b90d9f7d292ba47dc3dc4b8 Author: Dave Jones Date: Fri Jun 30 01:40:45 2006 -0400 Move workqueue exports to where the functions are defined. Signed-off-by: Dave Jones commit ffac80e925e54d84f6ea580231aa46d0ef051756 Author: Venkatesh Pallipadi Date: Wed Jun 28 13:52:18 2006 -0700 [CPUFREQ] Misc cleanups in ondemand. Misc cleanups in ondemand. Should have zero functional impact. Also adding Alexey as author. Signed-off-by: Alexey Starikovskiy Signed-off-by: Venkatesh Pallipadi Signed-off-by: Dave Jones commit 2f8a835c705794f71726eb12c06fb0f24fe07ed3 Author: Venkatesh Pallipadi Date: Wed Jun 28 13:51:19 2006 -0700 [CPUFREQ] Make ondemand sampling per CPU and remove the mutex usage in sampling path. Make ondemand sampling per CPU and remove the mutex usage in sampling path. Signed-off-by: Alexey Starikovskiy Signed-off-by: Venkatesh Pallipadi Signed-off-by: Dave Jones commit 7a6bc1cdd506cf81f856f0fef4e56a2ba0c5a26d Author: Venkatesh Pallipadi Date: Wed Jun 28 13:50:33 2006 -0700 [CPUFREQ] Add queue_delayed_work_on() interface for workqueues. Add queue_delayed_work_on() interface for workqueues. Signed-off-by: Alexey Starikovskiy Signed-off-by: Venkatesh Pallipadi Signed-off-by: Dave Jones commit ccb2fe209dac9ff67f6351e783e610073afaaeaf Author: Venkatesh Pallipadi Date: Wed Jun 28 13:49:52 2006 -0700 [CPUFREQ] Remove slowdown from ondemand sampling path. Remove slowdown from ondemand sampling path. This reduces the code path length in dbs_check_cpu() by half. slowdown was not used by ondemand by default. If there are any user level tools that were using this tunable, they may report error now. Signed-off-by: Alexey Starikovskiy Signed-off-by: Venkatesh Pallipadi Signed-off-by: Dave Jones commit 0702056f9f41274a06e21cb05f12b4265b4867a2 Author: Allan Stephens Date: Thu Jun 29 12:33:51 2006 -0700 [TIPC]: Initial activation message now includes TIPC version number Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit ea13847b240e689e8f291355c36b46de9f44ddf9 Author: Allan Stephens Date: Thu Jun 29 12:33:20 2006 -0700 [TIPC]: Improve response to requests for node/link information Now allocates reply space for "get links" request based on number of actual links, not number of potential links. Also, limits reply to "get links" and "get nodes" requests to 32KB to match capabilities of tipc-config utility that issued request. Signed-off-by: Allan Stephens Signed-off-by: Per Liden commit e49060c7cab6ca856d048e1e10d71c0e6fedf376 Author: Allan Stephens Date: Thu Jun 29 12:32:46 2006 -0700 [TIPC]: Fixed skb_under_panic caused by tipc_link_bundle_buf Now determines tailroom of bundle buffer by directly inspection of buffer. Previously, buffer was assumed to have a max capacity equal to the link MTU, but the addition of link MTU negotiation means that the link MTU can increase after the bundle buffer is allocated. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit caf430f37119af5faac9252ec4e18cb1c55dde26 Author: Adrian Bunk Date: Thu Jun 29 17:03:19 2006 -0700 [IrDA]: Fix the AU1000 FIR dependencies AU1000 FIR is broken, it should depend on SOC_AU1000. Spotted by Jean-Luc Leger. Signed-off-by: Adrian Bunk Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit 1bc1731133140dccdd08899a59bbc06d975d0a15 Author: Josh Triplett Date: Thu Jun 29 17:02:31 2006 -0700 [IrDA]: Fix RCU lock pairing on error path irlan_client_discovery_indication calls rcu_read_lock and rcu_read_unlock, but returns without unlocking in an error case. Fix that by replacing the return with a goto so that the rcu_read_unlock always gets executed. Signed-off-by: Josh Triplett Acked-by: Paul E. McKenney Signed-off-by: Samuel Ortiz samuel@sortiz.org <> Signed-off-by: David S. Miller commit 244055fdc8dd39407a33d4eb9f4053dd4ca8f1bb Author: Adrian Bunk Date: Thu Jun 29 13:04:41 2006 -0700 [XFRM]: unexport xfrm_state_mtu This patch removes the unused EXPORT_SYMBOL(xfrm_state_mtu). Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 5bba17127e7c78e819560519449db237e1b0f99b Author: Adrian Bunk Date: Thu Jun 29 13:02:35 2006 -0700 [NET]: make skb_release_data() static skb_release_data() no longer has any users in other files. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit c22751b73a3770b3046102bb97b139218ff1875b Author: Matt LaPlante Date: Thu Jun 29 12:51:15 2006 -0700 [NETFILTE] ipv4: Fix typo (Bugzilla #6753) This patch fixes bugzilla #6753, a typo in the netfilter Kconfig Signed-off-by: David S. Miller commit 7263ade1e1e72e34fc3c179f3aeaa07a11872d22 Author: Adrian Bunk Date: Thu Jun 29 12:39:07 2006 -0700 [IrDA]: MCS7780 usb_driver struct should be static This patch makes a needlessly global struct static. Signed-off-by: Adrian Bunk Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit 6c4f095eae35e83eb6148dec7f72874eeadf0c9b Author: Michael Chan Date: Thu Jun 29 12:38:15 2006 -0700 [BNX2]: Turn off link during shutdown Minor change in shutdown logic to effect a link down. Update version to 1.4.43. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 745720e58303f940e12944bf7fab52bc9ce48bda Author: Michael Chan Date: Thu Jun 29 12:37:41 2006 -0700 [BNX2]: Use dev_kfree_skb() instead of the _irq version Change all dev_kfree_skb_irq() and dev_kfree_skb_any() to dev_kfree_skb(). These calls are never used in irq context. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 656d98b09d57d4e1185c5d2436a42600d48fbcb5 Author: Roman Kagan Date: Thu Jun 29 12:36:34 2006 -0700 [ATM]: basic sysfs support for ATM devices Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit d17f086550a6fdb13fe82371d60ebf80904c6f96 Author: Chas Williams Date: Thu Jun 29 12:35:49 2006 -0700 [ATM]: [suni] change suni_init to __devinit Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 249c14b55c8576ad8c6ec23c7c1b3b2219b33e54 Author: Chas Williams Date: Thu Jun 29 12:35:32 2006 -0700 [ATM]: [iphase] should be __devinit not __init Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit b47eb0eb9bb5fcee6394f0d9bde0b471f7329841 Author: Chas Williams Date: Thu Jun 29 12:35:02 2006 -0700 [ATM]: [idt77105] should be __devinit not __init Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit b11d6213529b33d81c21eeba97343e3b714e62e7 Author: Michael Chan Date: Thu Jun 29 12:31:21 2006 -0700 [BNX2]: Add NETIF_F_TSO_ECN Add NETIF_F_TSO_ECN feature for all bnx2 hardware. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit b0da8537037f337103348f239ad901477e907aa8 Author: Michael Chan Date: Thu Jun 29 12:30:00 2006 -0700 [NET]: Add ECN support for TSO In the current TSO implementation, NETIF_F_TSO and ECN cannot be turned on together in a TCP connection. The problem is that most hardware that supports TSO does not handle CWR correctly if it is set in the TSO packet. Correct handling requires CWR to be set in the first packet only if it is set in the TSO header. This patch adds the ability to turn on NETIF_F_TSO and ECN using GSO if necessary to handle TSO packets with CWR set. Hardware that handles CWR correctly can turn on NETIF_F_TSO_ECN in the dev-> features flag. All TSO packets with CWR set will have the SKB_GSO_TCPV4_ECN set. If the output device does not have the NETIF_F_TSO_ECN feature set, GSO will split the packet up correctly with CWR only set in the first segment. With help from Herbert Xu . Since ECN can always be enabled with TSO, the SOCK_NO_LARGESEND sock flag is completely removed. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 877ce7c1b3afd69a9b1caeb1b9964c992641f52a Author: Catherine Zhang Date: Thu Jun 29 12:27:47 2006 -0700 [AF_UNIX]: Datagram getpeersec This patch implements an API whereby an application can determine the label of its peer's Unix datagram sockets via the auxiliary data mechanism of recvmsg. Patch purpose: This patch enables a security-aware application to retrieve the security context of the peer of a Unix datagram socket. The application can then use this security context to determine the security context for processing on behalf of the peer who sent the packet. Patch design and implementation: The design and implementation is very similar to the UDP case for INET sockets. Basically we build upon the existing Unix domain socket API for retrieving user credentials. Linux offers the API for obtaining user credentials via ancillary messages (i.e., out of band/control messages that are bundled together with a normal message). To retrieve the security context, the application first indicates to the kernel such desire by setting the SO_PASSSEC option via getsockopt. Then the application retrieves the security context using the auxiliary data mechanism. An example server application for Unix datagram socket should look like this: toggle = 1; toggle_len = sizeof(toggle); setsockopt(sockfd, SOL_SOCKET, SO_PASSSEC, &toggle, &toggle_len); recvmsg(sockfd, &msg_hdr, 0); if (msg_hdr.msg_controllen > sizeof(struct cmsghdr)) { cmsg_hdr = CMSG_FIRSTHDR(&msg_hdr); if (cmsg_hdr->cmsg_len <= CMSG_LEN(sizeof(scontext)) && cmsg_hdr->cmsg_level == SOL_SOCKET && cmsg_hdr->cmsg_type == SCM_SECURITY) { memcpy(&scontext, CMSG_DATA(cmsg_hdr), sizeof(scontext)); } } sock_setsockopt is enhanced with a new socket option SOCK_PASSSEC to allow a server socket to receive security context of the peer. Testing: We have tested the patch by setting up Unix datagram client and server applications. We verified that the server can retrieve the security context using the auxiliary data mechanism of recvmsg. Signed-off-by: Catherine Zhang Acked-by: Acked-by: James Morris Signed-off-by: David S. Miller commit d6b4991ad5d1a9840e12db507be1a6593def01fe Author: Herbert Xu Date: Thu Jun 29 12:25:53 2006 -0700 [NET]: Fix logical error in skb_gso_ok The test in skb_gso_ok is backwards. Noticed by Michael Chan . Signed-off-by: Herbert Xu Acked-by: Michael Chan Signed-off-by: David S. Miller commit 4ee303dfeac6451b402e3d8512723d3a0f861857 Author: Shuya MAEDA Date: Wed Jun 28 01:40:35 2006 -0700 [PKT_SCHED]: PSCHED_TADD() and PSCHED_TADD2() can result,tv_usec >= 1000000 Signed-off-by: Shuya MAEDA Signed-off-by: David S. Miller commit 3d3a85337937bb5e3db676eeb4f3bf7f02533b44 Author: Herbert Xu Date: Tue Jun 27 13:33:10 2006 -0700 [NET]: Make illegal_highdma more anal Rather than having illegal_highdma as a macro when HIGHMEM is off, we can turn it into an inline function that returns zero. This will catch callers that give it bad arguments. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 47da8ee681d04e68ca1b1812c10e28162150d453 Author: Sridhar Samudrala Date: Tue Jun 27 13:29:00 2006 -0700 [TCP]: Export accept queue len of a TCP listening socket via rx_queue While debugging a TCP server hang issue, we noticed that currently there is no way for a user to get the acceptq backlog value for a TCP listen socket. All the standard networking utilities that display socket info like netstat, ss and /proc/net/tcp have 2 fields called rx_queue and tx_queue. These fields do not mean much for listening sockets. This patch uses one of these unused fields(rx_queue) to export the accept queue len for listening sockets. Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit c7bdb545d23026b18be53289fd866d1ac07f5f8c Author: Darrel Goeddel Date: Tue Jun 27 13:26:11 2006 -0700 [NETLINK]: Encapsulate eff_cap usage within security framework. This patch encapsulates the usage of eff_cap (in netlink_skb_params) within the security framework by extending security_netlink_recv to include a required capability parameter and converting all direct usage of eff_caps outside of the lsm modules to use the interface. It also updates the SELinux implementation of the security_netlink_send and security_netlink_recv hooks to take advantage of the sid in the netlink_skb_params struct. This also enables SELinux to perform auditing of netlink capability checks. Please apply, for 2.6.18 if possible. Signed-off-by: Darrel Goeddel Signed-off-by: Stephen Smalley Acked-by: James Morris Signed-off-by: David S. Miller commit 576a30eb6453439b3c37ba24455ac7090c247b5a Author: Herbert Xu Date: Tue Jun 27 13:22:38 2006 -0700 [NET]: Added GSO header verification When GSO packets come from an untrusted source (e.g., a Xen guest domain), we need to verify the header integrity before passing it to the hardware. Since the first step in GSO is to verify the header, we can reuse that code by adding a new bit to gso_type: SKB_GSO_DODGY. Packets with this bit set can only be fed directly to devices with the corresponding bit NETIF_F_GSO_ROBUST. If the device doesn't have that bit, then the skb is fed to the GSO engine which will allow the packet to be sent to the hardware if it passes the header check. This patch changes the sg flag to a full features flag. The same method can be used to implement TSO ECN support. We simply have to mark packets with CWR set with SKB_GSO_ECN so that only hardware with a corresponding NETIF_F_TSO_ECN can accept them. The GSO engine can either fully segment the packet, or segment the first MTU and pass the rest to the hardware for further segmentation. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 68c1692e3ea5d79f24cb5cc566c4a73939d13d25 Author: Patrick McHardy Date: Tue Jun 27 03:02:14 2006 -0700 [NETFILTER]: statistic match: add missing Kconfig help text Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit ef47c6a7b8e36e3b160433673b1b68db799aabcd Author: Patrick McHardy Date: Tue Jun 27 03:01:48 2006 -0700 [NETFILTER]: ip_queue/nfnetlink_queue: drop bridge port references when dev disappears When a device that is acting as a bridge port is unregistered, the ip_queue/nfnetlink_queue notifier doesn't check if its one of physindev/physoutdev and doesn't release the references if it is. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 1c7e47726a88303e4cfa2785f0a357bf1ceecee1 Author: Jorge Matias Date: Tue Jun 27 03:01:25 2006 -0700 [NETFILTER]: xt_sctp: fix --chunk-types matching xt_sctp uses an incorrect header offset when --chunk-types is used. Signed-off-by: Jorge Matias Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 9abdcf6b6cf387035d934c77bf9ebe5e747166f9 Author: Yuri Gushin Date: Tue Jun 27 03:01:03 2006 -0700 [NETFILTER]: xt_tcpudp: fix double unregistration in error path "xt_unregister_match(AF_INET, &tcp_matchstruct)" is called twice, leaving "udp_matchstruct" registered, in case of a failure in the registration of the udp6 structure. Signed-off-by: Yuri Gushin Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 40a839fdbd5d76cebb2a61980bc1fc7ecd784be2 Author: Yasuyuki Kozakai Date: Tue Jun 27 03:00:35 2006 -0700 [NETFILTER]: nf_conntrack: Fix undefined references to local_bh_* CC net/netfilter/nf_conntrack_proto_sctp.o net/netfilter/nf_conntrack_proto_sctp.c: In function `sctp_print_conntrack': net/netfilter/nf_conntrack_proto_sctp.c:206: warning: implicit declaration of function `local_bh_disable' net/netfilter/nf_conntrack_proto_sctp.c:208: warning: implicit declaration of function `local_bh_enable' CC net/netfilter/nf_conntrack_netlink.o net/netfilter/nf_conntrack_netlink.c: In function `ctnetlink_dump_table': net/netfilter/nf_conntrack_netlink.c:429: warning: implicit declaration of function `local_bh_disable' net/netfilter/nf_conntrack_netlink.c:452: warning: implicit declaration of function `local_bh_enable' Spotted by Toralf Förster Signed-off-by: Yasuyuki Kozakai Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit da298d3a4f01dbc10c54da75d6b5717a99fb9cbc Author: Patrick McHardy Date: Tue Jun 27 03:00:09 2006 -0700 [NETFILTER]: x_tables: fix xt_register_table error propagation When xt_register_table fails the error is not properly propagated back. Based on patch by Lepton Wu . Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 6002e45045a190a112bc3bc2134d0ff4fac7ced7 Author: David S. Miller Date: Thu Jun 29 16:20:12 2006 -0700 [SUNHME]: Mark SBUS probing routines as __devinit. Signed-off-by: David S. Miller commit 675f740e557bc752cdcdb0739d80666b488abb58 Author: David S. Miller Date: Thu Jun 29 15:48:59 2006 -0700 [SPARC64]: Print symbol name of regs->tpc on kernel unaligned accesses. This makes things easier to track down, especially in modules. Signed-off-by: David S. Miller commit f57caaefacc2ffa7ace11a325c663e569e2b4164 Author: David S. Miller Date: Thu Jun 29 15:42:29 2006 -0700 [SERIO] i8042-sparcio.h: Convert to of_driver framework. Signed-off-by: David S. Miller commit ff0d2fc6a60624df46055f47ea7261c8198c7862 Author: David S. Miller Date: Thu Jun 29 15:28:05 2006 -0700 [SPARC64]: time: Kill unnecessary asm/{fhc,sbus,ebus,isa}.h includes. Signed-off-by: David S. Miller commit abbce6e2fd156cbcab2fc1247c7dec8a0c68e7e3 Author: David S. Miller Date: Thu Jun 29 15:22:46 2006 -0700 [SPARC64] power: Convert to of_driver. Signed-off-by: David S. Miller commit f2ad06a20133125e5b6ab6497c6d90e63ded4761 Author: David S. Miller Date: Thu Jun 29 15:22:22 2006 -0700 [SPARC64] auxio: Remove asm/{sbus,ebus}.h includes. Signed-off-by: David S. Miller commit 89d1d0ab4d99e1e0fe193352e1dd857787a0bfc0 Author: David S. Miller Date: Thu Jun 29 15:18:50 2006 -0700 [SERIAL] sunsab: Fix section mis-match errors. sunsab_init_one() needs to be __devinit, not __init Signed-off-by: David S. Miller commit c4d37215a824820e1b614ff9f6969af72cd953f4 Author: David S. Miller Date: Thu Jun 29 15:17:47 2006 -0700 [SERIAL] sunsab: Convert to of_driver framework. Signed-off-by: David S. Miller commit 9efc3715f7b13127fd202108304352e1be76e077 Author: David S. Miller Date: Thu Jun 29 15:14:17 2006 -0700 [SERIAL] sun{su,zilog}: Add missing MODULE_*() niceties. Signed-off-by: David S. Miller commit 1708d242d222e751a0922e3c56ef857cf60bbedd Author: David S. Miller Date: Thu Jun 29 15:14:03 2006 -0700 [SERIAL] sunsu: Convert to of_driver framework. Signed-off-by: David S. Miller commit 4fa97dcf9d48b02934c60a48873199850351e760 Author: David S. Miller Date: Thu Jun 29 15:13:40 2006 -0700 [SERIAL] sunzilog: Fix bugs in device deregristration. 1) Need to unregister 2 ports per of_device. 2) Need to of_iounmap() 1 mapping per of_device. 3) Need to free up the IRQ only after all devices have been unregistered. Signed-off-by: David S. Miller commit 3676463178401293d625a102a00da0473fa33a1b Author: David S. Miller Date: Thu Jun 29 15:13:17 2006 -0700 [SERIAL] sunzilog: Convert to of_driver. Signed-off-by: David S. Miller commit 8f96cd1a69d4c43e3473406a1fdf15cd9f1de5e5 Author: David S. Miller Date: Thu Jun 29 15:08:02 2006 -0700 [SPARC]: sparc32 side of of_device layer IRQ resolution. Happily, life is much simpler on 32-bit sparc systems. The "intr" property, preferred over the "interrupts" property is used-as. Some minor translations of this value happen on sun4d systems. The stage is now set to rewrite the sparc serial driver probing to use the of_driver framework, and then to convert all SBUS, EBUS, and ISA drivers in-kind so that we can nuke all those special bus frameworks. Signed-off-by: David S. Miller commit 2b1e59787198e75fb2ffb3bb4fb247da1c55ac12 Author: David S. Miller Date: Thu Jun 29 15:07:37 2006 -0700 [SPARC64]: of_device layer IRQ resolution Do IRQ determination generically by parsing the PROM properties, and using IRQ controller drivers for final resolution. One immediate positive effect is that all of the IRQ frobbing in the EBUS, ISA, and PCI controller layers has been eliminated. We just look up the of_device and use the properly computed value. The PCI controller irq_build() routines are gone and no longer used. Unfortunately sbus_build_irq() has to remain as there is a direct reference to this in the sunzilog driver. That can be killed off once the sparc32 side of this is written and the sunzilog driver is transformed into an "of" bus driver. Signed-off-by: David S. Miller commit c3a8b85f5ac2c21f4ef75e87bfe55ee7a753ffcf Author: David S. Miller Date: Thu Jun 29 14:43:37 2006 -0700 [SPARC64]: Fix typo in clock_probe(). Signed-off-by: David S. Miller commit 915214853d7681416d6bdd1591787cdbded459e7 Author: David S. Miller Date: Thu Jun 29 14:39:40 2006 -0700 [SPARC64] clock: Only probe central fhc clock on Enterprise boxes. Signed-off-by: David S. Miller commit 00cde6748255a84beecfdea4caeaf7c9cd05a527 Author: David S. Miller Date: Thu Jun 29 14:39:11 2006 -0700 [SPARC64] power: Do not pass SA_SHIRQ to request_irq(). This needs to be a unique interrupt source because we do not have a register or similar to poll to make sure the IRQ is really for us. We do not have any dev_id to pass in anyways, and the generic IRQ layer is now enforcing that when SA_SHIRQ is specified, dev_id must be non-NULL. Signed-off-by: David S. Miller commit d44b3be88ed58bb1bbbf7d70c533598b3dc3d870 Author: David S. Miller Date: Thu Jun 29 14:38:51 2006 -0700 [SPARC64]: Fix typo in isa_dev_get_irq_using_imap(). Signed-off-by: David S. Miller commit 24ac26d425c96659b12cf16de7cbfe3bcbd73f05 Author: David S. Miller Date: Thu Jun 29 14:38:21 2006 -0700 [SPARC64]: Let irq_install_pre_handler() get called multiple times. Signed-off-by: David S. Miller commit 946ea09962a56674fe564b41c3007933bb41a068 Author: David S. Miller Date: Thu Jun 29 14:37:09 2006 -0700 [SPARC]: Kill interrupt stuff and linux_phandle from device_node. Signed-off-by: David S. Miller commit ee5caf0ee19f65a5e29bf20a0dffd8be8b4827fd Author: David S. Miller Date: Thu Jun 29 14:36:52 2006 -0700 [SPARC]: Convert clock drivers to of_driver framework. Signed-off-by: David S. Miller commit 36a59bd89c50c1090c7438db89f751720974a6fc Author: David S. Miller Date: Thu Jun 29 14:36:35 2006 -0700 [SPARC64] auxio: Convert to pure of_device driver. Signed-off-by: David S. Miller commit 50312ce9dd794eef3df9e64194ba95ca730d82c8 Author: David S. Miller Date: Thu Jun 29 14:35:52 2006 -0700 [SPARC]: Convert all FB SBUS drivers to of_driver framework. Signed-off-by: David S. Miller commit 3ca9fab410fbef6fc3a13284f5c26faccade21d1 Author: David S. Miller Date: Thu Jun 29 14:35:33 2006 -0700 [SPARC]: Add of_io{remap,unmap}(). Signed-off-by: David S. Miller commit 95714e12dfb4794ee120f058fdf763e61baaad82 Author: David S. Miller Date: Thu Jun 29 14:35:14 2006 -0700 [SPARC]: Encode I/O space into resource flags on sparc32. On sparc64 we don't need to do this because the resource values are large enough to encode the full physical address. Signed-off-by: David S. Miller commit cf44bbc26cf1361b692ab68c884f6a0df7da2fdb Author: David S. Miller Date: Thu Jun 29 14:34:50 2006 -0700 [SPARC]: Beginnings of generic of_device framework. The idea is to fully construct the device register and interrupt values into these of_device objects, and convert all of SBUS, EBUS, ISA drivers to use this new stuff. Much ideas and code taken from Ben H.'s powerpc work. Signed-off-by: David S. Miller commit 3ae9a3489a4e2ba665a344a9250c2af05b7b0c59 Author: David S. Miller Date: Thu Jun 29 14:34:12 2006 -0700 [SPARC]: Add of_n_{addr,size}_cells(). Signed-off-by: David S. Miller commit 286bbe87c143ca7ecee5bb499cd78048c5a05d49 Author: David S. Miller Date: Thu Jun 29 14:27:13 2006 -0700 [SPARC64]: Kill starfire_cookie from SBUS/PCI. Totally unused. We need to traverse the list of global IRQ translaters, so storing it in the per-bus structures was useless. Signed-off-by: David S. Miller commit 184d7d20d352c7374f70ebca7468dc8cd5cc618a Author: Florin Malita Date: Sat Jun 3 19:30:10 2006 -0400 ocfs2: remove redundant NULL checks in ocfs2_direct_IO_get_blocks() Signed-off-by: Florin Malita Signed-off-by: Mark Fasheh commit 784270435b001164054e803421a624ef1098519d Author: Mark Fasheh Date: Thu May 4 12:03:26 2006 -0700 ocfs2: clean up some osb fields Get rid of osb->uuid, osb->proc_sub_dir, and osb->osb_id. Those fields were unused, or could easily be removed. As a result, we also no longer need MAX_OSB_ID or ocfs2_globals_lock. Signed-off-by: Mark Fasheh commit a75a6e4c3ada10b15e26f6d12f72c03efde266e0 Author: Mark Fasheh Date: Thu May 4 11:49:22 2006 -0700 ocfs2: fix init of uuid_net_key ocfs2_initialize_super() should be copying from the beginning of the uuid. Signed-off-by: Mark Fasheh commit e7607ab3daeeaea50b3b5aebe8dfa29a1dfb8311 Author: Mark Fasheh Date: Thu Apr 27 17:53:22 2006 -0700 ocfs2: silence a debug print Signed-off-by: Mark Fasheh commit d426721cf10824391fd38bd42f38357ace2b1c08 Author: Sunil Mushran Date: Thu Apr 27 16:44:13 2006 -0700 ocfs2: silence ENOENT during lookup of broken links Signed-off-by: Sunil Mushran Signed-off-by: Mark Fasheh commit 781ee3e2b1ea41d56ed86ae1c85fc40b7f330205 Author: Sunil Mushran Date: Thu Apr 27 16:41:31 2006 -0700 ocfs2: Cleanup message prints Signed-off-by: Sunil Mushran Signed-off-by: Mark Fasheh commit a43db30c7c614c08851a97476aeb317ca2e14475 Author: Joel Becker Date: Thu Apr 27 16:36:14 2006 -0700 ocfs2: silence -EEXIST from ocfs2_extent_map_insert/lookup Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit 8169cae5a13b9f8ae53edc183825d20b4f4daeeb Author: Adrian Bunk Date: Fri Mar 31 16:53:55 2006 +0200 [PATCH] fs/ocfs2/dlm/dlmrecovery.c: make dlm_lockres_master_requery() static dlm_lockres_master_requery() became global without any external usage. Signed-off-by: Adrian Bunk Signed-off-by: Mark Fasheh commit 0db638f44e7db9732d9c5704ca837f57ce061f42 Author: Mark Fasheh Date: Tue May 9 15:09:35 2006 -0700 ocfs2: warn the user on a dead timeout mismatch Print a warning to the user when a node with a different dead count joins the region. Signed-off-by: Mark Fasheh commit c05d52c748da10a3f27f6e638875514153776b15 Author: Adrian Bunk Date: Thu Jun 22 12:03:35 2006 +0200 fs/jffs2/: make 2 functions static This patch makes two needlessly global functions static. Signed-off-by: Adrian Bunk Signed-off-by: David Woodhouse commit 4ba63adce06bc7549e1dd36344123dbaccdaa52f Author: Adrian Bunk Date: Sun Mar 26 14:25:52 2006 +0200 ocfs2: OCFS2_FS must depend on SYSFS Signed-off-by: Adrian Bunk Signed-off-by: Mark Fasheh commit 2b388c67906ee8cd3bf1a600a7023cd0807d414f Author: Joel Becker Date: Wed May 10 18:28:59 2006 -0700 ocfs2: Compile-time disabling of ocfs2 debugging output. Give gcc the chance to compile out the debug logging code in ocfs2. This saves some size at the expense of being able to debug the code. Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit e7515d065d09f6450c996a8fa206ad66569e183c Author: Joel Becker Date: Fri Mar 10 11:42:30 2006 -0800 configfs: Clear up a few extra spaces where there should be TABs. Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit 257a5bdeb0441789d8e34e1b3e92b26d0f51bbf0 Author: David Woodhouse Date: Thu Jun 29 22:40:06 2006 +0100 Remove export of include/linux/isdn/tpam.h Signed-off-by: David Woodhouse commit 22dd0e88b70f5faa3a0101081e290431c3439189 Author: Joel Becker Date: Wed Apr 12 18:34:43 2006 -0700 configfs: Release memory in configfs_example. The configfs_example module was missing a ->release(). Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit bf7e8511088963078484132636839b59e25cf14f Author: Milan Svoboda Date: Thu Jun 29 12:40:00 2006 -0700 [PATCH] usb gadget: fixup pxa2xx_udc to include asm/arch/udc.h again This fixes pxa2xx_udc.c to include asm/arch/udc.h again to fix current build breakage. Signed-off-by: Milan Svoboda [ forwarded by David Brownell ] [ fixed to apply properly by Linus ] Signed-off-by: Linus Torvalds commit ff0daca525dde796382b9ccd563f169df2571211 Author: Russell King Date: Thu Jun 29 20:17:15 2006 +0100 [ARM] Add section support to ioremap Allow section mappings to be setup using ioremap() and torn down with iounmap(). This requires additional support in the MM context switch to ensure that mappings are properly synchronised when mapped in. Based an original implementation by Deepak Saxena, reworked and ARMv6 support added by rmk. Signed-off-by: Russell King commit 8db089c6b5594c961fb6bc6d613b9926e0d3d98f Author: Ralf Baechle Date: Thu Jun 29 20:06:53 2006 +0100 [MIPS] Add missing backslashes to macro definitions. Signed-off-by: Ralf Baechle commit 127fe6af38fe237374fc158c11da6bb44bcfdc9a Author: Ralf Baechle Date: Wed Jun 28 12:28:27 2006 +0100 [MIPS] Death list of board support to be removed after 2.6.18. As usual fixes would be prefered. Signed-off-by: Ralf Baechle commit fc103349bb7d3f011ffe9678da86a35634f4b6fc Author: Ralf Baechle Date: Wed Jun 28 11:24:12 2006 +0100 [MIPS] Remove BSD and Sys V compat data types. Signed-off-by: Ralf Baechle commit 89e22d15910a47fe026fe607710ec4646efc100a Author: Ralf Baechle Date: Tue Jun 27 17:34:35 2006 +0100 [MIPS] ioc3.h: Uses u8, so include . Signed-off-by: Ralf Baechle commit 2e78ae3f48b2596797101fa365abd6348143299f Author: Ralf Baechle Date: Fri Jun 23 18:48:21 2006 +0100 [MIPS] 74K: Assume it will also have an AR bit in config7 Signed-off-by: Ralf Baechle commit beab375a48f0cd90eb08f04e2c1dad67b9e6d3f8 Author: Ralf Baechle Date: Mon Jun 19 21:56:25 2006 +0100 [MIPS] Treat CPUs with AR bit as physically indexed. Signed-off-by: Ralf Baechle commit 92c7b62fd1a6898fbfaf1db790ba4e70e90f39d2 Author: Ralf Baechle Date: Fri Jun 23 18:39:00 2006 +0100 [MIPS] Oprofile: Support VSMP on 34K. Signed-off-by: Ralf Baechle commit a2c2bc4b263828a380813a236fa6fcf8185b460b Author: Atsushi Nemoto Date: Thu Jun 22 19:42:43 2006 +0900 [MIPS] MIPS32/MIPS64 S-cache fix and cleanup Use blast_scache_range, blast_inv_scache_range for mips32/mips64 scache routine. Also initialize waybit for MIPS32/MIPS64 S-cache. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 86165879a20753e7ed86be4c2e9bba3f32ed0aff Author: Ralf Baechle Date: Fri Jun 23 15:02:03 2006 +0100 [MIPS] excite: PCI makefile needs to use += if it wants a chance to work. Signed-off-by: Ralf Baechle commit ec52d7bff060171a74a7b1826a42bd60d5b1b07d Author: Ralf Baechle Date: Fri Jun 23 15:00:38 2006 +0100 [MIPS] excite: plat_setup -> plat_mem_setup. Signed-off-by: Ralf Baechle commit 3e2c6ef3c67bfebe28215a18338641ecffbe73bc Author: Domen Puncer Date: Fri Jun 23 12:00:21 2006 +0200 [MIPS] au1xxx: export dbdma functions These are needed for au1550_ac97 module. Signed-off-by: Domen Puncer Signed-off-by: Ralf Baechle commit c06138941c2b5331e752546cf4ef7f4a2735ec99 Author: Domen Puncer Date: Fri Jun 23 11:59:50 2006 +0200 [MIPS] au1xxx: dbdma, no sleeping under spin_lock kmalloc under spin_lock can't sleep. Signed-off-by: Domen Puncer Signed-off-by: Ralf Baechle commit 38e9156147e5b0defb71a3eb7e9eff74609c496a Author: Domen Puncer Date: Fri Jun 23 11:58:31 2006 +0200 [MIPS] au1xxx: fix PSC_SMBTXRX_RSR. Signed-off-by: Domen Puncer Signed-off-by: Ralf Baechle commit a3d45391866d2c244363c3000fc6c1acb3dfcb0b Author: Ralf Baechle Date: Thu Jun 22 20:09:04 2006 +0100 [MIPS] Early printk for IP27. Signed-off-by: Ralf Baechle commit 73f403527b9ec5367376076eafb3d2f505d8e2e3 Author: Chris Dearman Date: Tue Jun 20 18:06:52 2006 +0100 [MIPS] Fix handling of 0 length I & D caches. Don't ask. Signed-off-by: Chris Dearman Signed-off-by: Ralf Baechle commit c09b47d8a99104897afd682b48f292e05461a0c2 Author: Chris Dearman Date: Tue Jun 20 17:15:20 2006 +0100 [MIPS] Typo fixes. Signed-off-by: Chris Dearman Signed-off-by: Ralf Baechle commit 9318c51acd9689505850152cc98277a6d6f2d752 Author: Chris Dearman Date: Tue Jun 20 17:15:20 2006 +0100 [MIPS] MIPS32/MIPS64 secondary cache management Signed-off-by: Chris Dearman Signed-off-by: Ralf Baechle commit f7a849153be3b66326b52dce0d07896b56cb4cd7 Author: Atsushi Nemoto Date: Tue Jun 20 23:59:11 2006 +0900 [MIPS] Fix FIXADDR_TOP for TX39/TX49. FIXADDR_TOP is used for HIGHMEM and for upper limit of vmalloc area on 32bit kernel. TX39XX and TX49XX have "reserved" segment in CKSEG3 area. 0xff000000-0xff3fffff on TX49XX and 0xff000000-0xfffeffff on TX39XX are reserved (unmapped, uncached) therefore can not be used as mapped area. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 6feb6efaec9858dfb673fc5c89b8280b1b73bb08 Author: Yoichi Yuasa Date: Tue Jun 20 23:55:17 2006 +0900 [MIPS] Remove first timer interrupt setup in wrppmc_timer_setup() The first timer interrupt setup already happens in time_init(). Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit f41ae0b2b9e5b4455cfc68dcc885f4fa2a973384 Author: Ralf Baechle Date: Mon Jun 5 17:24:46 2006 +0100 [MIPS] Fix configuration of R2 CPU features and multithreading. Signed-off-by: Ralf Baechle commit e73ea273ef87a04ff59fc368fa33333dca275dde Author: Ralf Baechle Date: Sun Jun 4 11:51:46 2006 +0100 [MIPS] Fix build error: don't offer SMP on systems that don't have SMP. Signed-off-by: Ralf Baechle commit a620dbe378f3940dc058435d8ce89f5a4a7b77d5 Author: Ralf Baechle Date: Sun Jun 4 00:35:10 2006 +0100 [MIPS] Limit MIPS_MT to MIPS32R2 only. Signed-off-by: Ralf Baechle commit 08aecfb9eaf019f07384175101c970ede271c17a Author: Yoichi Yuasa Date: Tue Jun 20 23:26:30 2006 +0900 [MIPS] Remove set_c0_status(ST0_IM) from wrppmc's irq.c. mips_cpu_irq_init() does clear_c0_status(ST0_IM) first, so set_c0_status(ST0_IM) isn't necessary. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 1500b9a0f4381831e41f7e02f61dbef980ded342 Author: Yoichi Yuasa Date: Tue Jun 20 23:17:18 2006 +0900 [MIPS] Remove unused system type name for DDB5074 and DDB5476. This patch removes unused system type name. DDB5074 and DDB5476 were already removed. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 7ae7cdab97f33d6a5d42664b411be52b46572e5b Author: Ralf Baechle Date: Thu Jun 29 21:10:50 2006 +0100 elf-em.h: Define and explain both EM_MIPS_RS3_LE and EM_MIPS_RS4_BE. They have been obsoleted by the ELF header EI_CLASS and EI_DATA fields in combination with e_flags. Afaics EM_MIPS_RS3_LE and EM_MIPS_RS4_BE never had any practical relevance. Binutils will not produce such binaries and the kernel will not accept them as MIPS binaries. Signed-off-by: Ralf Baechle commit 0ef831b1ff1ff0bcd8bf5b1890913ef6bb263250 Author: Yoichi Yuasa Date: Tue Jun 20 21:33:02 2006 +0900 [MIPS] Removes unused functions for GT64120 Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 4277ff5ee55694f67d9c6586bb4c06991e221a68 Author: Ralf Baechle Date: Sat Jun 3 22:40:15 2006 +0100 [MIPS] Fix use of ehb instruction for non-R2 configurations. Signed-off-by: Ralf Baechle commit b4ab24e1c8c1442b2928bab1325b56bdbbcf898e Author: Ralf Baechle Date: Sat Jun 3 22:30:58 2006 +0100 [MIPS] Define ARCH_HAS_IRQ_PER_CPU for all SMP systems. Without SMTC on non-Malta will blow up. Signed-off-by: Ralf Baechle commit 14cd8015015199d6e8dea8aa4948b559137df7b7 Author: Ralf Baechle Date: Thu Jun 29 21:10:47 2006 +0100 [MIPS] Consistent formatting for Qemu makefile segment. commit 136d47d3e1cc455e9e1d9cb7b9d513a8581d3835 Author: Ralf Baechle Date: Sat Apr 15 11:16:19 2006 +0200 [MIPS] Wire up tee(2). Signed-off-by: Ralf Baechle commit 10edd8b9d5e42d5fb0a51061a0e97bc4009aeb1a Author: Ralf Baechle Date: Thu Jun 29 21:10:46 2006 +0100 Remove au1x00_uart from feature-removal-schedule.txt. The driver has been removed a while ago already. Signed-off-by: Ralf Baechle commit 6adb5fe7020e8f99d27da932157ea27325df9263 Author: Ralf Baechle Date: Tue Jun 20 12:47:53 2006 +0100 [MIPS] Only register RAM as resources if UNCAC_BASE != IO_BASE. This fixes a resource collision of RAM and I/O memory on systems that use the physical address space multiple times. Signed-off-by: Ralf Baechle commit 9247857f5acadf0ea87fd6a9514c633644634f08 Author: Mark.Zhan Date: Tue Jun 20 18:15:02 2006 +0800 [MIPS] Fix the build error of Wind River PPMC board, rewrite irq code to C o Fix the build error Wind River PPMC board caused by the change of plat_setup hook interface. o Rewrite first level interrupt dispatch code to C. Signed-off-by: Rongkai.Zhan Signed-off-by: Ralf Baechle commit ba53201180e267bd1f0792e6c375ced7c100738e Author: Russell King Date: Thu Jun 29 20:56:47 2006 +0100 [ARM] Fix sa11x0 SDRAM selection Avoid folk having to edit cpu-sa1110.c to select their RAM type; instead, allow the SDRAM type to be selected via the kernel command line. Signed-off-by: Russell King commit 27a288677de33c50af980e55abec5643db4cd0b8 Author: Thomas Gleixner Date: Thu Jun 29 21:25:10 2006 +0200 [MTD] NAND: Fix broken sharpsl driver Remove the not longer supported NO_VIRTBLOCKS flag and remove an unused variable while at it. Signed-off-by: Thomas Gleixner commit 1f1332f727c3229eb2166a83fec5d3de6a73dce2 Author: Matt LaPlante Date: Thu Jun 29 01:32:47 2006 -0400 [PATCH] KConfig: Spellchecking 'similarity' and 'independent' Several KConfig files had 'similarity' and 'independent' spelled incorrectly... Acked-by: Alan Cox Signed-off-by: Linus Torvalds commit 09fca29de4bdfd7eff47acbc6bd71c5fb5b79d79 Author: Karsten Keil Date: Thu Jun 29 13:16:29 2006 +0200 [PATCH] i4l:add some checks for valid drvid and driver pointer If all drivers go away before all ISDN network interfaces are closed we got a OOps on removing interfaces, this patch avoid it. Signed-off-by: Karsten Keil Signed-off-by: Linus Torvalds commit 0f6c10ead876492b386a19474e6dca4710eeef8e Author: Karsten Keil Date: Thu Jun 29 13:14:51 2006 +0200 [PATCH] i4l make PCMCIA for all cards working with shared IRQ most current laptops do not work without allowing shared cardbus IRQs. This patch enables IRQ sharing, so these cards work again. This was tested with shared and none shared cardbus IRQs on different laptops without problems. Signed-off-by: Karsten Keil Signed-off-by: Linus Torvalds commit 47c2a3aa4475d27073dd3c7e183fcc13f495c8f5 Author: Ingo Molnar Date: Thu Jun 29 02:25:03 2006 -0700 [PATCH] genirq: add chip->eoi(), fastack -> fasteoi Clean up the fastack concept by turning it into fasteoi and introducing the ->eoi() method for chips. This also allows the cleanup of an i386 EOI quirk - now the quirk is cleanly separated from the pure ACK implementation. Signed-off-by: Ingo Molnar Cc: Benjamin Herrenschmidt Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f702d7013c7470284843a6370aaa53b8b75c5a40 Author: Eric W. Biederman Date: Thu Jun 29 02:25:02 2006 -0700 [PATCH] genirq: irq: document what an IRQ is Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Rajesh Shah Cc: Andi Kleen Cc: "Protasevich, Natalie" Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 98bb244b685eb2a297aa60fa2e5c0631f95828e1 Author: Benjamin Herrenschmidt Date: Thu Jun 29 02:25:01 2006 -0700 [PATCH] genirq: fasteoi handler: handle interrupt disabling Note when a disable interrupt happened with the fasteoi handler as well so that delayed disable can be implemented with fasteoi-type controllers. Signed-off-by: Benjamin Herrenschmidt Acked-by: Ingo Molnar Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f210be198ddd3f54b17d4aa6e69b829f75f226e5 Author: Benjamin Herrenschmidt Date: Thu Jun 29 02:25:00 2006 -0700 [PATCH] genirq: add IRQ_TYPE_SENSE_MASK Add a #define for the mask of the part of IRQ_TYPE that represents the trigger type. I use that in my in-progress work as I've standardized the way the irq description in the firmware device-tree get translated to linux useable things by using those constants. Having this mask to isolate the "trigger type" part of the flags is useful in a few places. Signed-off-by: Benjamin Herrenschmidt Acked-by: Thomas Gleixner Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 43f7775944e40221827e4b3aec43824aa4c4e4a9 Author: Ingo Molnar Date: Thu Jun 29 02:24:58 2006 -0700 [PATCH] genirq: more verbose debugging on unexpected IRQ vectors One frequent sign of IRQ handling bugs is the appearance of unexpected vectors. Print out all the IRQ state in that case. We dont want this patch upstream, but it is useful during initial testing. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f1c2662cbc6a0a9772655649bdf579803d33470b Author: Ingo Molnar Date: Thu Jun 29 02:24:57 2006 -0700 [PATCH] genirq: cleanup: no_irq_type -> no_irq_chip rename Rename no_irq_type to no_irq_chip. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e76de9f8eb67b7acc1cc6f28c4be8583adf0a90c Author: Thomas Gleixner Date: Thu Jun 29 02:24:56 2006 -0700 [PATCH] genirq: add SA_TRIGGER support Enable drivers to request an IRQ with a given irq-flow (trigger/polarity) setting. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba9a2331bae5da8f65be3722b9e2d210f1987857 Author: Thomas Gleixner Date: Thu Jun 29 02:24:55 2006 -0700 [PATCH] genirq: add irq-wake (power-management) support Enable platforms to set the irq-wake (power-management) properties of an IRQ. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a55713ab456d267815fd5ca3c3d0fd14301f306 Author: Ingo Molnar Date: Thu Jun 29 02:24:54 2006 -0700 [PATCH] genirq: add handle_bad_irq() Handle bad IRQ vectors via the irqchip mechanism. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd87eb3a24c4527741122713e223d74b85d43c85 Author: Thomas Gleixner Date: Thu Jun 29 02:24:53 2006 -0700 [PATCH] genirq: add irq-chip support Enable platforms to use the irq-chip and irq-flow abstractions: allow setting of the chip, the type and provide highlevel handlers for common irq-flows. [rostedt@goodmis.org: misroute-irq: Don't call desc->chip->end because of edge interrupts] Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Cc: Benjamin Herrenschmidt Signed-off-by: Steven Rostedt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dae8620421833bb2e9a01c4ccc42bdc3759b81df Author: Ingo Molnar Date: Thu Jun 29 02:24:52 2006 -0700 [PATCH] genirq MSI fixes This is a fixed up and cleaned up replacement for genirq-msi-fixes.patch, which should solve the i386 4KSTACKS problem. I also added Ben's idea of pushing the __do_IRQ() check into generic_handle_irq(). I booted this with MSI enabled, but i only have MSI devices, not MSI-X devices. I'd still expect MSI-X to work now. irqchip migration helper: call __do_IRQ() if a descriptor is attached to an irqtype-style controller. This also fixes MSI-X IRQ handling on i386 and x86_64. Signed-off-by: Ingo Molnar Cc: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a6de9ef5850d063c3d3fb50784bfe3a6d0712c6 Author: Thomas Gleixner Date: Thu Jun 29 02:24:51 2006 -0700 [PATCH] genirq: core Core genirq support: add the irq-chip and irq-flow abstractions. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a34db9b28a1c63317e1d6f1080a12d711579e7d0 Author: Ingo Molnar Date: Thu Jun 29 02:24:50 2006 -0700 [PATCH] genirq: update copyrights Update/add copyrights in the generic IRQ code. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94d39e1f6e8132ea982a1d61acbe0423d3d14365 Author: Thomas Gleixner Date: Thu Jun 29 02:24:50 2006 -0700 [PATCH] genirq: add IRQ_NOAUTOEN support Enable platforms to disable the automatic enabling of freshly set up irqs. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6550c775cb5ee94c132d93d84de3bb23f0abf37b Author: Thomas Gleixner Date: Thu Jun 29 02:24:49 2006 -0700 [PATCH] genirq: add IRQ_NOREQUEST support Enable platforms to disable request_irq() for certain interrupts. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3418d72404e35eb19e7995cbf3e7a76ba8fefbce Author: Thomas Gleixner Date: Thu Jun 29 02:24:49 2006 -0700 [PATCH] genirq: add IRQ_NOPROBE support Introduce IRQ_NOPROBE: enables platforms to control chip-probing. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a4633adcdbc15ac51afcd0e1395de58cee27cf92 Author: Thomas Gleixner Date: Thu Jun 29 02:24:48 2006 -0700 [PATCH] genirq: add genirq sw IRQ-retrigger Enable platforms that do not have a hardware-assisted hardirq-resend mechanism to resend them via a softirq-driven IRQ emulation mechanism. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 11c869eaf1a9c97ef273f824a697fac017d68286 Author: Thomas Gleixner Date: Thu Jun 29 02:24:47 2006 -0700 [PATCH] genirq: doc: add design documentation Add docbook file - includes API documentation. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 77a5afecdb15e65034ab8390b46b824c186c62a8 Author: Ingo Molnar Date: Thu Jun 29 02:24:46 2006 -0700 [PATCH] genirq: cleanup: no_irq_type cleanups Clean up no_irq_type: share the NOP functions where possible, and properly name the ack_bad() function. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d28bc751bb9ad479e33964d5d9eedfe5fb488a5 Author: Ingo Molnar Date: Thu Jun 29 02:24:46 2006 -0700 [PATCH] genirq: doc: handle_IRQ_event() and __do_IRQ() comments Document handle_IRQ_event() and __do_IRQ(). Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8fee5c36177ee098fa41f5fe72999609fef4df6b Author: Ingo Molnar Date: Thu Jun 29 02:24:45 2006 -0700 [PATCH] genirq: doc: comment include/linux/irq.h structures Better document the hw_interrupt_type and irq_desc structures. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c0ad90a32fb60f4129d0e24dfd5fd7128e2e09f2 Author: Ingo Molnar Date: Thu Jun 29 02:24:44 2006 -0700 [PATCH] genirq: add ->retrigger() irq op to consolidate hw_irq_resend() Add ->retrigger() irq op to consolidate hw_irq_resend() implementations. (Most architectures had it defined to NOP anyway.) NOTE: ia64 needs testing. i386 and x86_64 tested. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 096c8131c573ed37939dc3f1440221c92c87e74b Author: Thomas Gleixner Date: Thu Jun 29 02:24:44 2006 -0700 [PATCH] genirq: debug: better debug printout in enable_irq() Make enable_irq() debug printouts user-readable. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0d7012a968d006e277eb0fe20edd7a9b5563c2b7 Author: Ingo Molnar Date: Thu Jun 29 02:24:43 2006 -0700 [PATCH] genirq: cleanup: turn ARCH_HAS_IRQ_PER_CPU into CONFIG_IRQ_PER_CPU Cleanup: change ARCH_HAS_IRQ_PER_CPU into a Kconfig method. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd916d31cc31273eca8a620fae02b7bf7f577559 Author: Ingo Molnar Date: Thu Jun 29 02:24:42 2006 -0700 [PATCH] genirq: cleanup: merge pending_irq_cpumask[] into irq_desc[] Consolidation: remove the pending_irq_cpumask[NR_IRQS] array and move it into the irq_desc[NR_IRQS].pending_mask field. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4a733ee12618cf3ec25cbc337a5e0ba3ad5d7fb6 Author: Ingo Molnar Date: Thu Jun 29 02:24:42 2006 -0700 [PATCH] genirq: cleanup: merge irq_dir[], smp_affinity_entry[] into irq_desc[] Consolidation: remove the irq_dir[NR_IRQS] and the smp_affinity_entry[NR_IRQS] arrays and move them into the irq_desc[] array. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 71d218b75fa91219c6bd310fbdd257dfbcac6c88 Author: Ingo Molnar Date: Thu Jun 29 02:24:41 2006 -0700 [PATCH] genirq: cleanup: include/linux/irq.h Small cleanups in include/linux/irq.h. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34ffdb7233d5847808d2b63ca6761dac3af9c942 Author: Ingo Molnar Date: Thu Jun 29 02:24:40 2006 -0700 [PATCH] genirq: cleanup: reduce irq_desc_t use, mark it obsolete Cleanup: remove irq_desc_t use from the generic IRQ code, and mark it obsolete. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 06fcb0c6fb3aae9570a32ac3b72a8222563baa69 Author: Ingo Molnar Date: Thu Jun 29 02:24:40 2006 -0700 [PATCH] genirq: cleanup: misc code cleanups Assorted code cleanups to the generic IRQ code. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e60bbb6d50de654d8e68f115161e27878b5e72d Author: Ingo Molnar Date: Thu Jun 29 02:24:39 2006 -0700 [PATCH] genirq: cleanup: remove fastcall Now that i386 defaults to regparm, explicit uses of fastcall are not needed anymore. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a8553acd6c14e827078779c0a0ee1c18f27b2403 Author: Ingo Molnar Date: Thu Jun 29 02:24:38 2006 -0700 [PATCH] genirq: cleanup: remove irq_descp() Cleanup: remove irq_descp() - explicit use of irq_desc[] is shorter and more readable. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a53da52fd743fd637637572838c0a7af23a2d038 Author: Ingo Molnar Date: Thu Jun 29 02:24:38 2006 -0700 [PATCH] genirq: cleanup: merge irq_affinity[] into irq_desc[] Consolidation: remove the irq_affinity[NR_IRQS] array and move it into the irq_desc[NR_IRQS].affinity field. [akpm@osdl.org: sparc64 build fix] Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74ffd553a3a7fbae34be70b751852d5b6fe5acac Author: Ingo Molnar Date: Thu Jun 29 02:24:37 2006 -0700 [PATCH] genirq: sem2mutex probe_sem -> probing_active Convert the irq auto-probing semaphore to a mutex. (This allows us to find probing API usage bugs sooner, via the mutex debugging code.) Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d1bef4ed5faf7d9872337b33c4269e45ae1bf960 Author: Ingo Molnar Date: Thu Jun 29 02:24:36 2006 -0700 [PATCH] genirq: rename desc->handler to desc->chip This patch-queue improves the generic IRQ layer to be truly generic, by adding various abstractions and features to it, without impacting existing functionality. While the queue can be best described as "fix and improve everything in the generic IRQ layer that we could think of", and thus it consists of many smaller features and lots of cleanups, the one feature that stands out most is the new 'irq chip' abstraction. The irq-chip abstraction is about describing and coding and IRQ controller driver by mapping its raw hardware capabilities [and quirks, if needed] in a straightforward way, without having to think about "IRQ flow" (level/edge/etc.) type of details. This stands in contrast with the current 'irq-type' model of genirq architectures, which 'mixes' raw hardware capabilities with 'flow' details. The patchset supports both types of irq controller designs at once, and converts i386 and x86_64 to the new irq-chip design. As a bonus side-effect of the irq-chip approach, chained interrupt controllers (master/slave PIC constructs, etc.) are now supported by design as well. The end result of this patchset intends to be simpler architecture-level code and more consolidation between architectures. We reused many bits of code and many concepts from Russell King's ARM IRQ layer, the merging of which was one of the motivations for this patchset. This patch: rename desc->handler to desc->chip. Originally i did not want to do this, because it's a big patch. But having both "desc->handler", "desc->handle_irq" and "action->handler" caused a large degree of confusion and made the code appear alot less clean than it truly is. I have also attempted a dual approach as well by introducing a desc->chip alias - but that just wasnt robust enough and broke frequently. So lets get over with this quickly. The conversion was done automatically via scripts and converts all the code in the kernel. This renaming patch is the first one amongst the patches, so that the remaining patches can stay flexible and can be merged and split up without having some big monolithic patch act as a merge barrier. [akpm@osdl.org: build fix] [akpm@osdl.org: another build fix] Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cfb9e32f2ff32ef5265c1c80fe68dd1a7f03a604 Author: Adrian Bunk Date: Thu Jun 29 02:24:34 2006 -0700 [PATCH] drivers/md/raid5.c: remove an unused variable Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d81931d9a2ec3e2e2cd8238b72f20c5fe44ccc7b Author: Eric Sesterhenn Date: Thu Jun 29 02:24:34 2006 -0700 [PATCH] SKB leak in drivers/isdn/i4l/isdn_x25iface.c Coverity spotted this leak (id #613), when we are not configured, we return without freeing the allocated skb. Signed-off-by: Eric Sesterhenn Acked-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9dc3885dfbebc76f4461b19e1af15e704ff4fcb0 Author: Karsten Keil Date: Thu Jun 29 02:24:33 2006 -0700 [PATCH] i4l: remove unneeded include/linux/isdn/tpam.h The TPAM isdn driver was removed in 2.6.12, but include/linux/isdn/tpam.h was missed. Signed-off-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 699352c30da8525a6224116983dab012689a0a76 Author: Dave Jones Date: Thu Jun 29 02:24:32 2006 -0700 [PATCH] GPIO for SCx200 & PC-8736x: x86-only AFAICT, this is x86 only, so the patch below is needed to stop this new option showing up on PPC, IA64, etc.. Signed-off-by: Dave Jones Cc: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8e53cfc8f20345713fab7e290e19514a8032bb06 Author: Eric Sesterhenn Date: Thu Jun 29 02:24:32 2006 -0700 [PATCH] Deref in drivers/block/paride/pf.c Another possible dereference detected by coverity (id #759). pf_probe() might call pf_identify() which might call get_capacity() which dereferences pf->disk Signed-off-by: Eric Sesterhenn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 85bd84345f64cb953101ddd8ab1340dde351c579 Author: Dave Jones Date: Thu Jun 29 02:24:31 2006 -0700 [PATCH] remove devinit from ioc4 pci_driver Documention/pci.txt states.. "The struct pci_driver shouldn't be marked with any of these tags." (Referring to __devinit and friends). (akpm: good documentation, that. Link this driver into vmlinux with hotplug CPU disabled and it'll crash). Signed-off-by: Dave Jones Cc: Brent Casavant Cc: Pat Gefre Cc: Jes Sorensen Cc: Tony Luck Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e075d58d667eb919a5df428b593ea7133e13d9c Author: Adrian Bunk Date: Thu Jun 29 02:24:30 2006 -0700 [PATCH] re-add CONFIG_SOUND_SSCAPE Due to a regression in the correcponding ALSA driver (ALSA #2234), the OSS driver should stay until it's fixed. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0e41142bf52002d604e16798dc3f1c28f46cc4b6 Author: Adrian Bunk Date: Thu Jun 29 02:24:30 2006 -0700 [PATCH] arch/i386/mach-visws/setup.c: remove dummy function calls Thankfully, these dummy function calls are no longer required to avoid warnings - if they weren't eliminated as dead code but accidentially executed there would be a guaranteed NULL dereference. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7256d819e43f89af6ba30047936c96c683436941 Author: Andrew Morton Date: Thu Jun 29 02:24:29 2006 -0700 [PATCH] ufs: printk() fix fs/ufs/inode.c: In function `ufs_frag_map': fs/ufs/inode.c:101: warning: long long unsigned int format, u64 arg (arg 4) fs/ufs/inode.c: In function `ufs_getfrag_block': fs/ufs/inode.c:432: warning: long long unsigned int format, u64 arg (arg 2) Cc: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4e54f08543d05e519e601368571cc3787fefae96 Author: David Howells Date: Thu Jun 29 02:24:28 2006 -0700 [PATCH] Keys: Allow in-kernel key requestor to pass auxiliary data to upcaller The proposed NFS key type uses its own method of passing key requests to userspace (upcalling) rather than invoking /sbin/request-key. This is because the responsible userspace daemon should already be running and will be contacted through rpc_pipefs. This patch permits the NFS filesystem to pass auxiliary data to the upcall operation (struct key_type::request_key) so that the upcaller can use a pre-existing communications channel more easily. Signed-off-by: David Howells Acked-By: Kevin Coffman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94583779e6625154e8d7fce33d097ae7d089e9de Author: Andrew Morton Date: Thu Jun 29 02:24:27 2006 -0700 [PATCH] sparc: register_cpu() build fix arch/sparc/kernel/setup.c: In function 'topology_init': arch/sparc/kernel/setup.c:528: error: too many arguments to function 'register_cpu' Cc: William Lee Irwin III Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cc57637b0b015fb5d70dbbec740de516d33af07d Author: Yasunori Goto Date: Thu Jun 29 02:24:27 2006 -0700 [PATCH] solve config broken: undefined reference to `online_page' Memory hotplug code of i386 adds memory to only highmem. So, if CONFIG_HIGHMEM is not set, CONFIG_MEMORY_HOTPLUG shouldn't be set. Otherwise, it causes compile error. In addition, many architecture can't use memory hotplug feature yet. So, I introduce CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG. Signed-off-by: Yasunori Goto Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 81b0c8713385ce1b1b9058e916edcf9561ad76d6 Author: Andrew Morton Date: Thu Jun 29 02:24:26 2006 -0700 [PATCH] generic_file_buffered_write(): handle zero-length iovec segments The recent generic_file_write() deadlock fix caused generic_file_buffered_write() to loop inifinitely when presented with a zero-length iovec segment. Fix. Note that this fix deliberately avoids calling ->prepare_write(), ->commit_write() etc with a zero-length write. This is because I don't trust all filesystems to get that right. This is a cautious approach, for 2.6.17.x. For 2.6.18 we should just go ahead and call ->prepare_write() and ->commit_write() with the zero length and fix any broken filesystems. So I'll make that change once this code is stabilised and backported into 2.6.17.x. The reason for preferring to call ->prepare_write() and ->commit_write() with the zero-length segment: a zero-length segment _should_ be sufficiently uncommon that this is the correct way of handling it. We don't want to optimise for poorly-written userspace at the expense of well-written userspace. Cc: "Vladimir V. Saveliev" Cc: Neil Brown Cc: Martin Schwidefsky Cc: Chris Wright Cc: Greg KH Cc: Cc: walt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0686cd8fbe3e5fb1441ae84b9cbc813f9297b879 Author: Adrian Bunk Date: Thu Jun 29 02:24:25 2006 -0700 [PATCH] fix sgivwfb compile drivers/built-in.o: In function `sgivwfb_set_par': sgivwfb.c:(.text+0x88583): undefined reference to `sgivwfb_mem_phys' sgivwfb.c:(.text+0x88596): undefined reference to `sgivwfb_mem_phys' sgivwfb.c:(.text+0x885a8): undefined reference to `sgivwfb_mem_phys' drivers/built-in.o: In function `sgivwfb_check_var': sgivwfb.c:(.text+0x88ad0): undefined reference to `sgivwfb_mem_size' drivers/built-in.o: In function `sgivwfb_mmap': sgivwfb.c:(.text+0x88c75): undefined reference to `sgivwfb_mem_size' sgivwfb.c:(.text+0x88c7f): undefined reference to `sgivwfb_mem_phys' drivers/built-in.o: In function `sgivwfb_probe': sgivwfb.c:(.init.text+0x4060): undefined reference to `sgivwfb_mem_size' sgivwfb.c:(.init.text+0x4065): undefined reference to `sgivwfb_mem_phys' sgivwfb.c:(.init.text+0x4076): undefined reference to `sgivwfb_mem_phys' sgivwfb.c:(.init.text+0x409c): undefined reference to `sgivwfb_mem_size' sgivwfb.c:(.init.text+0x410e): undefined reference to `sgivwfb_mem_size' sgivwfb.c:(.init.text+0x4113): undefined reference to `sgivwfb_mem_phys' sgivwfb.c:(.init.text+0x4162): undefined reference to `sgivwfb_mem_size' sgivwfb.c:(.init.text+0x4168): undefined reference to `sgivwfb_mem_phys' make: *** [.tmp_vmlinux1] Error 1 Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8799ee9f49f6171fd58f4d64f8c067ca49006a5d Author: Russell King Date: Thu Jun 29 18:24:21 2006 +0100 [ARM] Set bit 4 on section mappings correctly depending on CPU On some CPUs, bit 4 of section mappings means "update the cache when written to". On others, this bit is required to be one, and others it's required to be zero. Finally, on ARMv6 and above, setting it turns on "no execute" and prevents speculative prefetches. With all these combinations, no one value fits all CPUs, so we have to pick a value depending on the CPU type, and the area we're mapping. Signed-off-by: Russell King commit 0f13fc09db68de92585558984bff1c51b87db72f Author: James Bottomley Date: Thu Jun 29 13:02:11 2006 -0400 [SCSI] 53c700: fix breakage caused by the autosense update A bit of a brown paper bag issue. The previous patch to remove the soon to be ripped out fields that were used in autosense actually broke the driver. This patch fixes it and has been tested (honestly). Signed-off-by: James Bottomley commit 326764a85b7676388db3ebad6488f312631d7661 Author: Jürgen Schindele Date: Thu Jun 29 16:01:43 2006 +0100 [ARM] 3666/1: TRIZEPS4 [1/5] core Patch from Jürgen Schindele This patch adds support for Trizeps4 SoM and ConXS-evalboard from "Keith und Koep" This DIMM-module is based on PXA270. Signed-off-by: Jürgen Schindele Signed-off-by: Russell King commit 53cb8a1f45e06a2627a6d89b151cccb95fa45cbf Author: Mike Christie Date: Wed Jun 28 12:00:32 2006 -0500 [SCSI] iscsi: add async notification of session events This patch adds or modifies the transport class functions used to notify userspace of session state events. We modify the session addition up event and add a destruction event to notify userspace of session creation, relogin and destruction. And we modify the conn error event to be sent by broadcast since multiple listeners may want to listen for it. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 6a8a0d3621745279a131d95f0204dc9ddac60d55 Author: Mike Christie Date: Wed Jun 28 12:00:31 2006 -0500 [SCSI] iscsi: pass target nr to session creation So the drivers do not use the channel numbers, but some do use the target numbers. We were just adding some goofy variable that just increases for the target nr. This is useless for software iscsi because it is always zero. And for qla4xxx the target nr is actually the index of the target/session in its FW or FLASH tables. We needed to expose this to userspace so apps could access those numbers so this patch just adds the target nr to the iscsi session creation functions. This way when qla4xxx's Hw thinks a session is at target nr 4 in its hw, it is exposed as that number in sysfs. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 8434aa8b6fe5af27a33b8aa830c24e3680356c83 Author: Mike Christie Date: Wed Jun 28 12:00:30 2006 -0500 [SCSI] iscsi: break up session creation into two stages qla4xxx is initialized in two steps like other HW drivers. It allocates the host, sets up the HW, then adds the host. For iscsi part of HW setup is setting up persistent iscsi sessions. At that time, the interupts are off and the driver is not completely set up so we just want to allocate them. We do not want to add them to sysfs and expose them to userspace because userspace could try to do lots of fun things with them like scanning and at that time the driver is not ready. So this patch breakes up the session creation like other functions that use the driver model in two the alloc and add parts. When the driver is ready, it can then add the sessions and userspace can begin using them. This also fixes a bug in the addition error patch where we forgot to do a get on the session. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit e6f3b63f50b4bb9fdc9025e0c3994acd265ad3a2 Author: Mike Christie Date: Wed Jun 28 12:00:29 2006 -0500 [SCSI] iscsi: rm channel usage from iscsi I do not remember what I was thinking when we added the channel as a argument to the session create function. It was probably due to too much cut and paste work from the FC transport class. The channel is meaningless for iscsi drivers so this patch drops its usage everywhere in the iscsi related code. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit f53a88da18e3c04c3ade07bc5eff520ee4259c3e Author: Mike Christie Date: Wed Jun 28 12:00:27 2006 -0500 [SCSI] iscsi: fix session refcouting iscsi_tcp and iser cannot be rmmod from the kernel when sessions are running because session removal is driven from userspace. For those modules we get a module reference when a session is created then drop it when the session is removed. For qla4xxx, they can jsut remove the sessions from the pci remove function like normal HW drivers, so this patch moves the module reference from the transport class functions shared by all drivers to the libiscsi functions only used be software iscsi modules. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 5c75b7fcf0c0e3921391fd93f5fa58ec9a6c428f Author: Mike Christie Date: Wed Jun 28 12:00:26 2006 -0500 [SCSI] iscsi: convert iscsi_tcp to new set/get param fns Convert iscsi_tcp to new lib functions. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 358ff019b89aa530ab6c0dd139d8089c932b103f Author: Mike Christie Date: Wed Jun 28 12:00:25 2006 -0500 [SCSI] iscsi: convert iser to new set/get param fns Convert iser to libiscsi get/set param functions. Fix bugs in it returning old error return values and have it expose exp_statsn. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit a54a52caad4bd6166cb7fa64e4e93031fa2fda5d Author: Mike Christie Date: Wed Jun 28 12:00:23 2006 -0500 [SCSI] iscsi: fixup set/get param functions Reduce duplication in the software iscsi_transport modules by adding a libiscsi function to handle the common grunt work. This also has the drivers return specifc -EXXX values for different errors so userspace can finally handle them in a sane way. Also just pass the sysfs buffers to the drivers so HW iscsi can get/set its string values, like targetname, and initiatorname. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 01cb225dad8da2e717356fab03240e2f4a8d01bf Author: Mike Christie Date: Wed Jun 28 12:00:22 2006 -0500 [SCSI] iscsi: add target discvery event to transport class Patch from david.somayajulu@qlogic.com: Add target discovery event. We may have a setup where the iscsi traffic is on a different netowrk than the other network traffic. In this case we will want to do discovery though the iscsi card. This patch adds a event to the transport class that can be used by hw iscsi cards that support this. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 8fc5ffa063f6551c9e6dd66cab89c46ad41e59c5 Author: Andrew Victor Date: Thu Jun 29 16:06:33 2006 +0100 [ARM] 3675/2: Preparing for AT91SAM926 support Patch from Andrew Victor This prepares the way for adding support for the new Atmel AT91SAM926x processors. Major changes: - Rename time.c to at91rm9200_time.c - Rename common.c to at91rm9200.c - Introduce ARCH_AT91, of which ARCH_AT91RM9200, ARCH_AT91SAM9260 and ARCH_AT91SAM9261 are dependent. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 1100c257ad11954416df5fcf4bcfcab43de54f57 Author: Lennert Buytenhek Date: Thu Jun 29 16:06:31 2006 +0100 [ARM] 3674/1: ep93xx: add cirrus logic edb9302 support Patch from Lennert Buytenhek This patch adds support for the Cirrus Logic EDB9302, an evaluation board based on the Cirrus Logic EP9302 SoC, with 32M RAM, one USB host port, audio in/out, two serial ports and a 10/100 ethernet interface. George Kashperko submitted the original patch, this patch is a rewrite using the newer physmap platform driver. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 332959cb521af6bb0281c7aae797f1f91dcb4c42 Author: Martin Habets Date: Wed Jun 28 15:40:36 2006 +0100 [SCSI] st: remove unused st_buffer.in_use I noticed that in_use in st_buffer is not used. The patch below against 2.6.17-rc3 removes it, assuming there is no future use for it. It was tested in a sparc SS20 with a DLT4000. Signed-off-by: Martin Habets Acked-by: Kai Mäkisara Signed-off-by: James Bottomley commit 656602978e43a4e5d929423d766be0448bdacc1e Author: Lennert Buytenhek Date: Thu Jun 29 16:06:30 2006 +0100 [ARM] 3673/1: lpd270: parse lcd= command line parameter Patch from Lennert Buytenhek The bootloader on the LogicPD PXA270 platform informs the kernel of which type of TFT screen is connected via an lcd=$FOO kernel command line parameter. Before this patch, we ignored this parameter and just hardcoded the use of the Sharp lq64d343 display kit. This patch implement parsing of the command line option, and chooses the right pxafb_mach_info to use (six choices) based on this command line option. Also fix the fb settings to correspond with those of the bootloader. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit c6e8c6ccf96e9249805d0e9828b994f4c926ad51 Author: KaiGai Kohei Date: Thu Jun 29 15:33:02 2006 +0100 [JFFS2][XATTR] Fix xd->refcnt race condition When xd->refcnt is checked whether this xdatum should be released or not, atomic_dec_and_lock() is used to ensure holding the c->erase_completion_lock. This fix change a specification of delete_xattr_datum(). Previously, it's only called when xd->refcnt equals zero. (calling it with positive xd->refcnt cause a BUG()) If you applied this patch, the function checks whether xd->refcnt is zero or not under the spinlock if necessary. Then, it marks xd DEAD flahs and links with xattr_dead_list or releases it immediately when xd->refcnt become zero. Signed-off-by: KaiGai Kohei Signed-off-by: David Woodhouse commit 22b1908610dd7ff68471cd4fbd383dbdfe5e0ecd Author: Russell King Date: Thu Jun 29 15:09:57 2006 +0100 [ARM] nommu: provide a way for correct control register value selection Most MMU-based CPUs have a restriction on the setting of the data cache enable and mmu enable bits in the control register, whereby if the data cache is enabled, the MMU must also be enabled. Enabling the data cache without the MMU is an invalid combination. However, there are CPUs where the data cache can be enabled without the MMU. In order to allow these CPUs to take advantage of that, provide a method whereby each proc-*.S file defines the control regsiter value for use with nommu (with the MMU disabled.) Later on, when we add support for enabling the MMU on these devices, we can adjust the "crval" macro to also enable the data cache for nommu. Signed-off-by: Russell King commit 264edb35ce5c85749bfdd2942c74b786ea1cde41 Author: Russell King Date: Thu Jun 29 15:03:09 2006 +0100 [ARM] Remove yucky ifdefs to print "id(wb)BRR" suffix on CPU name The "id(wb)BRR" suffix reports which CPU debugging options were (or were not) selected at kernel build time. Rather than have every proc-*.S file implement this, report the control register value, from which this information can be deduced. Signed-off-by: Russell King commit 94bb063312d872d9269deb2e5c0c7c6d5b0318e1 Author: Cornelia Huck Date: Thu Jun 29 15:08:41 2006 +0200 [S390] rework of channel measurement facility. Fixes for several channel measurement facility bugs: * Blocks copied from the hardware might not be consistent. Solve this by moving the copying into idle state and repeating the copying. * avg_sample_interval changed with every read, even though no new block was available. Solve this by storing a timestamp when the last new block was received. * Several locking issues. * Measurements were not reenabled after a disconnected device became available again. * Remove #defines for ioctls that were never implemented. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 5b5dd21a8e6652fc8b58a32757575cc7fce2b54d Author: Gerald Schaefer Date: Thu Jun 29 15:08:35 2006 +0200 [S390] appldata enhancements. Add CPU ID and steal time, and make OS record size variable. Signed-off-by: Gerald Schaefer Signed-off-by: Martin Schwidefsky commit 585c3047a881d0f54b93a0dd8ab499b07ed25d09 Author: Peter Oberparleiter Date: Thu Jun 29 15:08:25 2006 +0200 [S390] Add vmpanic parameter. Implementation of new kernel parameter vmpanic that provides a means to perform a z/VM CP command after a kernel panic occurred. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky commit 405455734e1cdec09c37233216f9240cb1a058e5 Author: Horst Hummel Date: Thu Jun 29 15:08:18 2006 +0200 [S390] add PAV support to the dasd driver. Add support for parallel-access-volumes to the dasd driver. This allows concurrent access to dasd devices with multiple channel programs. Signed-off-by: Horst Hummel Signed-off-by: Martin Schwidefsky commit 8f27766a883149926e7c1f69d9f1d8f68efcd65f Author: Martin Schwidefsky Date: Thu Jun 29 15:03:54 2006 +0200 [S390] remove export of sys_call_table Remove export of the sys_call_table symbol to prevent the misuse of it. Signed-off-by: Martin Schwidefsky commit 65b73c69c527a295ff3730b0b14e73359a8b4a16 Author: Martin Schwidefsky Date: Thu Jun 29 15:03:48 2006 +0200 [S390] remove unused macros from binfmt_elf32.c The two macros NEW_TO_OLD_UID and NEW_TO_OLD_GID in binfmt_elf32.c are not used by any code. Remove them. Signed-off-by: Martin Schwidefsky commit 8e0474f3b43e8bec1be164006a378e9dbd439b2c Author: Serge E. Hallyn Date: Thu Jun 29 15:03:42 2006 +0200 [S390] fix duplicate export of overflow{ug}id overflowuid and overflowgid were exported twice. Remove the export from s390_ksyms.c Signed-off-by: Serge E. Hallyn Signed-off-by: Martin Schwidefsky commit b4f7b1ee577857aca467e6825122a3b29d6c3c0e Author: Cornelia Huck Date: Thu Jun 29 15:03:35 2006 +0200 [S390] cio chpid offline. After setting a path to a dasd offline at the SE, I/O hangs on that dasd for 5 minutes, then continues. I/O for which an interrupt will not be reported after the channel path has been disabled was not terminated by the common I/O layer, causing the dasd MIH to hit after 5 minutes. Be more aggressive in terminating I/O after setting a channel path offline. Also make sure to generate a fake irb if the device driver issues an I/O request after being notified of the killed I/O and clear residual information from the irb before trying to start the delayed verification. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 3ee526841ba409f7b23f825f120772a79e7d7bd2 Author: Gerald Schaefer Date: Thu Jun 29 15:03:28 2006 +0200 [S390] avenrun export in appdata_base.c Remove EXPORT_SYMBOL_GPL(avenrun) from appdata_base.c, since it is already exported in kernel/timer.c Signed-off-by: Gerald Schaefer Signed-off-by: Martin Schwidefsky commit 84d11c5dcc4cdfe962fcd58a0302711befcdceda Author: Serge E. Hallyn Date: Thu Jun 29 15:03:17 2006 +0200 Convert s390_collect_crw_info() in s390mach.c from being started as a deprecated kernel_thread to a kthread. Signed-off-by: Serge E. Hallyn Signed-off-by: Martin Schwidefsky commit 774fc4ef718f7343306ba3695e8a2622cbd9764d Author: Stefan Weinhuber Date: Thu Jun 29 15:02:59 2006 +0200 [S390] dasd eer data format. The struct dasd_eer_header needs the packed attribute, or there will be 6 additional bytes of random data between the fixed header and the variable length part of the eer data. Signed-off-by: Stefan Weinhuber Signed-off-by: Martin Schwidefsky commit cc43ec1ab0ae67c9cd5b3c2483a731afc98cbc2c Author: Heiko Carstens Date: Thu Jun 29 15:02:47 2006 +0200 [S390] preempt_count initialization. The preempt_count in the thread_info structure must be initialized to 1. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit b1b70306911a35b3851a73c87e6e9bd45a08b893 Author: Heiko Carstens Date: Thu Jun 29 14:58:17 2006 +0200 [S390] head.S code moving. There is almost no room left for any new code between 0x10000 and 0x10480. Move the code from 0x10000 to 0x11000. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 138c014dcba74211dc4e835658f34a787c40cf17 Author: Horst Hummel Date: Thu Jun 29 14:58:12 2006 +0200 [S390] dasd whitespace and other cosmetics. Dasd code cleanup: 1) remove white space, 2) remove the emacs override sections, and 3) use kzalloc instead of kmalloc. Signed-off-by: Horst Hummel Signed-off-by: Martin Schwidefsky commit 63b122466484e44d09af12bba33b34019757a3c2 Author: Martin Schwidefsky Date: Thu Jun 29 14:58:05 2006 +0200 [S390] virtual cpu accounting vs. machine checks. If a machine checks interrupts the external or the i/o interrupt handler before they have completed the cpu time calculations, the accounting goes wrong. After the cpu returned from the machine check handler to the interrupted interrupt handler, a negative cpu time delta can occur. If the accumulated cpu time in lowcore is small enough this value can get negative as well. The next jiffy interrupt will pick up that negative value, shift it by 12 and add the now huge positive value to the cpu time of the process. To solve this the machine check handler is modified not to change any of the timestamps in the lowcore if the machine check interrupted kernel context. Signed-off-by: Martin Schwidefsky commit 9faf06547efe11ccb51678c6805037c7377b85ee Author: Gerald Schaefer Date: Thu Jun 29 14:57:58 2006 +0200 [S390] add __cpuinit to appldata cpu hotplug notifier. Signed-off-by: Gerald Schaefer Signed-off-by: Martin Schwidefsky commit 445b5b499e0ca1584ee3aa8af298c9ef8c84d711 Author: Horst Hummel Date: Thu Jun 29 14:57:52 2006 +0200 [S390] dasd_eckd_dump_sense bug. The ccw dump function dasd_eckd_dump_ccw_range can crash because it does not take care about the IDAL flag in the ccw. Check for IDALs flag set in CCW and follow the indirect list to print the data that is refered by the ccw. Signed-off-by: Horst Hummel Signed-off-by: Martin Schwidefsky commit f45a43d847c96949d22e702879e52385a1547f6b Author: Stefan Weinhuber Date: Thu Jun 29 14:57:46 2006 +0200 [S390] missing check in dasd_eer_open. Check the return value of kzalloc in dasd_eer_open. Signed-off-by: Stefan Weinhuber Signed-off-by: Martin Schwidefsky commit 132fab13635a56a8151641671a2f896be00fd215 Author: Martin Schwidefsky Date: Thu Jun 29 14:57:39 2006 +0200 [S390] modular 3270 driver. The initial i/o to a 3270 device is done using the static module variables raw3270_init_data and raw3270_init_request. If the 3270 device driver is built as a module and gets loaded above 2GB, the initial i/o will fail because these variables will get addresses > 2GB. To make it work the two variables are moved to struct raw3270 and the data structure is allocated with GFP_DMA. Signed-off-by: Martin Schwidefsky commit 06fa46a2fcb7e13386707a3eac74f11140a9f818 Author: Martin Schwidefsky Date: Thu Jun 29 14:57:32 2006 +0200 [S390] console_unblank woes. The software watchdog calls machine_restart from a timer function. The s390 machine_restart calls console_unblank to flush the console output. This is needed for panic to get the panic message printed. If console_unblank is called in interrupt a BUG is triggered in acquire_console_sem. That makes the software watchdog panic instead of restarting the machine. To get around this problem the call to console_unblank is made conditionally on !in_interrupt() || oops_in_progress. Signed-off-by: Martin Schwidefsky commit 4980082db1a8aa3ec45aa22cd4a10021955e22ed Author: Heiko Carstens Date: Thu Jun 29 14:57:25 2006 +0200 [S390] __syscall_return error check. Fix __syscall_return macro: valid error numbers are in the range of -1..-4095. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 40154b824331cd9c81c06545761338f3d80a36e2 Author: Peter Oberparleiter Date: Thu Jun 29 14:57:03 2006 +0200 [S390] cio async subchannel reprobe. Changes in the DASD driver require an asynchronous implementation of the subchannel reprobe loop. This loop was so far only used by the blacklisting mechanism but is now available to all CCW device drivers. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky commit 887ab5992925736ab23985c35f8149739e9de354 Author: Cornelia Huck Date: Thu Jun 29 14:56:52 2006 +0200 [S390] ccwgroup device unregister. Work around the problem that a device cannot be unregistered from driver_for_each_device() because of klist node refcounting: Get device after device owned by the driver to be unregistered with driver_find_device() and then unregister it. This works because driver_get_device() gets us out of the region of the elevated klist node refcount. driver_find_device() will always get the next device in the list after the found one has been unregistered. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 231caa1cac555bdd5cb64bf91b554b38e8ddf715 Author: Cornelia Huck Date: Thu Jun 29 14:56:45 2006 +0200 [S390] channel measurement fix. Specify correct sizeof() in chp_measurement_read() and return correct amount of read data. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit da039bd1e872b89e1c92c6c891c43b96d0a1bc41 Author: Peter Oberparleiter Date: Thu Jun 29 14:56:38 2006 +0200 [S390] cio long busy in read configuration data. Trying to set a DASD root device online can fail under some circumstances with the message "Read configuration data returned error -5". The cause is that read configuration data incorrectly aborts with -EIO when it encounters a temporary busy condition at a storage server. Perform retry when encountering temporary busy conditions. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky commit d7d23702554dc13297cff5eaf7a551c802daeab3 Author: Heiko Carstens Date: Thu Jun 29 14:56:32 2006 +0200 [S390] memory detection. The wrong base register is used to read a value from the sclp data structure. The value is used to calculate the memory size. Use correct register %r4. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 7380534314865528ef080593b291bba32fba60e8 Author: Heiko Carstens Date: Thu Jun 29 14:56:23 2006 +0200 [S390] incomplete stack traces. show_stack() passes a pointer to the current stack frame to show_trace(). Because of tail call optimization the pointer doesn't point to the original stack frame anymory and therefore traces are wrong. Don't pass the pointer of the current stack frame to show_trace(). Instead let show_trace() calculate the pointer on its own. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit c406abd3a6d0cf5ce8db4db155a729a28fb98c4f Author: Heiko Carstens Date: Thu Jun 29 14:56:13 2006 +0200 [S390] cleanup bitops.h. Encapsulate complete bitops.h with #ifdef __KERNEL__ and remove the now superfluous ALIGN_CS define and its users. This patch is needed for compiling klibc. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit ea9b6dcc152f09c207117ab121d4fa03d2db282a Author: Randy Dunlap Date: Wed Jun 28 21:48:38 2006 -0700 MTD: kernel-doc fixes + additions Fix some kernel-doc typos/spellos. Use kernel-doc syntax in places where it was almost used. Correct/add struct, struct field, and function param names where needed. Signed-off-by: Randy Dunlap Signed-off-by: David Woodhouse commit 844d3b427ef1a4f96e54866747bdb6c6cbca4c6a Author: Randy Dunlap Date: Wed Jun 28 21:48:27 2006 -0700 MTD: fix all kernel-doc warnings Fix all kernel-doc warnings in MTD headers and source files: - add some missing struct fields; - correct some function parameter names; - use kernel-doc format for function doc. headers; - nand_ecc.c contains only exported interfaces, no internal ones; Signed-off-by: Randy Dunlap Signed-off-by: David Woodhouse commit 339d76c54336443f5050b00172beb675f35e3be0 Author: Paul Mackerras Date: Thu Jun 29 17:12:30 2006 +1000 [POWERPC] Use little-endian bit from firmware ibm,pa-features property Signed-off-by: Paul Mackerras commit 33dbcf72f607f5da791402e161feaf1ccf5d5be4 Author: Michael Ellerman Date: Wed Jun 28 13:18:53 2006 +1000 [POWERPC] Make sure smp_processor_id works very early in boot There's a small period early in boot where we don't know which cpu we're running on. That's ok, except that it means we have no paca, or more correctly that our paca pointer points somewhere random. So that we can safely call things like smp_processor_id(), we need a paca, so just assume we're on cpu 0. No code should _write_ to the paca before we've set the correct one up. We setup the proper paca after we've scanned the flat device tree in early_setup(), so there's no need to do it again in start_here_common. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit feb76c7b23fb660f015583359a4c75a1139c0d36 Author: Olof Johansson Date: Wed Jun 28 02:50:36 2006 -0700 [POWERPC] U4 DART improvements Better late than never... Respin based on previous comment. Only remaining issue last time was an extra mb() that I've taken out. Signed-off-by: Paul Mackerras commit c220153654ede57b41900159eb8d1f6029d85642 Author: Mark A. Greer Date: Wed Jun 28 14:13:20 2006 -0700 [POWERPC] todc: add support for Time-Of-Day-Clock This is a resubmit with a proper subject and with all comments addressed. Applies cleanly to powerpc.git 649e85797259162f7fdc696420e7492f20226f2d Mark -- The todc code from arch/ppc supports many todc/rtc chips and is needed in arch/powerpc. This patch adds the todc code to arch/powerpc. Signed-off-by: Mark A. Greer -- arch/powerpc/Kconfig | 7 arch/powerpc/sysdev/Makefile | 1 arch/powerpc/sysdev/todc.c | 392 ++++++++++++++++++++++++++++++++++ include/asm-powerpc/todc.h | 487 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 887 insertions(+) -- Signed-off-by: Paul Mackerras commit 16e9f994442b599987ce5dd4a5ebe50865e6573d Author: Stephen Rothwell Date: Thu Jun 29 15:07:42 2006 +1000 [POWERPC] Make lparcfg.c work when both iseries and pseries are selected This also consolidates the initial bits of lparcfg_data() and adds the partition number to the iSeries flattened device tree. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit f86c9747fe1cd72b2c5c6bdf72d17aeb2a3c6cb0 Author: Sonny Rao Date: Tue Jun 27 08:46:09 2006 -0400 [POWERPC] Fix idr locking in init_new_context We always need to serialize accesses to mmu_context_idr. I hit this bug when testing with a small number of mmu contexts. Signed-off-by: Sonny Rao Signed-off-by: Paul Mackerras commit 975b365895b638a62da55f9fb180b0a71d05874d Author: Zang Roy-r61911 Date: Tue Jun 13 15:07:29 2006 +0800 [POWERPC] mpc7448hpc2 (taiga) board config file Add default config for mpc7448 hpc2 (taiga) board. Signed-off-by: Roy Zang Signed-off-by: Paul Mackerras commit 2b9d7467a6dbc41872c605511e105cbde1eda100 Author: Zang Roy-r61911 Date: Tue Jun 13 15:07:23 2006 +0800 [POWERPC] Add tsi108 pci and platform device data register function Add Tundra Semiconductor tsi108 pci and platform device data register function support. Signed-off-by: Alexandre Bounine Signed-off-by: Roy Zang --- Signed-off-by: Paul Mackerras commit c5d56332fd6c2f0c7cf9d1f65416076f2711ea28 Author: Zang Roy-r61911 Date: Tue Jun 13 15:07:15 2006 +0800 [POWERPC] Add general support for mpc7448hpc2 (Taiga) platform Add support for Freescale mpc7448 (Taiga) board support Signed-off-by: Roy Zang Signed-off-by: Paul Mackerras commit 1729dc7833014eaba3520091a673dbdc9242d9f9 Author: Paul Mackerras Date: Thu Jun 29 16:16:15 2006 +1000 [POWERPC] Correct the MAX_CONTEXT definition When we increased the address space per process to 2^44 bytes, the number of contexts that we could actually use reduced, but we forgot to decrease the MAX_CONTEXT definition. (Fortunately this would only cause problems if we actually had more than 512k user processes running.) This patch corrects the definition. Signed-off-by: Paul Mackerras commit 0a6047eef1c465c38aacfbdab193161b3f0cd144 Author: Linus Torvalds Date: Wed Jun 28 17:09:34 2006 -0700 Fix vsnprintf off-by-one bug The recent vsnprintf() fix introduced an off-by-one, and it's now possible to overrun the target buffer by one byte. The "end" pointer points to past the end of the buffer, so if we have to truncate the result, it needs to be done though "end[-1]". [ This is just an alternate and simpler patch to one proposed by Andrew and Jeremy, who actually noticed the problem ] Acked-by: Andrew Morton Acked-by: Jeremy Fitzhardinge Signed-off-by: Linus Torvalds commit b44597906e03d5e2b467c17a3b73585596c0d7be Author: Thomas Gleixner Date: Wed Jun 28 17:14:07 2006 +0200 [PATCH] Fix plist include dependency plist.h uses container_of, which is defined in kernel.h. Include kernel.h in plist.h as the kernel.h include does not longer happen automatically on all architectures. Signed-off-by: Thomas Gleixner Signed-off-by: Linus Torvalds commit 980a01c9bfb090cb8a991e39e56ac379c30c61b8 Author: David Brownell Date: Wed Jun 28 07:47:15 2006 -0700 [PATCH] SPI: infrastructure to initialize spi_device.mode early This patch adds earlier initialization of spi_device.mode, as needed on boards using nondefault chipselect polarity. An example would be ones using the RS5C348 RTC without an external signal inverter between the RTC chipselect and the SPI controller. Without this mechanism, the first setup() call for that chip would wrongly enable chips, corrupting transfers to/from other chips sharing that SPI bus. Signed-off-by: David Brownell Signed-off-by: Linus Torvalds commit 1c952af548012bcf281623dafa2173897bfc6a77 Author: Greg Ungerer Date: Wed Jun 28 16:44:14 2006 +1000 [PATCH] m68knommu: remove fixed ROM region setups from linker script Remove the hard coded ROM region setups. Use Kconfig options to specify these in a generic way for platorms that want them. This builds on top of the other recent m68knommu linker script changes to completely remove fixed board configurations. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit c750a012da6bc11ca4e49a5e170b417c4b344ffc Author: Greg Ungerer Date: Wed Jun 28 16:39:19 2006 +1000 [PATCH] m68knommu: configuration options for ROM region Use Kconfig options to setup the optional ROM region used on some platforms. We used to define this in the linker script on a per board basis. The configure options are more flexible and clean up the linker script a lot. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 3448ff8967a00067cbc3b6ebe9a3741b4e72f6d0 Author: Greg Ungerer Date: Wed Jun 28 16:23:14 2006 +1000 [PATCH] m68knommu: fix 68EZ328/config.c asm Fix 68EZ328/config.c asm to be clean for new gcc versions. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 69614fc66a11222baf61e05a3e5b98ef2e3427be Author: Greg Ungerer Date: Wed Jun 28 16:21:56 2006 +1000 [PATCH] m68knommu: fix 68VZ328/config.c asm Fix 68VZ328/config.c asm to be clean for new gcc versions. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit bda658382614198714b27581528f9bfb60c05a71 Author: Greg Ungerer Date: Wed Jun 28 16:21:38 2006 +1000 [PATCH] m68knommu: fix 68360/config.c asm Fix 68360/config.c asm to be clean for new gcc versions. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 0f7cfcc5bf2a1380f6cb8660f9e0127a5a872cbb Author: Greg Ungerer Date: Wed Jun 28 16:09:41 2006 +1000 [PATCH] m68knommu: include irqnode.h in 68360/ints.c The irqnode_t struct has moved to irqnode.h, need to include that 68360 ints.c. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 0aee77b221a68bf8ef5401712bb55c89e36b461c Author: Greg Ungerer Date: Wed Jun 28 16:12:45 2006 +1000 [PATCH] m68knommu: fix clobber list in uCdimm/uCsimm helper asm Fix clobber list in uCsimm/uCdimm boot load helper asm. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 541960fef7f0bd98be3a27052c8845e9c4b6a2ac Author: Greg Ungerer Date: Wed Jun 28 15:59:54 2006 +1000 [PATCH] m68knommu: build support for 68328 romvec.S Conditionaly compile the 68328 romvec code based on the ROM configuration being enabled. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 0d44269e1fb1118473cae36958c96f08cf69905b Author: Greg Ungerer Date: Wed Jun 28 15:56:22 2006 +1000 [PATCH] m68knommu: remove romvec asm code from ints.c Remove the inline 68328 romvec section asm code into its own file. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 727dda800f5076ce6f4653393fab651706959c93 Author: Greg Ungerer Date: Wed Jun 28 15:54:22 2006 +1000 [PATCH] m68knommu: fix compilation problems with 68328serial driver Clean out the 68328serial driver: . remove use of cli/sti . fix usage of tty_* calls . remove unused variables Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 9a9bb6fb343c4ce54cc67d83f77ca52c9d18d01b Author: Greg Ungerer Date: Wed Jun 28 15:58:18 2006 +1000 [PATCH] m68knommu: create romvec.S for 68328 Create the 68328 romvec section in its own assembler file. It can be compiled in when required. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit d9a5685436b0dd08a6386a2f9423103cb4689dbc Author: Andrew Morton Date: Wed Jun 28 04:27:04 2006 -0700 [PATCH] x86_64: oprofile build fix WARNING: "unset_nmi_callback" [arch/x86_64/oprofile/oprofile.ko] undefined! WARNING: "set_nmi_callback" [arch/x86_64/oprofile/oprofile.ko] undefined! Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3706a8728bcedfad54ed665e1a144e95b90f1ac7 Author: Alan Cox Date: Wed Jun 28 04:27:03 2006 -0700 [PATCH] Set err_stops_fifo for newer Promise as well Signed-off-by: Alan Cox Cc: Bartlomiej Zolnierkiewicz Cc: Sergei Shtylyov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 57e834e2fb0590b4bf9ecffa4d5c87b6f44c5b6b Author: Alan Cox Date: Wed Jun 28 04:27:03 2006 -0700 [PATCH] ide: clean up pdc202xx_old so its more readable (done so I could work on libata ports) Also sets the new fifo flag so that we don't hang on some errors with this chipset. Signed-off-by: Alan Cox Cc: Bartlomiej Zolnierkiewicz Cc: Sergei Shtylyov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f201f5046ddaeeccb036bdf6848549bf5cb51bb1 Author: Alan Cox Date: Wed Jun 28 04:27:02 2006 -0700 [PATCH] ide: housekeeping on IDE drivers Move auto arrays to static (const). Clean up using PCI_DEVICE in places, remove unreachable junk and dead code. Fix the serverworks cable detect logic (if ordering is wrong). Backport from libata. Plenty of scope for more cleanup left. Signed-off-by: Alan Cox Cc: Bartlomiej Zolnierkiewicz Cc: Sergei Shtylyov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da574af755bcb1d604e01feadf2a8c31b364447c Author: Alan Cox Date: Wed Jun 28 04:27:01 2006 -0700 [PATCH] ide: fix error handling for drives which clear the FIFO on error If the controller FIFO cleared automatically on error we must not try and drain it as this will hang some chips. Based in concept on a broken patch from -mm some while back Signed-off-by: Alan Cox Cc: Sergei Shtylyov Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2930d1bed7ffea3062e43b8acdeb9e0587bfc6a9 Author: Alan Cox Date: Wed Jun 28 04:27:00 2006 -0700 [PATCH] SC1200 debug printk Kill a pair of long escaped debug printk calls Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 19c1ef5f671b5793622a7a3d03940ef3f20a3ba0 Author: Alan Cox Date: Wed Jun 28 04:26:59 2006 -0700 [PATCH] ide: clean up siimage Remove all the ifdef preparation for enhanced features that never occcurred and is only in libata. For the SATA chips (but not yet PATA ones) politely suggest to the user that libata may offer more features. Signed-off-by: Alan Cox Cc: Sergei Shtylylov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a1276e7b6cba549553285f74e87f702bfff6fac Author: Alan Cox Date: Wed Jun 28 04:26:58 2006 -0700 [PATCH] Old IDE, fix SATA detection for cabling This is based on the proposed patches flying around but also checks that the device in question is new enough to have word 93 rather thanb blindly assuming word 93 == 0 means SATA (see ATA-5, ATA-7) Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e866f0bf89e829736a12599bb7f476d1c378646 Author: Randy Dunlap Date: Wed Jun 28 04:26:58 2006 -0700 [PATCH] oss/via: make bitfield unsigned Make a 1-bit field unsigned like all of the others near it. sound/oss/via82cxxx_audio.c:311:21: error: dubious one-bit signed bitfield Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit be6990e7473fcd11becda747c24b94a478413245 Author: Randy Dunlap Date: Wed Jun 28 04:26:57 2006 -0700 [PATCH] ac97_codec: make bitfield unsigned Make a 1-bit bitfield unsigned (no space for sign bit). Removes 24 sparse warnings from this one file: include/linux/ac97_codec.h:262:13: error: dubious one-bit signed bitfield Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e85f8dcc2750685e50139df4da8bdb68475393fc Author: Randy Dunlap Date: Wed Jun 28 04:26:56 2006 -0700 [PATCH] sound: fix cs4232 section mismatch Fix section mismatch: adds __init to probe function, frees some init memory, not critical. WARNING: sound/oss/cs4232.o - Section mismatch: reference to .init.text: from .text after 'cs4232_pnp_probe' (at offset 0x152) Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cab267c65f44337974e4f1eae490b21dce0e9811 Author: Michael Hanselmann Date: Wed Jun 28 04:26:55 2006 -0700 [PATCH] powermac backlight fixes Fix a erroneous calculation of the legacy brightness values as reported by Paul Collins. Additionally, it moves the calculation of the negative value in the radeonfb driver after the value check. Signed-off-by: Michael Hanselmann Acked-by: Benjamin Herrenschmidt Acked-by: Paul Collins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 96febe9fb7b04f2a078882d08bd6a997dee7cfa3 Author: Corey Minyard Date: Wed Jun 28 04:26:55 2006 -0700 [PATCH] IPMI: watchdog handle panic properly Modify the watchdog timeout in IPMI to only do things at panic/reboot time if the watchdog timer was already running. Some BIOSes do not disable the watchdog timer at startup, and this led to a reboot a while later if the new OS running didn't start monitoring the watchdog, even if the watchdog was not running before. Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a245866f8a417250c0f82b16f7a6dcf0b812f58 Author: Corey Minyard Date: Wed Jun 28 04:26:54 2006 -0700 [PATCH] IPMI: remove high res timer code There was some old high-res-timer code in the IPMI driver that is dead. Remove it. Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 409035e088ce15178c5aa157cab493bc22096b6d Author: Corey Minyard Date: Wed Jun 28 04:26:53 2006 -0700 [PATCH] IPMI: tidy msghandler timer Tidy up the timer usage in the IPMI driver. Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ac4360b95496f4137ee19b54e9f7dfa3946984d Author: Alan Cox Date: Wed Jun 28 04:26:52 2006 -0700 [PATCH] istallion: cleanups Turned out to be rather a monster Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit effc8b704b48c3c727715abf49592a57547b6818 Author: Alan Cox Date: Wed Jun 28 04:26:51 2006 -0700 [PATCH] stallion: fix recent SMP locking cleanup Works better on SMP if... Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9d7fa40098253a6768cfc3ffbbd5988ba852d364 Author: Latchesar Ionkov Date: Wed Jun 28 04:26:51 2006 -0700 [PATCH] v9fs: fix fid check in v9fs_create Fix an incorrect check whether a fid was allocated in v9fs_create and if it should be freed on error. Signed-off-by: Latchesar Ionkov Cc: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94374e7cc369b972855cebd13ba942f4eb1be1ac Author: Latchesar Ionkov Date: Wed Jun 28 04:26:50 2006 -0700 [PATCH] v9fs: return the correct error when interrupted by signal If a signal interrupts the user process, v9fs sends a flush request to the file server and waits for its response. It error code is incorrectly set to the error code of the flush message instead of ERESTARTSYS. The patch sets the error code to the correct value. Signed-off-by: Latchesar Ionkov Cc: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 33b37a33c242542fac2980b8ccd90977388b7a8d Author: Paul Fulghum Date: Wed Jun 28 04:26:49 2006 -0700 [PATCH] remove active field from tty buffer structure Remove 'active' field from tty buffer structure. This was added in 2.6.16 as part of a patch to make the new tty buffering SMP safe. This field is unnecessary with the more intelligently written flush_to_ldisc that adds receive_room handling. Removing this field reverts to simpler logic where the tail buffer is always the 'active' buffer, which should not be freed by flush_to_ldisc. (active == buffer being filled with new data) The result is simpler, smaller, and faster tty buffer code. Signed-off-by: Paul Fulghum Cc: Alan Cox Cc: Theodore Ts'o Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2c3bb20f46709a0adfa7ea408013edbcab945d5a Author: Paul Fulghum Date: Wed Jun 28 04:26:48 2006 -0700 [PATCH] add receive_room flow control to flush_to_ldisc Flush data serially to line discipline in blocks no larger than tty->receive_room to avoid losing data if line discipline is busy (such as N_TTY operating at high speed on heavily loaded system) or does not accept data in large blocks (such as N_MOUSE). Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 817d6d3bceaf34c99f5343820f9b9e6021f0655c Author: Paul Fulghum Date: Wed Jun 28 04:26:47 2006 -0700 [PATCH] remove TTY_DONT_FLIP Remove TTY_DONT_FLIP tty flag. This flag was introduced in 2.1.X kernels to prevent the N_TTY line discipline functions read_chan() and n_tty_receive_buf() from running at the same time. 2.2.15 introduced tty->read_lock to protect access to the N_TTY read buffer, which is the only state requiring protection between these two functions. The current TTY_DONT_FLIP implementation is broken for SMP, and is not universally honored by drivers that send data directly to the line discipline receive_buf function. Because TTY_DONT_FLIP is not necessary, is broken in implementation, and is not universally honored, it is removed. Signed-off-by: Paul Fulghum Cc: Alan Cox Cc: Theodore Ts'o Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e0ac4761fa52acda90f9f53819c81474b511e3af Author: Atsushi Nemoto Date: Wed Jun 28 04:26:47 2006 -0700 [PATCH] RTC: add rtc-rs5c348 driver Add an SPI driver for the Ricoh RS5C348 RTC chip. Signed-off-by: Atsushi Nemoto Acked-by: Alessandro Zummo Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 84860f9979804cfd97638ce0ec9d583daf338e0d Author: Andrew Morton Date: Wed Jun 28 04:26:46 2006 -0700 [PATCH] load_module() cleanup Undo bizarre declaration in load_module(). Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f71d20e961474dde77e6558396efb93d6ac80a4b Author: Arjan van de Ven Date: Wed Jun 28 04:26:45 2006 -0700 [PATCH] Add EXPORT_UNUSED_SYMBOL and EXPORT_UNUSED_SYMBOL_GPL Temporarily add EXPORT_UNUSED_SYMBOL and EXPORT_UNUSED_SYMBOL_GPL. These will be used as a transition measure for symbols that aren't used in the kernel and are on the way out. When a module uses such a symbol, a warning is printk'd at modprobe time. The main reason for removing unused exports is size: eacho export takes roughly between 100 and 150 bytes of kernel space in the binary. This patch gives users the option to immediately get this size gain via a config option. Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f5e54d6e53a20cef45af7499e86164f0e0d16bb2 Author: Christoph Hellwig Date: Wed Jun 28 04:26:44 2006 -0700 [PATCH] mark address_space_operations const Same as with already do with the file operations: keep them in .rodata and prevents people from doing runtime patching. Signed-off-by: Christoph Hellwig Cc: Steven French Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a052b68b1e7a31f1e6a721290035e9deb0f6fed9 Author: Andrew Morton Date: Wed Jun 28 04:26:43 2006 -0700 [PATCH] x86: do_IRQ(): check irq number We recently changed x86 to handle more than 256 IRQs. Add a check in do_IRQ() just to make sure that nothing went wrong with that implementation. [chrisw@sous-sol.org: do x86_64 too] Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Rusty Russell Cc: Andi Kleen Cc: Chris Wright Cc: "Protasevich, Natalie" Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 607f31e80b6f982d7c0dd7a5045377fc368fe507 Author: Trond Myklebust Date: Wed Jun 28 16:52:45 2006 -0400 Revert "Merge branch 'odirect'" This reverts ccf01ef7aa9c6c293a1c64c27331a2ce227916ec commit. No idea how git managed this one: when I asked it to merge the odirect topic branch it actually generated a patch which reverted the change. Reverting the 'merge' will once again reveal Chuck's recent NFS/O_DIRECT work to the world. Signed-off-by: Trond Myklebust commit 56fb9e5346b99bc6b77def79b3739097bc13ea8a Author: Randy Dunlap Date: Sun May 21 20:58:10 2006 -0700 [WATCHDOG] Documentation/watchdog update Documentation/watchdog/: Expose example and tool source files in the Documentation/ directory in their own files instead of being buried (almost hidden) in readme/txt files. This will make them more visible/usable to users who may need to use them, to developers who may need to test with them, and to janitors who would update them if they were more visible. Also, if any of these possibly should not be in the kernel tree at all, it will be clearer that they are here and we can discuss if they should be removed. Signed-off-by: Randy Dunlap Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit 79bc79b07c9c6f8ae9290704e9e503a9327fcbb2 Author: pageexec@freemail.hu Date: Wed Jun 28 20:44:16 2006 +0200 [PATCH] small fix for not releasing the mmap semaphore in i386/arch_setup_additional_pages the VDSO randomization code on i386 fails to release the mmap semaphore if insert_vm_struct() fails. [ Made the conditional unlikely. -- Linus ] Signed-off-by: Linus Torvalds commit adf8a287150667feb5747f8beade62acacc17d4e Author: Dave Jones Date: Wed Jun 28 13:38:43 2006 -0400 [AGPGART] Make AGP depend on PCI Fixes possible compile error in amd64 with pci=n pointed out by Adrian Bunk. Signed-off-by: Dave Jones commit 8caf7aa26e0797e5706043f94c491acd1a08636a Author: Takashi Iwai Date: Wed Jun 28 16:39:36 2006 +0200 [ALSA] echoaudio - Remove kfree_nocheck() Remove obsoleted kfree_nochec() (for debug)