| |||||||||||||
2.6.10-rc1 long-format changelogSummary of changes from v2.6.9 to v2.6.10-rc1 ============================================ <akpm@osdl.org> [PATCH] wireless-extension-v17-for-linus.patch From: Jean Tourrilhes <jt@bougret.hpl.hp.com> This is the patch to migrate Wireless Extension from WE-16 to WE-17 for kernel 2.6.X. I would like you to queue that patch and submit it to Linus as soon as 2.6.8 is released (so it can be fully tested during 2.6.9). If you want, I can resend that as soon as 2.6.8 is released. The patch is basically unchanged compared to the version posted to the netdev list and my web page one month ago, I just re-diff to the latest kernel (2.6.8-rc2-bk12). The patch already included feedback from various driver maintainers, and nobody else complained, so I guess it's ready. The patch for some drivers inside the kernel will follow (airo.c, wavelan.c, wavelan_cs). Patch for various other drivers (orinoco, hostap, prism54) have been sent already to their maintainers (one month ago) and basically waiting for this patch. Changelog : * - Add flags to frequency -> auto/fixed * - Document (struct iw_quality *)->updated, add new flags (INVALID) * - Wireless Event capability in struct iw_range * - Add support for relative TxPower (yick !) * - Change the way we get to spy_data method for added safety and hostap * - Remove spy #ifdef, they are always on -> cleaner code * - Allow any size GET request if user specifies length > max * - Start migrating get_wireless_stats to struct iw_handler_def * Based on patch from Pavel Roskin <proski@gnu.org> : * - Fix kernel data leak to user space in private handler handling I also added on my page a version of Wireless Tools that use RtNetlink instead of ioctls. This is not as clean as I would like, but is fully functional (if you have WE-19). I know that you were interested, so feel free to send feedback on that... Signed-off-by: Andrew Morton <akpm@osdl.org> <akpm@osdl.org> [PATCH] wireless-drivers-update-for-we-17.patch From: Jean Tourrilhes <jt@bougret.hpl.hp.com> This patch complement the main WE-17 patch I just sent you. It updates a few driver to take advantage of WE-17. You should queue it along with the other patch. o Aironet driver : o iwspy data can be shared between eth0 and wifi0 if needed o allow arbitrarily large scan results (no longer limited) o export wireless event capabilities o Wavelan drivers : o export wireless event capabilities Signed-off-by: Andrew Morton <akpm@osdl.org> <viro@www.linux.org.uk> [netdrvr eth1394] use netdev_priv <viro@www.linux.org.uk> [netdrvr usb] use netdev_priv Update catc, pegasus, rtl8150, and gadget/ether to use netdev_priv() <viro@www.linux.org.uk> [netdrvr] netdev_priv for ewrk3, xircom_tulip_cb, wavelan_cs <viro@www.linux.org.uk> [netdrvr] netdev_priv for sundance, typhoon, yellowfin <viro@www.linux.org.uk> [netdrvr] use netdev_priv in dl2k, hamachi <viro@www.linux.org.uk> [netdrvr starfire] fix unregister_netdev call site <viro@www.linux.org.uk> [netdrvr starfire] use netdev_priv <viro@www.linux.org.uk> [PATCH] (1/27) eth1394 ethtool conversion <viro@www.linux.org.uk> [PATCH] (2/27) cris ethtool conversion <viro@www.linux.org.uk> [PATCH] (3/27) ixgb ethtool conversion <viro@www.linux.org.uk> [PATCH] (4/27) 3c509 ethtool conversion <viro@www.linux.org.uk> [PATCH] (5/27) smc91c92_cs ethtool conversion <viro@www.linux.org.uk> [PATCH] (6/27) tulip ethtool conversion <viro@www.linux.org.uk> [PATCH] (7/27) xircom ethtool conversion <viro@www.linux.org.uk> [PATCH] (8/27) wavelan ethtool conversion <viro@www.linux.org.uk> [PATCH] (9/27) wl3501_cs ethtool conversion <viro@www.linux.org.uk> [PATCH] (10/27) yellowfin ethtool conversion <viro@www.linux.org.uk> [PATCH] (11/27) typhoon ethtool conversion <viro@www.linux.org.uk> [PATCH] (12/27) sundance ethtool conversion <viro@www.linux.org.uk> [PATCH] (13/27) starfire ethtool conversion <viro@www.linux.org.uk> [PATCH] (14/27) ns83820 ethtool conversion <viro@www.linux.org.uk> [PATCH] (15/27) natsemi ethtool conversion <viro@www.linux.org.uk> [PATCH] (16/27) veth ethtool conversion <viro@www.linux.org.uk> [PATCH] (17/27) hamachi ethtool conversion <viro@www.linux.org.uk> [PATCH] (18/27) forcedeth ethtool conversion <viro@www.linux.org.uk> [PATCH] (19/27) ewrk3 ethtool conversion <viro@www.linux.org.uk> [PATCH] (20/27) eepro100 ethtool conversion <viro@www.linux.org.uk> [PATCH] (21/27) dl2k ethtool conversion <viro@www.linux.org.uk> [PATCH] (22/27) amd8111e ethtool conversion <viro@www.linux.org.uk> [PATCH] (23/27) gadget ethtool conversion <viro@www.linux.org.uk> [PATCH] (24/27) rtl8150 ethtool conversion <viro@www.linux.org.uk> [PATCH] (25/27) pegasus ethtool conversion <viro@www.linux.org.uk> [PATCH] (26/27) kaweth ethtool conversion <viro@www.linux.org.uk> [PATCH] (27/27) catc ethtool conversion <oliver@neukum.org> [PATCH] USB: update of help text for hpusbscsi Signed-Off-By: Oliver Neukum <oliver@neukum.name> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <oliver@neukum.org> [PATCH] USB: switching microtek to usb_kill_urb this reworks the microtek driver's disconnect method, now that usb_kill_urb is available. Signed-Off-By: Oliver Neukum <oliver@neukum.name> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <zaitcev@redhat.com> [PATCH] USB: Fixes for ub in 2.4.9-rc1 from Oliver and Pat - Set the allocation size in REQUEST SENSE (Pat LaVarre) - Move add_timer invocations to safer places (Oliver Neukum) Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <stern@rowland.harvard.edu> [PATCH] USB: Make usbcore use usb_kill_urb() This patch changes the only places in usbcore where usb_unlink_urb() is still used for synchronous unlinking; now they will use usb_kill_urb(). As it turns out, there were only a couple of changes needed. This still leaves all the drivers to audit! Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <stern@rowland.harvard.edu> [PATCH] USB: Suspend/resume/wakeup support for UHCI root hub ports This patch adds support for suspending, resuming, and remote wakeup detection on root hub ports to the UHCI driver. It doesn't add support for suspending or resuming the root hub itself (beyond what's already there) -- that will require considerably more work. But at least devices plugged directly into the computer will interact nicely with power management. Of lesser importance, the patch also simplifies some constant expressions. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <oliver@neukum.org> [PATCH] USB: correct interrupt interval for kaweth - overriding the media check interrupt interval Signed-Off-By: Oliver Neukum <oliver@neukum.name> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <wouter-kernel@fort-knox.rave.org> [PATCH] USB: usb audio is for oss only Doh. Fixed. <petkan@nucleusys.com> [PATCH] USB: small rtl8150 patch this one make rtl8150 auto-load its register values at reset. Not doing so is known to cause improper setup when the device is being reseted frequently. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <oliver@neukum.org> [PATCH] USB: switching microtek to usb_kill_urb Am Dienstag, 31. August 2004 17:41 schrieb Alan Stern: > On Tue, 31 Aug 2004, Oliver Neukum wrote: > > Alan Stern > > > > > > @@ -822,9 +822,8 @@ > > > > usb_set_intfdata(intf, NULL); > > > > + usb_kill_urb(desc->urb); > > scsi_remove_host(desc->host); > > - usb_unlink_urb(desc->urb); > > - scsi_host_put(desc->host); > > > > usb_free_urb(desc->urb); > > kfree(desc); > > I think you still need the scsi_host_put(), to account for the fact that > scsi_host_alloc() sets the refcount to 1 initially. Right you are. Greg, please also apply this one. Signed-Off-By: Oliver Neukum <oliver@neukum.name> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <alborchers@steinerpoint.com> [PATCH] USB: corrected digi_acceleport 2.6.9-rc1 fix for hang on disconnect - Fixed hang on disconnect in digi_acceleport USB serial driver. See http://bugme.osdl.org/show_bug.cgi?id=2459. Close after disconnect no longer tries to communicate with the device. Signed-off-by: Al Borchers <alborchers@steinerpoint.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <david-b@pacbell.net> [PATCH] USB: OHCI init cleanups This ought to fix the NS9750 init issue, and make the AMD756 case at least somewhat better. It makes the init go "by the book" in more ways, and formalizes one quirk. Various OHCI init/reset cleanups for different silicion environments: - Reset a bit more "by the book". * Define a new quirk flag for the SiS and OPTi problem seen earlier. Since 2.4 we've always worked around that quirk, even though we've not seen that on other chips; but it's "wrong" and doesn't work on some chips (notably NetSilicon NS9750). The quirk still seems to be needed for SiS, but either this test machine is too fast for the OPTi problem to show up, or the frame timing setup problem there came from a now-fixed bug. * Look at the HC state before resetting it; depending on whether it was previously owned by BIOS, SMM, an OS, or nobody, different USB signaling (and timings) might be needed. * Re-init the frame timings right after soft reset, rather than later (potentially too much later). * Restore a reset in the PCI startup code, so this logic more closely resembles the non-PCI paths (future code sharing). It also makes it easier to guarantee a 1-millisecond ceiling between reset and "go". An earlier reset is being done to help workaround BIOS-related problems on some boards, but we may need an even earlier one (as a PCI quirk, before IRQs get reconfigured). - Add an explicit #define to disable the BIOS/SMM handoff; it's not just HPPA, many embedded chips don't expect BIOS either. - There are reports of AMD 756 machines disliking the OHCI suspend patch of a few months back. Erratum #10 partly explains that, so now root hubs won't autosuspend on those Slot-A era chips. - Other minor fixes * We've got lots of non-PCI OHCI now too, so comments shouldn't be assuming all-is-pci! * Hey, it's unsafe to call hc_reset() in IRQ (after unrecoverable error); so just force a soft reset, don't do the whole thing. Tested on half a dozen different OHCI versions, but maybe some other versions of OHCI will be sensitive to one of these changes. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <abbotti@mev.co.uk> [PATCH] USB: Add B&B Electronics VID/PIDs to ftdi_sio This patch adds VID/PIDs for a few FTDI-based USB serial devices from B&B Electronics to the ftdi_sio driver. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <akpm@osdl.org> [PATCH] USB: "Lost sync on frames" error in konicawc module From: <fgalea@prism.uvsq.fr> http://bugme.osdl.org/show_bug.cgi?id=3286 The kernel keeps printing "Lost sync on frames" error messages as soon as a program tries to access the webcam. No video data can be retrieved from the webcam. The following patch seems enough to solve the problem. (just inverting the order at which the old and new data blocks are sent to the user). Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <stern@rowland.harvard.edu> [PATCH] USB: Remove inappropriate unusual_devs.h entry A couple of months ago you applied a patch from Torsten Scherer to create a new unusual_devs.h entry. In further discussions with him I learned that the entry wasn't needed to access the device; the only reason for it was as a workaround for some old, buggy hotplug program on his system. Now Evan Fletcher reports that the entry actively prevents him from using his device. For me that's the last straw, so here's a patch to remove the entry. Torsten should be okay if he simply upgrades his hotplug package or removes the buggy program. On Mon, 30 Aug 2004, Evan Fletcher wrote: > Hi list, > > I have a Bytecc 5.25" External Enclosure, model ME-320U2F, that has > both USB 2.0 and Firewire connections > (http://www.byteccusa.com/product/enclosure/ME-320.htm). It used to > work fine on earlier Linux 2.6 kernels, but stopped working a few > revisions ago. > > I tracked the problem down to an entry in unusual_devs.h: > > /* <torsten.scherer@uni-bielefeld.de>: I don't know the name of the bridge > * manufacturer, but I've got an external USB drive by the Revoltec company > * that needs this. otherwise the drive is recognized as /dev/sda, but any > * access to it blocks indefinitely. > */ > UNUSUAL_DEV( 0x0402, 0x5621, 0x0103, 0x0103, > "Revoltec", > "USB/IDE Bridge (ATA/ATAPI)", > US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY), <...> > So, is there some way that this entry can be modified so that my DVD+R > works properly, and Mr. Scherer can still use his Revoltec external > disk? > > Thank you, > Evan Fletcher Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <bjorn.helgaas@hp.com> [PATCH] HCD PCI probe: print actual, not ioremapped, address I think the USB HCD should print the actual PCI memory address, not the ioremapped address. AFAIK, there's no reason the ioremapped address has to have any fixed relationship to the actual address. Also, this makes it match what's in /proc/iomem. I also added a leading "0x". Example from ia64: - ehci_hcd 0000:00:01.2: irq 52, pci mem c000000080021000 + ehci_hcd 0000:00:01.2: irq 52, pci mem 0x80021000 USB HCD: print actual PCI mem address, not the ioremapped value. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <janitor@sternwelten.at> [PATCH] usb/tiglusb: insert set_current_state() before schedule_timeout() Insert set_current_state() so schedule_timeout() functions as expected. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <janitor@sternwelten.at> [PATCH] usb/dabusb: insert set_current_state() before schedule_timeout() After discussing this patch with Mark Hollomon, I think it is much safer / better to leave the conditional check within the while loop. This way the mutex state is as expected and maintainability is not compromised. The previous patch should not be applied. Description: Inserts appropriate set_current_state() call so that schedule_timeout() functions as expected. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <stern@rowland.harvard.edu> [PATCH] USB: Nag message for usb_kill_urb This patch is only for nuisance value. It puts a nag message in the system log every time usb_unlink_urb() is called for synchronous unlinking. My hope is this will speed the process of converting drivers to use usb_kill_urb(). Don't apply this if it generates too much noise, but otherwise go ahead. A little prodding never hurt anyone. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <alborchers@steinerpoint.com> [PATCH] USB: circular buffer for pl2303 Here is the patch adding a circular buffer to pl2303 updated to 2.6.9-rc1. Phil and I both tested this. (Phil tested a slightly different earlier version.) This fixes the carriage return newline problem Olaf Hering reported and helps Phil with hotsyncing his phone. This patch also fixes a problem that would sometimes leave a pl2303 port unable to send data, reporting "already writing", after closing the port while writing was in progress. This happened about 1/3 of the time in my tests with the stock 2.6.9-rc1 pl2303 driver. - Added a circular write buffer, protected by the existing spin lock. - Write_room and chars_in_buffer now report room and chars in the circular buffer. - Added a "bounce buffer" when transfering data from user space to the circular buffer--needed for locking. - Replaced (urb->status != -EINPROGRESS) with a private write_urb_in_use flag protected by the existing spin lock. Clear this flag when the urb is unlinked. - Free memory on failed startup. - These changes make ONLCR mapping work and fix a bug that would sometimes leave the port unable to write, reporting "already writing", after closing the port while writing was in progress. Signed-off-by: Al Borchers <alborchers@steinerpoint.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <alborchers@steinerpoint.com> [PATCH] USB: close waits for drain in pl2303 Here is an additional patch for pl2303 in 2.6.9-rc1, to be applied after my previous circular buffer patch. This patch waits for the buffer to drain on close and then clears the buffer. In addition to the obvious features, this also fixes a bug where closing a port with a full buffer would accidentally disable writes when the port was re-opened. The original pl2303 could lose data that was still going out the port on close, and even this patch only solves the problem completely for data rates of 1200 bps and above. Waiting for data to drain from the circular buffer is easy, but the problem is waiting for data to drain from the 256 byte hardware buffer on the device. I don't know how much data is in the hardware buffer, so I just wait long enough for a potentially full hardware buffer to drain, but I don't want to wait that long for low data rates if the buffer isn't full. There is probably some way to query the pl2303 to find out how much data is in its hardware buffer, maybe snooping would reveal that. - Added a wait for data to drain from the driver write buffer when closing. - Added a wait for the data to drain from the device hardware buffer when closing. - Cleared the driver write buffer when closing. Signed-off-by: Al Borchers <alborchers@steinerpoint.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <davej@redhat.com> [CPUFREQ] speedstep-smi: only allow it to run on mobile Intel Pentium III speedstep-smi only makes sense on Intel mobile Pentium III systems. So, unify the distributed checks for speedstep_processor there, and disallow P4s. Signed-off-by: Dominik Brodowski <linux@brodo.de> Signed-off-by: Dave Jones <davej@redhat.com> <kay.sievers@vrfy.org> [PATCH] export of SEQNUM to userspace (creates /sys/kernel) o /sys/kernel/hotplug_seqnum exports the current number o lib/kobject.c's sequence_num is renamed to hotplug_seqnum and exported by include/linux/kobject.h o the source file ksysfs.c in kernel/ creates on init the sybsystem "/sys/kernel/" in sysfs Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> kobject: adjust hotplug_seqnum increment to keep userspace and kernel agreeing. <greg@kroah.com> ksysfs: don't build ksysfs if CONFIG_SYSFS is not enabled. Thanks to Kay Sievers for pointing this out. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> kobject: fix build error if CONFIG_HOTPLUG is not enabled. Thanks to Kay Sievers for pointing this out. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> USB: remove usbdevfs filesystem name, usbfs is the proper one to use. This has been publicised for years now, and the usvfs name will work just fine with a 2.4 kernel, so we are not breaking backwards compatibility. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <janitor@sternwelten.at> [PATCH] list_for_each_entry: drivers-usb-core-devices.c Make code more readable with list_for_each_entry. Compile tested. Patch incremental on the list_for_each() change. Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <janitor@sternwelten.at> [PATCH] list_for_each_entry: drivers-usb-serial-ipaq.c Use list_for_each_entry_safe to make code more readable. Compile tested. Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <janitor@sternwelten.at> [PATCH] list_for_each_entry: drivers-usb-host-hc_sl811.c Make code more readable with list_for_each_entry_safe. (Is this a non i386? I can't compile it.) Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <janitor@sternwelten.at> [PATCH] list_for_each_entry: drivers-usb-media-dabusb.c Use list_for_each_entry to make code more readable. Compile tested. Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <janitor@sternwelten.at> [PATCH] list_for_each_entry: drivers-usb-class-usb-midi.c Make code more readable with list_for_each_entry. Compile tested. Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <janitor@sternwelten.at> [PATCH] list_for_each_entry: drivers-usb-class-audio.c Make code more readable with list_for_each_entry. Compile tested. Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <stern@rowland.harvard.edu> [PATCH] USB: Centralize logical disconnects in the hub driver This patch takes some code that was only used in one place in the hub driver, and packages it up into a subroutine which is now called from several places. The routine does a logical disconnect -- for example, after issuing a port reset, if the device descriptors have changed (because of a firmware update perhaps) we logically disconnect the old device structure and create a new one. Or if a resume fails for any reason we can do the same thing. This touches some of David Brownell's suspend/resume code, obviously. (It also fixes a couple of small errors in there.) He has said it looks okay. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <margitsw@t-online.de> [PATCH] prism54 Code cleanup (Patches submitted by Denis Vlasenko) There are neither functionality changes nor bug fixes. * 2004-08-14 Denis Vlasenko <vda@port.imtp.ilyichevsk.odessa.ua> * Move assignment out of if() * Remove trailing space from printk * Eliminate not needed local 'u32 reg' * Add a comment about undoc bits * Add #define VEC_SIZE, use it as appropriate * Add some printks to reset error code path (our * current area of trouble) * Make printk text less confusing * Some not needed NULL assignments removed * mgt_commit_list(): tell which oid has failed <margitsw@t-online.de> [PATCH] prism54 remove module params * Remove unneeded module params. <margitsw@t-online.de> [PATCH] prism54 add WE17 support * Add support for WE17 from Jean Tourrilhes <margitsw@t-online.de> [PATCH] prism54 initial WPA support * Work based on initial patches from Jouni Malinen <jkmaline@cc.hut.fi> * Initial wpa_supplicant support work: * isl_ioctl.c (prism54_process_trap_helper): Start to use mlmeex, * start doing what's right for * DOT11_OID_AUTHENTICATEEX, * DOT11_OID_ASSOCIATEEX, * DOT11_OID_ASSOCIATEEX, and * DOT11_OID_REASSOCIATEEX * isl_ioctl.c: add temporary structure for wpa_supplicant requests, * isl_ioctl.c: add prism2_ioctl_set_encryption which can probably be removed later * isl_ioctl.c: add prism2_ioctl_set_generic_element (well tested) * isl_ioctl.c: add prism2_ioctl_mlme which should be unnecessary since * WE scan should be used by wpa_supplicant * isl_ioctl.c: add prism54_hostapd - this parses wpa_supplicant * requests and does the right job for each * isl_ioctl.c (prism54_set_wpa): changed to not use mgt_set/mgt_commit * as commit is unecessary. Added proper OID sets to enable/disable WPA. * This is called by wpa_supplicant at startup. This should eventually * be part of WE18. * isl_ioctl.c (prism54_ioctl): Links wpa_supplicant to prism54 * isl_ioctl.h: defined prism54_set_wpa to allow prism54_hostapd to use * isl_oid.h: add struct obj_attachment for OID OID_TYPE_ATTACH * oid_mgt.c: map OID DOT11_OID_ATTACHMENT to struct obj_attachment * oid_mgt.c (mgt_le_to_cpu, mgt_cpu_to_le): handle endianness for * obj_attachment * oid_mgt.c: add mgt_set_varlen, needed for mlmeex as it has a * variable size field. * oid_mgt.c: add mgt_unlatch_all, this can be used to force a commit * on OIDs: * MEDIUMLIMIT, BEACONPERIOD, DTIMPERIOD, ATIMWINDOW, * LISTENINTERVAL, FREQUENCY, EXTENDEDRATES * These OIDs are "latched". TODO: config mode handling. * oid_mgt.c (mgt_response_to_str): learn to parse OID_TYPE_ATTACH * oid_mgt.h: add mgt_set_varlen, and mgt_unlatch_all <margitsw@t-online.de> [PATCH] prism54 fix wpa_supplicant frequency parsing * This work fixes wpa_supplicant frequency parsing. iwlist eth0 * scan will now show channel and frequency. <ben@fluff.org> Add S3C2410 (Samsung ARM9 Mobile SoC) watchdog driver <stern@rowland.harvard.edu> [PATCH] USB: Internal port numbers start at 0 This patch changes a couple of new routines in the suspend/resume code. Internally they use port numbers starting from 1, unlike every other routine in the hub driver. This changes the port numbers to origin-0, for consistency's sake. Of course, messages sent to the system log will continue to start counting from 1. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <luca.risolia@studio.unibo.it> [PATCH] USB: SN9C10x driver update Changes: - Add support for SN9C103 based devices. The audio capability is already supported but not released in this version. I will release it once someone donates two SN9C103 based devices. - Implement VIDIOC_G_CTRL for TAS5110C1B and TAS51130D1B - Replace "SN9C10[12]" strings with "SN9C10x" - Add red, green, blue gain controls to the SN9C103 - Memory offsets are now page-aligned - Fix typos in the documentation - Documentation updates - Setting bounds are checked by the core module - Add exposure control for TAS51130D1B Signed-off-by: Luca Risolia <luca.risolia@studio.unibo.it> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <david-b@pacbell.net> [PATCH] USB: EHCI SMP fix This addresses an SMP-only issue with the EHCI driver, where only one CPU should scan the schedule at a time (scanning is not re-entrant) but either the IRQ handler or a watchdog timer could end up starting it. Many thanks to Olaf Hering for isolating the failure mode, and testing this fix! Once once CPU starts scanning, any other might as well finish right away. This fix just adds a flag to detect that case. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <akpm@osdl.org> [PATCH] USB: Codemercs IO-Warrior support From: Steffen Zieger <lkml@steffenspage.de> Here is a patch to get the kernel module from Codemerces to work. The module is available in source for the 2.4 and 2.6 series except the needed changes in hid-core.c. Codemercs distribute the needed changes as a complete file (version 2.6.4). This isn't working with 2.6.8.1. http://www.codemercs.com Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <util@deuroconsult.ro> [PATCH] USB Serial: Correct a use of out of range variable Bug found by Coverity: http://linuxbugs.coverity.com/external/editbugparent.php?... Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <mdharm-usb@one-eyed-alien.net> [PATCH] USB Storage: change how INQUIRY is fixed up The usb-storage driver 'fixes up' the INQUIRY data returned by a device so that it reads SCSI rev 2 by intercepting the data in-flight. This was done to make various SCSI drivers (sd, sr, etc.) work with the device. However, this technique also has the unfortunate side-effect that nobody can see the real rev. -- not even sg users. This patch changes that. Now, the SCSI revision is changed in the slave_configure() function. Thus, the 'real' data is available to anyone who wants to issue an INQUIRY directly via any means. This also simplifies the code somewhat. Signed-off-by: Matthew Dharm <mdharm-usb@one-eyed-alien.net> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <nacc@us.ibm.com> [PATCH] i2c-algo-ite: remove iic_sleep() Removes unused function iic_sleep(). Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <castet.matthieu@free.fr> [PATCH] use of MODULE_DEVICE_TABLE in i2c busses driver hello, since you say your are interested of using MODULE_DEVICE_TABLE in http://bugzilla.kernel.org/show_bug.cgi?id=3091 I did a patch (attach). Also I notice that some pci_device_id are marked __devinitdata that seem a bug if I read Linux 2.6.0-test3 changelog. To find them do a "grep pci_device_id /usr/src/linux/drivers/i2c/busses/* | grep __devinitdata" Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <mhoffman@lightlink.com> [PATCH] I2C/SMBus stub for driver testing * Greg KH <greg@kroah.com> [2004-08-24 16:44:32 -0700]: > > > Why not? It looks useful to me. Care to send me a patch adding > > > this to the main kernel tree? * Mark M. Hoffman <mhoffman@lightlink.com> [2004-08-25 10:25:02 -0400]: > Later today, sure. Well here it is, one day later because I really didn't want to do this with printk. I spent some time looking around and relayfs seems like a good fit. Do you think relayfs will ever get merged? Meanwhile... * * * * * This patch, applied to 2.6.9-rc1, adds an I2C/SMBus test stub that is useful for developing sensors drivers. Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <margitsw@t-online.de> [PATCH] I2C: minor lm85 fix Jean scribeth : > Except lm85, but this should be fixed Indeed, patch attached. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <khali@linux-fr.org> [PATCH] I2C: Do not init global variables to 0 This trivial patch enforces the rule that global variables should not be explicitely initialized to 0 for all i2c chip drivers. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <khali@linux-fr.org> [PATCH] I2C: Fix macro calls in chip drivers I noticed that some I2C chip drivers (all written or reviewed by me, I feel ashamed to say) misuse macros. Passing function calls (simple_strtol in this case) to macros evaluating their argument up to 4 times is certainly not wise and obviously performs poorly. It is not critical in that it happens only when writing to the chips (setting limits), which doesn't happen that often. However I'd say it's worth fixing. Thus, the patch below fixes that, by moving the function calls outside of the macro calls. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <johnpol@2ka.mipt.ru> [PATCH] w1: Added slave->ttl - time to live for the registered slave. Added slave->ttl - time to live for the registered slave. When slave was not found we will not remove it immediately but wait until ->ttl attempts were done. It prevents various debouncing effects(problems with pull-up, power). Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] kobject: hotplug_seqnum is not 64 bits on all platforms, so fix it. Thanks to Kay Sievers for pointing this out. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] ksyms: don't implement /sys/kernel/hotplug_seqnum if CONFIG_HOTPLUG is not enabled. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> USB: make usb_unlink_urb() message only show up if CONFIG_DEBUG_KERNEL is enabled. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <johnpol@2ka.mipt.ru> [PATCH] W1: let W1 select NET. On Wed, 2004-08-25 at 23:41, Greg KH wrote: > On Wed, Aug 25, 2004 at 11:21:29PM +0400, Evgeniy Polyakov wrote: > > On Wed, 25 Aug 2004 10:49:12 -0700 > > Greg KH <greg@kroah.com> wrote: > > > > > On Fri, Aug 13, 2004 at 02:35:40PM +0400, Evgeniy Polyakov wrote: > > > > The patch below fixes this issue by letting W1 select NET. > > > > > > > > Patch was created by Adrian Bunk <bunk@fs.tum.de>. > > > > > > Nah, I'm going to hold off on this, it's not really needed (who > > > doesn't build with NET enabled...) > > > > Hmmm, but someone really may want to build it without NET support. > > I have an idea(I thought it out exactly for the case when you do not > > apply it) to disable networking(netlink) support in compilation time if > > CONFIG_NET is not defined. > > And add some warning like: > > > > #ifndef CONFIG_NET > > #warning Netlink support is disabled. > > #endif > > That sounds like a good fix. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <stern@rowland.harvard.edu> [PATCH] USB: Add OTG support to g_file_storage This patch adds minimal USB On-The-Go support (mainly just an extra descriptor) to the File-Storage Gadget. The changes were based on the additions made to the Gadget Zero driver. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <stern@rowland.harvard.edu> [PATCH] USB: New submission procedure for unusual_devs.h As you requested, this patch updates the documented procedure for submitting new unusual_devs.h entries. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <petkov@uni-muenster.de> [PATCH] USB: fix up usblp usb_unlink_urb() warning On Thursday 09 September 2004 08:38, Greg KH wrote: > On Thu, Sep 09, 2004 at 01:07:05AM -0400, Gene Heskett wrote: > > Greetings; > > > > I just had to reboot back to -mm2 after playing with some printer configs > > in cups, although the test pages worked, so I'm not sure what this all > > about, from var log/messages: > > > > Sep 8 23:13:42 coyote cups: cupsd -HUP succeeded > > Sep 8 23:13:43 coyote kernel: usb_unlink_urb() is deprecated for > > synchronous unlinks. Use usb_kill_urb() Sep 8 23:13:43 coyote kernel: > > Badness in usb_unlink_urb at drivers/usb/core/urb.c:456 Sep 8 23:13:44 > > coyote kernel: [<c01048ce>] dump_stack+0x1e/0x20 Sep 8 23:13:44 coyote > > kernel: [<c0295f35>] usb_unlink_urb+0x85/0xa0 Sep 8 23:13:44 coyote > > kernel: [<c02a7447>] usblp_unlink_urbs+0x17/0x40 Sep 8 23:13:44 coyote > > kernel: [<c02a74a8>] usblp_release+0x38/0x60 Sep 8 23:13:44 coyote > > kernel: [<c01501ea>] __fput+0x12a/0x140 > > Sep 8 23:13:44 coyote kernel: [<c014e8e7>] filp_close+0x57/0x80 > > Sep 8 23:13:44 coyote kernel: [<c014e971>] sys_close+0x61/0x90 > > Sep 8 23:13:44 coyote kernel: [<c010425d>] sysenter_past_esp+0x52/0x71 Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <stern@rowland.harvard.edu> [PATCH] USB: Unusual_devs entry for Panasonic cameras Thanks to Tom Hughes for jogging my memory about this patch, which has been sitting here waiting for Greg's return. It adds an unusual_devs.h entry for the Panasonic DMC-LCx line of cameras, which incorrectly report the total number of blocks in response to READ CAPACITY rather than the highest available block number. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> USB: fix usb_unlink_urb() usage in pl2303 driver Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> USB: fix usb_unlink_urb() usage in usb-serial core Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> USB: fix usb_unlink_urb() usage in belkin_sa driver Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> USB: fix usb_unlink_urb() usage in cyberjack driver Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> USB: fix usb_unlink_urb() usage in whiteheat driver Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> USB: fix usb_unlink_urb() usage in io_edgeport driver Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> USB: fix usb_unlink_urb() usage in ir-usb driver Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> USB: fix usb_unlink_urb() usage in ipaq driver Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> USB: fix usb_unlink_urb() usage in digi_acceleport driver Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> USB: fix usb_unlink_urb() usage in empeg driver Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> USB: fix usb_unlink_urb() usage in mct_u232 driver Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> USB: fix usb_unlink_urb() usage in omninet driver Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> USB: fix usb_unlink_urb() usage in visor driver Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> USB: fix usb_unlink_urb() usage in kl5kusb105 driver Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> USB: fix usb_unlink_urb() usage in kobil_sct driver Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> USB: fix usb_unlink_urb() usage in io_ti driver Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> USB: fix usb_unlink_urb() usage in ftdi_sio driver Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> USB: fix usb_unlink_urb() usage in keyspan_pda driver Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> USB: fix usb_unlink_urb() usage in generic usb-serial driver Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <david-b@pacbell.net> [PATCH] export usb_set_device_state(), use in ohci This patch is mostly cleanup, but it all helps make PM_SUSPEND_DISK start to behave better. This exports the new usb_set_device_state() routine for the virtual root hubs, and uses it in OHCI during resume after power-off to replace some HC-private code doing almost the same thing. Note that all HCDs will likely need the same kind of suspend-to-disk support (though it's different when BIOS kicks in). Some systems even power-off during suspend-to-ram (to save extra power), which is why OHCI already has this logic! Related updates: - Use usb_set_device_state() immediately when an HC dies, making khubd handle disconnect processing instead of a workqueue. So now drivers won't self-deadlock in this should-be-rare path, when disconnect() calls flush_scheduled_work(). - Don't warn about "Unlink after no-IRQ" for the the root hub's status URB ... like when suspending an HCD that never enumerated a device. - Minor IRQ handler cleanup, including more accurate tracking of whether this driver ever returned IRQ_HANDLED (shared IRQs don't count). Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <david-b@pacbell.net> [PATCH] USB: gadget_is_n9604 This adds recognition of one more UDC driver. (Driver is available separately.) Tell gadget drivers about the National 9603/9604 UDC. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <david-b@pacbell.net> [PATCH] USB: ohci updates Small bugfixes, at least one of which gets rid of some rather random behavior from certain board init behaviors. OHCI updates: - Bugfix the code taking frame clock adjustments from the boot loader. A recent change had a bug which caused inconsistent failures on some OHCI configs, including amd756. Thanks to <pacman@manson.clss.net> for tracking down the specifics. - From Lothar Wassmann <lk@karo-electronics.de> two fixes: (a) don't let tick clock sign-extend, that can make unlinks take excessively long (could happen easily enough); (b) when re-activating schedules after suspend, use the right bitmask (rare/exotic) - When suspending the root hub, mark it as USB_STATE_SUSPENDED Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <david-b@pacbell.net> [PATCH] USB: khubd looks at ports after probe Fix the hub probe logic so that when khubd wakes up, it will actually look at all ports on the new hub. This resolved a root hub enumeration issue, and I expect the "boot from USB disk" folk will like this too. The fix includes cleanup: centralizing the logic to make khubd look at a given hub, instead of cloning it three times (or in the case of hub probing, frankensteining it). This also adds a FIXME to the new routine centralizing disconnect processing: we also want "power down port but don't wake khubd" (for PM_SUSPEND_DISK as well as SRP). Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <jejb@raven.il.steeleye.com> Add scsi_target abstraction and place it in sysfs For some of the transport class attributes, we need to hang them off the SCSI target rather than the LUN (represented by scsi_device). To do this efficiently, we need to make the target visible in the sysfs hierarchy. The net effect of this change is to make an extra target component appear in all the SCSI sysfs paths: jejb@raven> ls -l /sys/class/scsi_device/0\:0\:5\:0/device lrwxrwxrwx 1 root root 0 Sep 7 12:10 /sys/class/scsi_device/0:0:5:0/device -> ../../../devices/parisc8/parisc8:0/pci0000:00/0000:00:13.0/host0/target0:0:5/0:0:5:0/ Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <jejb@raven.il.steeleye.com> Add host and target transport class abstractions This patch makes a transport class be composed of up to three individual device classes representing potential interfaces on the scsi_device, scsi_target and Scsi_Host. A class only has to implement at least one of these, but may optionally implement more. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <jejb@raven.il.steeleye.com> Make the SPI transport parameters operate at the target level Technically, the transfer agreement governs the I_T nexus (the target) not the I_T_L nexus (the device), so make it operate of the scsi_target structure. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <david-b@pacbell.net> [PATCH] USB: omap_udc supports 5910/1510 chips This removes the "don't run on OMAP 1510" constraint from the driver and teaches it how not to use registers only available on newer chips. It's effectively just a compile fix, though ... hasn't got any board support yet. Basic build fixes for the OMAP 1510/5910. This first generation chip doesn't include an OTG controller. The patch makes the driver stop using OTG registers, and adds some #defines that will be needed to support boards using those chips. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <dave@thedillows.org> PCI cleanups and convert to ethtool_ops *) Reorder MWI initialization *) Perform proper cleanup on probe failure *) Remove cruft, and avoid locking up NIC on reset Signed-off-by: David A. Dillow <dave@thedillows.org> <jejb@raven.il.steeleye.com> Add bus signalling host attribute to spi transport class This is just a simple illustration of host parameters: it adds a bus signalling type for LVD/SE/HVD Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <davej@redhat.com> [CPUFREQ] Work around AMD64 2nd identical PST errata AMD recently errata'd the definition of the PSB/PST for recent Athlon 64 and Opteron parts. The errata allows for a second, identical PST for those parts. The current powernow-k8 driver will not work in PST/PSB mode on those parts because it requires there be 1 and only 1 PST. From: Mark Langsdorf Signed-off-by: Dave Jones <davej@redhat.com> <arjanv@redhat.com> [PATCH] aic79xx hostraid support Patch ported to 2.6.8 by John A. Hull (john_hull@dell.com) to add support for the aic79xx hostraid family support. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> since AHD_HOSTRAID_BOARD wasn't actually used... a more minimal patch: <stern@rowland.harvard.edu> [PATCH] Add BLIST_INQUIRY_36 to all USB blacklist entries This patch adds the BLIST_INQUIRY_36 flag to all the SCSI blacklist entries for USB devices. While it may not be strictly necessary for all of them, it doesn't hurt: Since the usb-storage driver doesn't use any of the INQUIRY data after the first 36 bytes, there's no reason to try reading any more of it. And some devices crash when we try to read more, even though they advertise that more bytes are available. The usb-storage driver does try to set the flag automatically, but the blacklist entries override that setting. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <hch@lst.de> [PATCH] update NCR5380 comments Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <oliver@neukum.org> [PATCH] USB: maintainership of acm cdc I've discussed this with Vojtech. If I brake the probe method, I can also break the rest ;-) Signed-Off-By: Oliver Neukum <oliver@neukum.name> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> - new cdc acm maintainer <dougg@torque.net> [PATCH] scsi_debug version 1.74 To check descriptor format sense data handling we need a source. Clean up some other problems and improve support for st. Changes: - add 'dsense' option to generate descriptor sense data format (default still fixed format) - correct unit attention generation (only INQUIRY, REQUEST_SENSE and REPORT_LUNS ignore it) - better information sent to log in "noisy" mode (i.e. opts=1) - correct and expand standard INQUIRY response, include version descriptors - filter MODE_SENSE command so that subpage!=0 generates error - add REWIND (SSC) command support (NOP) Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <hch@lst.de> [PATCH] update dmx3191d to modern pci/scsi probing thanks to Mark Morschh\"auser for testing. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <hch@lst.de> [PATCH] first steps at BusLogic cleanup - switch to a normal lists.h list for all hbas - merge BusLogic_DetectHostAdapter and BusLogic_init - move scsi_remove_host into BusLogic_ReleaseHostAdapter instead of a second iteration over all hosts Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <jeremy@sgi.com> [PATCH] sg.c to warn about ambiguous data direction On Sat, Aug 28, 2004 at 02:39:45AM -0700, Jeremy Higdon wrote: > > Jeremy, > > You could use a (block scope) static and only print out > > the warning the first time it is detected. > > > > Doug Gilbert > > Yes, that's a good idea -- I'll add a rate limiter and also print > out the process name like James does in his recent deprecated > ioctl warning patch. I'll send a new patch out later this weekend. > Sorry for the churn. > > thanks > > jeremy Okay, I'm pretty happy with this. I get this kind of output: sg_write: data in/out 512/512 bytes for SCSI command 0x8--guessing data in; program java not setting count and/or reply_len properly printk: 11 messages suppressed. sg_write: data in/out 512/512 bytes for SCSI command 0x8--guessing data in; program java not setting count and/or reply_len properly printk: 4 messages suppressed. signed-off-by: jeremy@sgi.com Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <akpm@osdl.org> [PATCH] qla2xxx gcc-3.5 fixes From: Adrian Bunk <bunk@fs.tum.de> CC drivers/scsi/qla2xxx/qla_os.o drivers/scsi/qla2xxx/qla_os.c: In function `qla2x00_queuecommand': drivers/scsi/qla2xxx/qla_os.c:315: sorry, unimplemented: inlining failed in call to 'qla2x00_callback': function not considered for inlining drivers/scsi/qla2xxx/qla_os.c:269: sorry, unimplemented: called from here drivers/scsi/qla2xxx/qla_os.c:315: sorry, unimplemented: inlining failed in call to 'qla2x00_callback': function not considered for inlining drivers/scsi/qla2xxx/qla_os.c:269: sorry, unimplemented: called from here make[3]: *** [drivers/scsi/qla2xxx/qla_os.o] Error 1 ... CC drivers/scsi/qla2xxx/qla_rscn.o drivers/scsi/qla2xxx/qla_rscn.c: In function `qla2x00_cancel_io_descriptors': drivers/scsi/qla2xxx/qla_rscn.c:320: sorry, unimplemented: inlining failed in call to 'qla2x00_remove_iodesc_timer': function not considered for inlining drivers/scsi/qla2xxx/qla_rscn.c:257: sorry, unimplemented: called from here make[3]: *** [drivers/scsi/qla2xxx/qla_rscn.o] Error 1 Signed-off-by: Adrian Bunk <bunk@fs.tum.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <akpm@osdl.org> [PATCH] Disambiguate esp.c clones From: Joshua Kwan <joshk@triplehelix.org> Debian's initial ramdisk creation scripts rely on the content of /proc/scsi to determine which module is needed for the ramdisk. Unfortunately, bad things happen when a bazillion different drivers use the _exact same name_ for /proc, namely the esp family. Give them all unique names. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <janitor@sternwelten.at> [PATCH] scsi/mesh: replace schedule_timeout() with msleep() Description: Use msleep() instead of schedule_timeout() to guarantee the task delays for the desired time. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <janitor@sternwelten.at> [PATCH] scsi/osst: replace schedule_timeout() with msleep() Replace schedule_timeout() with msleep() to guarantee the task delays as desired. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <janitor@sternwelten.at> [PATCH] scsi/wd7000: replace schedule_timeout() with msleep() Use msleep() instead of schedule_timeout() to guarantee the task delays for the desired time. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <janitor@sternwelten.at> [PATCH] scsi/sd: replace schedule_timeout() with msleep() Use msleep() instead of schedule_timeout() to guarantee the task delays for the desired time. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <janitor@sternwelten.at> [PATCH] scsi/qla_init: replace schedule_timeout() with Replaces schedule_timeout() with msleep() to guarantee task delays as desired. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <janitor@sternwelten.at> [PATCH] scsi/qla_os: replace schedule_timeout() with msleep() Use msleep() instead of schedule_timeout() to guarantee the task delays for the desired time. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> incremental patch adds missing include. Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Max Attems <janitor@sternwelten.at> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <janitor@sternwelten.at> [PATCH] scsi/sata_sx4: replace schedule_timeout() with Use msleep() instead of schedule_timeout() to guarantee the task delays for the desired time. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <davej@redhat.com> [PATCH] Remove redundant freeing code from aic7770 ahc_alloc already frees the 'name' if ahc=NULL Spotted with the source checker from Coverity.com. Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <davej@redhat.com> [PATCH] plug leaks in aic79xx Spotted with the source checker from Coverity.com. Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <davej@redhat.com> [PATCH] Remove possible reuse of stale pointer in aic7xxx Spotted with the source checker from Coverity.com. Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <davej@redhat.com> [PATCH] plug leaks in aic7xxx_osm Spotted with the source checker from Coverity.com. Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <hch@lst.de> [PATCH] refactor tmscsim inititalization code this one I still had in my pipe. This greatly streamlines the setup code. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <hch@lst.de> [PATCH] update notcq blacklist This patch adds the two devices from the private blacklist in tmscsim to the generic one. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <hch@lst.de> [PATCH] don't include "scsi.h" in scsi_module.c we only need <scsi/scsi_host.h> here Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <hch@lst.de> [PATCH] avoid obsolete APIs in ide-scsi Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <hch@lst.de> [PATCH] avoid obsolete APIs in eata Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <hch@lst.de> [PATCH] allow non-modular mptctl There's no reason to keep people from building it into their kernels statically. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <olh@suse.de> [PATCH] mesh is ppc32-only On Wed, Aug 25, Christoph Hellwig wrote: > mesh is only present on older 32bit pmac boards and doesn't compile > on ppc64. This applies also to the other pmac-only scsi driver: Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <hch@lst.de> [PATCH] fix aic79xx module_init return value when no hardware So much rearranging to just propagate the pci_module_init return value.. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <andrew.vasquez@qlogic.com> [PATCH] PATCH [1/8] qla2xxx: PCI posting fixes Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <andrew.vasquez@qlogic.com> [PATCH] PATCH [2/8] qla2xxx: Dynamic resize of request-q Dynamically resize request-queue during initialization based on the amount of memory available to the ISP. Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <jejb@mulgrave.(none)> qla2xxx: DMA pool/api usage From: Andrew Vasquez <andrew.vasquez@qlogic.com> Rework driver DMA allocations to use the DMA pool APIs to minimize potential run-time allocation failures. Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Fixed up rejections and replaced the schedule_timeout's in the patch with msleep Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <andrew.vasquez@qlogic.com> [PATCH] PATCH [4/8] qla2xxx: Small fixes o Always set an TCQ modifier for each command submitted. o Always (re)-initialize NVRAM during execution. o Add pci_disable_device() calls to proper locations during pci-probe failure and pci-remove. o Do not begin processing until the DPC has been marked 'active'. o Fix off-by-one error while copying sense-data. o Fix bus-reset issue during back-door execution. Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <andrew.vasquez@qlogic.com> [PATCH] PATCH [5/8] qla2xxx: Rework ISR registration Rework interrupt-handler registration in anticipation of future chip types. Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <jejb@mulgrave.(none)> qla2xxx: 23xx/63xx firmware updates From: Andrew Vasquez <andrew.vasquez@qlogic.com> Resync with latest released firmware -- 3.03.02 Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <andrew.vasquez@qlogic.com> [PATCH] PATCH [8/8] qla2xxx: Update version Update version number to 8.00.00b21-k. Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <aradford@amcc.com> [PATCH] 3ware 5/6/7/8000 driver v1.26.02.000 - Remove deprecated SCSI_IOCTL_SEND_COMMAND interface. - Remove deprecated /proc/scsi/3w-xxxx interface. - Convert entire driver to pci_driver format. - Remove all mdelays, replace w/msleep to fix possible watchdog timer issues. - Make all register accesses macros. - Remove all prototypes from header file, reorder functions to eliminate all prototypes but one. - Add sysfs 'queue_depth' setting attribute. - Add sysfs 'stats' attribute. - Fix spinlocks everywhere, remove tw_lock spinlock. - Remove all bitfields, add bitmask access macros. - Remove un-needed scsi_eh_abort entrypoint. Controller does not support aborting invididual IO's, scsi_eh_reset sufficient. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <James.Bottomley@steeleye.com> [PATCH] Fix up scsi_test_unit_ready() to work correctly with CD-ROMs Olaf Hering noticed that SG_IO was no-longer working correctly on some CD-ROMS. The reason is a change in behaviour induced by switching to the new scsi_test_unit_ready() API. Apparently the CD-ROM special case needs to ignore both UNIT_ATTENTION and NOT_READY for removable media. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <dougg@torque.net> [PATCH] sg jiffy library calls [was: sg kill local jiffies Douglas Gilbert wrote: > It has been reported that the change to sg.c in lk 2.6.9-rc1-bk5 > to use library jiffy functions breaks sg (albeit under vmware). > Evidentally sg devices are no longer recognised after that change. > > Reverting that changeset removes the problem. Strange, it is not > obvious why. > > At some stage I must have detected negative time spans (yeh yeh it > never happens) and my versions returned 0 in this case; otherwise > the implementations look very similar. The following patch fixes the problem. It is against lk 2.6.9-rc1-bk7 (i.e. after "standard" jiffy_to_millisecs macros replaced sg versions). Change: - make sure a (large) user supplied timeout value does not result in a negative timeout passed to the midlevel Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <johnstul@us.ibm.com> [PATCH] USB: early usb handoff for 2.6 Apparently there is an issue w/ the IBM x440/x445's BIOS's USB Legacy support. Due to the delay in issuing SMI's across the IOAPICs, its possible for I/O to ports 60/64 to cause register corruption. The solution is to disable the BIOS's USB Legacy support early in boot(via PCI quirks) for x440/x445 systems. Originally written by Vojtech against SuSE's tree, this patch was then updated to disable EHCI by Aleksey Gorelov, cleaned up by Pete Zaitcev for 2.4 and finally tweaked and updated against 2.6 by me. I've lightly tested this version of the patch, but it differs little from what Aleksey, Pete and I have been testing for 2.4. Signed-off-by: John Stultz <jstultz@us.ibm.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <stern@rowland.harvard.edu> [PATCH] USB: Improve UHCI suspend/resume This patch fixes some problems with the suspend/resume handling in the UHCI driver: Don't try to resume ports that aren't already suspended. The controller won't permit Resume signals to be sent to a port if the port isn't enabled, so don't assume it will work. Port reset and port disable will terminate Resume signalling. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <jejb@mulgrave.(none)> scsi: normalize fixed and descriptor sense data From: Douglas Gilbert <dougg@torque.net> The patch only touches two files: scsi.h and scsi_lib.c It adds the proposed facility and then uses it in scsi_lib in roughly 4 locations. IMO there were 3 sense processing errors: - block SG_IO did not get passed back deferred errors [SG_IO is a __pass-through__ interface!!] - MEDIUM_ERRORs _do_ get processed for deferred sense errors in scsi_io_completion() which seems unintended [I did not fix this one.] - invalid command operation code handling in __scsi_mode_sense() was just wrong If people think this is a reasonable approach, then the rest of the scsi mid-level and upper level driver could be converted. As Kai pointed we may need some general routines to pick up the sense data "extras". The benefit of doing this conversion is that it may well highlight a lot more sense data processing errors (if the above is any guide). Changes: - add structure to receive normalized sense data from either fixed or descriptor format sense data - add scsi_normalize_sense() function to populate that structure - add scsi_sense_is_deferred() function so deferred errors can be ignored in many contexts - apply new mechanism to sense data processing within the scsi_lib.c file Patch reformatted by: Christoph Hellwig <hch@lst.de> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <stern@rowland.harvard.edu> [PATCH] USB: Fix off-by-one error in the hub driver This one-liner fixes a simple mistake in a newly-added part of the hub driver. When a connect change takes place on a suspended port the code clears the suspend, but the port number it passes is origin-0 and it should be origin-1. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <jejb@mulgrave.(none)> fix undefined function msleep warning in osst Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <jejb@mulgrave.(none)> fix printk warning in sg.c sizeof() != int Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <jejb@mulgrave.(none)> ServeRAID driver ( ips ) Version 7.10.18 From: Hammer, Jack <Jack_Hammer@adaptec.com> - Fix path/name for scsi_hosts.h include for 2.6 kernels - Fix sort order of 7k - Remove 3 unused "inline" functions Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <greg@kroah.com> Kobject Userspace Event Notification Implemetation of userspace events through a netlink socket. The kernel events layer provides the functionality to raise an event from a given kobject represented by its sysfs-path and a signal string to describe the type of event. Currently, kobject additions and removals are signalized to userspace by forking the /sbin/hotplug helper. This patch moves this special case of userspace-event out of the kobject core to the new kobject_uevent implementation. This makes it possible to send all hotplug messages also through the new netlink transport. Possible new users of the kernel userspace functionality are filesystem mount events (block device claim/release) or simple device state transitions (cpu overheating). To send an event, the user needs to pass the kobject, a optional sysfs-attribute and the signal string to the following function: kobject_uevent(const char *signal, struct kobject *kobj, struct attribute *attr) Example: kobject_uevent("overheating", &cpu->kobj, NULL); The message itself is sent over multicast netlink socket, which makes it possible for userspace to listen with multiple applications for the same messages. Signed-off-by: Robert Love <rml@novell.com> Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <akpm@osdl.org> [PATCH] tmscsim.c build fix This must have had a ton of testing. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <jejb@mulgrave.(none)> advansys build fix it uses TCQ defines but doesn't include scsi/scsi_tcq.h Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <hch@lst.de> [PATCH] start removing queue from tmscsim So actually I have a patch that starts to remove internal queueing from tmscsim. This gets rid of internal queueing for those cases where we can just make the midlayer do the the work by returning erros from ->queuecommand (and cleans up the tmscsim queuecommand implementation singnificantly). Next step would get rid of the more complicated internal queueing where we need to make the scsi layer requeue by returning appropinquate DID_ values from ->scsidone. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <davej@redhat.com> [CPUFREQ] Fix numerous typos in drivers/cpufreq/Kconfig Signed-off-by: Dave Jones <davej@redhat.com> <willy@debian.org> [PATCH] sym2 2.1.18k 2.1.18k: - Relicence from dual BSD/GPL to pure GPL - Add my copyright to various files - Remove unnecessary MDELAY calls after printfs - Rename remaining MDELAY() to mdelay(), delete MDELAY and sym_mdelay macros - Restructure PCI initialisation to not disable chips that are part of Mylex RAID cards. - Make SYM_OPT_NVRAM_PRE_READ non-optional. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <markh@osdl.org> [PATCH] aacraid: Detect non-committed array From: Mark Salyzyn at Adaptec In the case of this driver patch, we will report to the user via a syslogd kernel message that a foreign array has been ignored in non-intel environments; or intel environments where the BIOS fails to load to perform this set of housekeeping functions. There is a provision, via the commit variable, to change this behavior to accept the configuration instead. Signed-off-by: Mark Haverkamp <markh@osdl.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <david-b@pacbell.net> [PATCH] USB: ohci init refactor Please merge, some recent changes made problems by making init take too long. This also adds a bit of support for detecting the funky resume states that happen with suspend-to-disk (like swsusp, pmdisk). Refactor controller initialization ... this is most of the patch by volume. - A time-critical section now runs with IRQs blocked, rather than being split over two separate routines. (I've recently seen init failures because of preemption in the middle of that 2msec timeout, presumably by khubd.) - Bus glue for PCI, LH7A404, OMAP, and SA-1100 now shares more init logic; that'll help shrink support for upcoming non-PCI patches too. - Move the root hub register macros to the header (for debug build issue) - More tweaks to the frame clock initialization, including slightly more helpful diagnostics on "init err". Better SWSUSP support. - Detects and handles some funky "resume after suspend-to-disk" cases. These need to go through full driver re-init. - Restore root hub to CONFIGURED state on resume. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <jejb@mulgrave.(none)> Fix qla2xxx mismerge From: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <aradford@amcc.com> [PATCH] 3ware 5/6/7/8000 driver update - Make tw_check_bits() static. - Add MODULE_VERSION support. - Fix ioctl path to use dma_alloc/free_coherent() instead of pci_alloc/free_consistent(). - Remove error variable from ioctl code causing confusion. retval defaults to -EFAULT, any copy_to/from_user() that returns non zero returns -EFAULT. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <greg@kroah.com> I2C: fix up __iomem marking for i2c bus drivers Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <stern@rowland.harvard.edu> [PATCH] USB: Updated USB device locking This patch reintroduces the USB device locking code we tried out earlier. As before, it solves the problem of effectively locking all the devices while drivers are registered and unregistered by introducing an rwsem. Unlike the earlier attempt, this version does not ever try to acquire a lock re-entrantly. I trust that will eliminate the races and hang-ups you observed with the earlier version. There are also copious comments explaining exactly how things should work. The patch interacts slightly with the locktree() code introduced by David for suspend/resume support. It doesn't change the functionality at all; it just updates the routine to follow the new locking rules. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <stern@rowland.harvard.edu> [PATCH] USB: Add locking support for USB device resets This patch reintroduces the usb_lock_device_for_reset() routine, which is specially tailored to meet the needs of drivers that have to reset a device either during probe() or during normal operations. It updates a few drivers that do device resets, to make them use the new routine. It also adds a new field to struct usb_interface, to keep track of whether the interface is in the process of being bound to or unbound from a driver. This is necessary, because during binding we know the device is already locked so we don't want to try to acquire the lock again! With this patch in place, USB device resets should finally become reliable. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <khali@linux-fr.org> [PATCH] I2C: More verbose debug in w83781d detection Quoting myself: > As for me, I will propose my extra-debug patch (slightly cleaned up) > for inclusion into the 2.6 kernel. It helped us once, so it could > prove to be valuable in the future as well. Here is the patch. It makes the w83781d (mis)detection more verbose so as to help debugging problems. The extra messages of course only show when I2C chip debugging is enabled. It additionally features some code refactoring, some CodingStyle cleanups and adds a missing white space in one debug message. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <luca.risolia@studio.unibo.it> [PATCH] USB: SN9C10x driver updates SN9C10x driver updates. Changes: (+ new, - removed, * cleanup, @ bugfix, = sync with kernels) @ Create correct red,green,blue entries under /sys according to the detected bridge * Add and use defined symbols for I2C slave ids of TAS5110C1B and TAS51130D1B * Color fixes for PAS202BCB - from its maintainer - Signed-off-by: Luca Risolia <luca.risolia@studio.unibo.it> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <khali@linux-fr.org> [PATCH] I2C: Update Documentation/i2c/writing-clients This is a very small an update to Documentation/i2c/writing-clients. The changes are about i2c client driver ID. It used to say that chip driver writers should ask for a unique ID. It now explains that such an ID is not required and they can go without it. Until we get plain rid of it... The patch additionally features CodingStyle updates. We can't ask people to respect it and at the same time ignore it in our own docs. I have made a similar change to the i2c (the project) documentation, and will propose an update to Marcelo for Linux 2.4 (not sure he will accept it though). Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <akpm@osdl.org> [PATCH] kobject_uevent warning fix lib/kobject_uevent.c: In function `kobject_hotplug': lib/kobject_uevent.c:225: warning: long long int format, u64 arg (arg 3) Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <akpm@osdl.org> [PATCH] ksysfs warning fix kernel/ksysfs.c: In function `hotplug_seqnum_show': kernel/ksysfs.c:28: warning: long long unsigned int format, u64 arg (arg 3) Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <akpm@osdl.org> [PATCH] USB: add missing pci_disable_device for PCI-based USB HCD From: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> This patch adds pci_disable_device() into usb_hcd_pci_remove(). If the driver decides to stop using the device, it should call pci_disable_device() to deallocate any IRQ resources, disable PCI bus-mastering, etc. Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <eric.valette@free.fr> [PATCH] USB: rtl8150.c ethernet driver : usb_unlink_urb ->usb_kill_urb While we are looking at this driver, here is a way to avoid one full page of annoying messages at shutdown/module unload. Signed-off-by: Eric Valette <Eric.Valette@free.fr> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <zaitcev@redhat.com> [PATCH] USB: Patch for 3 ub bugs in 2.6.9-rc1-mm4 Actual users of ub quickly found problems, so here's a patch to address some of them. #1: An attempt to mount a CF card, pull the plug, then unmount causes a message "getblk: bad sector size 512" and an oops. This is caused by trying to do put_disk from disconnect instead of using a reference count. The sd.c does it this way (it uses kref). #2: The hald fills /var/log/messages with block device errors. It seems that it happens because ub allowed opens of known offline devices, and then partition checking produced those errors. I hope taking code from sd.c should fix it. Also I replaced usb_unlink_urb with usb_kill_urb. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <oliver@neukum.org> [PATCH] USB: acm work around for misplaced this implements a work around for some devices which have correct extra descriptors, but misplace them. Signed-Off-By: Oliver Neukum <oliver@neukum.name> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <stern@rowland.harvard.edu> [PATCH] USB: Descriptor listing bugfix for g_file_storage This patch repairs a mistake I made when adding OTG support to the file-storage gadget. All the descriptor entries were bumped up by one, which caused a problem during initialization. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <lcapitulino@conectiva.com.br> [PATCH] USB: remove ugly code from usb/serial/usb-serial.c. This patch removes ugly code from some function in usb/serial/usb-serial.c which is using a goto statement intead of a simple `return'. To be true, I'm not certain if there is a special reason to do that, if so ignore me. ;) Signed-off-by: Luiz Capitulino <lcapitulino@conectiva.com.br> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <lcapitulino@conectiva.com.br> [PATCH] USB: missing check in usb/serial/usb-serial.c. This patch add a missing check in the call to bus_register() and not initialise `result' (which is not necessary). Signed-off-by: Luiz Capitulino <lcapitulino@conectiva.com.br> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <catab@deuroconsult.ro> [PATCH] USB: cdc-acm-usb-use-uninit-mem-bug.patch Attached is a patch for cdc-acm out of bounds access. Signed-off-by: Catalin(ux aka Dino) BOIE <catab@umbrella.ro> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <stern@rowland.harvard.edu> [PATCH] USB: Allow device resets for hubs This patch adds support for calling usb_reset_device() on hubs (other than root hubs). It uses some of the new routines added recently by David Brownell to shorten and simplify the code. The only place where this is called is if khubd encounters a serious error with a hub, so I don't expect it to turn up very often in ordinary use. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <davej@redhat.com> [CPUFREQ] i386 Kconfig fixes i386 cpufreq Kconfig fixes: - /proc/acpi/processor/../performance is available for all ACPI perflib drivers - powernow-k8 depends on FREQ_TABLE - clarify the heavy dependency of SPEEDSTEP_CENTRINO on ACPI - remove the EXPERIMENTAL tag of SPEEDSTEP_CENTRINO_ACPI - allow to disable SPEEDSTEP_CENTRINO_TABLE Signed-off-by: Dominik Brodowski <linux@brodo.de> Signed-off-by: Dave Jones <davej@redhat.com> <davej@redhat.com> [CPUFREQ] x86_64 Kconfig fixes x86_64 cpufreq Kconfig fixes: - SPEEDSTEP_CENTRINO _needs_ the ACPI perflib as the tables are for Banias only, and the Banias is only 32bit - SPEEDSTEP_CENTRINO_TABLE won't be built in any longer as it only wastes space - /proc/acpi/processor/../performance is available for all ACPI perflib drivers Signed-off-by: Dominik Brodowski <linux@brodo.de> Signed-off-by: Dave Jones <davej@redhat.com> <davej@redhat.com> [CPUFREQ] arm Kconfig fixes arm cpufreq Kconfig enhancements: - don't force the deprecated 24_API on SA11x0 any more, as it will be removed ~2005-01-01 and different interfaces have been available for a long time - don't mark CPU_FREQ as being EXPERIMENTAL any longer - re-order it in the same way other arches are ordered Signed-off-by: Dominik Brodowski <linux@brodo.de> Signed-off-by: Dave Jones <davej@redhat.com> <davej@redhat.com> [CPUFREQ] core Kconfig fix cpufreq core Kconfig fix: - 24_API is a part of the userspace governor, so keep it directly below the userspace governor Signed-off-by: Dominik Brodowski <linux@brodo.de> Signed-off-by: Dave Jones <davej@redhat.com> <davej@redhat.com> [CPUFREQ] speedstep-centrino should only decode MSR on certain CPUs The encoding of the MSR only works as described in extract_clock() on certain EST-enabled CPUs. So, limit the actual MSR check to these CPUs. Signed-off-by: Dominik Brodowski <linux@brodo.de> Signed-off-by: Dave Jones <davej@redhat.com> <davej@redhat.com> [CPUFREQ] remove double calls to module_get/put in userspace governor The cpufreq core properly gets and puts the modules it calls, including governors. So there's no need to keep the racy in-module calls in cpufreq_userspace denoting otherwise. Signed-off-by: Dominik Brodowski <linux@brodo.de> Signed-off-by: Dave Jones <davej@redhat.com> <davej@redhat.com> [CPUFREQ][1/4] cpufreq "cpu group" awareness: add policy->cpus Save the "affected_cpu_map" used in SMT-aware drivers in struct cpufreq_policy->(cpumask_t) cpus, and use it wherever possible. In most cases, the ->get() function is only allowed to run on one CPU [the one passed as argument] to keep code simpler, and as that code path isn't executed often, and only root can do it anyway. Signed-off-by: Dominik Brodowski <linux@brodo.de> Signed-off-by: Dave Jones <davej@redhat.com> <davej@redhat.com> [CPUFREQ][2/4] cpufreq "cpu group" awareness: save sysdev for all CPUs Save a copy of each CPU's struct sys_device in drivers/cpufreq/cpufreq.c so that symlinks can be removed even outside the specific sys_device's ->remove() function. Signed-off-by: Dominik Brodowski <linux@brodo.de> Signed-off-by: Dave Jones <davej@redhat.com> <davej@redhat.com> [CPUFREQ][3/4] cpufreq "cpu group" awareness: do symlinks for other CPUs instead of registering kobjects Only register each "affected_cpu_mask" once, and do symlinks for those CPUs not directly registered to the driver model. Zwane Mwaikambo tested it, and here is the result: root@morocco cpu {0:0} pwd /sys/devices/system/cpu root@morocco cpu {0:0} tree . |-- cpu0 | |-- cpufreq | | |-- cpuinfo_cur_freq | | |-- ... | | -- scaling_setspeed | -- online -- cpu1 |-- cpufreq -> ../../../../devices/system/cpu/cpu0/cpufreq -- online Signed-off-by: Dominik Brodowski <linux@brodo.de> Signed-off-by: Dave Jones <davej@redhat.com> <davej@redhat.com> [CPUFREQ][4/4] cpufreq "cpu group" awareness: remove FIXME in speedstep-ich Remove the FIXME in speedstep-ich. arch/i386/kernel/cpu/cpufreq/speedstep-ich.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) Signed-off-by: Dominik Brodowski <linux@brodo.de> Signed-off-by: Dave Jones <davej@redhat.com> <greg@kroah.com> PCI: fix __iomem warnings in quirk code Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> kevent: standardize on the event types This prevents any potential typos from happening. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> USB: fix hcd-pci's __iomem warnings Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> USB: fix up __iomem warnings in the ehci driver. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> USB: fix up __iomem warnings in the ohci driver. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> USB: fix up some minor sparse warnings in the uhci driver. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> kevent: add block mount and umount support Send notification over the new netlink socket to let userspace know that the filesystem code claims/releases the superblock on an blockdevice. This way, userspace can get rid of constantly polling /proc/mounts to watch for filesystem changes. Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <johnpol@2ka.mipt.ru> [PATCH] w1_therm: more precise temperature calculation This patch will introduce new temperature calculation mechanism which allows to use up to 9bit resolution(currently 3 digits after point). Fixed timeout issues with multiple repeated reading. Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <petkov@uni-muenster.de> [PATCH] USB: remove calls to usb_unlink_urb in class/audio.c Signed-off-by: Borislav Petkov <petkov@uni-muenster.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <petkov@uni-muenster.de> [PATCH] USB: remove calls to usb_unlink_urb in class/bluetty.c Signed-off-by: Borislav Petkov <petkov@uni-muenster.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <petkov@uni-muenster.de> [PATCH] USB: remove calls to usb_unlink_urb in class/cdc-acm.c Signed-off-by: Borislav Petkov <petkov@uni-muenster.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <petkov@uni-muenster.de> [PATCH] USB: remove calls to usb_unlink_urb in class/usb-midi.c Signed-off-by: Borislav Petkov <petkov@uni-muenster.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <petkov@uni-muenster.de> [PATCH] USB: remove calls to usb_unlink_urb() in image/hpusbscsi.c here's my next cleanup. I've changed the name of the goto label in order to remain consistent with naming. Signed-off-by: Borislav Petkov <petkov@uni-muenster.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <jejb@titanic.il.steeleye.com> fix SPI transport attributes not showing up in sysfs There was a typo in the host patch that wrongly added a null into the target attributes. <jejb@titanic.il.steeleye.com> add channel to struct scsi_target this may be temporary depending on how the channel issue is resolved for qla1280 <arjanv@redhat.com> [PATCH] mark scsi_add_host __must_check it seems scsi_add_host() is one of those functions that a driver really has to check the return value of, but several forget to do this. Patch below marks it __must_check which will cause a warning in this case (with gcc 3.4 and later).. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <hch@lst.de> [PATCH] fix Scsi_Host leak in BusLogic Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <hch@lst.de> [PATCH] kill useless spinlock wrappers in BusLogic Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <hch@lst.de> [PATCH] remove abort,reset methods from host templates Due to the prototype changes they'd been giving warnings since before 2.6.0 was release, it's time to finally kill them. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <Kai.Makisara@kolumbus.fi> [PATCH] avoid obsolete "scsi.h" APIs in st > Date: Tue, 14 Sep 2004 20:18:00 +0200 > From: Christoph Hellwig <hch> > Subject: [PATCH] avoid obsolete "scsi.h" APIs in st > > no actual behaviour changes, just update to the less obsfucated 2.6+ > APIs. > Looks good to me but did not link when DEBUG was set to 1: one print_req_sense() conversion was missed. This is corrected in the patch at the end of this message. Signed-off-by: Kai Makisara <kai.makisara@kolumbus.fi> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <jejb@mulgrave.(none)> scsi: add blacklist attribute indicating no ULD attach From: Jeremy Higdon <jeremy@sgi.com> Add blacklist attribute to disable ULD attachment to a lun, and use that attribute for SGI-branded Engenio UTM luns. Minor rejection fixes and Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <akpm@osdl.org> [PATCH] pegasus.c fixes drivers/usb/net/pegasus.c: In function `pegasus_set_settings': drivers/usb/net/pegasus.c:961: warning: passing arg 2 of `mii_ethtool_sset' from incompatible pointer type drivers/usb/net/pegasus.c: In function `pegasus_get_msglevel': drivers/usb/net/pegasus.c:978: warning: unused variable `pegasus' drivers/usb/net/pegasus.c: In function `pegasus_set_msglevel': drivers/usb/net/pegasus.c:985: warning: unused variable `pegasus' Signed-off-by: Andrew Morton <akpm@osdl.org> <jolt@tuxbox.org> [netdrvr b44] ignore carrier lost errors some (?) hardware seems to be buggy and is reporting bogus carrier lost values. Both reference implementations from Broadcom indicate that this counter is not reliable and therefore ignore it. We should do the same. "Fixes" the carrier lost problem i've seen. Signed-off-by: Florian Schirmer <jolt@tuxbox.org> <jolt@tuxbox.org> [netdrvr b44] clean up SiliconBackplane definitions/functions there is a good amount of code to support SiliconBackplane functions which are unneeded or simply plain wrong. Lets get rid of it. Signed-off-by: Florian Schirmer <jolt@tuxbox.org> <jgarzik@pobox.com> [netdrvr b44] update MODULE_AUTHORS As prodded by David Miller. <pp@ee.oulu.fi> [PATCH] b44: use bounce buffers to workaround chip DMA bug/limitations Signed-off-by: Pekka Pietikainen <pp@ee.oulu.fi> <jejb@mulgrave.(none)> scsi: add proper pci id table to aic7xxx From: Andi Kleen <ak@suse.de> Patch updated by: Christoph Hellwig <hch@infradead.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <markh@osdl.org> [PATCH] 2.6.9 aacraid: aac_count fix Changed the managing of aac device structures to a linked list so that there is no limit to how many adapters can be configured. Also, put the call to scsi_add_host earlier in the probe function, before devices are accessed. Signed-off-by: Mark Haverkamp <markh@osdl.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <jbarnes@engr.sgi.com> [PATCH] SCSI QLA not working on latest *-mm SN2 On Thursday, September 16, 2004 1:56 pm, Andrew Vasquez wrote: > On Thu, 2004-09-16 at 13:05, Jesse Barnes wrote: > > On Thursday, September 16, 2004 12:56 pm, Paul Jackson wrote: > > > Andrew Vasquez has been looking at this, via private email with just > > > me (no progress yet). Figured I update the larger list with this much > > > ... > > > > It seems to be failing on one of the accesses to PCI_COMMAND in config > > space in qla2x00_reset_chip(). I'm checking now to see if we're > > accessing the card right after a reset but before the card has finished. > > That would cause a master abort, the symptom I'm seeing at least. > > Interesting, the only changes in reset_chip() are for PCI posting > issues. Relevant diff attached. Yeah, I think one of these is the culprit. Before I got your message, I fixed some of them in my tree already (see attached) and things seem to work. WRT_REG_WORD(®->hccr, HCCR_CLR_RISC_INT); + RD_REG_WORD(®->hccr); /* PCI Posting. */ WRT_REG_WORD(®->hccr, HCCR_CLR_HOST_INT); + RD_REG_WORD(®->hccr); /* PCI Posting. */ /* Reset ISP chip. */ WRT_REG_WORD(®->ctrl_status, CSR_ISP_SOFT_RESET); + RD_REG_WORD(®->ctrl_status); /* PCI Posting. */ In particular, are the above ok? If the chip is resetting, won't doing a read cause a machine check (or at the very least, a device select timeout, which will return all ones on friendlier platforms). WRT_REG_WORD(®->ctrl_status, CSR_ISP_SOFT_RESET); + RD_REG_WORD(®->ctrl_status); /* PCI Posting. */ Same here? Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <andrew.vasquez@qlogic.com> [PATCH] SCSI QLA not working on latest *-mm SN2 (qla_dbg fixes) On Thu, 2004-09-16 at 14:09, Jesse Barnes wrote: > On Thursday, September 16, 2004 1:56 pm, Andrew Vasquez wrote: > > On Thu, 2004-09-16 at 13:05, Jesse Barnes wrote: > > > On Thursday, September 16, 2004 12:56 pm, Paul Jackson wrote: > > > > Andrew Vasquez has been looking at this, via private email with just > > > > me (no progress yet). Figured I update the larger list with this much > > > > ... > > > > > > It seems to be failing on one of the accesses to PCI_COMMAND in config > > > space in qla2x00_reset_chip(). I'm checking now to see if we're > > > accessing the card right after a reset but before the card has finished. > > > That would cause a master abort, the symptom I'm seeing at least. > > > > Interesting, the only changes in reset_chip() are for PCI posting > > issues. Relevant diff attached. > > Yeah, I think one of these is the culprit. Before I got your message, I fixed > some of them in my tree already (see attached) and things seem to work. > Hmm, seems we were a bit too over-aggressive in placement of the readw()s :( > WRT_REG_WORD(®->hccr, HCCR_CLR_RISC_INT); > + RD_REG_WORD(®->hccr); /* PCI Posting. */ > WRT_REG_WORD(®->hccr, HCCR_CLR_HOST_INT); > + RD_REG_WORD(®->hccr); /* PCI Posting. */ > > /* Reset ISP chip. */ > WRT_REG_WORD(®->ctrl_status, CSR_ISP_SOFT_RESET); > + RD_REG_WORD(®->ctrl_status); /* PCI Posting. */ > > In particular, are the above ok? If the chip is resetting, won't doing a read > cause a machine check (or at the very least, a device select timeout, which > will return all ones on friendlier platforms). > There are several more which deltas in qla_dbg.c which are suspect also. > WRT_REG_WORD(®->ctrl_status, CSR_ISP_SOFT_RESET); > + RD_REG_WORD(®->ctrl_status); /* PCI Posting. */ > > Same here? > Andrew, please add Jesse's patch along with the patch I'm attaching to your tree. I'll be sure to add the ia64 machine back into our test ring. Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <jejb@mulgrave.(none)> some ncr53c8xx decrufting From: Christoph Hellwig <hch@lst.de> kills lots of BSD glue and procfs mess Acked by: Matthew Wilcox <willy@debian.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <jejb@mulgrave.(none)> scsi: Add reset ioctl capability to ULDs Currently, the only way to issue a SCSI reset of any type is to use the sg device. By adding extra ioctls to scsi_ioctl.c we enable this for all ULDs. The slight complication is that scsi_ioctl() is usually only called when the device has been checked not to be undergoing eh recovery. Resets may be issued in this scenario if the user opens the device O_NONBLOCK. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <webvenza@libero.it> [netdrvr sis900] whitespace and codingstyle updates Big patch, but only contains whitespace and CodingStyle fixes to make the whole sis900.c file uniform. Some >80 lines where too difficult to split, so I let them alone, readability would be just as bad as is now. This patch depends on the previous one liner that adds the new PHY ID and is made against kernel 2.6.8 (as the previous). This patch is also available at: http://teg.homeunix.org/sis900.html <hch@lst.de> [PATCH] move scsi_add_host back to where it belongs in aacraid looks like you applied a premature version of the last aacraid patch. This one moves the scsi_add_host back so it's not called before the driver is ready to accept queued commands. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <hch@lst.de> [PATCH] don't mark aacraid as experimental Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <James.Smart@Emulex.Com> [PATCH] Allow LLDD's to fail slave alloc (non-existent slave) In the cases where an LLDD knows that a lun does not exist, if it fails slave_alloc(), the midlayer reports an error message indicating slave_alloc failed. This patch allows the LLDD to reject the slave_alloc() call if it knows the lun doesn't exist, and skips the reporting of the slave_alloc failure message. This avoids jumping through hoops in the LLDD to avoid error messages from slave_alloc. Also saves cycles in that the probe is also cancelled for the non-existent device. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <petkov@uni-muenster.de> [PATCH] USB: remove call to usb_unlink_urb() in media/usbvideo.c Signed-off-by: Borislav Petkov <petkov@uni-muenster.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <petkov@uni-muenster.de> [PATCH] USB: remove calls to usb_unlink_urb in media/stv680.c Signed-off-by: Borislav Petkov <petkov@uni-muenster.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <petkov@uni-muenster.de> [PATCH] USB: remove calls to usb_unlink_urb in media/se401.c Signed-off-by: Borislav Petkov <petkov@uni-muenster.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <petkov@uni-muenster.de> [PATCH] USB: remove call to usb_unlink_urb in media/ov511.c Signed-off-by: Borislav Petkov <petkov@uni-muenster.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <petkov@uni-muenster.de> [PATCH] USB: remove calls to usb_unlink_urb in media/konicawc.c since usb_kill_urb is a void function, the checking of the return status had to go too. Signed-off-by: Borislav Petkov <petkov@uni-muenster.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <petkov@uni-muenster.de> [PATCH] USB: remove calls to usb_unlink_urb in input/xpad.c Signed-off-by: Borislav Petkov <petkov@uni-muenster.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <petkov@uni-muenster.de> [PATCH] USB: usb_unlink_urb removal from input/ati_remote.c Signed-off-by: Borislav Petkov <petkov@uni-muenster.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <petkov@uni-muenster.de> [PATCH] USB: remove calls to usb_unlink_urb in input/wacom.c Signed-off-by: Borislav Petkov <petkov@uni-muenster.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <petkov@uni-muenster.de> [PATCH] USB: remove calls to usb_unlink_urb in input/usbmouse.c Signed-off-by: Borislav Petkov <petkov@uni-muenster.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <petkov@uni-muenster.de> [PATCH] USB: remove calls to usb_unlink_urb in core/message.c Signed-off-by: Borislav Petkov <petkov@uni-muenster.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <petkov@uni-muenster.de> [PATCH] USB: remove usb_unlink_urb() calls in input/kbtab.c Signed-off-by: Borislav Petkov <petkov@uni-muenster.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <petkov@uni-muenster.de> [PATCH] USB: usb_unlink_urb removal from input/hid-core.c Signed-off-by: Borislav Petkov <petkov@uni-muenster.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <petkov@uni-muenster.de> [PATCH] USB: remove calls to usb_unlink_urb in input/mtouchusb.c Signed-off-by: Borislav Petkov <petkov@uni-muenster.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <petkov@uni-muenster.de> [PATCH] USB: usb_unlink_urb removal from input/aiptek.c Signed-off-by: Borislav Petkov <petkov@uni-muenster.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <petkov@uni-muenster.de> [PATCH] USB: remove calls to usb_unlink_urb in input/usbkbd.c Signed-off-by: Borislav Petkov <petkov@uni-muenster.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <petkov@uni-muenster.de> [PATCH] USB: remove calls to usb_unlink_urb() in input/pid.c Signed-off-by: Borislav Petkov <petkov@uni-muenster.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <petkov@uni-muenster.de> [PATCH] USB: remove calls to usb_unlink_urb in image/mdc800.c (v2) Signed-off-by: Borislav Petkov <petkov@uni-muenster.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <petkov@uni-muenster.de> [PATCH] USB: remove calls to usb_unlink_urb in input/powermate.c Signed-off-by: Borislav Petkov <petkov@uni-muenster.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <petkov@uni-muenster.de> [PATCH] USB: remove calls to usb_unlink_urb() in input/touchkitusb.c Signed-off-by: Borislav Petkov <petkov@uni-muenster.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] USB: oops, revert drivers/usb/core/message.c change. That patch was just not right... Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <baldrick@free.fr> [PATCH] usb speedtch: no side-effects in BUG_ON It seems that people want BUG_ON to be like an assertion: harmless if removed. Signed-off-by: Duncan Sands <baldrick@free.fr> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <baldrick@free.fr> [PATCH] usb speedtch: convert to using usb_kill_urb Unlike usb_unlink_urb, usb_kill_urb guarantees that completion handlers have finished running before it returns. The bunch of disconnect code that waited for completion handlers can now go away. Signed-off-by: Duncan Sands <baldrick@free.fr> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <hch@lst.de> [PATCH] switch fusion to use <linux/list.h> everywhere Acked By: Moore, Eric Dean <emoore@lsil.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <greg@kroah.com> USB: fix incorrect usage of usb_kill_urb in rtl8150 driver. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <vojtech@suse.cz> [PATCH] USB: Fix oops in usblp driver This bug was reported back in July, and I sent out a patch but apparently it never got to you. The usblp driver was calling usb_buffer_free() from usblp_cleanup(), which runs after disconnect() if a user process holds the device open. But once the usb_device is gone usb_buffer_free() will oops. The patch frees the buffers in usb_disconnect() instead. Recently Joost Witteveen reported the same oops and found that the patch solved it for him. So there shouldn't be problems with accepting it. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <david-b@pacbell.net> [PATCH] USB: net2280 updates Net2280 patches to: - Make reset logic ensure endpoint toggle and halt bits only get cleared on endpoints other than ep0 to fix an extremely unlikely (but possible) state when a setup packet come in after we've checked the reset status but before calling ep_reset(). - Avoid a disconnect hang by exchanging SUSPEND_IMMEDIATELY (intended for use when the 8051 is the PCI host) with SUSPEND_REQUEST_INTERRUPT to suspend the NET2280. - Make rmmod of gadget drivers trigger disconnect; earlier changes to reset logic broke this. Signed-off-by: Alex Sanks <alex@netchip.com> Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <david-b@pacbell.net> [PATCH] USB: host side fixes for pxa2xx/ethernet/rndis gadgets, like gumstix This fixes an interop glitch with PXA gadgets; please merge. This resolves an issue that's more or less specific to hosts trying to talk pxa255 based Linux devices using the Ethernet/RNDIS gadget driver. - Teaches "usbnet" about the product ID used by pxa255 based devices when they enable RNDIS, since it won't be using CDC Ethernet. - Forces usbcore config selection code to use non-RNDIS configurations, even when their class is vendor-specific (as in the pxa255 case). This makes gumstix devices, for example, talk with Linux 2.6.9 hosts AND with Windows ... previously only one would work. From: Craig Hughes <craig@gumstix.com> Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <stern@rowland.harvard.edu> [PATCH] USB: Support system suspend in File-Storage Gadget This patch adds support for system-wide suspend to the File-Storage Gadget. Please apply. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <stern@rowland.harvard.edu> [PATCH] USB: Suspend update for dummy_hcd This patch fixes a few minor errors in the port suspend/resume handling code of the dummy_hcd driver. There are a couple of other small changes too, such as removing a BUG_ON(). Please apply. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <stern@rowland.harvard.edu> [PATCH] USB: Activate new hubs and resumed hubs the same way This patch makes the newly-probed hub pathway, the hub reset pathway, and the resumed hub pathway all use the same routine for activating the hub and scanning for port change events as soon as possible. It's a modified version of something originally written by David Brownell, updated to match the current source. Please apply. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <dhollis@davehollis.com> [PATCH] USB: Add Surecom USB Ethernet device ids to usbnet Add Surecom EP-1427X-2 device ids. Signed-off-by: David Hollis <dhollis@davehollis.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <stern@rowland.harvard.edu> [PATCH] USB: Use list_for_each_entry etc. in UHCI driver This patch was developed largely by Domen Puncer. It makes the code in the UHCI driver more readable by utilizing list_for_each_entry and related macros. I merely made a couple of very small stylistic changes and converted one additional hunk of code. Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <stern@rowland.harvard.edu> [PATCH] USB: Fix data toggle handling in the UHCI driver This patch fixes an error in the way the UHCI driver computes data-toggle updates when unlinking a bulk or interrupt URB that hasn't transferred any data. Thanks to Thierry Chantry for finding this bug and testing the patch. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <mhoffman@lightlink.com> [PATCH] i2c: Add Intel VRD 10.0 and AMD Opteron VID support This patch adds support for Intel VRD 10.0 and AMD Opteron VID calculations. It is based on the lm_sensors project CVS, r1.6. Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <khali@linux-fr.org> [PATCH] I2C: Cleanup lm78 init This patch cleans the init part of the lm78 driver. * Do not reset the chip. * Get rid of useless code, which was accidentally left in when we removed the limit initialization from the driver. * Do not enable monitoring if it is already enabled (it wouldn't hurt, but since we can avoid it at no cost...) Similar changes were applied to the Linux 2.4 driver, which I successfully tested on my own LM78 chip. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <nacc@us.ibm.com> [PATCH] i2c/i2c-mpc: replace schedule_timeout() with msleep_interruptible() Properly orders set_current_state() and add_wait_queue(). Uses msleep_interruptible() in place of schedule_timeout() to guarantee the task delays as expected. Uses set_current_state() instead of direct assignment of current->state. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] Put symbolic links between drivers and modules in the sysfs tree This functionality is essential for us to work out which drivers are supplied by which modules. We use this in turn to work out which modules are necessary to find the root device (and hence what initrd/initramfs needs to insert). If you look at debian at the moment, it uses a huge mapping table on /proc/scsi/* to do this. If we implement the sysfs feature, we can simply go from /sys/block/<device> to the actual device to the driver and then to the module with no need of any fixed tables. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] USB: add support for symlink from usb and usb-serial driver to its module in sysfs Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] PCI: add "struct module *" to struct pci_driver to show symlink in sysfs for pci drivers. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <jejb@mulgrave.(none)> remove old ifdefs aic79xx From: janitor@sternwelten.at Patches to remove some old ifdefs. remove most of the #include <linux/version.h> kill compat cruft like #define ahd_pci_set_dma_mask pci_set_dma_mask Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <jejb@mulgrave.(none)> remove old ifdefs aic7xxx From: janitor@sternwelten.at Patches to remove some old ifdefs. remove most of the #include <linux/version.h> kill compat cruft like #define ahd_pci_set_dma_mask pci_set_dma_mask Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <James.Bottomley@steeleye.com> [PATCH] add .module to qla1280 template This was missing. It needs to be added so the module tracking actually works correctly for the driver. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <jejb@mulgrave.(none)> complete the bus_addr_t removal from aic7xxx Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <akpm@osdl.org> [PATCH] QLogic ISP2x00: remove needless busyloop From: Bjorn Helgaas <bjorn.helgaas@hp.com> There's no need to wait for an isp2x00 to recognize a fabric if there's no isp2x00. Probably nobody will notice the unnecessary slowdown on real hardware, but it's a significant delay on a simulator. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <mochel@digitalimplant.org> [driver model] Change symbol exports to GPL only in drivers/base/bus.c. Signed-off-by: Patrick Mochel <mochel@digitalimplant.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <mochel@digitalimplant.org> [driver model] Change sybmols exports to GPL only in class.c Signed-off-by: Patrick Mochel <mochel@digitalimplant.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <mochel@digitalimplant.org> [driver model] Change symbol exports to GPL only in core.c Signed-off-by: Patrick Mochel <mochel@digitalimplant.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <mochel@digitalimplant.org> [driver model] Change symbol exports to GPL only in driver.c Signed-off-by: Patrick Mochel <mochel@digitalimplant.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <mochel@digitalimplant.org> [driver model] Change symbol exports to GPL only in firmware.c Signed-off-by: Patrick Mochel <mochel@digitalimplant.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <mochel@digitalimplant.org> [driver model] Change symbol exports to GPL only in platform.c. Signed-off-by: Patrick Mochel <mochel@digitalimplant.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <mochel@digitalimplant.org> [driver model] Change symbol exports to GPL only in sys.c Signed-off-by: Patrick Mochel <mochel@digitalimplant.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <mochel@digitalimplant.org> [sysfs] Change symbol exports to GPL only in bin.c Signed-off-by: Patrick Mochel <mochel@digitalimplant.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <mochel@digitalimplant.org> [sysfs] Change symbol exports to GPL only in dir.c Signed-off-by: Patrick Mochel <mochel@digitalimplant.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <mochel@digitalimplant.org> [sysfs] Change symbol exports to GPL only in file.c. Signed-off-by: Patrick Mochel <mochel@digitalimplant.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <mochel@digitalimplant.org> [sysfs] Change symbol exports to GPL only in group.c. Signed-off-by: Patrick Mochel <mochel@digitalimplant.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <mochel@digitalimplant.org> [sysfs] Change symbol exports to GPL only in symlink.c. Signed-off-by: Patrick Mochel <mochel@digitalimplant.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <mochel@digitalimplant.org> [driver core] Change symbol exports to GPL only in power/main.c Signed-off-by: Patrick Mochel <mochel@digitalimplant.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <mochel@digitalimplant.org> [driver core] Change symbol exports to GPL only in power/resume.c Signed-off-by: Patrick Mochel <mochel@digitalimplant.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <mochel@digitalimplant.org> [driver core] Change symbol exports to GPL only in power/suspend.c. Signed-off-by: Patrick Mochel <mochel@digitalimplant.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <hch@lst.de> [PATCH] don't mark the initio 9100 driver broken Users report it just works fine, it has basic EH and compiles without warnings even on ppc64. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <hch@lst.de> [PATCH] remove internal queueing from inia100 The driver had some trivial internal queueing for srb allocation failure in ->queuecommand that can be done at the midlayer easily. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <willy@debian.org> [PATCH] Add SPI-5 constants to scsi.h On Tue, Sep 21, 2004 at 01:04:38PM +0100, Christoph Hellwig wrote: > On Tue, Sep 21, 2004 at 12:50:59PM +0100, Matthew Wilcox wrote: > > > > Add the new constant names from SPI-5 to <scsi/scsi.h> > What about having a section ala > > /* > * Old SCSI2 names, don't use in new code > */ > #define ABORT ABORT_TASK_SET > #define BUS_DEVICE_RESET TARGET_RESET > > instead of intermixing them with the rest of the defines? Sure... Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <jejb@mulgrave.(none)> Remove duplicate IDENTIFY from scsi.h Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <hch@lst.de> [PATCH] fix inia100 dma mapping warnings - always use the midlayer provided field to save the dma handle for unmapping - merge the unmapping into the main completion handler Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <akpm@osdl.org> [PATCH] PCI: fix up usb quirk __init marks Lukas Hejtmanek <xhejtman@fi.muni.cz> wrote: > > Unable to handle kernel paging request at virtual address 0000ffff > printing eip: > c0402097 > *pde = 00000000 > Oops: 0002 [#1] > PREEMPT > Modules linked in: yenta_socket pcmcia_core i830 ehci_hcd uhci_hcd rtc > CPU: 0 > EIP: 0060:[<c0402097>] Tainted: P VLI > EFLAGS: 00010246 (2.6.9-rc2-mm2) > EIP is at quirk_usb_early_handoff+0x0/0x3e > eax: 0000ffff ebx: c035d954 ecx: c6866000 edx: 00020000 > esi: c6866000 edi: c035da4c ebp: ceede380 esp: c7f4bed8 > ds: 007b es: 007b ss: 0068 > Process pccardd (pid: 3386, threadinfo=c7f4a000 task=c5ea2d70) > Stack: c01d2076 c6866000 c6866000 ceede380 00000000 c01d20ba c6866000 c035d81c > c035da4c c01d01ce 00000000 c6866000 00000000 00000000 c01d0214 ceede380 > 00000000 c686642c ceede380 ceede394 c7f4a000 cfbdd0de ceede380 00000000 > Call Trace: > [<c01d2076>] pci_do_fixups+0x49/0x4b Well quirk_usb_early_handoff() should be __devinit, not __init. There are a few other things in there which look hotpluggy, and are marked __init. The whole thing needs a review. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <dougg@torque.net> [PATCH] scsi_mid_low_api.txt update - initiator device -> initiator port - add scsi_activate_tcq() + scsi_deactivate_tcq() Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <jejb@mulgrave.(none)> fusion dead code removal From: Christoph Hellwig <hch@lst.de> This patch (ontop of the patch to use <linux/list.>) removes lots of dead code from the fusion driver, mostly related to the orphaned dmp and target drivers. Acked By: Moore, Eric Dean <Emoore@lsil.com> also modified not to back out MPTSTM code Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <markh@osdl.org> [PATCH] aacraid: dynamic dev update Here is the patch with Christoph's comments addressed. Description from Mark Salyzyn: The main purpose of this patch is to move the array's cached request sense packets into a per-adapter structure rather than leaving it global (before ID 1,0,0,0 shares 2,0,0,0 cached sense). SAS pressed this change as we needed to allocate the sense packets dynamically. Signed-off-by Mark Haverkamp <markh@osdl.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <hch@lst.de> [PATCH] tmscsim: back out bogus eeprom reading changes Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <jejb@mulgrave.(none)> merge a100u2w source files From: Christoph Hellwig <hch@lst.de> looking at the a100u2w driver the split between the inia100.c and i60uscsi.c source files is hindering work badly. So I'm attaching below a new a100u2w.c that is a merge of those two, but no code changes at all (yet) - just the comment headers and includes of the two merged, then rest of i60uscsi.c, then rest of inia100.c. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <aia21@cantab.net> NTFS: Implement extent mft record deallocation. Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <jejb@mulgrave.(none)> Fix a100u2w compile error Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <jejb@mulgrave.(none)> Add refcounting to scsi command allocation The USB bug reported in: http://bugme.osdl.org/show_bug.cgi?id=3466 Looks to be because we allow device and host removal while some commands are in-flight. This can be fixed by taking and releasing a ref on the scsi_device when the commands are allocated and freed. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <jejb@mulgrave.(none)> qla1280: ISP1020/1040 support From: Christoph Hellwig <hch@lst.de> This patch adds support for the older ISP1020/1040 chips to the qla1280 driver. In fact it does not add much support but enables the work merged earlier. It's been tested to work nicely on x86 and alpha machines by multiple people, it unfortunately doesn't work on SGI mips systems yet, but I'm pretty sure that's due to bugginess in the pci code for those plattforms. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <jejb@mulgrave.(none)> tmscsim: remove redundant code From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <hch@lst.de> [PATCH] initio: remove obsolete APIs, cleanup This patch has the usual cleanups for the initio driver: - remove scsi.h APIs - add missing statics - remove the trivial internal queuing for the srb allocation failure case but while doing that I noticed that the two source files use completely different headers, and the interface between the two files often casted to generic types just to cast it back to a separate defintion of the same type again. In one case the structures were even mismatching, but because we allocated the bigger defintion and only passed pointers around it actually worked.. Thanks to Rodrigo Severo for testing this patch. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <hch@lst.de> [PATCH] a100u2w: cleanups - mark all functions static - don't use scsi.h obsolete symbols - add my copyright boilerplate (more for last years work then the trivial nitpicks here) - comment formatting fixes - remove dead wood from a100u2w.h Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <greg@kroah.com> I2C: change i2c-elektor.c driver from using pci_find_device() Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> I2C: convert scx200_acb driver to not use pci_find_device Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <david-b@pacbell.net> [PATCH] USB Gadget: Ethernet/RNDIS gadget, minor updates Helps battery recharge, and gives this a new version string since it's changed a lot since St. Patrick's Day. Just minor updates: - use usb_gadget_vbus_draw() when changing configs, so that USB can be used to recharge batteries (or whatever); and report power use. bMaxPower is now 100 mA except with OTG (where it's 8mA). - rename /proc/rndis/000 as /proc/driver/rndis-000, and only have it when a new CONFIG variable is set (added by a later patch) - minor fixes to make some debug-only rndis messages compile - version is now "Equinox 2004". Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <david-b@pacbell.net> [PATCH] USB: OHCI support for PXA27x here's a patch from Nico to add PXA27x OHCI support. Please merge; it applies on top of your current BK with some offsets, but I can't build that tree for ARM because of some #include lossage. OHCI driver for the Intel PXA27x processor Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <david-b@pacbell.net> [PATCH] USB Gadget: debug files now Kconfigured This adds a new Kconfig option, so now all the usb peripheral controllers have the same way to enable debug files (or more typically, disable them). Several of the USB peripheral controller drivers have a /proc/driver/udc file that's handy when debugging, but probably not wanted otherwise. This patch adds CONFIG_USB_GADGET_DEBUG_FILES, and uses it to replace some driver-internal defines. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <mdharm-usb@one-eyed-alien.net> [PATCH] USB storage: delayed device scanning This patch started life as as366, got some modifications, and lives now as as366b. It implements a delay in SCSI-layer device scanning for usb-storage devices at insertion time. Many devices work better with this delay. We believe we can remove several US_FL_FIX_INQUIRY unusual_devs.h entries with this patch. (That's a hint, Phil!) The delay is adjustable via a sysfs parameter which is global to the usb-storage module. The default is 5 seconds. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Matthew Dharm <mdharm-usb@one-eyed-alien.net> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <mdharm-usb@one-eyed-alien.net> [PATCH] USB Storage: ignore bogus residue values This patch allows usb-storage to ignore the reported residue values when required by some devices. A few devices are included... I know more are waiting to be merged into unusual_devs.h In case anyone is curious... yes, these are broken devices. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Matthew Dharm <mdharm-usb@one-eyed-alien.net> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <mdharm-usb@one-eyed-alien.net> [PATCH] USB Storage: revert GetMaxLUN strictness This is patch as384. It reverts some of our sanity checks on the GetMaxLUN part of the Bulk-only protocol. Apparently, this is one area where vendors can't even get close to correct. So, in the face of any sort of error, we assume a single LUN. We also include some comments so we don't make this mistake again. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Matthew Dharm <mdharm-usb@one-eyed-alien.net> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <lcapitulino@conectiva.com.br> [PATCH] usb-serial: Moves the search in device list out of usb_serial_probe(). Move the search in `usb_serial_driver_list' out of usb_serial_probe(). Note that: 1) The `found' variable is not necessary; 2) If the device does have a probe function, I'm calling usb_match_id() again. I'm uncertain if this is the better thing to do. Signed-off-by: Luiz Capitulino <lcapitulino@conectiva.com.br> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <lcapitulino@conectiva.com.br> [PATCH] usb-serial: create_serial() return value trivial fix. create_serial() only returns NULL if there is no memory enough to a new `usb_serial' structure, thus, the right error code to return is -ENOMEM. Signed-off-by: Luiz Capitulino <lcapitulino@conectiva.com.br> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <lcapitulino@conectiva.com.br> [PATCH] usb-serial: return_serial() trivial cleanup. return_serial() trivial cleanup: 1) CodingStyle fix; 2) The `return' is not necessary, we are at the end of a function which don't return nothing (void). Signed-off-by: Luiz Capitulino <lcapitulino@conectiva.com.br> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <lcapitulino@conectiva.com.br> [PATCH] usb-serial: usb_serial_register() cleanup. usb_serial_register() cleanup 1) CodingStyle in the call of usb_serial_bus_register() 2) The goto and the duplicate `return retval' are not necessary Signed-off-by: Luiz Capitulino <lcapitulino@conectiva.com.br> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <lcapitulino@conectiva.com.br> [PATCH] usb-serial: Add module version information. Add module version information for drivers/usb/serial/usb-serial.c. Signed-off-by: Luiz Capitulino <lcapitulino@conectiva.com.br> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <petkov@uni-muenster.de> [PATCH] USB: remove calls to usb_unlink_urb in net/catc.c Signed-off-by: Borislav Petkov <petkov@uni-muenster.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <petkov@uni-muenster.de> [PATCH] USB: remove calls to usb_unlink_urb in misc/legousbtower.c another trivial one. Signed-off-by: Borislav Petkov <petkov@uni-muenster.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <petkov@uni-muenster.de> [PATCH] USB: remove _some_ calls to usb_unlink_urb in misc/auerswald.c here's a more controversial one. Firstly, auerchain_unlink_urb:1180 is a wrapper for usb_unlink_urb so i don't think we should change that. Secondly, auerswald_int_release returns an int which is the error code returned by usb_unlink_urb. usb_kill_urb is a void, however, so I've removed the error checking. For the sake of debugging, the dbg-line announcing the name of the function is probably enough. Signed-off-by: Borislav Petkov <petkov@uni-muenster.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <akpm@osdl.org> [PATCH] module.h build fix From: Ingo Molnar <mingo@elte.hu> Forward-declare the structures before using them, rather than relying on previous inclusions. akpm: The breakage was introduced by bk-driver-core.patch Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <khali@linux-fr.org> [PATCH] I2C: Store lm83 and lm90 temperatures in signed Back when I wrote the lm83 and lm90 drivers, I decided to use unsigned variables to store temperature values as mirrored from the chipset registers. I wonder why, since the registers use signed values themselves. The patch below changes the variables back to signed types, so as to simplify the conversions made by the driver, making them faster and easier to understand. Additionally, the lm90 driver was lacking boundary checkings and proper rounding when writing temperature limits to the chipset, so I added these. I also reworded the comments about internal temperature values representation for all chipsets. Tested to work fine on my (LM90-compatible) ADM1032 chip. lm83 patch untested, but it is more simple and directly copied from the lm90, so I am confident it works fine too. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <mhoffman@lightlink.com> [PATCH] i2c: sensors chip driver updates This patch modifies some sysfs file names for sensors chip drivers in accordance with the standard interface proposed here [1] and refined here [2]. The lm_sensors userspace tools have been modified to accept both the new and old names. This patch was tested for some drivers, and at least compile tested for the rest. [1] http://archives.andrew.net.au/lm-sensors/msg08477.html [2] http://archives.andrew.net.au/lm-sensors/msg18391.html Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <mhoffman@lightlink.com> [PATCH] i2c: kill some sensors driver macro abuse This patch kills a specific kind of ugly and ultimately useless macro abuse found in many sensors chip drivers. Compile tested only. Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <zaitcev@redhat.com> [PATCH] USB: Fixes for ub in 2.4.9-rc2-mm2 - Do retries for a memory key which was handed out on Kernel Summit 04. - Add missing del_timer. - Add shifts for a 2KB block size device, from Pat LaVarre. Signed-off-by: Pete Zaitcev <zaitcev@yahoo.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <baldrick@free.fr> [PATCH] usb: extract sensible strings from buggy string descriptors The Freebox is a USB modem popular in France. It returns bogus string descriptors: while the string part is there, the length and type bytes are both zero. This patch detects that case and tries to recover a sensible string by scanning for printable Latin characters. This not only causes the modem to spring to life (because usbnet gets a valid MAC address) - it also means you get the correct Product and Manufacturer strings in sysfs and elsewhere. This patch is in the "mostly harmless" category. Signed-off-by: Duncan Sands <baldrick@free.fr> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <ak@sensi.org> [PATCH] USB: export inteface and configuration strings to sysfs this patch adds exporting of configuration and interface strings to sysfs. both configuration and interface strings are present on my Nokia 7610 phone, which can be connected via USB, and I thought it would be a good idea to make them easily accessible via sysfs: [root@cs181035096 usb1]# cat 1-1/manufacturer 1-1/product Nokia 7610 [root@cs181035096 usb1]# grep "" `find . -name configuration` ./1-1/configuration:First and Last and Always [root@cs181035096 usb1]# grep "" `find . -name interface` ./1-1/1-1:1.6/interface:CDC Data Interface ./1-1/1-1:1.5/interface:CDC Comms Interface ./1-1/1-1:1.3/interface:PC Suite Services ./1-1/1-1:1.1/interface:SYNCML-SYNC The first two interfaces are for accessing the GPRS modem, they are recognized and supported perfectly by the cdc_acm driver. The last two are CDC OBEX interfaces, for which there is no driver currently, but I plan to write one. This would allow userspace to do really nifty things, for example accessing the phone filesystem, and exchanging contacts and calendar entries via SyncML. Pretty much the same thing that Nokia PC Suite does. But the software needs to distinguish between the two OBEX interfaces (which is syncml and which is file transfer? the only way to know is to read the strings), and that"s why this patch was written. Signed-off-by: Alex Kanavin <ak@sensi.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <nacc@us.ibm.com> [PATCH] usb/file_storage: replace schedule_timeout() with msleep_interruptible() Use msleep_interruptible() instead of schedule_timeout() so that the task delays as expected. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <nacc@us.ibm.com> [PATCH] usb/ati_remote: add set_current_state() Add set_current_state() before schedule_timeout() so that if the while-loop iterates multiple times, schedule_timeout() delays as expected. Without the addition, schedule_timeout() will return immediately. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <nacc@us.ibm.com> [PATCH] usb/kaweth: reorder set_current_state() and schedule_timeout() Reorder set_current_state() and schedule_timeout() for a minor cleanup. The reorder allows removing two of the set_current_state() calls. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <nacc@us.ibm.com> [PATCH] usb/hid-core: add set_current_state() before schedule_timeout() Add set_current_state() before schedule_timeout() so that the task delays as expected. Without the addition, schedule_timeout() will return immediately on subsequent iterations of the while-loop. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <nacc@us.ibm.com> [PATCH] usb/mdc800: cleanup set_current_state() around wait queues This patch cleans up the wait queue usage in this driver. The state is no longer set until just before the task sleeps, which removes a few set_current_state()s. Correspondingly, the state doesn't need to be set back to TASK_RUNNING outside of the while-loops, as schedule_timeout() takes care of it. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <nacc@us.ibm.com> [PATCH] usb/uss720: replace schedule_timeout() with msleep_interruptible() Use msleep_interruptible() instead of schedule_timeout() to guarantee the task delays as expected. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <johnpol@2ka.mipt.ru> [PATCH] w1: schedule_timeout() issues. Need to set current state and check signals. Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <jbarnes@engr.sgi.com> [PATCH] USB: handle usb host allocation failures gracefully It looks like a host (like ohci or whatever) could try to allocate a new usb_device structure with usb_alloc_dev and get back a valid pointer even if the allocation of its private data failed. I first saw this in the 2.4 sources, but it looks like 2.6 has the same problem. This patch attempts to fix it by freeing dev if the ->allocate() routine fails, and then returns NULL instead of a potentially dangerous dev pointer. Signed-off-by: Jesse Barnes <jbarnes@sgi.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <david-b@pacbell.net> [PATCH] USB: OHCI autodetects "need" for init reset quirk Ther recent QUIRK_INITRESET update turns out to need support for some ALi and ServerWorks chips, as well as the original SiS and OPTi cases. Rather than trying to maintain a quirk table (for what I still think must be a subtle init sequence bug), this patch kicks it in automatically when the frame clock init problem is detected. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <hare@suse.de> [PATCH] Driver Core: Handle NULL arg for put_device() Since get_device() accepts a NULL argument, put_device() should do so, too. Signed-off-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <roland@topspin.com> [PATCH] kobject: add add_hotplug_env_var() Add a (non-inlined) add_hotplug_env_var() function to <linux/kobject.h> and lib/kobject.c. There's a lot of boilerplate code involved in setting environment variables in a hotplug method, so we should have a convenience function to consolidate it (and avoid subtle bugs). Signed-off-by: Roland Dreier <roland@topspin.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <roland@topspin.com> [PATCH] USB: use add_hotplug_env_var() in core/usb.c Use the new add_hotplug_env_var() function in drivers/usb/core/usb.c. In addition to cleaning up the code, this fixes a (probably harmless) bug here: for each value added to the environment, the code did length += sprintf(...); and then scratch += length; which means that we skip the sum of the lengths of all the values we've put so far, rather than just the length of the value we just put. This is probably harmless since we're unlikely to run out of space but if nothing else it's setting a bad example.... I've tested this on a system with USB floppy and CD-ROM; hotplug gets the same environment with the patch as without. Signed-off-by: Roland Dreier <roland@topspin.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <jeremy@sgi.com> [PATCH] add ability to set device queue depth to mptfusion This patch lets you override the default queue depth for SCSI devices attached through the mptfusion driver. I moved some common code that I needed out of mpt_slave_configure() into its own function. New patch with some style issues fixed. I went ahead and moved the logical "and" to the end of the line from the start of the next line. I agreed with Matthew's reasoning on the comparison with 0. Thanks for reviewing, Christoph. signed-off-by: Jeremy Higdon <jeremy@sgi.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <aia21@cantab.net> NTFS: Splitt runlist related functions off from attrib.[hc] to runlist.[hc]. Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <aia21@cantab.net> NTFS: Add vol->mft_data_pos and initialize it at mount time. Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <aia21@cantab.net> NTFS: Rename init_runlist() to ntfs_init_runlist(), ntfs_vcn_to_lcn() to ntfs_rl_vcn_to_lcn(), decompress_mapping_pairs() to ntfs_mapping_pairs_decompress() and adapt all callers. Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <aia21@cantab.net> NTFS: Forgot to lock the mft bitmap when clearing the bit in ntfs_extent_mft_record_free(). Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <aia21@cantab.net> NTFS: Add fs/ntfs/runlist.[hc]::ntfs_get_nr_significant_bytes(), ntfs_get_size_for_mapping_pairs(), ntfs_write_significant_bytes(), and ntfs_mapping_pairs_build(), adapted from libntfs. Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <aia21@cantab.net> NTFS: Rename ntfs_merge_runlists() to ntfs_runlists_merge(). Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <aia21@cantab.net> NTFS: - Add fs/ntfs/lcnalloc.h::ntfs_cluster_free_from_rl() which is a static inline wrapper for ntfs_cluster_free_from_rl_nolock() which takes the cluster bitmap lock for the duration of the call. - Make fs/ntfs/lcnalloc.c::ntfs_cluster_free_from_rl_nolock() not static and add a declaration for it to lcnalloc.h. Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <aia21@cantab.net> NTFS: Add fs/ntfs/attrib.[hc]::ntfs_attr_record_resize(). Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <jejb@mulgrave.(none)> megaraid 2.20.4: Fix a data corruption bug From: Bagalkote, Sreenivas <sreenib@lsil.com> Fixes a data corruption issue. Because of a typo in the driver, IO packets were wrongly shared by the IOCTL path. This caused the whole IO command to be replaced by an incoming IOCTL command. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <jgarzik@pobox.com> [libata] add sata_uli driver for ULi (formerly ALi) SATA Contributed by Peer Chen <peer_chen@ali.com.tw>, updated to latest libata by me. <jgarzik@pobox.com> [libata sata_uli] add dev_select hook <jt@bougret.hpl.hp.com> [PATCH] WE-17 typo fix Felix R. found a typo in the WE-17 patch I sent you and is pending in your tree (more correctly, an overzealous search&replace). The patch below fix this mistake. I would appreciate you adding this patch to your tree ;-) <manfred@colorfullife.com> [PATCH] rx checksum support for gige nForce ethernet <romieu@fr.zoreil.com> [PATCH] sata_nv: enable hotplug event on successfull init only Wait for successfull completion of nv_init_one() before hotplug events are enabled. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> <romieu@fr.zoreil.com> [PATCH] sata_nv: wrong failure path and leak - wrong branching: the driver does not want to iounmap() an address that it has just failed to set; - return a sensible error status code instead of a success code; - leak plugged: host was never freed if a late error heppened. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> <romieu@fr.zoreil.com> [PATCH] sata_nv: housekeeping for goto labels - each label used in a goto contains a part of the operation that must be issued. This way both the no-error and the error paths can be checked separately; - probe_ent does not need to be NULL-initialized. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> <aia21@cantab.net> NTFS: Implement the equivalent of memset() for an ntfs attribute in fs/ntfs/attrib.[hc]::ntfs_attr_set() and switch fs/ntfs/logfile.c::ntfs_empty_logfile() to using it. Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <aia21@cantab.net> NTFS: Remove unnecessary casts from LCN_* constants. Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <aia21@cantab.net> NTFS: Implement fs/ntfs/runlist.c::ntfs_rl_truncate_nolock(). Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <jejb@mulgrave.(none)> merge initio source files From: Christoph Hellwig <hch@lst.de> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <jejb@mulgrave.(none)> ST34555N misbehaves on tagged INQUIRY commands - add to blacklist From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <James.Smart@Emulex.Com> [PATCH] suspending I/Os to a device Add a device blocked state and API to the mid-layer Use the new device blocked API in the fc transport class to invoke a user settable delay on cable pulls. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <aia21@cantab.net> NTFS: Add MFT_RECORD_OLD as a copy of MFT_RECORD in fs/ntfs/layout.h and change MFT_RECORD to contain the NTFS 3.1+ specific fields. Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <aia21@cantab.net> NTFS: Add some debugging checks to fs/ntfs/inode.c::ntfs_truncate() and fix a typo in fs/ntfs/layout.h. Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <ben@fluff.org> [WATCHDOG] s3c2410_wdt.c-wdog-fix-memrelease.patch fix the release of the memory resource at exit from the code, and tidy up the static variables at the start. Signed-of-by: Ben Dooks <ben-wdog@fluff.org> Signed-of-by: Wim Van Sebroeck <wim@iguana.be> <dwmw2@shinybook.infradead.org> USB: Generic USB ATM/DSL core and completed SpeedTouch driver This can now load the firmware and initialise the modem for itself, with no need for any userspace help (except for putting the firmware in /lib/firmware in the first place). The core packet I/O code is split out into a separate file where it can be used by drivers for some of the other similar modems. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <margitsw@t-online.de> [PATCH] prism54 remove TRACE * Remove TRACE to please the janitors <margitsw@t-online.de> [PATCH] prism54 Bug in timeout scheduling * Bug in loop around schedule_timeout * We must rearm the task * * Make timeout message meaningful <margitsw@t-online.de> [PATCH] prism54 print firmware version * Print firmware version * * As per convention, make errno return negative <margitsw@t-online.de> [PATCH] prism54 bug initialization/mgt_commit * Change mgt_commit from void to int * (and pass a return code) * We call this from device initialization, * therefore we need to know that it has succeeded * If it hasn't, we do not have a working device and * should pass a non-zero value upwards <zaitcev@redhat.com> [PATCH] USB: fix oops with latest ub driver in -mm tree On Fri, 1 Oct 2004 11:39:17 -0700 Greg KH <greg@kroah.com> wrote: > Pete, any ideas? Oh, it also happens on my UP laptop. >[...] > kernel BUG at kernel/timer.c:413! I have a suspicion. Actually, it was pointed to me by a kind soul before, but I forgot who he was, unfortunately. I'm not sure if this is the problem, but please try it if you can. It should apply on top of "latest". I really hate that word, but in this case I haven't got a version number. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <hch@lst.de> [PATCH] tmscsim: remove superflous global host list It's only used to "verify" the host pointer in the interrupt handler, which better had to be correct or else 90% of the drivers would break. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <g.liakhovetski@gmx.de> [PATCH] tmscsim: use mid-layer's decision for tag support Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <g.liakhovetski@gmx.de> [PATCH] tmscsim: remove internal command queue Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <hch@lst.de> [PATCH] get rid of obsolete APIs in u14-34f Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <markh@osdl.org> [PATCH] aacraid: Add get container name functionality Description from Mark Salyzyn: This patch to aacraid overrides the default naming for an array with the programmed array name when set. The array name can be set in the BIOS, or the management applications. Signed-off-by: Mark Haverkamp <markh@osdl.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <jejb@pashleys.(none)> ncr53c8xx: remove integrity checking The comments read like it's a precursor to mid layer domain validation. Anyway, it's never been compiled. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <jejb@pashleys.(none)> ncr53c8xx: move driver local quirks up to scsi blacklist Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <jejb@pashleys.(none)> mcr53c8xx: remove INQUIRY snooping and believe the mid-layer flags Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <jejb@pashleys.(none)> add device_configure to the transport classes This allows attributes to be picked out of the INQUIRY fields and placed into transport specific capability flags Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <jejb@pashleys.(none)> ncr53c8xx: Convert to using transport classes Convert the driver to export period offset and width. Pick up domain validation on targets for free Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <dwmw2@shinybook.infradead.org> USB: Reformat usb-atm code and rework SpeedTouch firmware loading. Now it's all from a single kernel thread started directly by the probe routine, and it checks it can find _all_ the firmware it wants before starting to poke at the modem. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <aia21@cantab.net> NTFS: Add a helper function fs/ntfs/aops.c::mark_ntfs_record_dirty() which marks all buffers belonging to an ntfs record dirty, followed by marking the page the ntfs record is in dirty and also marking the vfs inode containing the ntfs record dirty (I_DIRTY_PAGES). Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <aia21@cantab.net> NTFS: Switch fs/ntfs/index.h::ntfs_index_entry_mark_dirty() to using the new helper fs/ntfs/aops.c::mark_ntfs_record_dirty() and remove the no longer needed fs/ntfs/index.[hc]::__ntfs_index_entry_mark_dirty(). Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <dwmw2@shinybook.infradead.org> USB: Fix assertion logic in USB ATM core. We assert something we believe to be _true_, not false. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <marcel@holtmann.org> [Bluetooth] Improve connection hash handling The connection hash counts the ACL and SCO links together at the moment and this is not a useful behaviour. Separate the counters and put the calling of the notifier before the TX tasklet is enabled. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> <marcel@holtmann.org> [Bluetooth] Fix race when unlinking incoming connections When the user space applications don't call accept() it can happen that incoming connections stay in the accept queue and block further connection attempts until the server is restarted. On a disconnect it is necessary that the connection is removed from the accept queue. This can't be the job of a cleanup function. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> <greg@kroah.com> [PATCH] PCI: remove pci_find_subsys() calls from cpufreq code. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] PCI: remove pci_find_subsys() calls from acpi code. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] PCI: make pci_find_subsys() static, as it should not be used anymore Use pci_get_subsys() if you want this functionality. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] PCI: update the pci.txt documentation about pci_find_device and pci_find_subsys going away Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] PCI: make pci_find_class() warn if in interrupt like all other find/get functions do. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] PCI: add pci_get_class() to make a safe pci_find_class() like call. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] PCI: clean up the comments in search.c to be correct. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] PCI: remove pci_find_class() usage from arch specific files. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] PCI: remove pci_find_class() usage from all drivers/ files Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] PCI: delete the pci_find_class() function as it's unsafe in hotpluggable systems. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] PCI: fix improper pr_debug() statement Thanks to Joe Perches for pointing this out. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <johnpol@2ka.mipt.ru> [PATCH] scx200: pci_find_device() removal. Remove pci_find_device() in arch/i386/kernel/scx200.c. Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <hch@lst.de> [PATCH] PCI: mark proc_bus_pci_dir static Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <david-b@pacbell.net> [PATCH] PCI: update Documentation/power/pci.txt That document was wrong on some things, misleading on others; this fixes some of the issues I noticed. However it probably needs to say that drivers for devices that implement the PCI PM spec "should" always use pci_set_power_state() to reduce the power usage. If I get ambitions I might submit a patch to the PCI core to print a nag message for drivers that don't do that. Updates the PCI PM docs, better matching the specs and code. - List both D3 states (D3hot, D3cold) up front. - Clarify that suspend() methods should disable I/0 (including DMA) and IRQs; it's not optional. - More accurately describe resume(); there are common cases where device re-initialization isn't appropriate. The previous text said re-init was always required; that's false. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <shaohua.li@intel.com> [PATCH] PCI: Reorder some initialization code to allow resources to be proper allocated. On Tuesday, August 31, 2004, Linus Torvalds wrote: > That list per se obviously looks ok by me, although I'd worry that some > other fs_initcall depends on the ACPI stuff having been run (ie while the > abover ordering is great, I worry that some _other_ part doesn't fit in > the above ordering). Doing a quick check finds "chr_dev_init()", for > example, which will do fbmem_init(), which might depend on the ACPI/PnP > stuff having run already. > > So it _might_ be safer to make this ordering more explicit, rather than Yes, I agree. The problem is there isn't a straightforward method for it. It possibly is hard to get it. > depending on the different phases of the initcalls. But I'd happily be > proven wrogn with some simple argument for why this is guaranteed to be > ok.. For example, maybe ACPI and PnP is linked before chr/mem.c, in which > case it should all be ok. Original PCI assign resources code is the last 'subsys_initcall' according to the makefile, so move some code of it to 'fs_initcall' (just below 'subsystem_initcall') should be ok. As you said, ACPI and PnP is linked before chr/mem.c. The method requires all other 'fs_initcall' don't touch PCI resources, since 'pcibios_assign_resources' is a 'fs_initcall' and maybe don't run, but it looks ok currently. Again, I will be appreciated if we can find a solution to make the ordering explicit. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <janitor@sternwelten.at> [PATCH] PCI list_for_each: arch-i386-pci-i386.c Replace for with more readable list_for_each. Compile tested. Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <janitor@sternwelten.at> [PATCH] PCI list_for_each: arch-alpha-kernel-pci.c Change for loops with list_for_each(). Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <janitor@sternwelten.at> [PATCH] PCI list_for_each: arch-ia64-pci-pci.c Change for loops with list_for_each_entry(). Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <janitor@sternwelten.at> [PATCH] PCI list_for_each: arch-ia64-sn-io-machvec-pci_bus_cvlink.c s/for/list_for_each/ Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <janitor@sternwelten.at> [PATCH] PCI list_for_each: arch-ppc64-kernel-pci.c s/for/list_for_each/ Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <janitor@sternwelten.at> [PATCH] PCI list_for_each: arch-ppc64-kernel-pci_dn.c s/for/list_for_each/ Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <janitor@sternwelten.at> [PATCH] PCI list_for_each: arch-ppc-kernel-pci.c s/for/list_for_each/ Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <janitor@sternwelten.at> [PATCH] PCI list_for_each: arch-sparc-kernel-pcic.c s/for/list_for_each/ Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <janitor@sternwelten.at> [PATCH] PCI pci_dev_b to list_for_each_entry: drivers-pci-setup-bus.c list_for_each & pci_(dev|bus)_[bg] replaced by list_for_each_entry. Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <akpm@osdl.org> [PATCH] add-pci_fixup_enable-pass.patch From: Bjorn Helgaas <bjorn.helgaas@hp.com> Nick Piggin's USB driver stopped working when I removed the unconditional PCI ACPI IRQ routing stuff. He has verified that the attached patch fixes it. I sort of hate to add another pass of PCI fixups, so I'm open to alternate solutions if anybody suggests one. Add a "pci_fixup_enable" pass of PCI fixups. These are run at the end of pci_enable_device() to fix up things like IRQs that are not set up until then. Some VIA boards require a fixup after the IRQ is set up. Found by Nick Piggin, initial patch by Bjorn Helgaas, reworked to fit into current -mm by Nick. Signed-off-by: Nick Piggin <nickpiggin@yahoo.com.au> Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] PCI: get rid of pci_find_device() from arch/i386/* Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] PCI: remove pci_find_device() usages from drivers/pci/* yeah, I ignored the ppc64 hotplug pci driver, they can fix it up themselves... Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <johnrose@austin.ibm.com> [PATCH] PCI Hotplug: add host bridges to RPA hotplug subsystem The following patch implements the registration of PCI Host Bridges as hotplug slots. Only host bridges that are dynamically removable will be registered. The hotplug slots directory goes from looking like this: # ls /sys/bus/pci/slots . 0000:00:02.2 0001:00:02.4 0002:00:02.2 30000000 .. 0000:00:02.4 0001:00:02.6 0002:00:02.4 control 0000:00:02.0 0001:00:02.2 0002:00:02.0 0002:00:02.6 to this: # ls /sys/bus/pci/slots . 0000:00:02.0 0001:00:00.0 0001:00:02.6 0002:00:02.2 30000000 .. 0000:00:02.2 0001:00:02.2 0002:00:00.0 0002:00:02.4 control 0000:00:00.0 0000:00:02.4 0001:00:02.4 0002:00:02.0 0002:00:02.6 This work is precursory to the DLPAR module changes that implement addition/removal of these bridges. Please apply if there are no objections. Signed-off-by: John Rose <johnrose@austin.ibm.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <ben@fluff.org> [WATCHDOG] s3c2410_wdt.c-wdog-fix3.patch This patch fixes the following problems: - debug is now configurable from cmdline (see previous emails) - re-worked the open call - moved clock enable to before we setup watchdog (some units on the s3c2410 don't like their registers changing without the clock enabled) - fixed bug in having two timer counts, one unused - fixed semaphore initialisation, so opens no longer blow up <kaneshige.kenji@jp.fujitsu.com> [PATCH] PCI: warn of missing pci_disable_device() As mentioned in Documentaion/pci.txt, pci device driver should call pci_disable_device() when it decides to stop using the device. But there are some drivers that don't use pci_disable_device() so far. This patch adds warning messages that are displayed if the device is removed without properly calling pci_disable_device(). 'WARN_ON(1)' is commented out for now because I guess many people (including some distros) enables 'CONFIG_DEBUG_KERNEL'. People might be surprised if many stack dumps are displayed on their console. Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <dlsy@snoqualmie.dp.intel.com> [PATCH] PCI Hotplug: change bus speed patch Greg, Here is a patch (against 2.6.8-rc2) that fixes the following things: 1) adds code to lower bus speed if the adapter card added run at a lower speed that the current bus speed; 2) checks for any devices on the same bus - not just those that sit on slots controlled by the same shpc; 3) cleans up the code in the check bus speed area in board_added() by creating two functions to handle common code. Signed-off-by: Dely Sy <dely.l.sy@intel.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] PCI: fix __iomem * warnings for PCI msi core code. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <dimitry.andric@tomtom.com> [WATCHDOG] s3c2410_wdt.c-wdog-fix4.patch This patch moves the tmr_margin assignment until after the check for a correct timeout value. (Plus another minor cosmetic thing.) <greg@kroah.com> [PATCH] PCI Hotplug: fix __iomem warnings in the compaq pci hotplug driver Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] PCI Hotplug: fix __iomem warnings in the ibm pci hotplug driver Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <dlsy@snoqualmie.dp.intel.com> [PATCH] PCI Hotplug: Bug fixes for shpchp driver Can you please apply the following patch that has bug fixes for shpchp driver? One bug was writing 1's to RsvdZ in Slot Status register causing hot-plugging of PCI-X cards not working in some slots. The other fix is for getting the correct bus number. Signed-off-by: Dely Sy <dely.l.sy@intel.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] PCI Hotplug: fix the rest of the drivers for __iomem and other sparse issues. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <hannal@us.ibm.com> [PATCH] PCI: Fix one missed pci_find_device Just noticed this in my update to the latest mm kernel... Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] ibmasm: fix __iomem warnings Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <johnrose@austin.ibm.com> [PATCH] PCI Hotplug: RPA dynamic addition/removal of PCI Host Bridges The following patch implements the RPA PCI Hotplug and DLPAR driver changes for the dynamic addition/removal of PCI Host bridges (PHBs). These operations are initiated in the same way as existing slot DLPAR operations, which is by writing the firmware (drc) name of the PHB to: /sys/bus/pci/slots/control/[add,remove]_slot The "kernel" entry points for these operations are: pcibios_remove_root_bus() ppc64-specific, submitted to ppc64 list on 8/19, not yet accepted http://ozlabs.org/ppc64-patches/patch.pl?id=241 init_phb_dynamic() ppc64-specific, submitted to ppc64 list on 9/16, not yet accepted http://ozlabs.org/ppc64-patches/patch.pl?id=292 pci_remove_bus() generic, submitted and accepted by Greg http://www.uwsg.iu.edu/hypermail/linux/kernel/0408.3/0595... Signed-off-by: John Rose <johnrose@austin.ibm.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <vernux@us.ibm.com> [PATCH] PCI Hotplug: acpiphp extension fixes This patch fixes an off by one error that one of the IBM machines that uses the acpiphp_ibm driver. The slots were numbered starting at 0 in BIOS instead of starting at 1 like the pci hotplug subsystem names them. So this patch provides a lookup to translate the Linux slot numbers to the internal ACPI numbers. Signed-off-by: Vernon Mauery <vernux@us.ibm.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <wim@iguana.be> [WATCHDOG] s3c2410_wdt.c-wdog-fix5.patch Changed nowayout handling so that it uses the "Kconfig" value. <hannal@us.ibm.com> [PATCH] PCI: Changed pci_find_device to pci_get_device for acpi.c Another simple patch to complete the /i386 conversion to pci_get_device. I was able to compile and boot this patch to verify it didn't break anything (on my T22). Signed-off-by: Hanna Linder <hannal@us.ibm.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <dlsy@snoqualmie.dp.intel.com> [PATCH] PCI Hotplug: quirk fix missed out in last patch This patch contains a fix that was missed out in the last patch I sent you regarding fixes for writing 1's to RsvdZ in Slot Status register causing hot-plugging of PCI-X cards not working in some slots. Signed-off-by: Dely Sy <dely.l.sy@intel.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <lcapitulino@conectiva.com.br> [PATCH] PCI: add missing checks in drivers/pci/probe.c. I noticed drivers/pci/probe.c::pci_scan_bus_parented() has some functions which the return value is not checked. The patch bellow adds the check for device_register(), class_device_register(), class_device_create_file() and sysfs_create_link(). (hope the error label names are not too ugly). Signed-off-by: Luiz Capitulino <lcapitulino@conectiva.com.br> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] PCI: Create new function to see if a pci device is present This is needed to help get rid of the pci_find_device() usage in the tree. Signed-off-by: Hanna Linder <hannal@us.ibm.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] PCI: change cyrix.c driver to use pci_dev_present Signed-off-by: Hanna Linder <hannal@us.ibm.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <buytenh@wantstofly.org> [PATCH] PCI: minor pci.ids update Here is another patch (against 2.6.9-rc2, not sure if that has the latest version of the PCI db) that removes the vendor names from Intel IXP and Radisys ENP entries, as per Martin's suggestion. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <rl@hellgate.ch> [PATCH] PCI: remove driver private PCI state, 1 arg for pci_{save,restore}_state This is the second (and hopefully final) iteration of the interface change we talked about a while ago. The patch applies cleanly against 2.6.9-rc2-mm4. This removes the second argument (buffer for storing PCI state) from pci_{save,restore}_state since pci_dev contains such a buffer now. Fixed all callers. Three drivers used to pass a buffer of 256 bytes, one only 48(!). The rest was correct. Changes were compile tested, except for Alpha. Signed-off-by: Roger Luethi <rl@hellgate.ch> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <nacc@us.ibm.com> [PATCH] pci hotplug/shpchp: replace schedule_timeout() with msleep_interruptible() Use msleep_interruptible() instead of schedule_timeout() to guarantee the task delays as expected. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <nacc@us.ibm.com> [PATCH] pci hotplug/pciehp: replace schedule_timeout() with msleep_interruptible() Use msleep_interruptible() instead of schedule_timeout() to guarantee the task delays as expected. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <nacc@us.ibm.com> [PATCH] pci hotplug/cpqphp: replace schedule_timeout() with msleep_interruptible() Use msleep_interruptible() instead of schedule_timeout() to guarantee the task delays as expected. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <nacc@us.ibm.com> [PATCH] pci hotplug/cpqphp_ctrl: replace schedule_timeout() with msleep_interruptible() Use msleep_interruptible() instead of schedule_timeout() to guarantee the task delays as expected. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <paulus@samba.org> [PATCH] PPC64: Add pcibios_remove_root_bus From: John Rose <johnrose@austin.ibm.com> The following patch creates pcibios_remove_root_bus(), which performs the ppc64-specific actions for removal of PCI Host Bridges. This call is invoked by the RPA DLPAR driver upon PHB removal. Signed-off-by: John Rose <johnrose@austin.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> PCI Hotplug: Oops, didn't mean to apply the msi pci express patch, so revert it Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <paulus@samba.org> [PATCH] PPC64: RPA dynamic addition/removal of PCI Host Bridges From: John Rose <johnrose@austin.ibm.com> The following patch implements the ppc64-specific bits for dynamic (DLPAR) addition of PCI Host Bridges. The entry point for this operation is init_phb_dynamic(), which will be called by the RPA DLPAR driver. Among the implementation details, the global number aka PCI domain for the newly added PHB is assigned using the same simple counter that assigns it at boot. This has two consequences. First, the PCI domain associated with a PHB will not persist across DLPAR remove and subsequent add. Second, stress tests that repeatedly add/remove PHBs might generate some large values for PCI domain. If we decide at a later point to hash an OF property to PCI domain value, this can be easily fixed up. Also, the linux,pci-domain property is not generated for the newly added PHBs at the moment. Because there doesn't seem to be an easy way to dynamically add single properties to the OFDT, and because the userspace dependency on this property is being questioned, I've ignored it for now. If we decide on a solution for this at a later point, it can also be easily fixed up. Signed-off-by: John Rose <johnrose@austin.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] PCI: remove pci_module_init() usage from drivers/pci/hotplug/* Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] PCI: clean up pci_dev_get() to be sane Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <johnrose@austin.ibm.com> [PATCH] PCI Hotplug: RPA DLPAR - remove error check Here's a really long explanation for a really short patch! :) As an unfortunate side effect of runtime addition/removal of PCI Host Bridges, the RPA DLPAR driver can no longer depend on the success of ioremap_explicit() (and therefore remap_page_range()) for the case of DLPAR adding an I/O Slot. Without addressing this, an attempt to add the first child slot of a newly added PHB will fail when __ioremap_explicit() determines the mappings for that range to already exist. For a little context, __ioremap_explicit() creates mappings for the range of a newly added slot. Here's why these calls will be expected to fail in some cases. Keep in mind that at boot-time, the PPC64 kernel calls ioremap() for the entire range spanned by each PHB. Consider the following scenarios of DLPAR-adding an I/O slot. 1) Just after boot, one removes an I/O slot. At this point the range associated with the parent PHB is fragmented, and the child range for the slot in question is iounmap()'ed. One then re-adds the slot, at which point remap_page_range()/ioremap_explicit() restores the mappings that were previously removed. 2) One adds a new PHB, at which point the ppc64-specific addition ioremaps the entire PHB range. One then performs a DLPAR-add of a child slot of that PHB. At this point, mappings already exist for the range of the slot to be added. So remap_page_range()/ioremap_explicit() will fail at this point. The problem is, there's not a good way to distinguish between cases 1 and 2 from the perspective of the DLPAR driver. Because of that, I believe the correct solution to be: - Removal of relevant error prints from iounmap_explicit(), which is only used for DLPAR. - Removal of error code checks from the RPA driver Signed-off-by: John Rose <johnrose@austin.ibm.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] PCI: remove all usages of pci_dma_sync_sg as it's obsolete. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] PCI: remove all usages of pci_dma_sync_single as it's obsolete. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] PCI: fix up pci_register_driver() to stop lying in its return value. It shouldn't return 1, it needs to return either -ERROR or 0. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] PCI: audit all callers of pci_register_driver() to work properly. No, pci_register_driver() does not return the number of pci devices found, sorry. No, if pci_register_driver() fails, you do not need to call pci_unregister_driver(). Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] PCI: pci_module_init() is identical to pci_register_driver() so just make it a #define It needs to stay this way until all usages of pci_module_init() are purged from the tree. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] PCI: remove pci_module_init() usage from drivers/usb/* Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <akpm@osdl.org> [PATCH] PCI: CONFIG_PCI=n build fix With CONFIG_PCI=n: arch/i386/kernel/cpu/cyrix.c: In function `init_cyrix': arch/i386/kernel/cpu/cyrix.c:285: `cyrix_55x0' undeclared (first use in this function) arch/i386/kernel/cpu/cyrix.c:285: (Each undeclared identifier is reported only once arch/i386/kernel/cpu/cyrix.c:285: for each function it appears in.) Make pci_dev_present() a macro. It doesn't make sense to require that pci_device_id's be in scope when CONFIG_PCI=n Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <akpm@osdl.org> [PATCH] PCI: pci_dev_put() build fix With CONFIG_PCI=n: arch/i386/kernel/cpu/mtrr/main.c: In function `have_wrcomb': arch/i386/kernel/cpu/mtrr/main.c:86: warning: implicit declaration of function `pci_dev_put Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <akpm@osdl.org> [PATCH] USB: Fix hiddev devfs oops From: Herbert Xu <herbert@gondor.apana.org.au> There is a long-standing devfs_unregister oops in hid/hiddev. It's caused by hid calling hiddev_exit before unregistering itself which in turn calls hiddev_disconnect. hiddev_exit removes the directory which contains the hiddev devices. Therefore it needs to be called after the hiddev devices have been disconnected. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <jejb@titanic.il.steeleye.com> Fix up 3w-xxxx after NULL removal mismerge Looks like there were also several other NULL<->0 replacements necessary in the new code. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <jejb@titanic.il.steeleye.com> remove config_compat from Megaraid From: "Bagalkote, Sreenivas" <sreenib@lsil.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <aia21@cantab.net> NTFS: - Move ntfs_{un,}map_page() from ntfs.h to aops.h and fix resulting include errors. - Move typedefs for runlist_element and runlist from ntfs.h to runlist.h and fix resulting include errors. Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <aia21@cantab.net> NTFS: Remove unused {__,}format_mft_record() from fs/ntfs/mft.c. Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <aia21@cantab.net> NTFS: - Modify fs/ntfs/mft.c::__mark_mft_record_dirty() to use the helper mark_ntfs_record_dirty() which also changes the behaviour in that we now set the buffers belonging to the mft record dirty as well as the page itself. - Update fs/ntfs/mft.c::write_mft_record_nolock() and sync_mft_mirror() to cope with the fact that there now are dirty buffers in mft pages. Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <dwmw2@shinybook.infradead.org> USB: SpeedTouch / ATM update: - Continue polling even if we receive a 'line down' interrupt. The Rev 4 modems give that one but not 'line up'. - Make the warn() on debugging assertions actually conditional :) - Keep a reference count on the module while its thread is running. - Provide empty exit function for usb_atm.ko so it's unloadable. - Handle firmware which is in /usr so only turns up later. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <olh@suse.de> [NET]: Allow CONFIG_NET=n on ppc64. Signed-off-by: Olaf Hering <olh@suse.de> Signed-off-by: David S. Miller <davem@davemloft.net> <marcel@holtmann.org> [Bluetooth] Let the CAPI free the SKB in the error case If the CAPI send_message() function returns with anything else than CAPI_NOERROR then there is no need to free the SKB. The CAPI will take care of it by itself. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> <marcel@holtmann.org> [Bluetooth] Add module parameter for disabling ISOC transfers Some USB host controllers don't like the way Bluetooth USB dongles uses the isochronous transfers for the SCO audio support. This patch makes it possible to disable them without recompiling the driver. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> <marcel@holtmann.org> [Bluetooth] Add security manager flags and options This patch adds the initial flags and options for the upcoming kernel based Bluetooth security manager. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> <marcel@holtmann.org> [Bluetooth] Stop TX task before notifying the driver When notifying the driver of a changed voice setting the TX task must be stopped first. Otherwise the driver don't have a chance to switch the settings if needed. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> <rmk@flint.arm.linux.org.uk> [ARM] Convert system ticker timer to sysdev model. Machine support files are now expected to provide a sys_timer structure which encapsulates everything to do with the kernels system timer, and provides elegant with the system device model. In addition, it provides the relevant power management hooks. <rmk@flint.arm.linux.org.uk> [ARM] Move OS timer suspend/resume from pm.c to time.c This makes OS timer suspend/resume part of the system device power management model. <rmk@flint.arm.linux.org.uk> [ARM] Separate out footbridge DC21285 and ISA timer implementations. <aia21@cantab.net> NTFS: Update fs/ntfs/inode.c::ntfs_write_inode() to also use the helper mark_ntfs_record_dirty() and thus to set the buffers belonging to the mft record dirty as well as the page itself. Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <aia21@cantab.net> NTFS: Fix warnings on x86-64. (Randy Dunlap with slight modification from me) Fix printk arg type warnings on x86-64 (and OK on x86-32) (gcc 3.3.3): fs/ntfs/dir.c:1272: warning: long long unsigned int format, long unsigned int arg (arg 6) fs/ntfs/dir.c:1388: warning: long long unsigned int format, long unsigned int arg (arg 5 Signed-off-by: Randy Dunlap <rddunlap@osdl.org> Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <aia21@cantab.net> NTFS: Add fs/ntfs/mft.c::try_map_mft_record() which fails with -EALREADY if the mft record is already locked and otherwise behaves the same way as fs/ntfs/mft.c::map_mft_record(). Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <jejb@titanic.il.steeleye.com> scsi: fix host transport allocations Spotted by: <James.Smart@emulex.com> The allocation in scsi_host_alloc() is completely innefective because the host has only just been allocated and is set to the blank transport template (with zero size for host attributes). On the current model, the host attribute storage must be allocated later in scsi_add_host() when the driver has had an opportunity to set the transport template. This is getting a bit cumbersome, so it might also be better simply to move the transport template from the host structure into the host template structure instead. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <pfg@sgi.com> [IA64-SGI] Remove Altix I/O code (ready for re-org). Signed-off-by: Patrick Gefre <pfg@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com> <pfg@sgi.com> [IA64-SGI] Add in Altix I/O code Signed-off-by: Patrick Gefre <pfg@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com> <pfg@sgi.com> [IA64] qla1280.c Mod for Altix I/O add code. Changes inside CONFIG_IA64_GENERIC CONFIG_IA64_SGI_SN2 Need to include sn/io.h for generic builds (sn_+pci_set_vchan def) Remove rrb alloc - now done in PROM Remove endian setting - now done in PROM Change arg 2 for sn_pci_set_vchan() Acked-by: Jes Sorenson Signed-off-by: Patrick Gefre <pfg@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com> <pfg@sgi.com> [IA64-SGI] Fix issue with gemini TIO systems Signed-off-by: Patrick Gefre <pfg@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com> <pfg@sgi.com> [IA64-SGI] Redundant BUG check Signed-off-by: Patrick Gefre <pfg@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com> <jejb@titanic.il.steeleye.com> 53c700: update driver for host spi class Since currently the host class isn't initialised until scsi_add_host(), we have to make sure we don't set the spi_signalling() attribute until after this has been run. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <pfg@sgi.com> [IA64-SGI] Fix a possible memory leak. Fix a possible memory leak. Change the name of the 'new_sn_irq_info' variable to 'tmp_sn_irq_info' since we're not really allocating a new kernel sn_irq_info, we just getting new target information from the PROM and replacing it in the kernel's sn_irq_info for the given irq Signed-off-by: Patrick Gefre <pfg@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com> <pfg@sgi.com> [IA64-SGI] make pci_root_ops non static add extern for pci_root_ops delete our version of the pci_root_ops code make pci_root_ops non static Ack-by: Matthew Wilcox Ack-by: Jesse Barnes Ack-by: Grant Grundler Signed-off-by: Patrick Gefre <pfg@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com> <aia21@cantab.net> NTFS: Modify fs/ntfs/mft.c::write_mft_record_nolock() so that it only writes the mft record if the buffers belonging to it are dirty. Otherwise we assume that it was written out by other means already. Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <bzolnier@elka.pw.edu.pl> [PATCH] libata: PCI IDE legacy mode fix In PCI IDE legacy mode ap->port_no is incorrectly set to zero for the second port. Fix it by adding ->hard_port_no to struct ata_probe_ent and struct ata_port (per Jeff's suggestion) and teaching ata_piix.c to use it instead of ->port_no. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> <aia21@cantab.net> NTFS: Attempting to write outside initialized size is _not_ a bug so remove the bug check from fs/ntfs/aops.c::ntfs_write_mst_block(). It is in fact required to write outside initialized size when preparing to extend the initialized size. Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <aia21@cantab.net> NTFS: Map the page instead of using page_address() before writing to it in fs/ntfs/aops.c::ntfs_mft_writepage(). Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <aia21@cantab.net> NTFS: Provide exclusion between opening an inode / mapping an mft record and accessing the mft record in fs/ntfs/mft.c::ntfs_mft_writepage() by setting the page not uptodate throughout ntfs_mft_writepage(). Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <hch@lst.de> [PATCH] tmscsim: remove remaining INQUIRY sniffing Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <akpm@osdl.org> [PATCH] psi240i build fix drivers/scsi/psi240i.c:713: unknown field `abort' specified in initializer drivers/scsi/psi240i.c:713: warning: initialization from incompatible pointer type drivers/scsi/psi240i.c:714: unknown field `reset' specified in initializer drivers/scsi/psi240i.c:714: warning: initialization from incompatible pointer typ Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <hch@lst.de> [PATCH] get rid of obsolete APIs in BusLogic Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <hch@lst.de> [PATCH] get rid of obsolete APIs in nsp32 Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <hch@lst.de> [PATCH] fdomain: reduce usage of global variables preparation for supporting more than HBA instance Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <luben_tuikov@adaptec.com> [PATCH] Adding PCI ID tables to aic7xxx and aic79xxx Adding proper PCI ID tables to aic7xxx and aic79xx. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <rmk@flint.arm.linux.org.uk> [ARM] Fix Integrator timer implementation. <aia21@cantab.net> NTFS: Big cleanup of mft record writing code. - Clear the page uptodate flag in fs/ntfs/aops.c::ntfs_write_mst_block() to ensure noone can see the page whilst the mst fixups are applied. - Add the helper fs/ntfs/mft.c::ntfs_may_write_mft_record() which checks if an mft record may be written out safely obtaining any necessary locks in the process. This is used by fs/ntfs/aops.c::ntfs_write_mst_block(). - Modify fs/ntfs/aops.c::ntfs_write_mst_block() to also work for writing mft records and improve its error handling in the process. Now if any of the records in the page fail to be written out, all other records will be written out instead of aborting completely. - Remove ntfs_mft_aops and update all users to use ntfs_mst_aops. - Modify fs/ntfs/inode.c::ntfs_read_locked_inode() to set the ntfs_mst_aops for all inodes which are NInoMstProtected() and ntfs_aops for all other inodes. - Rename fs/ntfs/mft.c::sync_mft_mirror{,_umount}() to ntfs_sync_mft_mirror{,_umount}() and change their parameters so they no longer require an ntfs inode to be present. Update all callers. - Cleanup the error handling in fs/ntfs/mft.c::ntfs_sync_mft_mirror(). - Clear the page uptodate flag in fs/ntfs/mft.c::ntfs_sync_mft_mirror() to ensure noone can see the page whilst the mst fixups are applied. - Remove the no longer needed fs/ntfs/mft.c::ntfs_mft_writepage() and fs/ntfs/mft.c::try_map_mft_record(). - Fix callers of fs/ntfs/aops.c::mark_ntfs_record_dirty() to call it with the ntfs inode which contains the page rather than the ntfs inode the mft record of which is in the page. Ooops. Yes, I know, I should have split this up into smaller changes... Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <aia21@cantab.net> NTFS: - Fix two race conditions in fs/ntfs/inode.c::ntfs_put_inode(). - Fix race condition in fs/ntfs/inode.c::ntfs_put_inode() by moving the index inode bitmap inode release code from there to fs/ntfs/inode.c::ntfs_clear_big_inode(). (Thanks to Christoph Hellwig for spotting this.) - Fix race condition in fs/ntfs/inode.c::ntfs_put_inode() by taking the inode semaphore around the code thst sets ni->itype.index.bmp_ino to NULL and reorganize the code to optimize it a bit. (Thanks to Christoph Hellwig for spotting this.) Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <akpm@osdl.org> [PATCH] smc91x: Revert 1.1923.3.58: "m32r: modify drivers/net/smc91x.c for m32r" From: Nicolas Pitre <nico@cam.org> This change is flaky. Also conflicting with planned update of the driver. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Andrew Morton <akpm@osdl.org> <akpm@osdl.org> [PATCH] smc91x: Assorted minor cleanups From: Nicolas Pitre <nico@cam.org> - turn #if THROTTLE_TX into C code - adjust some debug messages - factorize code a litle - fix warnings with gcc-3.4.1 - etc. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Andrew Morton <akpm@osdl.org> <akpm@osdl.org> [PATCH] smc91x: set the MAC addr from the smc_enable function From: Nicolas Pitre <nico@cam.org> This is a pre-requisite for patch 05. Also a good thing to do. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Andrew Morton <akpm@osdl.org> <akpm@osdl.org> [PATCH] smc91x: fold smc_setmulticast() into smc_set_multicast_list() From: Nicolas Pitre <nico@cam.org> This allows for access to the chip to be entirely factorized, and proper locking to be added over an extremely small critical area. Also a prerequisite for patch 05. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Andrew Morton <akpm@osdl.org> <akpm@osdl.org> [PATCH] smc91x: simplify register bank usage From: Nicolas Pitre <nico@cam.org> Let's avoid all that crap of preserving the bank to restore it all the time if that's not necessary. The rule is simple: bank 2 is the only allowed bank when the chip is active and unlocked. Anything that needs to change the bank to something other than bank 2 must lock against any concurrent access and return to bank 2 before unlocking. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Andrew Morton <akpm@osdl.org> <akpm@osdl.org> [PATCH] smc91x: move TX processing out of IRQ context entirely From: Nicolas Pitre <nico@cam.org> When large amount of packets are sent, the most likely source of throttling (when THROTTLE_TX_PKTS is off) is the completion of on-chip buffer allocation that triggers an IRQ. Instead of pushing data to the chip in IRQ context, we now schedule a tasklet which has the big advantage of being interruptible by the RX packet IRQ giving the RX processing the ultimate priority over anything else. This is really important especially on the SMC91C111 which has only 4 packet buffers total regardless of packet size and has a tendency of suffering from RX overruns. This change allows RX packets to be pulled immediately upon arrival instead of having to wait for a (possibly much larger) TX packet to be entirely pushed onto the chip. The THROTTLE_TX_PKTS logic is also a bit more efficient as it now looks for a packet already been transmitted before stopping the queue therefore decreasing unnecessary TX idle periods while still keeping most buffers free for RX packets. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Andrew Morton <akpm@osdl.org> <akpm@osdl.org> [PATCH] smc91x: use a work queue to reconfigure the phy from smc_timeout() From: Nicolas Pitre <nico@cam.org> This way we can reconfigure the phy and sleep as needed. Also removed unnecessary locking from smc_phy_powerdown() since the chip is not active anymore when this is called. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Andrew Morton <akpm@osdl.org> <akpm@osdl.org> [PATCH] smc91x: fix possible leak of the skb waiting for mem allocation From: Nicolas Pitre <nico@cam.org> Free the pending TX skb inside smc_reset() rather than doing it where smc_reset() is called. Worse, some places just didn't care. Also do it when closing the driver. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Andrew Morton <akpm@osdl.org> <akpm@osdl.org> [PATCH] smc91x: display pertinent register values from the timeout function From: Nicolas Pitre <nico@cam.org> If ever that function is called, this will certainly help track the reason for it. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Andrew Morton <akpm@osdl.org> <akpm@osdl.org> [PATCH] smc91x: straighten SMP locking From: Nicolas Pitre <nico@cam.org> Fix SMP locking, and add special cases for SMP in order to preserve UP's slightly better efficiency and reliability. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Andrew Morton <akpm@osdl.org> <akpm@osdl.org> [PATCH] smc91x: cosmetics From: Nicolas Pitre <nico@cam.org> Update version string, some coments, rename a variable, etc. Nothing really worrying... Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Andrew Morton <akpm@osdl.org> <akpm@osdl.org> [PATCH] m32r: trivial fix of smc91x.h From: Hirokazu Takata <takata@linux-m32r.org> Fix LED control. Signed-off-by: Hayato Fujiwara <fujiwara@linux-m32r.org> Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@osdl.org> <akpm@osdl.org> [PATCH] smc91x: fix SMP lock usage From: Nicolas Pitre <nico@cam.org> Well, there is no such thing as a spin_trylock_irq() in the kernel. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Andrew Morton <akpm@osdl.org> <akpm@osdl.org> [PATCH] smc91x: more SMP locking fixes From: Nicolas Pitre <nico@cam.org> This fixes remaining locking problems on SMP. Thanks to Hirokazu Takata for testing. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Andrew Morton <akpm@osdl.org> <akpm@osdl.org> [PATCH] smc91x: fix compilation with DMA on PXA2xx From: Nicolas Pitre <nico@cam.org> This is required for DMA on PXA to compile with the latest changes in mainline. Also moved away from the PCI DMA flags. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Andrew Morton <akpm@osdl.org> <akpm@osdl.org> [PATCH] smc91x: receives two bytes too many From: Nicolas Pitre <nico@cam.org> The logic about proper packet size was a bit confused. Fix comments and the code where appropriate. Thanks to Stuart Juengst for spotting this. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Andrew Morton <akpm@osdl.org> <akpm@osdl.org> [PATCH] smc91x: release on-chip RX packet memory ASAP From: Nicolas Pitre <nico@cam.org> We are desperately in need of on-chip memory so free it as soon as we have fetched its content. Suggested by Marc Singer. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Andrew Morton <akpm@osdl.org> <jgarzik@pobox.com> [libata] add AHCI driver <jgarzik@pobox.com> [libata ahci] fix several bugs * PCI IDs from test version didn't make it into mainline... doh * do all command setup in ->qc_prep * phy_reset routine that does signature check * check SATA phy for errors * reset hardware from scratch, in case card BIOS didn't run * implement staggered spinup by default * adding additional debugging output <jgarzik@pobox.com> [libata ahci] more updates * allocate DMA areas in better order * remove unneeded hooks <jeremy@sgi.com> [PATCH] per-port LED control for sata_vsc signed-off-by: Jeremy Higdon <jeremy@sgi.com> <bzolnier@gmail.com> [libata] do not memset() SCSI request buf in a get-reference style function fixes INQUIRY command handling for ATAPI. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> <lsml@rtr.ca> [PATCH] Export ata_scsi_simulate() for use by non-libata drivers This patch modifies libata-scsi for easier sharing of the various ata_id_* functions and the ata_scsi_simulate() function with non-libata drivers. Signed-off-by: Mark Lord <mlord@pobox.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com> <bzolnier@gmail.com> [libata piix] Fix PATA UDMA masks piix_pata_cbl_detect() handles cable detection just fine. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> <aia21@cantab.net> NTFS: Modify fs/ntfs/aops.c::mark_ntfs_record_dirty() to no longer take the ntfs inode as a parameter as this is confusing and misleading and the ntfs inode is available via NTFS_I(page->mapping->host). Adapt all callers to this change. Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <aia21@cantab.net> NTFS: Modify fs/ntfs/mft.c::write_mft_record_nolock() and fs/ntfs/aops.c::ntfs_write_mst_block() to only check the dirty state of the first buffer in a record and to take this as the ntfs record dirty state. We cannot look at the dirty state for subsequent buffers because we might be racing with fs/ntfs/aops.c::mark_ntfs_record_dirty(). Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <jejb@mulgrave.(none)> merge scsiiom.c into tmscsim.c From: Christoph Hellwig <hch@lst.de> Also reapplied sparse fixes on top of the initial patch. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <g.liakhovetski@gmx.de> [PATCH] tmscsim: use block-layer tags Now uses the generic block layer tag handling routines (via the SCSI API). Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <jejb@mulgrave.(none)> SCSI: Fix problems with non-power-of-two sector size discs We can't support them, but the system should disable them cleanly and continue when they're detected (at the moment it dumps a stack trace). The fix (hack) is to set them to zero size and 512 byte sectors. This means they're still amenable to ioctls (like to reformat them with a useful block size) but cannot be read from or written to. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] amd8111e iomem annotations * trivial iomem annotations * couple of missing dev->priv -> netdev_priv(dev). Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> <johnrose@austin.ibm.com> [PATCH] PCI Hotplug: rpaphp safe list traversal Hoping you will accept this fix. The bug can cause a crash upon hotplug remove. The bug involves unsafe traversal of a list while deleting list members. The fix uses list_for_each_safe() rather than list_for_each(). Also threw in an initialization to get rid of a compiler warning. Signed-off-by: John Rose <johnrose@austin.ibm.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] typhoon.c missing include DMA_32BIT_MASK is declared in linux/dma-mapping.h; not all platforms get it from already included headers, so we need explicit include here (fixes breakage at least on alpha and sparc64). Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> <kernel@kolivas.org> [PATCH] netconsole support for b44 <kernel@kolivas.org> [PATCH] b44poll - whitespace <stern@rowland.harvard.edu> [PATCH] Let LLD specify INQUIRY length That sounds like a good suggestion. Even better, instead of adding a new field we can simply use the existing inquiry_length. This patch changes scsi_probe_lun() to use the value in sdev->inquiry_length for the first INQUIRY attempt, if that value is nonzero. Subsequent attempts are based, as before, on the blacklist flags and the Additional Length field in the INQUIRY data. The patch also contains a fairly extensive reorganization of the subroutine. All the code that was duplicated for sending the INQUIRY command twice has been consolidated. The routine now makes up to three passes: In the first pass, the transfer length is the value initially found in sdev->inquiry_length if that has been set, otherwise it is the current conservative 36 bytes. If the first pass succeeds, the routine retrieves the blist flags for the device and checks the Additional Length field. The blist flags take precedence over sdev->inquiry_length, which in turn takes precedence over the Additional Length. If it turns out there is more data available than we transferred the first time, a second pass tries to get it. If the second pass succeeds the INQUIRY data may have changed, so the blist flags are looked up again and the Additional Length is checked again. If not, a third pass tries to get the data back, using the same transfer length as the first pass. Finally, the value stored in sdev->inquiry_length is set to the amount actually transferred or the size computed from the Additional Length, whichever is smaller. Although the net change in the source file size is small, the new routine has more comments and less code. Overall I think it's an improvement. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <aia21@cantab.net> NTFS: Move the static inline ntfs_init_big_inode() from fs/ntfs/inode.c to inode.h and make fs/ntfs/inode.c::__ntfs_init_inode() non-static and add a declaration for it to inode.h. Fix some compilation issues that resulted due to #includes and header file interdependencies. Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <aia21@cantab.net> NTFS: Simplify setup of i_mode in fs/ntfs/inode.c::ntfs_read_locked_inode(). Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <aia21@cantab.net> NTFS: Add helpers fs/ntfs/layout.h::MK_MREF() and MK_LE_MREF(). Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <aia21@cantab.net> NTFS: Modify fs/ntfs/mft.c::map_extent_mft_record() to only verify the mft record sequence number if it is specified (i.e. not zero). Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <aia21@cantab.net> NTFS: Add fs/ntfs/mft.[hc]::ntfs_mft_record_alloc() and various helper functions used by it. Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <greg@kroah.com> kevent: add __bitwise kobject_action to help the compiler check for misusages Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> USB: add endian markups to the ub driver. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <shemminger@osdl.org> [PATCH] b44: replace MODULE_PARM Replace MODULE_PARM with module_param Signed-off-by: Stephen Hemminger <shemminger@osdl.org> <shemminger@osdl.org> [PATCH] b44: use netdev_priv Replace uses of dev->priv with netdev_priv Signed-off-by: Stephen Hemminger <shemminger@osdl.org> <bzolnier@gmail.com> [PATCH] REQUEST_SENSE support for ATAPI It is quite different from your patch: * uses ata_qc_issue() * supports both DMA and PIO * ->sense_buffer[] mangling dropped for now Now libata works with ATAPI devices (yeah!)... ...unless PIO is used, then it fails in mysterious way. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> <bzolnier@gmail.com> [libata] arbitrary size ATAPI PIO support Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> <viro@www.linux.org.uk> [PATCH] 64bit fix in cycx_x25.c comparing u32 with ~0UL is wrong Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> <viro@www.linux.org.uk> [PATCH] cyclom iomem annotations __iomem added where needed in cyclom code cycx_setup() gets physical address as an explicit argument instead of abusing hw->dpmbase Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> <viro@www.linux.org.uk> [PATCH] hd6457x iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> <viro@www.linux.org.uk> [PATCH] dscc4 iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> <viro@www.linux.org.uk> [PATCH] bunch of trivial iomem annotations in drivers/net Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> <viro@www.linux.org.uk> [PATCH] rrunner iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> <viro@www.linux.org.uk> [PATCH] via-velocity iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> <viro@www.linux.org.uk> [PATCH] tulip iomem annotations, switch to io{read,write} Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> <viro@www.linux.org.uk> [PATCH] winbond840 iomem annotations, switch to io{read,write} Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> <viro@www.linux.org.uk> [PATCH] forcedeth iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> <viro@www.linux.org.uk> [PATCH] yellowfin iomem annotations, switch to io{read,write} Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> <viro@www.linux.org.uk> [PATCH] hp100 iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> <aia21@cantab.net> NTFS: 2.1.21 release Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <mike.miller@hp.com> [PATCH] cciss: SCSI API updates This patch updates our SCSI support to no longer use deprecated APIs. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <wim@iguana.be> [WATCHDOG] v2.6.9-rc3 i8xx_tco.c-stop_reboot-patch Fix for Bugzilla Bug 132719: "watchdog i8xx_tco causing machine to reboot." <dwmw2@shinybook.infradead.org> USB SpeedTouch / ATM: Make it work on 64-bit hosts. Reduce size of struct udsl_control to make it fit in skb->cb, by dropping the cell_header and generating it later instead of storing it. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Duncan Sands <baldrick@free.fr> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <baldrick@free.fr> USB SpeedTouch cleanup. - Don't free pages with kfree() - Clean up debugging messages - Print name of firmware file loaded. Signed-off-by: Duncan Sands <baldrick@free.fr> Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <aia21@cantab.net> NTFS: Update Documentation/filesystems/ntfs.txt with instructions on how to use the Device-Mapper driver with NTFS ftdisk/LDM raid. This removes the linear raid problem with the Software RAID / MD driver when one or more of the devices has an odd number of sectors. Signed-off-by: Anton Altaparmakov <aia21@cantab.net> <hch@lst.de> [PATCH] sparse __iomem annotations for qla2xxx this also found a real bug, qla2xxx isn't iounmapping at host removal at all currently - and if the right cpp macro would have been set it'd be too late. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <linux@de.rmk.(none)> [PCMCIA] 01-unused_bulkmem_code.diff Most of drivers/pcmcia/bulkmem.c is unused by the Linux kernel PCMCIA subsystem and/or in-kernel PCMCIA device drivers. Remove this unused code as well as references to it. <linux@de.rmk.(none)> [PCMCIA] 02-move_bulkmem.diff The rest of drivers/pcmcia/bulkmem.c is only used by code relevant for 16-bit PCMCIA devices. So, link it with ds instead of with cs. The newly created module pcmcia.ko contains a MODULE_ALIAS() for the name "ds" so that backwards compatibility is ensured. <linux@de.rmk.(none)> [PCMCIA] 03-remove_ftl_memory.diff Remove both include/pcmcia/ftl.h and include/pcmcia/memory.h as they are unused. <linux@de.rmk.(none)> [PCMCIA] 04-obsolete_kconfig.diff Add a new CONFIG_PCMCIA_OBSOLETE option. <linux@de.rmk.(none)> [PCMCICA] 05-obsolete_parts_of_cs.diff Some parts of cs.c are not used by any PCMCIA socket or card driver or the PCMCIA subsystem itself. Mark them CONFIG_PCMCIA_OBSOLETE. Also, define pcmcia_get_window static as it was supposed to be. <linux@de.rmk.(none)> [PCMCIA] 06-Kconfig_PCMCIA.diff After noting three things, namely 1.) CardBus cards work without ds a.k.a. pcmcia loaded, 2.) ds a.k.a pcmcia cannot be built as module if pcmcia_core is built in, and 3.) some commenting in drivers/pcmcia/Kconfig was obsolete [to use 32-bit cards, you don't need pcmcia-cs], I wrote this patch which introduces more config options for fine- grained tuning of what to built as what and what not to built. In future, 16-bit-specific code in pcmcia_core may be surrounded by CONFIG_PCMCIA. Also, I'll try to remove the dependency of yenta_socket on cardbus. <mike.miller@hp.com> [PATCH] cciss: fixes for clustering This patch changes our open specifically for clustering software. We must allow root to access any volume or device with a LUN ID. We also modified our revalidate function for this reason. If a logical is reserved, we must register it with the OS with size=0. Then the backup system can call BLKRRPART after breaking the reservation to set the device to the correct size. We also must register a controller with no logical volumes for the online utilities to function. This is the way we've done it since the 2.2 kernel. Which doesn't neccesarily make it right, but we have legacy apps to consider. Signed off by: Mike Miller <mike.miller@hp.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <linux@de.rmk.(none)> [PCMCIA] 01-lookup_bus.diff pcmcia_lookup_bus is only called from ds.c, and doesn't need to know about a handle -- just about the struct pcmcia_socket. <linux@de.rmk.(none)> [PCMCIA] 02-adjust_resource_info.diff pcmcia_adjust_resource_info is only called from ds.c and doesn't need to know about a valid handle. <linux@de.rmk.(none)> [PCMCIA] 03-replace_cis.diff pcmcia_replace_cis doesn't need to know about the handle or a sub- function, as the cis can only be replaced as a whole. Also, remove bogus entries in cs_internal.h <linux@de.rmk.(none)> [PCMCIA] 04-get_firstnext_tuple.diff Add wrappings around pcmcia_get_{first,next}_tuple, and use the new pccard_get_first,next_tuple calls wherever possible. <linux@de.rmk.(none)> [PCMCIA] 05-get_tuple_data.diff Add a wrapping around pcmcia_get_tuple_data, and use pccard_get_tuple_data wherever possible. <linux@de.rmk.(none)> [PCMCIA] 06-parse_tuple.diff Add a wrapper around pcmcia_parse_tuple, and use pccard_parse_tuple in ds.c <linux@de.rmk.(none)> [PCMCIA] 07-read_tuple.diff Rename the "internal" read_tuple to pccard_read_tuple, and update it to better calling conventions. <linux@de.rmk.(none)> [PCMCIA] 08-validate_cis.diff Add a wrapper around pcmcia_validate_cis, and use pccard_validate_cis in ds.c <jejb@titanic.il.steeleye.com> SCSI: fix Suspend I/O block/unblock path From: James.Smart@Emulex.Com urther testing is showing that we are having some i/o threads prematurely die with the following message: "rejecting I/O to device being removed" Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <linux@de.rmk.(none)> [PCMCIA] 09-pcmcia_compat.diff Move the compatibility pcmcia_* functions which take a "handle" as argument to a new file, pcmcia_compat.c, which is built into "ds" a.k.a. "pcmcia.ko". This makes sense as only 16-bit PCMCIA drivers have a valid handle. <linux@de.rmk.(none)> [PCMCIA] 10-get_window.diff Change calling conventions to pcmcia_get_window, and use this function directly in ds.c, but keep the existing wrappers pcmcia_get_{first,next}_window in pcmcia_compat.c <phil@ipom.com> [PATCH] USB Storage: Unusual_dev patch for Finepix 1300 and 1400's. There are several cameras (1300s and 1400s) with the same bcdDevice number (1000). Most of them are 8070 devices, but some of them are UFI devices (similar to 8070 devices but don't clear the sense data after an INQUIRY or REQUEST SENSE). Furthermore if the devices that truely do act like 8070 devices are overridden to be UFI, they find more than one LUN. Specifiying UFI and SINGLE_LUN seems to satisfy all kinds of devices that claim device number 1000. From: Pavel Machek <pavel@ucw.cz> Signed-off-by: Phil Dibowitz <phil@ipom.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <phil@ipom.com> [PATCH] USB Storage: unusual_devs patch for new tekom entry Stephan Fuhrmann sent in the entry for a device needing the new RESIDUE flag. Here is an appropriate tested patch. From: Stephan Fuhrmann <atomenergie@t-online.de> Signed-off-by: Phil Dibowitz <phil@ipom.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <phil@ipom.com> [PATCH] USB Storage: unusual_devs patch for winward music disk The following is needed for Winward Music Disk. I narrowed the range of the original patch which was sent by Stephan Walter. From: Stephan Walter <stephan.walter@epfl.ch> Signed-off-by: Phil Dibowitz <phil@ipom.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <phil@ipom.com> [PATCH] USB Storage: Remove unusual_dev entry for IBM Storage Key This removes the 0a16/8888/0100 unusual_devs entry for an IBM USB Storag key. It does not appear to be needed and caused issues for Buddha Henry <spanishbuddha@hotmail.com>, who has tested with this patch and his device works properly. Signed-off-by: Phil Dibowitz <phil@ipom.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <phil@ipom.com> [PATCH] USB Storage: Remove unusual_devs entries for Genesys Drives Here's a patch to remove the three Genesys disk entries in unusual_devs. They don't appear to be needed anymore because: 1. The inquiries now request the right amount of data 2. MODE_XLATE, according to Alan, isn't used in 2.6 Signed-off-by: Phil Dibowitz <phil@ipom.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <phil@ipom.com> [PATCH] USB Storage: Fix Kyocera order This removes a duplicate entry and fixes order. Trivial. Signed-off-by: Phil Dibowitz <phil@ipom.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <linux@de.rmk.(none)> [PCMCIA] 11-configuration_info.diff Add a wrapper around pcmcia_get_configuration_info, and use pccard_get_configuration_info in ds.c <jejb@mulgrave.(none)> aic7xxx and aic79xx: fix sleeping while holding a lock From: Luben Tuikov <luben_tuikov@adaptec.com> Fix sleeping while holding a lock on host removal and on killing the DV thread. Signed-off-by: Luben Tuikov <luben_tuikov@adaptec.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <stern@rowland.harvard.edu> [PATCH] USB Storage: new unusual_devs entry Here's another USB mass storage device that incorrectly reports the total number of disk blocks. Please apply. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <phil@ipom.com> [PATCH] USB Storage: unusual_dev modification The following patch changes the 0x059f/0xa601/0x0200 per the report from Torsten Eriksson. It adds comments to the uncommented entry and changes the subclass. Signed-off-by: Phil Dibowitz <phil@ipom.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <linux@de.rmk.(none)> [PCMCIA] 12-reset_card.diff pcmcia_reset_card doesn't need to know about the handle, but add a wrapper for backwards compatibility anyways. <linux@de.rmk.(none)> [PCMCIA] 13-get_status.diff Add a wrapper around pcmcia_get_status, and use pccard_get_status in ds.c <linux@de.rmk.(none)> [PCMCIA] 14-access_configuration.diff Add a wrapper around pcmcia_access_configuration_register, and use pccard_access_configuration_register in ds.c <linux@de.rmk.(none)> [PCMCIA] 15-get_firstnext_region.diff pcmcia_get_{first,next}_region are tricky: they're used only by ds.c, but to keep backwards compatibility proper wrappers are needed (for the moment). However, match_region() doesn't work without knowing about ds.c's handle, it seems... but wait: while (list != NULL) { if (!(handle->Attributes & INFO_MTD_CLIENT) || (strcmp(handle->dev_info, list->dev_info) == 0)) { *match = list->info; return CS_SUCCESS; } list = list->info.next; } as ds.c's handle doesn't have INFO_MTD_CLIENT, the if always succeeds -- allowing is to simplify it for ds.c. However, this means we need special functions for ds.c. It's not too large, fortunately. <ak@sensi.org> [PATCH] USB: USB CDC OBEX driver Also, as the full patch isn't going in, can you please apply this tiny part of it? Somehow the header descriptor was omitted from the CDC ACM driver, but it's present on my phone (thus giving me the "ignoring extra header" error when it's plugged in) and in the CDC spec (section 5.2.3.1). Signed-off-by: Alex Kanavin <ak@sensi.org> Signed-Off-By: Oliver Neukum <oliver@neukum.name> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <hj.oertel@surfeu.de> [PATCH] USB: usb/serial RM vendor/product id for ftdi_sio Hello, this is a small patch of the USB ftdi_sio driver against linux-2.6.8.1. I only added a new vendor and product id for the RM-CANview, a CAN fieldbus interface: http://www.rmcan.com/site/en/products/gateways/usb/index.htm Thanks Heinz Signed-off-by: Heinz-Juergen Oertel <oe@port.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <ben-linux@org.rmk.(none)> [ARM PATCH] 2131/1: Add _iomem to the IO string functions Patch from Ben Dooks This patch stops mtd from generating problems of casting pointers to ints, due to the memcpy_fromio and related functions all taking `unsigned long` for their IO addresses. Replace `unsigned long` with `void __iomem *` Compiled clean on arch-s3c2410 Signed-off-by: Ben Dooks <bzolnier@gmail.com> [PATCH] arbitrary size ATAPI PIO support bugfixes * sg was incorrectly used instead of qc->sg in __atapi_pio_bytes() * due to obvious typo qc->curbytes wasn't zeroed in ata_qc_new_init() Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> <bzolnier@gmail.com> [PATCH] make ATAPI PIO work If "BSY=0, DRQ=0" condition happens on ATAPI just complete the command as this condition happens for: * the end of the PIO transfer (ie. REQUEST_SENSE seems to return only 18 of 96 requested bytes) * unsupported ATAPI commands (ie. REPORT_LUNS) Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> <petkov@uni-muenster.de> [PATCH] USB: remove calls to usb_unlink_urb in net/usbnet.c Signed-off-by: Borislav Petkov <petkov@uni-muenster.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <petkov@uni-muenster.de> [PATCH] USB: remove calls to usb_unlink_urb() in net/pegasus.c Signed-off-by: Borislav Petkov <petkov@uni-muenster.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <petkov@uni-muenster.de> [PATCH] USB: remove calls to usb_unlink_urb() in net/kaweth.c Hi there Greg, here's another one. Signed-off-by: Borislav Petkov <petkov@uni-muenster.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <ben-linux@org.rmk.(none)> [ARM PATCH] 2144/1: S3C2410 - s3c2440 fixes and clock updates Patch from Ben Dooks Fixes the following problems and ommisions: - added variable for base crystal rate - moved clock variables into clock.c - fixed bug in identifying s3c2440 cpus - added initial support for new uart registration - removed base blocks from include/asm/arch/hardware.h Signed-off-by: Ben Dooks <ben-linux@org.rmk.(none)> [ARM PATCH] 2145/1: S3C2410 - GPIO ID register update Patch from Ben Dooks Update the include/asm-arm/arch-s3c2410/regs-gpio.h with GSTATUS1 register information Signed-off-by: Ben Dooks <torvalds@ppc970.osdl.org> Add fake '__builtin_warning()' for the gcc case. Allows us to do compile-time sparse warnings of our own. <greg@kroah.com> USB: add bulk_in_size for usb-serial devices. Don't know why I didn't do it before... Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <torvalds@ppc970.osdl.org> Older gcc's ICE on missing (unused) varags macro name. <benh@kernel.crashing.org> [PATCH] ppc32/64: FPU/vector register restore after signal This fixes some issues with restoring the altivec and/or FPU registers upon return from a signal or when setting a context. It also add a proper stack backlink to the signal frames created for 64 bits applications. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <benh@kernel.crashing.org> [PATCH] ppc64: Fix iSeries build (ouch !) The move of iomap out of eeh inadvertently broke iSeries ... Fixed like this. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <torvalds@ppc970.osdl.org> Add copyright notice on ppc64 iomap files. Paul cares. I think there's something in the water at IBM that makes people sticklers ;) <torvalds@ppc970.osdl.org> Wrap <linux/compiler.h> inside '#ifndef __ASSEMBLY__' None of the compatibility defines make sense for assembly files, and gcc has trouble with vararg macros when using "-traditional" (which is used for asm), to the point of ICE'ing. <rohit.seth@intel.com> [PATCH] add sys_setaltroot() Add a new system call setaltroot(2). Currently, using the altroot feature is accessible only via the set_personality() system call. It is accessible to user space only if there is more than one exec domain in the system. This patch allows using the altroot feature on systems where there is only one exec domain. It is possible to work around the issue by adding a dummy exec domain, but it was rejected for not being very elegant. If this feature is implemented in userspace, it adds a 16% overhead on a test case which greps for a single word in the kernel source tree. Signed-off-by: Zou Nanhai <nanhai.zou@intel.com> Signed-off-by: Gordon Jin <gordon.jin@intel.com> Signed-off-by: Arun Sharma <arun.sharma@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <andrea@novell.com> [PATCH] parport_pc superio chip fixes This patch fixes some troubles that somebody reported me with the superio chips. In short rmmod parport_pc && cat /proc/iomem was good enough for crashing the box hard on some machine (and hwscan --printer was doing just that). The way the oops triggers is that iomem tries to vsprintf the p->name, but the p->name was a static string in the module address (now unloaded). The reason is that the superio chip scanning leaves up to two persistent ranges claimed. But the second (legacy) pass has no way to notice the resources are already reclaimed. Plus if the superio->io was different than the "io" variable (the range to scan for superio chips) the "io" range would generate a leak of the original "io" range too. I simply make sure to always release the requested space during the superio scan, and I make sure not to istantiate new ranges in the p->base that would cause the later parport scan to fail too (plus leaving up to leaked resources). The previous code that was returning values and was leaving garbage in there made no sense to me. My best guess (assuming I didn't misread it ;) is that probably somebody added the request_region without realizing they're pointing to the very same address that would be requested later (and nobody does accesses on those ranges until later, so it was very safe to claim it later). Disclaimer: I don't have the specs of the winbond and smsc at hand, I just guessed what they do from the code (nothing checks superio->io except get_superio_dma get_superio_irq, which made the thing enough self explainatory to fix it without specs) Signed-off-by: Andrea Arcangeli <andrea@novell.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <pavel@ucw.cz> [PATCH] swsusp: progress in percent swsusp currently has very poor progress indication. Thanks to Erik Rigtorp <erik@rigtorp.com>, we have percentages there, so people know how long wait to expect. Please apply, From: Erik Rigtorp <erik@rigtorp.com> Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <pavel@ucw.cz> [PATCH] acpi proc: error handling Propagate the software_suspend() return value. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <mingo@elte.hu> [PATCH] i386 entry.S cleanups Remove the unused lcall7/lcall27 code. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <roland@redhat.com> [PATCH] make rlimit settings per-process instead of per-thread POSIX specifies that the limit settings provided by getrlimit/setrlimit are shared by the whole process, not specific to individual threads. This patch changes the behavior of those calls to comply with POSIX. I've moved the struct rlimit array from task_struct to signal_struct, as it has the correct sharing properties. (This reduces kernel memory usage per thread in multithreaded processes by around 100/200 bytes for 32/64 machines respectively.) I took a fairly minimal approach to the locking issues with the newly shared struct rlimit array. It turns out that all the code that is checking limits really just needs to look at one word at a time (one rlim_cur field, usually). It's only the few places like getrlimit itself (and fork), that require atomicity in accessing a whole struct rlimit, so I just used a spin lock for them and no locking for most of the checks. If it turns out that readers of struct rlimit need more atomicity where they are now cheap, or less overhead where they are now atomic (e.g. fork), then seqcount is certainly the right thing to use for them instead of readers using the spin lock. Though it's in signal_struct, I didn't use siglock since the access to rlimits never needs to disable irqs and doesn't overlap with other siglock uses. Instead of adding something new, I overloaded task_lock(task->group_leader) for this; it is used for other things that are not likely to happen simultaneously with limit tweaking. To me that seems preferable to adding a word, but it would be trivial (and arguably cleaner) to add a separate lock for these users (or e.g. just use seqlock, which adds two words but is optimal for readers). Most of the changes here are just the trivial s/->rlim/->signal->rlim/. I stumbled across what must be a long-standing bug, in reparent_to_init. It does: memcpy(current->rlim, init_task.rlim, sizeof(*(current->rlim))); when surely it was intended to be: memcpy(current->rlim, init_task.rlim, sizeof(current->rlim)); As rlim is an array, the * in the sizeof expression gets the size of the first element, so this just changes the first limit (RLIMIT_CPU). This is for kernel threads, where it's clear that resetting all the rlimits is what you want. With that fixed, the setting of RLIMIT_FSIZE in nfsd is superfluous since it will now already have been reset to RLIM_INFINITY. The other subtlety is removing: tsk->rlim[RLIMIT_CPU].rlim_cur = RLIM_INFINITY; in exit_notify, which was to avoid a race signalling during self-reaping exit. As the limit is now shared, a dying thread should not change it for others. Instead, I avoid that race by checking current->state before the RLIMIT_CPU check. (Adding one new conditional in that path is now required one way or another, since if not for this check there would also be a new race with self-reaping exit later on clearing current->signal that would have to be checked for.) The one loose end left by this patch is with process accounting. do_acct_process temporarily resets the RLIMIT_FSIZE limit while writing the accounting record. I left this as it was, but it is now changing a limit that might be shared by other threads still running. I left this in a dubious state because it seems to me that processing accounting may already be more generally a dubious state when it comes to NPTL threads. I would think you would want one record per process, with aggregate data about all threads that ever lived in it, not a separate record for each thread. I don't use process accounting myself, but if anyone is interested in testing it out I could provide a patch to change it this way. One final note, this is not 100% to POSIX compliance in regards to rlimits. POSIX specifies that RLIMIT_CPU refers to a whole process in aggregate, not to each individual thread. I will provide patches later on to achieve that change, assuming this patch goes in first. Signed-off-by: Roland McGrath <roland@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <roland@redhat.com> [PATCH] add WCONTINUED support to wait4 syscall POSIX specifies the new WCONTINUED flag for waitpid, not just for waitid. I overlooked this addition when I implemented waitid. The real work was already done to support waitid, but waitpid needs to report the results Signed-off-by: Roland McGrath <roland@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <roland@redhat.com> [PATCH] fix PTRACE_ATTACH race with real parent's wait calls There is a race between PTRACE_ATTACH and the real parent calling wait. For a moment, the task is put in PT_PTRACED but with its parent still pointing to its real_parent. In this circumstance, if the real parent calls wait without the WUNTRACED flag, he can see a stopped child status, which wait should never return without WUNTRACED when the caller is not using ptrace. Here it is not the caller that is using ptrace, but some third party. This patch avoids this race condition by adding the PT_ATTACHED flag to distinguish a real parent from a ptrace_attach parent when PT_PTRACED is set, and then having wait use this flag to confirm that things are in order and not consider the child ptraced when its ->ptrace flags are set but its parent links have not yet been switched. (ptrace_check_attach also uses it similarly to rule out a possible race with a bogus ptrace call by the real parent during ptrace_attach.) While looking into this, I noticed that every arch's sys_execve has: current->ptrace &= ~PT_DTRACE; with no locking at all. So, if an exec happens in a race with PTRACE_ATTACH, you could wind up with ->ptrace not having PT_PTRACED set because this store clobbered it. That will cause later BUG hits because the parent links indicate ptracedness but the flag is not set. The patch corrects all the places I found to use task_lock around diddling ->ptrace when it's possible to be racing with ptrace_attach. (The ptrace operation code itself doesn't have this issue because it already excludes anyone else being in ptrace_attach.) Signed-off-by: Roland McGrath <roland@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <mingo@elte.hu> [PATCH] softirqs: fix latency of softirq processing The attached patch fixes a local_bh_enable() buglet: we first enabled softirqs then did we do local_softirq_pending() - often this is preemptible code. So this task could be preempted and there's no guarantee that softirq processing will occur (except the periodic timer tick). The race window is small but existent. This could result in packet processing latencies or timer expiration latencies - hard to detect and annoying bugs. The fix is to invoke softirqs with softirqs enabled but preemption still disabled. Patch is against 2.6.9-rc2-mm1. Signed-off-by: Ingo Molnar <mingo@elte.hu> Cc: <davem@davemloft.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <arnd@arndb.de> [PATCH] add missing linux/syscalls.h includes I found that the prototypes for sys_waitid and sys_fcntl in <linux/syscalls.h> don't match the implementation. In order to keep all prototypes in sync in the future, now include the header from each file implementing any syscall. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <albert@users.sourceforge.net> [PATCH] distinct tgid/tid CPU usage This patch adjusts /proc/*/stat to have distinct per-process and per-thread CPU usage, faults, and wchan. Signed-off-by: Albert Cahalan <albert@users.sf.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <Lev_Makhlis@bmc.com> [PATCH] show aggregate per-process counters in /proc/PID/stat 2 Add up resource usage counters for live and dead threads to show aggregate per-process usage in /proc/<pid>/stat. This mirrors the new getrusage() semantics. /proc/<pid>/task/<tid>/stat still has the per-thread usage. After moving the counter aggregation loop inside a task->sighand lock to avoid nasty race conditions, it has survived stress-testing with '(while true; do sleep 1 & done) & top -d 0.1' Signed-off-by: Lev Makhlis <mlev@despammed.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <roland@redhat.com> [PATCH] exec: fix posix-timers leak and pending signal loss I've found some problems with exec and fixed them with this patch to de_thread. The second problem is that a multithreaded exec loses all pending signals. This is violation of POSIX rules. But a moment's thought will show it's also just not desireable: if you send a process a SIGTERM while it's in the middle of calling exec, you expect either the original program in that process or the new program being exec'd to handle that signal or be killed by it. As it stands now, you can try to kill a process and have that signal just evaporate if it's multithreaded and calls exec just then. I really don't know what the rationale was behind the de_thread code that allocates a new signal_struct. It doesn't make any sense now. The other code there ensures that the old signal_struct is no longer shared. Except for posix-timers, all the state there is stuff you want to keep. So my changes just keep the old structs when they are no longer shared, and all the right state is retained (after clearing out posix-timers). The final bug is that the cumulative statistics of dead threads and dead child processes are lost in the abandoned signal_struct. This is also fixed by holding on to it instead of replacing it. Signed-off-by: Roland McGrath <roland@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hugh@veritas.com> [PATCH] __set_page_dirty_nobuffers mappings Marcelo noticed that the BUG_ON in __set_page_dirty_nobuffers doesn't make much sense: it lost its way in 2.6.7, amidst so many page_mappings! It's supposed to be checking that, although page->mapping may suddenly go NULL from truncation, and although tmpfs swizzles page_mapping(page) between tmpfs inode address_space and swapper_space, there's sufficient stabilization while here in __set_page_dirty_nobuffers that the mapping after we locked mapping->tree_lock is the same as the mapping before we locked mapping->tree_lock i.e. the lock we hold is the right one. Signed-off-by: Hugh Dickins <hugh@veritas.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <mason@suse.com> [PATCH] reiserfs: small filesystem fix On small filesystems (<128M), make sure not to reference bitmap blocks that don't exist. Thanks to Jan Kara for finding this bug. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <mingo@elte.hu> [PATCH] fix the prof=schedule feature Fix mismerge of the "prof=schedule" feature. Without this patch the output is a boring empty profile. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <gkurz@meiosys.com> [PATCH] fork() bug invalidates file descriptors Take a process P1 that spawns a thread T (aka. a clone with CLONE_FILES). If P1 forks another process P2 (aka. not a clone) while T is blocked in a open() that should return file descriptor FD, then FD will be unusable in P2. This leads to strange behaviors in the context of P2: close(FD) returns EBADF, while dup2(a_valid_fd, FD) returns EBUSY and of course FD is never returned again by any syscall... testcase: #include <errno.h> #include <fcntl.h> #include <sched.h> #include <signal.h> #include <string.h> #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> #include <asm/page.h> #define FIFO "/tmp/bug_fifo" #define FD 0 /* * This program is meant to show that calling fork() while a clone spawned * with CLONE_FILES is blocked in open() makes a fd number unusable in the * child. * * * Parent Clone Child * | * clone(CLONE_FILES)- <mingo@elte.hu> [PATCH] generic irq subsystem: core The main goal of this patch is to consolidate all the different but still fundamentally similar arch/*/kernel/irq.c code into the kernel/irq/ subsystem. There are 4 new files in the kernel/irq/ directory: - handle.c: core bits: __do_IRQ() and handle_IRQ_event(), callable from arch-specific irq.c code. - manage.c: the main driver apis - spurious.c: the handling of buggy interrupt sources. - autoprobe.c: probing of interrupts - older code but still in use. - proc.c: /proc/irq/ code. - internals.h for irq-core-internal interfaces not visible to drivers nor arch PIC code. An architecture enables the generic hardirq code by defining CONFIG_GENERIC_HARDIRQS in its arch Kconfig. People doing this conversion should check out the x86/x64/ppc/ppc64 patches for details - the conversion is quite straightforward but every converted function (i.e. every function removed from the arch irq.c) _must_ be matched to the generic version and if there is any detail that the generic code should do it has to be added to the generic code. All of the currently converted 4 architectures were converted like that, and the generic code was extended/fixed along the way. Other changes related to this patchset: - clean up the irq include files (linux/irq.h, linux/interrupt.h, linux/hardirq.h) and consolidate asm-*/[hard]irq.h. Note, to keep all non-touched architectures in an untouched state this consolidation is done carefully and strictly under CONFIG_GENERIC_HARDIRQS. Once the consolidation is done we can do a couple of final cleanups to reach the following logical splitup of 3 include files: linux/interrupt.h: driver-visible APIs and details linux/irq.h: core irq and arch-PIC code, internals asm-*/irq.h: arch PIC and irq delivery details the following include files will likely vanish: linux/hardirq.h merges into linux/irq.h asm-*/hardirq.h: merges into asm-*/irq.h asm-*/hw_irq.h: merges into asm-*/irq.h Christoph would like to do these once the current wave of cleanups gets in. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <mingo@elte.hu> [PATCH] generic irq subsystem: x86 port x86 port of generic hardirq handling. akpm: (in response to build errors) - remove APIC_MISMATCH_DEBUG altogether. Just make it synonymous with CONFIG_X86_IO_APIC - Move the definition of irq_mis_count over to io_apic.c Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <mingo@elte.hu> [PATCH] generic irq subsystem: x86_64 port x86_64 port of generic hardirq handling. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <mingo@elte.hu> [PATCH] generic irq subsystem: ppc port ppc32 port of generic hardirq handling. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <mingo@elte.hu> [PATCH] generic irq subsystem: ppc64 port ppc64 port of generic hardirq handling. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <mingo@elte.hu> [PATCH] doc: remove references to hardirq.c The patch below removes stale references to kernel/hardirq.c in comments, remnants of the earlier iterations of the generic irq subsystem code. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <axboe@suse.de> [PATCH] invalidate page race fix invalidate_inode_pages() and invalidate_inode_pages2() can mark pages not uptodate while read() is trying to read from them. This is interpreted as an I/O error. Fix that by teaching the invalidate code to leave the page alone if someone else has a ref on it. Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <akonovalov@ru.mvista.com> [PATCH] ppc32: Xilinx ML300 board support (very basic) Adds minimal Xilinx ML300 board support (enough to boot with ramdisk). The only peripheral devices supported are 16x50 compatible UARTs. Signed-off-by: Andrei Konovalov <akonovalov@ru.mvista.com> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by: Matt Porter <mporter@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <mporter@kernel.crashing.org> [PATCH] ppc32: use gen550 for PPC44x progress/ppc-stub Use gen550 for early PPC progress messages and for the in-kernel ppc-stub.c on PPC44x. Signed-off-by: Matt Porter <mporter@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <mporter@kernel.crashing.org> [PATCH] ppc32: add gen550.h Add a missing include file for gen550. Signed-off-by: Matt Porter <mporter@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <mporter@kernel.crashing.org> [PATCH] ppc32: configure PPC440GX L2 cache based on CPU rev This patch enables/disables the PPC440GX L2 cache based on errata which prevents reliable operation on certain CPU revisions and speed grades. Signed-off-by: Eugene Surovegin <ebs@ebshome.net> Signed-off-by: Matt Porter <mporter@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paulus@samba.org> [PATCH] ppc32: fix cpu voltage change delay This patch fixes a problem where my new powerbook would sometimes hang or crash when changing CPU speed. We had schedule_timeout(HZ/1000) in there, intended to provide a delay of one millisecond. However, even with HZ=1000, it was (I believe) only waiting for the next jiffy before proceeding, which could be less than a millisecond. Changing the code to use msleep, and specifying a time of 1 jiffy + 1ms has fixed the problem. (When I looked at the msleep code, it appeared to me that msleep(1) with HZ=1000 would sleep for between 0 and 1ms.) Ben also asked me to remove the code that changes the AACK delay enable, after looking in the Darwin sources and seeing that Darwin does not change this in its corresponding code. Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paul.mundt@nokia.com> [PATCH] sh: SH73180 subtype support This adds support for the SH73180 subtype (sh4a). Signed-off-by: Hiroshi DOYU <Hiroshi_DOYU@montavista.co.jp> Signed-off-by: Paul Mundt <paul.mundt@nokia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paul.mundt@nokia.com> [PATCH] sh: SH7705 subtype cleanup + 32k cache support This fixes up the existing SH7705 support and enables the 32k cache mode for the processor. Signed-off-by: Alex Song <songqf9@yahoo.ca> Signed-off-by: Paul Mundt <paul.mundt@nokia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paul.mundt@nokia.com> [PATCH] sh: Use asm-offsets This basically follows the same change as for sh64 and adds asm-offsets to sh. Some hardcoded thread_info struct offsets get cleaned up by this. Signed-off-by: Paul Mundt <paul.mundt@nokia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paul.mundt@nokia.com> [PATCH] sh: consistent API cleanup This gets rid of the hardcoded workarounds for the Dreamcast in the dma-mapping code, and now wraps into the common consistent_alloc() and consistent_free() routines if the ones in the machvec aren't interested in handling it. Signed-off-by: Paul Mundt <paul.mundt@nokia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paul.mundt@nokia.com> [PATCH] sh: defconfig updates Nothing exciting here.. random defconfig updates, as well as a few new ones for microdev and ctp/pci-sh03. Signed-off-by: Paul Mundt <paul.mundt@nokia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paul.mundt@nokia.com> [PATCH] sh: DMA API updates This updates some of the sh DMA drivers and core API. Previously modules had to register for the channels they were interested in, but now it's dealt with transparently by the API with only the number of physical channels needing to be specified by each module. Signed-off-by: Paul Mundt <paul.mundt@nokia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paul.mundt@nokia.com> [PATCH] sh: SCBRR calculation fixes for early printk() The early printk() code was using a fixed PCLK value that was only sane in the SH7750 case. This updates the SCBRR value calculation to use CONFIG_SH_PCLK_FREQ instead and thus works on other subtypes as well (tested on SH4-202). Signed-off-by: Paul Mundt <paul.mundt@nokia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paul.mundt@nokia.com> [PATCH] sh: EDOSK7705 board support This adds support for the edosk7705 board from Renesas. Signed-off-by: Paul Mundt <paul.mundt@nokia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paul.mundt@nokia.com> [PATCH] sh: SH-4 optimized memcpy() This adds support for an SH-4 optimized memcpy(). Written by Stuart Menefy <stuart.menefy@st.com>. Signed-off-by: Paul Mundt <paul.mundt@nokia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paul.mundt@nokia.com> [PATCH] sh: SH4-202 MicroDev board support This adds support for the SH4-202 MicroDev from SuperH, Inc. Signed-off-by: Paul Mundt <paul.mundt@nokia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paul.mundt@nokia.com> [PATCH] sh: cleanup + merge This adds other random bits of sh cleanup. This includes Kconfig updates, some exported symbols to satisfy module builds, cleanup of some whitespace damage, some compile fixes, and some general header and mach-type cleanup. Signed-off-by: Tom Rini <trini@kernel.crashing.org> Signed-off-by: Paul Mundt <paul.mundt@nokia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paul.mundt@nokia.com> [PATCH] sh: PCI updates This updates some of the PCI drivers. SH7751, the sh03 board-specific PCI code, and some ST40 PCI updates are grouped in this. Signed-off-by: Paul Mundt <paul.mundt@nokia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paul.mundt@nokia.com> [PATCH] sh: oprofile support for SH7750/SH7750S The SH7750 and SH7750S have hardware performance counters, this adds an oprofile driver for those. Signed-off-by: Paul Mundt <paul.mundt@nokia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paul.mundt@nokia.com> [PATCH] sh: Broken-out CPU subtype probing Previously we could do subtype parsing and cache configuration in the same location.. but with the introduction of things like the SH7705 where we use SH-3 style probing with SH-4 style caches, this is no longer the case. As such, we move the probe code to a saner place. Signed-off-by: Paul Mundt <paul.mundt@nokia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paul.mundt@nokia.com> [PATCH] sh: SE73180 board support This adds support for the SH73180 Solution Engine. Signed-off-by: Hiroshi DOYU <Hiroshi_DOYU@montavista.co.jp> Signed-off-by: Paul Mundt <paul.mundt@nokia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paul.mundt@nokia.com> [PATCH] sh: CTP/PCI-SH03 board support This adds support for the CTP/PCI-SH03 board from Interface. Signed-off-by: Saito.K <ksaito@interface.co.jp> Signed-off-by: Paul Mundt <paul.mundt@nokia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paul.mundt@nokia.com> [PATCH] sh: sh-sci updates sh-sci updates all around the board. Support for the newly added subtypes, some compilation cleanups, etc. Signed-off-by: Paul Mundt <paul.mundt@nokia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paul.mundt@nokia.com> [PATCH] sh: ST40 updates This includes some ST40 updates from the ST tree. The most notable change is the ST40GX1 fixes for INTC2-based interrupts. Signed-off-by: Alex Bennee <kernel-hacker@bennee.com> Signed-off-by: Paul Mundt <paul.mundt@nokia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <trini@kernel.crashing.org> [PATCH] sh: fix EMBEDDED_RAMDISK with O= The following fixes EMBEDDED_RAMDISK to work with O=. The problem was that we couldn't find the linker script, since we needed to specify the patch to the source tree for it. I've tested this with the ramdisk set to both 'ramdisk.gz' and '../ramdisk.gz'. Signed-off-by: Tom Rini <trini@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <suresh.b.siddha@intel.com> [PATCH] share i386/x86_64 intel cache descriptors table Some cache descriptors are missing from x86_64 table. So instead of copying from i386 code, here is a patch to share the table between i386 and x86_64. Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <oleg@tv-sign.ru> [PATCH] Fix show_trace() in irq context with CONFIG_4KSTACKS - valid_stack_ptr() erroneously assumes that stack always lives in task_struct->thread_info. - the main loop in show_trace() does not recalc ebp after stack switching. With CONFIG_FRAME_POINTER every call to print_context_stack() will produce the same output. With this patch, show_trace() does not use task argument in the main loop. Instead, it converts stack to thread_info* context, and passes it to print_context_stack() and (implicitly) to valid_stack_ptr(). valid_stack_ptr() now does bounds checking against proper context. Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <suresh.b.siddha@intel.com> [PATCH] Disable SW irqbalance/irqaffinity for E7520/E7320/E7525 v2 As part of the workaround for the "Interrupt message re-ordering across hub interface" errata (page #16 in http://developer.intel.com/design/chipsets/specupdt/30288...), BIOS may enable hardware IRQ balancing for E7520/E7320/E7525(revision ID 0x9 and below) based platforms. Add pci quirks to disable SW irqbalance/affinity on those platforms. Move balanced_irq_init() to late_initcall so that kirqd will be started after pci quirks. Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <mingo@elte.hu> [PATCH] fix nosmp & pcibios_fixup_irqs() interaction Fix interaction between nosmp and pcibios_fixup_irqs(). When we boot with nosmp we dont have all the mptable info, so IO_APIC_get_PCI_irq_vector() doesnt work and devices just end up getting a wrong interrupt. From: Oleg Nesterov <oleg@tv-sign.ru> Acked-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <rddunlap@osdl.org> [PATCH] i386/io_apic init section fixups Code section errors in i386/io_apic.c found by scripts/reference_init.pl. Looks like they could cause problems for a few drivers or in a real hotplug environment. Error: ./arch/i386/kernel/io_apic.o .text refers to 000018ff R_386_PC32 .init.text call chain: snd_mpu401_acpi_resource acpi_register_gsi mp_register_gsi io_apic_set_pci_routing {A} ioapic_register_intr IO_APIC_irq_trigger find_irq_entry Error: ./arch/i386/kernel/io_apic.o .text refers to 00001967 R_386_PC32 .init.text (as above thru {A}, then:) IO_APIC_irq_trigger irq_trigger MPBIOS_trigger >> removing __init from this led to needing to remove __init from EISA_ELCR also. Signed-off-by: Randy Dunlap <rddunlap@osdl.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <pavel@ucw.cz> [PATCH] swsusp: fix process start times after resume Currently, process start times change after swsusp (because they are derived from jiffies and current time, oops). This should fix it. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <pavel@ucw.cz> [PATCH] swsusp: add comments at critical places apm.c needs save_processor_state and friends. Add a comment to keep people from removing it. Describe a way to make swsusp work on non-PSE machines. Document purpose of acpi_restore_state. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <pavel@ucw.cz> [PATCH] swsusp: Documentation update Documentation update. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <oliver@neukum.org> [PATCH] additional documentation for power management This is additional documentation for power management. Pavel Machek has given his acknowledgement. Signed-Off-By: Oliver Neukum <oliver@neukum.name> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <venkatesh.pallipadi@intel.com> [PATCH] S3 suspend/resume with noexec v2 This patch is required for S3 suspend-resume on noexec capable systems. On these systems, we need to save and restore MSR_EFER during S3 suspend-resume. Signed-off-by: "Venkatesh Pallipadi" <venkatesh.pallipadi@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <agx@sigxcpu.org> [PATCH] Mac swsusp driver fixes Allow swsusp work with macintosh's own thermal sensor drivers enabled. Contributions from Nathan Hand <nathanh@manu.com.au> Signed-Of-By: Guido Guenther <agx@sigcpu.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <takata@linux-m32r.org> [PATCH] m32r: ds1302 driver This is a DS1302 real-time clock driver. It is moved from arch/m32r/drivers/, has been originally taken from arch/cris/arch-v10/drivers/ds1302.c. Currently, this driver supports only m32r target boards. Maybe some work will be required to support other target. Signed-off-by: Hayato Fujiwara <fujiwara@linux-m32r.org> Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <takata@linux-m32r.org> [PATCH] m32r: new CF/PCMCIA driver for m32r This patch is for the new M32R CF/PCMCIA drivers. It is moved from arch/m32r/drivers/ and some part are updated for 2.6 kernel. Signed-off-by: Hayato Fujiwara <fujiwara@linux-m32r.org> Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <takata@linux-m32r.org> [PATCH] m32r: update include/asm-m32r/m32102.h Here is a patch to update include/asm-m32r/m32102.h. * include/asm-m32r/m32102.h: - Add macro definitions for DMA controller. - Cosmetics; rearrange indentations. Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <takata@linux-m32r.org> [PATCH] m32r: AR camera driver Here is a patch for the Renesas AR camera driver for m32r. - AR (artificial retina) camera is newly supported. AR camera module: Renesas M64278E-800, VGA(640x480 pixcels) http://www.renesas.com/avs/resource/japan/jpn/pdf/assp/rj... Signed-off-by: Hayato Fujiwara <fujiwara@linux-m32r.org> Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <takata@linux-m32r.org> [PATCH] m32r: SIO driver Here is a patch to support the M32R SIO (serial IO) driver. This driver supports the M32R serial ports. - Supports two types M32R serial interfaces; M32R_SIO and M32R_PLDSIO. - With SMP safeness. Currently the M32R_PLDSIO serial interface, which is implemented on a PLD on the M3T-M32700UT evaluation board, has slightly different specification from the integrated peripheral SIO (M32R_SIO). Now we can select them by CONFIG_ option. It is a serial-core based driver, based on drivers/serial/8250.c. Any comments or suggestions will be appreciated. Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <takata@linux-m32r.org> [PATCH] m32r: fix sys_tas system call for m32r This patch fixes a sys_tas system call for m32r. - This patch fixes an Oops at sys_tas() in case CONFIG_SMP && CONFIG_PREEMPT. > Unable to handle kernel paging request at virtual address XXXXXXXX It is because a page fault happens at the spin_locked region in sys_tas() and in_atomic() checks preempt_count, but spin_lock() already counts up the preemt_count. arch/m32r/kernel/sys_m32r.c: 32 /* 33 * sys_tas() - test-and-set 34 * linuxthreads testing version 35 */ 36 #ifndef CONFIG_SMP 37 asmlinkage int sys_tas(int *addr) 38 { 39 int oldval; 40 unsigned long flags; 41 42 if (!access_ok(VERIFY_WRITE, addr, sizeof (int))) 43 return -EFAULT; 44 local_irq_save(flags); 45 oldval = *addr; 46 *addr = 1; 47 local_irq_restore(flags); 48 return oldval; 49 } 50 #else /* CONFIG_SMP */ 51 #include <linux/spinlock.h> 52 53 static spinlock_t tas_lock = SPIN_LOCK_UNLOCKED; 54 55 asmlinkage int sys_tas(int *addr) 56 { 57 int oldval; 58 59 if (!access_ok(VERIFY_WRITE, addr, sizeof (int))) 60 return -EFAULT; 61 62 spin_lock(&tas_lock); 63 oldval = *addr; /* <<< ATTENTION >>> * A page fault may happen here, because "addr" points an * user-space area. */ 64 *addr = 1; 65 spin_unlock(&tas_lock); 66 67 return oldval; 68 } 69 #endif /* CONFIG_SMP */ arch/mm/fault.c: 137 /* 138 * If we're in an interrupt or have no user context or are runni ng in an 139 * atomic region then we must not take the fault.. 140 */ 141 if (in_atomic() || !mm) 142 goto bad_area_nosemaphore; - sys_tas() is used for user-level mutual exclusion for the m32r, which is prepared to implement a linuxthreads library. The above problem may be happened in a program, which uses pthread_mutex_lock(), calls sys_tas(). The current m32r instruction set has no user-level locking functions for mutual exclusion. # I hope it will be fixed in the future... - This patch fixes the problem by using _raw_spin_lock() instead of spin_lock(). spin_lock() increments up preemt_count, on the contrary, _raw_sping_lock() does not. # I think this fix is just a temporary work around, and # it is preferable to be rewrite to make it simpler by using # asm() function or something... * arch/m32r/kernel/sys_m32r.c: - Fix sys_tas() for CONFIG_SMP && CONFIG_PREEMPT. Signed-off-by: Hayato Fujiwara <fujiwara@linux-m32r.org> Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <takata@linux-m32r.org> [PATCH] m32r: update arch/m32r/mm/fault.c to fix a compile error Here is a patch to update arch/m32r/mm/fault.c in order to fix a compile error of -mm kernel for m32r. * arch/m32r/mm/fault.c: - Add the third parameter of expand_stack(). This modification is derived from enforce-a-gap-between-heap-and-stack.patch; "heap-stack-gap for 2.6" (Sep. 25, 2004) http://www.uwsg.iu.edu/hypermail/linux/kernel/0409.3/0435... Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <takata@linux-m32r.org> [PATCH] m32r: fix a compile error of M32R SIO driver Here is a patch to fix a compile error of m32r-sio.c. * include/asm-m32r/termbits.h: - Add CTVB definition. This modification is derived from new-serial-flow-control.patch; "[Patch] new serial flow control" (Oct. 4, 2004) http://www.uwsg.iu.edu/hypermail/linux/kernel/0410.0/0853... Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <blaisorblade_spam@yahoo.it> [PATCH] uml: readd linux Makefile target Since people are used to doing "make linux ARCH=um" and to use "linux" as the kernel image, make it be an hard link to vmlinux. This should hurt the less possible the users (actually nothing) while not slowing down the build. Acked-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <aherrman@de.ibm.com> [PATCH] s390: zfcp host adapter zfcp host adapter change: - Return -EIO if wait_event_interruptible_timeout was interrupted. - Reduce stack uage of zfcp_cfdc_dev_ioctl. - Make zfcp_sg_list_[alloc,free] more consistent. - Store driver version to zfcp_data structure. - Add missing FSF states and make corresponding log messages consistent. - Always wait for completion in zfcp_scsi_command_sync. - Add Andreas to authors list. - Add timeout for cfdc upload/download. - Add support for temporary units (units not registered to the scsi stack). - Allow sending of ELS commands to ports by their d_id. - Increase port refcount while link test is running. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <schwidefsky@de.ibm.com> [PATCH] s390: qeth layer 2 support From: Frank Pavlic <pavlic@de.ibm.com> From: Thomas Spatzier <tspat@de.ibm.com> qeth network driver changes: - Add Layer 2 support for OSA-Express. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <arndb@de.ibm.com> [PATCH] s390: z/VM watchdog timer Add support for z/VM watchdog timer. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <wein@de.ibm.com> [PATCH] s390: z/VM log reader Add an interface to read from the z/VM recording system services. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <edrossma@us.ibm.com> [PATCH] s390: crypto device driver crypto driver changes: - Add support for zero-pad and crypto express II (CEX2C). Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <geraldsc@de.ibm.com> [PATCH] s390: add support to read z/VM monitor records Add support to read z/VM monitor records. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jeffm@novell.com> [PATCH] ReiserFS: Cleanup internal use of bh macros This patch cleans up ReiserFS's use of buffer head flags. All direct access of BH_* are made into macro calls, and all reiserfs-specific BH_* macro implementations have been removed and replaced with the BUFFER_FNS implementations found in linux/buffer_head.h Signed-off-by: Jeff Mahoney <jeffm@novell.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jeffm@novell.com> [PATCH] ReiserFS: Cleanup access of journal (cosmetic) This patch cleans up fs/reiserfs/journal.c such that repeated uses of SB_JOURNAL(p_s_sb) are removed in favor of a local journal variable. The compiler won't care, and it makes the code much easier to read. Signed-off-by: Jeff Mahoney <jeffm@novell.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jeffm@novell.com> [PATCH] ReiserFS: Add I/O error handling to journal operations This patch allows ReiserFS to handle I/O errors in the journal (or journal flush) where it would have previously panicked. The new behavior is to mark the filesystem read-only, disallow new transactions to be started, and to allow existing transactions to complete (though not to commit). The resultant filesystem can be safely umounted, and checked via normal mechanisms. As it is a journaling filesystem, the filesystem itself will be in a similar state to the power being cut to the machine, once umounted. Signed-off-by: Jeff Mahoney <jeffm@novell.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jeffm@novell.com> [PATCH] ReiserFS: Fix several missing reiserfs_write_unlock calls This patch fixes several missing reiserfs_write_unlock() calls on error paths not introduced by reiserfs-io-error-handling.diff Signed-off-by: Jeff Mahoney <jeffm@novell.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <vladimir.grouzdev@Jaluna.COM> [PATCH] xtime value may become incorrect The xtime value may become incorrect when the update_wall_time(ticks) function is called with "ticks" > 1. In such a case, the xtime variable is updated multiple times inside the loop but it is normalized only once outside of the loop. This bug was reported at: http://bugme.osdl.org/show_bug.cgi?id=3403 Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <nickpiggin@yahoo.com.au> [PATCH] sched: trivial sched changes The following patches properly intergrate sched domains and cpu hotplug (using Nathan's code), by having sched-domains *always* only represent online CPUs, and having hotplug notifier to keep them up to date. Then tackle Jesse's domain setup problem: the disjoint top-level domains were completely broken. The group-list builder thingy simply can't handle distinct sets of groups containing the same CPUs. The code is ugly and specific enough that I'm re-introducing the arch overridable domains. I doubt we'll get a proliferation of implementations, because the current generic code can do the job for everyone but SGI. I'd rather take a look at it again down the track if we need to rather than try to shoehorn this into the generic code. Nathan and I have tested the hotplug work. He's happy with it. I've tested the disjoint domain stuff (copied it to i386 for the test), and it does the right thing on the NUMAQ. I've asked Jesse to test it as well, but it should be fine - maybe just help me out and run a test compile on ia64 ;) This really gets sched domains into much better shape. Without further ado, the patches. This patch: Make a definition static and slightly sanitize ifdefs. Signed-off-by: Nick Piggin <nickpiggin@yahoo.com.au> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <nickpiggin@yahoo.com.au> [PATCH] sched: add CPU_DOWN_PREPARE notifier Add a CPU_DOWN_PREPARE hotplug CPU notifier. This is needed so we can dettach all sched-domains before a CPU goes down, thus we can build domains from online cpumasks, and not have to check for the possibility of a CPU coming up or going down. Signed-off-by: Nick Piggin <nickpiggin@yahoo.com.au> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <nickpiggin@yahoo.com.au> [PATCH] sched: integrate cpu hotplug and sched domains Register a cpu hotplug notifier which reinitializes the scheduler domains hierarchy. The notifier temporarily attaches all running cpus to a "dummy" domain (like we currently do during boot) to avoid balancing. It then calls arch_init_sched_domains which rebuilds the "real" domains and reattaches the cpus to them. Also change __init attributes to __devinit where necessary. Signed-off-by: Nathan Lynch <nathanl@austin.ibm.com> Alterations from Nick Piggin: * Detach all domains in CPU_UP|DOWN_PREPARE notifiers. Reinitialise and reattach in CPU_ONLINE|DEAD|UP_CANCELED. This ensures the domains as seen from the scheduler won't become out of synch with the cpu_online_map. * This allows us to remove runtime cpu_online verifications. Do that. * Dummy domains are __devinitdata. * Remove the hackery in arch_init_sched_domains to work around the fact that the domains used to work with cpu_possible maps, but node_to_cpumask returned a cpu_online map. Signed-off-by: Nick Piggin <nickpiggin@yahoo.com.au> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <akpm@osdl.org> [PATCH] sched: arch_destroy_sched_domains warning fix kernel/sched.c:4114: warning: `arch_destroy_sched_domains' defined but not used Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <nickpiggin@yahoo.com.au> [PATCH] sched: sched add load balance flag Introduce SD_LOAD_BALANCE flag for domains where we don't want to do load balancing (so we don't have to set up meaningless spans and groups). Use this for the initial dummy domain, and just leave isolated CPUs on the dummy domain. Signed-off-by: Nick Piggin <nickpiggin@yahoo.com.au> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <nickpiggin@yahoo.com.au> [PATCH] sched: remove disjoint NUMA domains setup Remove the disjoint NUMA domains setup code. It was broken. Signed-off-by: Nick Piggin <nickpiggin@yahoo.com.au> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <nickpiggin@yahoo.com.au> [PATCH] sched: make domain setup overridable Allow sched domain setup to be overridden by arch code. This functionality is needed again. From: Paul Jackson <pj@sgi.com> Builds of 2.6.9-rc1-mm5 ia64 NUMA configs fail, with many complaints that SD_NODE_INIT is defined twice, in asm/processor.h and linux/sched.h. I guess that the preprocessor conditionals were wrong when Nick added the per-arch override ability again of SD_NODE_INIT were wrong. At least this change lets me rebuild ia64 again. Signed-off-by: Nick Piggin <nickpiggin@yahoo.com.au> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Paul Jackson <pj@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <nickpiggin@yahoo.com.au> [PATCH] sched: IA64 add disjoint NUMA domain support Implement disjoint NUMA domain setup for IA64 architecture. Most of the code was what was ripped out of kernel/sched.c, which was written by Jesse Barnes <jbarnes@sgi.com>. I fixed up the tricky NUMA groups initialistion. Signed-off-by: Nick Piggin <nickpiggin@yahoo.com.au> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <nickpiggin@yahoo.com.au> [PATCH] sched: fix domain debug for isolcpus Fix an oops in the domain debug code when isolated CPUs are specified. Introduced by 5/8 "sched add load balance flag" Signed-off-by: Nick Piggin <nickpiggin@yahoo.com.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <nickpiggin@yahoo.com.au> [PATCH] sched: enable SD_LOAD_BALANCE Actually turn on SD_LOAD_BALANCE for the regular domains. Introduced by 5/8 "sched add load balance flag". Signed-off-by: Nick Piggin <nickpiggin@yahoo.com.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <nickpiggin@yahoo.com.au> [PATCH] sched: hotplug add a CPU_DOWN_FAILED notifier Introduce CPU_DOWN_FAILED notifier, so we can cope with a failure after a CPU_DOWN_PREPARE notice. This fixes 3/8 "add CPU_DOWN_PREPARE notifier" to be useful Signed-off-by: Nick Piggin <nickpiggin@yahoo.com.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <nickpiggin@yahoo.com.au> [PATCH] sched: use CPU_DOWN_FAILED notifier Use CPU_DOWN_FAILED notifier in the sched-domains hotplug code. This goes with 4/8 "integrate cpu hotplug and sched domains" Signed-off-by: Nick Piggin <nickpiggin@yahoo.com.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <nickpiggin@yahoo.com.au> [PATCH] sched: fixes for ia64 domain setup Still having some trouble with ia64 domain setup on the Altixes. Jesse hasn't had much time to look into it, and I'm lacking an Altix, so I'm not sure if this is right or not... Anyway, it again does the right thing on the NUMAQ, and fixes some real bugs, so can you include it please? * Increase SD_NODES_PER_DOMAIN to 6 from 4 to better match Altix's topology. A setting of 4 will include this node, the other one in the brick, and the 2 nodes in the next closest brick, while 6 will catch 2 other bricks. Probably it could be increased even more. * Work correctly with sparse and not completely full node maps. * Nasty typo fixed in find_next_best_node: - val = node_distance(node, i); + val = node_distance(node, n); * Ensure all nodes are themselves a member of their numa balancing domain. This is more a precaution against creative implementations of node_distance.. but it makes the setup easier to verify without having to look at a table of node_distance's, which is possibly generated at runtime. So again, I'm not too sure if this will fix the Altix setup or not. But if you do a release, it will surely be less broken than it was before. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <akpm@osdl.org> [PATCH] sched: print preempt count Better debugging output when the CPU scheduler detects atomicity errors. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <pwil3058@bigpond.net.au> [PATCH] CPU Scheduler: fix potential error in runqueue nr_uninterruptible count Problem: In the function try_to_wake_up(), when the runqueue's nr_uninterruptible field is decremented it's possible (on SMP systems) that the pointer no longer points to the runqueue that the task being woken was on when it went to sleep. This would cause the wrong runqueue's field to be decremented and the correct one tp remain unchanged. Fix: Save a pointer to the old runqueue at the beginning of the function and use it when decrementing nr_uninterruptible. Signed-off-by: Peter Williams <pwil3058@bigpond.net.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <colpatch@us.ibm.com> [PATCH] sched_domains: Make SD_NODE_INIT per-arch #2 Here's yet another version of a patch to implement per-arch SD_*_INITs. This follows the same basic idea of my last patch, but 1) defines an arch-specific SD_NODE_INIT for the 4 NUMA arches (i386, x86_64, IA64 & PPC64), 2) defines *default* SD_CPU_INIT & SD_SIBLING_INIT for *all* arches, with the possibility of them being overridden by simply defining an arch-specific version in include/asm/topology.h. The motivation behind the third version of this patch is that Martin feels that there should be no "default" NUMA initializer because NUMA characteristics are *very* arch/platform specific, and hence a "default" NUMA initializer can only lead to confusion. I agree with most of that, but don't quite see as much harm in having a default as he does. Nevertheless, to keep him quiet, I've run up this version of the patch. Martin, please run this through your magic test suite and make sure I didn't break anything trivial. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <colpatch@us.ibm.com> [PATCH] sched: remove NODE_BALANCE_RATE definitions NODE_BALANCE_RATE is defined all over the place, but used nowhere. Let's remove it. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <mingo@elte.hu> [PATCH] sched: fix SCHED_SMT & numa=fake=2 lockup This patch fixes an interaction between the numa=fake=<domains> feature, the domain setup code and cpu_siblings_map[]. The bug leads to a bootup crash when using numa=fake=2 on a 2-way/4-way SMP+HT box. When SCHED_SMT is turned on the domains-setup code relies on siblings not spanning multiple domains (which makes perfect sense). But numa=fake=2 creates an assymetric 1101/0010 splitup between CPUs, which results in two siblings being on different nodes. The patch adds a check_siblings_map() function that checks the sibling maps and fixes them up if they violate this rule. (it also prints a warning in that case.) The patch also turns SCHED_DOMAIN_DEBUG back on - had this been enabled we'd have noticed this bug much earlier. From: Badari Pulavarty <pbadari@us.ibm.com> arch/x86_64/mm/numa.c: In function `numa_setup': arch/x86_64/mm/numa.c:332: error: `numa_fake' undeclared (first use in this function) arch/x86_64/mm/numa.c:332: error: (Each undeclared identifier is reported only once arch/x86_64/mm/numa.c:332: error: for each function it appears in.) Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <mingo@elte.hu> [PATCH] fix & clean up zombie/dead task handling & preemption This patch fixes all the preempt-after-task->state-is-TASK_DEAD problems we had. Right now, the moment procfs does a down() that sleeps in proc_pid_flush() [it could] our TASK_DEAD state is zapped and we might be back to TASK_RUNNING to and we trigger this assert: schedule(); BUG(); /* Avoid "noreturn function does return". */ for (;;) ; I have split out TASK_ZOMBIE and TASK_DEAD into a separate p->exit_state field, to allow the detaching of exit-signal/parent/wait-handling from descheduling a dead task. Dead-task freeing is done via PF_DEAD. Tested the patch on x86 SMP and UP, but all architectures should work fine. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <axboe@suse.de> [PATCH] return full SCSI status byte in SG_IO This has been around for a while. Return the full scsi result byte in rq->errors for SG_IO generated requests. Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <torvalds@ppc970.osdl.org> Fix old-style fn declaration. <torvalds@ppc970.osdl.org> Don't use obsolete gcc named initializer syntax. The proper C99 syntax is much preferred. <torvalds@ppc970.osdl.org> Fix pci config syscall definitions. Including the proper header file showed that they didn't match the declared prototypes. <rmk@flint.arm.linux.org.uk> [SERIAL] Add FCR setting to serial8250_config structure. This allows us to adapt the FCR for each port type in a much more flexible way, and allows us to set the transmit trigger levels. <rmk@flint.arm.linux.org.uk> [SERIAL] Convert TI16C750 flow control into a port capability. Add UART_CAP_AFE, and use this to enable TI16C750 flow control, but only if we have 32 bytes or more of FIFO. <rmk@flint.arm.linux.org.uk> [SERIAL] Add comment about frobbing the 950's ACR on TX disable. Add a bit of explaination why we only turn off the transmitter if we are called from uart_stop(). <rmk@flint.arm.linux.org.uk> [SERIAL] Clean up handling of LSR in receive function. It's pointless accessing the LSR value via a pointer all the time - it prevents the compiler optimising it. Also, ensure that we recognise a break sent during a kernel printk correctly. <rmk@flint.arm.linux.org.uk> [SERIAL] Add explaination why we don't use RTS flow control. <greg@kroah.com> USB: add serial ipw driver Based on a 2.4 tty usb driver from Roelf Diedericks <roelfd@inet.co.za> Cleaned up and ported to 2.6 and the usb-serial layer by me. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <rmk@flint.arm.linux.org.uk> [SERIAL] Make port autoprobing set up->capabilities. Convert port autoprobing to set up->capabilities as it discovers various capabilities of the port. Warn when the detected capabilities do not match those in the uart_config table. <rmk@flint.arm.linux.org.uk> [SERIAL] Add new port registration/unregistration functions. serial8250_register_port()/serial8250_unregister_port() has the capability of registering ports with their struct device nodes, which allows sysfs to indicate which tty devices belong to which hardware devices. We also add a serial8250 platform device driver in an initial attempt at PM for ISA ports. However, I'm leaving out the platform device for the time being since adding that would cause potential oops issues. <petero2@telia.com> [PATCH] DVD+RW support This patch adds support for using DVD+RW drives as writable block devices. The patch is based on work from: Andy Polyakov <appro@fy.chalmers.se> - Wrote the 2.4 patch Nigel Kukard <nkukard@lbsd.net> - Initial porting to 2.6.x It works for me using an Iomega Super DVD 8x USB drive. Nov 5 2001, Aug 8 2002. Modified by Andy Polyakov <appro@fy.chalmers.se> to support MMC-3 complaint DVD+RW units. Modified by Nigel Kukard <nkukard@lbsd.net> - support DVD+RW 2.4.x patch by Andy Polyakov <appro@fy.chalmers.se> This patch implements CDRW packet writing as a kernel block device. Usage instructions are in the packet-writing.txt file. A hint: If you don't want to wait for a complete disc format, you can format just a part of the disc. For example: cdrwtool -d /dev/hdc -m 10240 This will format 10240 blocks, ie 20MB. Signed-off-by: Peter Osterlund <petero2@telia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <petero2@telia.com> [PATCH] packet-writing: add credits Nigel pointed out that the earlier patches contained attributions that are not present in this patch. The 2.4 patch contains: Nov 5 2001, Aug 8 2002. Modified by Andy Polyakov <appro@fy.chalmers.se> to support MMC-3 complaint DVD+RW units. and Nigel changed it to this in his 2.6 patch: Modified by Nigel Kukard <nkukard@lbsd.net> - support DVD+RW 2.4.x patch by Andy Polyakov <appro@fy.chalmers.se> The patch I sent you deleted most of the earlier work and moved the rest to cdrom.c, but the comments were not moved over, since the earlier authors didn't modify cdrom.c. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <petero2@telia.com> [PATCH] CDRW packet writing support This patch implements CDRW packet writing as a kernel block device. Usage instructions are in the packet-writing.txt file. A hint: If you don't want to wait for a complete disc format, you can format just a part of the disc. For example: cdrwtool -d /dev/hdc -m 10240 This will format 10240 blocks, ie 20MB. Signed-off-by: Peter Osterlund <petero2@telia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <petero2@telia.com> [PATCH] cdrom: buffer sizing fix The problem is that some drives fail the "GET CONFIGURATION" command when asked to only return 8 bytes. This happens for example on my drive, which is identified as: hdc: HL-DT-ST DVD+RW GCA-4040N, ATAPI CD/DVD-ROM drive Since the cdrom_mmc3_profile() function already allocates 32 bytes for the reply buffer, this patch is enough to make the command succeed on my drive. Signed-off-by: Peter Osterlund <petero2@telia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <colpatch@us.ibm.com> [PATCH] Create nodemask_t The idea behind this patch is to create a nodemask_t as a node analog of cpumask_t. As NUMA machines become more common, the need for a standard, cross-platform bitmap of both online & possible nodes becomes more apparent. We believe we've worked out most of the kinks of the variable length bitmap types with the recent cpumask_t patches. Nodemasks are also currently far less widespread than cpumasks. Further, inclusion at this point in the kernel would mean consistency in node handling between 2.6 and 2.7. Future goals would be to get rid of the 'numnodes' variable used to count the number of online nodes, and replace with node_online_map. This would allow arbitrary node numbering and facilitate node hotplugging. (Nothing actually uses this yet, but several projects need it, and it does model a well-defined physical grouping). Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <akpm@osdl.org> [PATCH] reiserfs: rename struct key Rename resierfs's `struct key' to `struct reiserfs_key' to avoid namespace clashes. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <dhowells@redhat.com> [PATCH] Add some key management specific error codes Here's a patch to add some new error codes specific to key management. Signed-Off-By: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <dhowells@redhat.com> [PATCH] keys: new error codes for Alpha, MIPS, PA-RISC, Sparc & Sparc64 The attached patch adds the new error codes I added for key-related errors to those archs that don't make use of <asm-generic/errno.h>, including Alpha, MIPS, PA-RISC, Sparc and Sparc64. This is required to compile with CONFIG_KEYS on those platforms. Signed-Off-By: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <dhowells@redhat.com> [PATCH] implement in-kernel keys & keyring management The feature set the patch includes: - Key attributes: - Key type - Description (by which a key of a particular type can be selected) - Payload - UID, GID and permissions mask - Expiry time - Keyrings (just a type of key that holds links to other keys) - User-defined keys - Key revokation - Access controls - Per user key-count and key-memory consumption quota - Three std keyrings per task: per-thread, per-process, session - Two std keyrings per user: per-user and default-user-session - prctl() functions for key and keyring creation and management - Kernel interfaces for filesystem, blockdev, net stack access - JIT key creation by usermode helper There are also two utility programs available: (*) http://people.redhat.com/~dhowells/keys/keyctl.c A comprehensive key management tool, permitting all the interfaces available to userspace to be exercised. (*) http://people.redhat.com/~dhowells/keys/request-key An example shell script (to be installed in /sbin) for instantiating a key. Signed-Off-By: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <pmarques@grupopie.com> [PATCH] kallsyms data size reduction / lookup speedup This patch is an improvement over my first kallsyms speedup patch posted about 2 weeks ago. It changes scripts/kallsyms as to produce a different format for kallsyms_names and extra data to speedup lookups. The compression algorithm is quite simple: it uses all the char codes not actually used in symbols to build a lookup table that translates these codes into small strings. For instance, in my test runs the code 0xFE was being translated into "acpi_" giving a 4 byte save on every translation. The advantage of this algorithm is that to translate a symbol we only require information that is stored on that symbol position, and never need to go back on the compressed stream to get information from other symbols. To give an idea about the benefits of this algorithm here are some benchmark results on a P4 2.8GHz with a symbol table with 10000 entries: kallsyms_lookup average time: vanilla 1346.0 us speedup 14.4 us with this patch 0.5 us total data produced by scripts/kallsyms: uncompressed 169 Kb vanilla 134 Kb with this patch 91 Kb (speedup was my latest patch, that only changed the way kallsyms_lookup worked and not the data format) I removed a cond_resched() from the proc/kallsyms handling code path, because using stem compression, if the current position went backwards, the hole stream would be uncompressed up to the current position. It seemed that by removing this loop it would be safe to remove the conditional reschedule altogether. There is just one catch with this patch: the time it takes to compile the kernel goes up just a bit (about 0.8s on a P4 2.8GHz with defconfig). If this delay is not acceptable I can change the compression algorithm so that it can use the previous table (calculating a new table is what consumes most of the time, and not doing the actual compression) and check to see if it obtains a similar compression ratio. If it does, then this is a sign that the symbol patterns haven't changed that much and this table is still good to use. This would not only cut the time down to half on any compilation (because of the 2 pass symbol build method), but in frequent cases where a developer is compiling a single file and linking everything over and over again, the table optimization process would never run. I'm CC'ing Brent Casavant on this email, because last june he sent a patch trying a different approach that used a 32 entry symbol cache, because there was a problem with the time "top" took to read "proc/<pid>/wchan". I was hopping he would be willing to test this patch and comment on the results. Signed-off-by: Paulo Marques <pmarques@grupopie.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <od@suse.de> [PATCH] TIOCCONS security The ioctl TIOCCONS allows any user to redirect console output to another tty. This allows anyone to suppress messages to the console at will. AFAIK nowadays not many programs write to /dev/console, except for start scripts and the kernel (printk() above console log level). Still, I believe that administrators and operators would not like any user to be able to hijack messages that were written to the console. The only user of TIOCCONS that I am aware of is bootlogd/blogd, which runs as root. Please comment if there are other users. Is there any reason why normal users should be able to use TIOCCONS? Otherwise I would suggest to restrict access to root (CAP_SYS_ADMIN), e.g. with this patch. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <wli@holomorphy.com> [PATCH] move waitqueue functions to kernel/wait.c The following patch series consolidates the various instances of waitqueue hashing to use a uniform structure and share the per-zone hashtable among all waitqueue hashers. This is expected to increase the number of hashtable buckets available for waiting on bh's and inodes and eliminate statically allocated kernel data structures for greater node locality and reduced kernel image size. Some attempt was made to look similar to Oleg Nesterov's suggested API in order to provide some kind of credit for independent invention of something very similar (the original versions of these patches predated my public postings on the subject of filtered waitqueues). These patches have the further benefit and intention of enabling aio to use filtered wakeups by standardizing the data structure passed to wake functions so that embedded waitqueue elements in aio structures may be succesfully passed to the filtered wakeup wake functions, though this patch series doesn't implement that particular functionality. Successfully stress-tested on x86-64, and ia64 in recent prior versions. This patch: Move waitqueue -related functions not needing static functions in sched.c to kernel/wait.c Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <wli@holomorphy.com> [PATCH] standardize bit waiting data type Eliminate specialized page and bh waitqueue hashing structures in favor of a standardized structure, using wake_up_bit() to wake waiters using the standardized wait_bit_key structure. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <wli@holomorphy.com> [PATCH] consolidate bit waiting code patterns Consolidate bit waiting code patterns for page waitqueues using __wait_on_bit() and __wait_on_bit_lock(). Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <wli@holomorphy.com> [PATCH] eliminate bh waitqueue hashtable Eliminate the bh waitqueue hashtable using bit_waitqueue() via wait_on_bit() and wake_up_bit() to locate the waitqueue head associated with a bit. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <wli@holomorphy.com> [PATCH] eliminate inode waitqueue hashtable Eliminate the inode waitqueue hashtable using bit_waitqueue() via wait_on_bit() and wake_up_bit() to locate the waitqueue head associated with a bit. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <wli@holomorphy.com> [PATCH] move wait ops' contention case completely out of line Move the slow paths of wait_on_bit() and wait_on_bit_lock() out of line. Also uninline wake_up_bit() to reduce the number of callsites generated, and adjust loop startup in __wait_on_bit_lock() to properly reflect its usage in the contention case. Incremental atop the fastcall and wait_on_bit_lock()/test_and_set_bit() fixes. Successfully tested on x86-64. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <wli@holomorphy.com> [PATCH] reduce number of parameters to __wait_on_bit() and __wait_on_bit_lock() Some of the parameters to __wait_on_bit() and __wait_on_bit_lock() are redundant, as the wait_bit_queue parameter holds the flags word and the bit number. This patch updates __wait_on_bit() and __wait_on_bit_lock() to fetch that information from the wait_bit_queue passed to them and so reduce the number of parameters so that -mregparm may be more effective. Incremental atop the complete out-of-lining of the contention cases and the fastcall and wait_on_bit_lock()/test_and_set_bit() fixes. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <wli@holomorphy.com> [PATCH] document wake_up_bit()'s requirement for preceding memory barriers Document the requirement to use a memory barrier prior to wake_up_bit(). Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <akpm@osdl.org> [PATCH] jbd wakeup fix Processes can sleep in do_get_write_access(), waiting for buffers to be removed from the BJ_Shadow state. We did this by doing a wake_up_buffer() in the commit path and sleeping on the buffer in do_get_write_access(). With the filtered bit-level wakeup code this doesn't work properly any more - the wake_up_buffer() accidentally wakes up tasks which are sleeping in lock_buffer() as well. Those tasks now implicitly assume that the buffer came unlocked. Net effect: Bogus I/O errors when reading journal blocks, because the buffer isn't up to date yet. Hence the recently spate of journal_bmap() failure reports. The patch creates a new jbd-private BH flag purely for this wakeup function. So a wake_up_bit(..., BH_Unshadow) doesn't wake up someone who is waiting for a wake_up_bit(BH_Lock). JBD was the only user of wake_up_buffer(), so remove it altogether. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <akpm@osdl.org> [PATCH] unreachable code in ext3_direct_IO() davej points out that in this code local variable `ret' is already known to be positive non-zero, so this test is meaningless. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <axboe@suse.de> [PATCH] switchable and modular io schedulers This patch modularizes the io schedulers completely, allowing them to be modular. Additionally it enables online switching of io schedulers. See also http://lwn.net/Articles/102593/ . There's a scheduler file in the sysfs directory for the block device queue: axboe@router:/sys/block/hda/queue> ls iosched max_sectors_kb read_ahead_kb max_hw_sectors_kb nr_requests scheduler If you list the contents of the file, it will show available schedulers and the active one: axboe@router:/sys/block/hda/queue> cat scheduler [cfq] Lets load a few more. router:/sys/block/hda/queue # modprobe deadline-iosched router:/sys/block/hda/queue # modprobe as-iosched router:/sys/block/hda/queue # cat scheduler [cfq] deadline anticipatory Changing is done with router:/sys/block/hda/queue # echo deadline > scheduler router:/sys/block/hda/queue # cat scheduler cfq [deadline] anticipatory deadline is now the new active io scheduler for hda. Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <axboe@suse.de> [PATCH] cfq-v2 I/O scheduler update Here is the next incarnation of the CFQ io scheduler, so far known as CFQ v2 locally. It attempts to address some of the limitations of the original CFQ io scheduler (hence forth known as CFQ v1). Some of the problems with CFQ v1 are: - It does accounting for the lifetime of the cfq_queue, which is setup and torn down for the time when a process has io in flight. For a fork heavy work load (such as a kernel compile, for instance), new processes can effectively starve io of running processes. This is in part due to the fact that CFQ v1 gives preference to a new processes to get better latency numbers. Removing that heuristic is not an option exactly because of that. - It makes no attempts to address inter-cfq_queue fairness. - It makes no attempt to limit upper latency bound of a single request. - It only provides per-tgid grouping. You need to change the source to group on a different criteria. - It uses a mempool for the cfq_queues. Theoretically this could deadlock if io bound processes never exit. - The may_queue() logic can be unfair since it fluctuates quickly, thus leaving processes sleeping while new processes are allowed to allocate a request. CFQ v2 attempts to fix these issues. It uses the process io_context logic to maintain a cfq_queue lifetime of the duration of the process (and its io). This means we can now be a lot more clever in deciding which process is allowed to queue or dispatch io to the device. The cfq_io_context is per-process per-queue, this is an extension to what AS currently does in that we truly do have a unique per-process identifier for io grouping. Busy queues are sorted by service time used, sub sorted by in_flight requests. Queues that have no io in flight are also preferred at dispatch time. Accounting is done on completion time of a request, or with a fixed cost for tagged command queueing. Requests are fifo'ed like with deadline, to make sure that a single request doesn't stay in the io scheduler for ages. Process grouping is selectable at runtime. I provide 4 grouping criterias: process group, thread group id, user id, and group id. As usual, settings are sysfs tweakable in /sys/block/<dev>/queue/iosched axboe@apu:[.]s/block/hda/queue/iosched $ ls back_seek_max fifo_batch_expire find_best_crq queued back_seek_penalty fifo_expire_async key_type show_status clear_elapsed fifo_expire_sync quantum tagged In order, each of these settings control: back_seek_max back_seek_penalty: Useful logic stolen from AS that allow small backwards seeks in the io stream if we deem them useful. CFQ uses a strict ascending elevator otherwise. _max controls the maximum allowed backwards seek, defaulting to 16MiB. _penalty denotes how expensive we account a backwards seek compared to a forward seek. Default is 2, meaning it's twice as expensive. clear_elapsed: Really a debug switch, will go away in the future. It clears the maximum values for completion and dispatch time, shown in show_status. fifo_batch_expire fifo_batch_async fifo_batch_sync: The settings for the expiry fifo. batch_expire is how often we allow the fifo expire to control which request to select. Default is 125ms. _async is the deadline for async requests (typically writes), _sync is the deadline for sync requests (reads and sync writes). Defaults are, respectively, 5 seconds and 0.5 seconds. key_type: The grouping key. Can be set to pgid, tgid, uid, or gid. The current value is shown bracketed: axboe@apu:[.]s/block/hda/queue/iosched $ cat key_type [pgid] tgid uid gid Default is tgid. To set, simply echo any of the 4 words into the file. quantum: The amount of requests we select for dispatch when the driver asks for work to do and the current pending list is empty. Default is 4. queued: The minimum amount of requests a group is allowed to queue. Default is 8. show_status: Debug output showing the current state of the queues. tagged: Set this to 1 if the device is using tagged command queueing. This cannot be reliably detected by CFQ yet, since most drivers don't use the block layer (well it could, by looking at number of requests being between dispatch and completion. but not completely reliably). Default is 0. The patch is a little big, but works reliably here on my laptop. There are a number of other changes and fixes in there (like converting to hlist for hashes). The code is commented a lot better, CFQ v1 has basically no comments (reflecting that it was writting in one go, no touched or tuned much since then). This is of course only done to increase the AAF, akpm acceptance factor. Since I'm on the road, I cannot provide any really good numbers of CFQ v1 compared to v2, maybe someone will help me out there. Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <axboe@suse.de> [PATCH] convert jiffies <-> msecs for io schedulers The various io schedulers don't convert to and from jiffies and ms in their sysfs exported values. This patch adds that. Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hch@lst.de> [PATCH] don't export blkdev_open and def_blk_ops Already since 2.4 all block devices use block_device_operations and shouldn't deal with file operations directly. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <rmk@flint.arm.linux.org.uk> [SERIAL] Convert 8250_pci to use new serial8250_register_port() This allows 8250 PCI ports to register with their correct device structures. <hch@lst.de> [PATCH] remove dead code from fs/mbcache.c mb_cache_entry_takeout and mb_cache_entry_dup are totally unused. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hch@lst.de> [PATCH] remove posix_acl_masq_nfs_mode Completely unused but exported function in fs/posix_acl.c Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hch@lst.de> [PATCH] don't export shmem_file_setup Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hch@lst.de> [PATCH] remove pm_find, unexport pm_send cutting back some unused legacy PM code Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hch@lst.de> [PATCH] remove dead code and exports from signal.c Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hch@lst.de> [PATCH] unexport proc_sys_root Only used by kernel/sysctl.c which absolutely can't be modular Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hch@lst.de> [PATCH] unexport is_subdir and shrink_dcache_anon Two dcache.c functions that shouldn't be used by filesystems directly (probably a leftover of the intermezzo mess). Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hch@lst.de> [PATCH] unexport devfs_mk_symlink Only legit user is the partitioning code, in addition some uml code is still using despite the uml people beeing told to fix it at least two times. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hch@lst.de> [PATCH] unexport do_execve/do_select These are basically shared code for native/32bit compat code, but as CONFIG_COMPAT is a bool there's no need to export them. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hch@lst.de> [PATCH] unexport exit_mm Not exactly a thing we want done from modules, and no module uses it anyway. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hch@lst.de> [PATCH] unexport files_lock and put_filp Rather lowlevel functions that modules shouldn't mess with and fortunately currently don't. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hch@lst.de> [PATCH] unexport f_delown Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hch@lst.de> [PATCH] unexport lookup_create Besides namei.c it's only used in the SN2 hwgraph code which can't be modular (and will be removed soon) Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hch@lst.de> [PATCH] remove wake_up_all_sync no user in sight Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hch@lst.de> [PATCH] remove set_fs_root/set_fs_pwd Not exactly something we want modules to mess around with. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hch@lst.de> [PATCH] generic acl support for ->permission Currently we every filesystem with Posix ACLs has it's own reimplemtation of the generic permission checking code with additonal ACL support. This patch - adds an optional callback to vfs_permission that filesystems can use for ACL support (and renames it to generic_permission because the old name was wrong - it wasn't like the other vfs_* functions at all) - uses it in ext2, ext3 and jfs. XFS will follow a little later as it's permission checking is burried under several layers of abstraction. From: Dave Kleikamp <shaggy@austin.ibm.com> jfs doesn't currently set MS_POSIXACL (it doesn't require the acl mount option), so this test would fail here. The patch below will set it. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <marcelo.tosatti@cyclades.com> [PATCH] Adjust alignment of pagevec structure We can shrink the pagevec structure to cacheline align it. It is used all over VM reclaiming and mpage pagecache read code. Right now it is 140 bytes on 64-bit and 72 bytes on 32-bit. Thats just a little bit more than a power of 2 (which will cacheline align), so shrink it to be aligned: 64 bytes on 32bit and 124bytes on 64-bit. It now occupies two cachelines most of the time instead of three. I changed nr and cold to "unsigned short" because they'll never reach 2 ^ 16. Did some reaim benchmarking on 4way PIII (32byte cacheline), with 512MB RAM: #### stock 2.6.9-rc1-mm4 #### Peak load Test: Maximum Jobs per Minute 4144.44 (average of 3 runs) Quick Convergence Test: Maximum Jobs per Minute 4007.86 (average of 3 runs) Peak load Test: Maximum Jobs per Minute 4207.48 (average of 3 runs) Quick Convergence Test: Maximum Jobs per Minute 3999.28 (average of 3 runs) #### shrink-pagevec ##### Peak load Test: Maximum Jobs per Minute 4717.88 (average of 3 runs) Quick Convergence Test: Maximum Jobs per Minute 4360.59 (average of 3 runs) Peak load Test: Maximum Jobs per Minute 4493.18 (average of 3 runs) Quick Convergence Test: Maximum Jobs per Minute 4327.77 (average of 3 runs) Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <adaplas@hotpop.com> [PATCH] fbdev: remove unnecessary banshee_wait_idle from tdfxfb - This patch removes the unnecessary call to banshee_wait_idle() from tdfxfb_copyarea, imageblit and fillrect. Removal of the sync will garner an additional ~20% in scrolling speed. - Removes "inverse" which generates a compile warning if modular. Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <adaplas@hotpop.com> [PATCH] fbdev: fix logo drawing failure for vga16fb This fixes the logo failing to draw in vga16fb due to faulty boolean logic. Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <adaplas@hotpop.com> [PATCH] fbcon: Fix setup boot options of fbcon This patch fixes the 'fbcon=map:<option>" of fbcon. (This option has been present since 2.4, but got broken in 2.6). This particular option tells fbcon what framebuffer device gets mapped to what console. Syntax is: fbcon=map:abcd... where a, b, c, d,... are framebuffer numbers as it would appear in /proc/fb. Given only 2 valid fbdevs, 0 and 1, if fbcon=map:0110, then: tty1 = fb0 tty2 = fb1 tty3 = fb1 tty4 = fb0 (sequence repeats for the rest of the consoles) If an invalid framebuffer is used, then the console will be mapped to the first user-chosen framebuffer. Ie: fbcon=map:102 tty1 = fb1 tty2 = fb0 tty3 = fb1 < <adaplas@hotpop.com> [PATCH] fbdev: Pass struct device to class_simple_device_add Swsusp turns off the display when a power-management-enabled framebuffer driver is used. According to Nigel Cunningham <ncunningham@linuxmail.org>, the fix may involve the following: "...I thought the best approach would be to use device classes to find the struct dev for the frame buffer driver, and then use the same code I use for storage devices to avoid suspending the frame buffer until later..." Changes: - pass info->device to class_simple_device_add() - add struct device *device to struct fb_info - store struct device in framebuffer_alloc() - for drivers not using framebuffer_alloc(), store the struct during initalization - port i810fb and rivafb to use framebuffer_alloc() Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <adaplas@hotpop.com> [PATCH] fbdev: Add Tile Blitting support Hopefully, this patch fixes one last major regression for one particular driver, namely matroxfb. This drier has 2 versions, one for the kernel and another as a '2.4 backport' patch. This patch adds a tileblitting extension to fbcon. This extension, in summary, is basically a forward-port of the 2.4 fbdev/fbcon framework to 2.6 but without the fbcon dependency. Tile blitting is similar to bitblit, except that the basic unit is a tile (a bitmap of x-by-y dimensions). The display, instead of being described in terms of pixels and scanlines, are described as a region further subdivided into rectangular sections. In fbcon parlance, a tile is a character. Besides a possible fix for matroxfb, tileblitting can be advantageous for hardware that supports some kind of fontcaching mechanism. Also, in the unlikely chance that the console begins supporting multicolored fonts, tileblitting is probably more optimal than bitblitting because bitblitting will need to push more data through the bus. To enable support for this extension, a driver needs to: - enable CONFIG_FB_TILEBLITTING - set FBINFO_MISC_TILEBLITTING in info->flags - set the required function pointers in struct fb_tileops. The required operations are: - void (*fb_settile)(struct fb_info *info, struct fb_tilemap *map); tells driver about the tile characteristics (dimensions, bitdepth) and about the tilemap which is an array of bitmaps: display->fontdata - void (*fb_tilecopy)(struct fb_info *info, struct fb_tilearea *area); move a rectangular section of tiles (bmove) - void (*fb_tilefill)(struct fb_info *info, struct fb_tilerect *rect); fill a rectangular section with a tile (clear) - void (*fb_tileblit)(struct fb_info *info, struct fb_tileblit *blit); copy an array of tiles to a rectangular section (putcs) - void (*fb_tilecursor)(struct fb_info *info, struct fb_tilecursor *cursor); cursor function Changes: Addition of this extension necessitates cleanup of fbcon.c. The basic drawing functions in fbcon are bmove, clear, putcs and cursor (the fbcon_* set). The fbcon_* set are just wrappers to accel_* set. However, usage is not consistent, some functions call the fbcon_* set, others call the accel_* set. With this patch, a new fbcon-specific structure (struct fbcon_ops) is created. Depending on the setting of the hardware, this struct contains pointers to either the tileblitting set or the bitblitting set (formerly the accel_* set). The tileblitting set is new in this patch. The vast majority of functions in fbcon will need to only call the fbcon_* set. In turn, it calls functions in struct fbcon_ops. Knowledge of the blitting type is not required. The accel_* set is renamed to bit_* and is moved into a separate file, bitblit.c. The tile blitting set is in tileblit.c. In my case at least, the cleanup did produce an unexpected but beneficial side effect, a little more speedup. Not much, < 5%. Petr, if you have comments, suggestions, or you think this is a bad idea, let me know. Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <adaplas@hotpop.com> [PATCH] fbdev: fix scrolling corruption This patches fixes the following: - scrolling corruption if scrolling mode is SCROLL_PAN_MOVE. This bug was introduced by the tile blitting patch. - flashing cursor even when console is blanked Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <benh@kernel.crashing.org> [PATCH] radeonfb: Fix monitor probe logic Fix a small logic error in the monitor probe code when nothing was found. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <andreas@fjortis.info> [PATCH] fbdev: Remove i810fb explicit agp initialization hack. When Antonino A. Daplas posted his "fbdev: Initialize i810fb after agpgart" patch he said that the ugly agp initialization hack for intel agp shouldn't be needed but that he couldn't test it. I have tested the framebuffer updates and additionally removed the initialization hack and it does indeed work. Signed-off-by: Andreas Henriksson <andreas@fjortis.info> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <adaplas@hotpop.com> [PATCH] fbdev: Add iomem annotations to fbmem.c Add iomem annotations to fbmem.c Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <adaplas@hotpop.com> [PATCH] fbdev: Add iomem annotations to i810fb Add iomem annotations to i810fb. Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <adaplas@hotpop.com> [PATCH] fbdev: Add iomem annotations to vga16fb.c Add iomem annotations to vga16fb.c Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <tiwai@suse.de> [PATCH] VGA console font problems on 2.6 kernel From: Egbert Eich <eich@suse.de> I would like to utilize kernel ioctls to save/restore console fonts in VGA text mode when running X. So far the Xserver takes care of this however there more and more problems with this: 1. On some platforms (IA64) we need to POST the BIOS before we even have a chance to access the hardware ourselves. This POSTing will usually undo any changes to the graphics hardware that the kernel may have done. 2. More and more drivers fully rely on BIOS support however the BIOS functions which could be used to save/restore register settings may be broken so the only way of mode save/restore is getting/setting the BIOS mode ID. I've hacked up some code for X however I ran into two problems: 1. con_font_get() in linux/drivers/char/vt.c seems to be broken as the font parameters (height, width, charcount) are never reported back. Therefore this function seems to be pretty useless. The fix is simple (please see below). 2. fb consoles seem to allow to install fonts per vt so that the user can have a different font on every console. The text console driver doesn't support this: the font is downloaded to the video card and will be used for all systems. Still the vga_con driver stores the font parameters per console with the effect that setting a font with different parameters on one console will result in the wron values when this font information is read back from another console. Appearantly this broken feature has been introduced in 2.6 as in the 2.4 kernel the vga_con font information is stored in one single global variable. The IA64 platform at least still heavily relies on the VGA text console. To be able to fix some VT switching issues with X on this platform I need these two issues resolved. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <adaplas@hotpop.com> [PATCH] fbcon unimap fix fbcon doesn't set a unimap at boot time, so special characters come out wrongly. This is the code sequence in take_over_console(). newcon->startup() oldcon->deinit() newcon->init() The previous console driver (ie, vgacon), via its deinit method, may release the unimap allocated by fbcon in fbcon_startup. This is the reason why calling con_set_default_unimap() in fbcon_init() works, but not in fbcon_startup(). Check if the default display has an allocated unimap, and if it has none, call con_set_default_unimap(). And if the target display has no allocated unimap, then call con_copy_unimap(), where the source unimap is from the default display. Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <venkatesh.pallipadi@intel.com> [PATCH] Fix EDID_INFO in zero-page EDID_INFO is encroaching on the space meant for E820 map in zero-page. This will result in E820 map corruption on any system that has more=20 than 18 E820 entries and CONFIG_VIDEO_SELECT. Not sure how this bug=20 managed to hide for more than a year. Attached patch should fix the bug. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <adaplas@hotpop.com> [PATCH] fbdev: fix framebuffer memory calculation for vesafb - use vesafb_fix.line_length * vesafb_defined.yres to calculate the minimum memory required for a video mode. From Aurelien Jacobs <aurel@gnuage.org>. - separately calculate the memory required for a video mode, memory to be remapped, and total memory (for MTRR). From Gerd Knorr <kraxel@bytesex.org>. - the 'vram' option is for memory to be remapped, not total memory. Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <adaplas@hotpop.com> [PATCH] fbdev: split vesafb option vram into vtotal and vremap From: Gerd Knorr <kraxel@bytesex.org>: "IMHO the the only sane thing is to have two options for total + remapped memory as well. Otherwise we'll end up changing that back and forth like it happened for the size calculation stuff for quite some time ... The patch below does just that and also has the other vmode fix (vmode = yres * linelength /* instead of yres * xres * depth >> 3 */)." Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <vandrove@vc.cvut.cz> [PATCH] Remove big-endian mode from matroxfb One of the PowerPC developers, Kostas Georgiou, pointed out to me discussion back from 2001 that they would prefer little endian mode as majority of users runs XF4.x and not Xpmac. And apparently nobody runs Xpmac now, so we can safely remove big-endian mode from matroxfb completely. So let's simplify matroxfb a bit: Accelerator and ILOAD fifo is now always in little endian mode. This is what XFree does. Due to this change all #ifdefs based on endianness was removed from driver - except one which selects framebuffer endinaness (but there is no code in matroxfb which writes to framebuffer directly). It seems that while I was not looking m68k got ioremap, and all architectures now offer ioremap and ioremap_nocache. Let's kill code which mapped ioremap_nocache to ioremap, and ioremap to bus_to_virt for architectures which did not provide them. And this also fixes small typo - M_C2CTL should be 0x3C10 and not 0x3E10. Apparently Matrox notes about need to program this register during initialization are not so important... Signed-off-by: Petr Vandrovec <vandrove@vc.cvut.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <vandrove@vc.cvut.cz> [PATCH] Assorted matroxfb fixes This small change does: (1) Properly document 'outputs' option. (2) Properly use accelerated characters drawing. fbcon used depth == 0 for character painting long ago, but it is fixed for several months. (3) Provide correct hints for fbcon about matroxfb/matroxfb_crtc2 hardware capabilities. Signed-off-by: Petr Vandrovec <vandrove@vc.cvut.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <benh@kernel.crashing.org> [PATCH] rework radeonfb blanking This patch cleans up some old cruft in the manipulation of the LVDS interface registers and fixes the blanking code to work with various DVI flat panels. Since this is all very sensitive stuff, I'm posting the patch here for testing before submitting it upstream, though Andrew is welcome to put it in -mm. It also fix some problems with getting the right PLL setup on recent Mac laptops, replacing the old hard coded list of values with cleaner code that "probes" the PLL setup done by the firmware. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <geert@linux-m68k.org> [PATCH] FrameMaster II build fix fm2fb: Trivial fix for the breakage introduced by the addition of fb_get_options(). Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <adaplas@hotpop.com> [PATCH] fbdev: trivial fb_get_options fix for cyber2000fb and bw2fb Trivial fb_get_options fix for - cyber200fb - bw2fb Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <vandrove@vc.cvut.cz> [PATCH] Add VIDIOC_S_CTRL_OLD to matroxfb For several months I'm receiving complaints from matroxfb users that v4lctl suddenly stops working for them on kernel upgrade. Problem is that VIDIOC_S_CTRL was renumbered, but all distros still use old VIDIOC_S_CTRL value (f.e. even xawtv-3.94 in Debian unstable still uses old VIDIOC_S_CTRL definition). So let's add this old VIDIOC_S_CTRL value (now named VIDIOC_S_CTRL_OLD) to matroxfb's v4l handling. Signed-off-by: Petr Vandrovec <vandrove@vc.cvut.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <suresh.b.siddha@intel.com> [PATCH] no exec: i386 and x86_64 cleanups Sync x86_64 noexec behaviour with i386. And remove all the confusing noexec related boot parameters. Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <wli@holomorphy.com> [PATCH] pidhashing: rewrite alloc_pidmap() Rewrite alloc_pidmap() to clarify control flow by eliminating all usage of goto, honor pid_max and first available pid after last_pid semantics, make only a single pass over the used portion of the pid bitmap, and update copyrights to reflect ongoing maintenance by Ingo and myself. Signed-off-by: William Irwin <wli@holomorphy.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <wli@holomorphy.com> [PATCH] pidhashing: retain older vendor copyright I was informed that the vendor component of the copyright can't be clobbered without more care, so this patch retains the older vendor, updating it only to reflect the appropriate time period. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <wli@holomorphy.com> [PATCH] pidhashing: lower PID_MAX_LIMIT for 32-bit machines /proc/ breaks when PID_MAX_LIMIT is elevated on 32-bit, so this patch lowers it there. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <wli@holomorphy.com> [PATCH] pidhashing: enforce PID_MAX_LIMIT in sysctls The pid_max sysctl doesn't enforce PID_MAX_LIMIT or sane lower bounds. RESERVED_PIDS + 1 is the minimum pid_max that won't break alloc_pidmap(), and PID_MAX_LIMIT may not be aligned to 8*PAGE_SIZE boundaries for unusual values of PAGE_SIZE, so this also rounds up PID_MAX_LIMIT to it. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <zwane@linuxpower.ca> [PATCH] Allow multiple inputs in alternative_input I had to use the following patch to allow multiple arguments to be passed down to the asm stub for alternative_input whilst writing alternatives for mwait code, it seems like a simple enough fix. Signed-off-by: Zwane Mwaikambo <zwane@linuxpower.ca> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <raven@themaw.net> [PATCH] autofs4: allow map update recognition Having recently repaired autofs' ability to recognise updates to maps dynamically I found I needed to reintroduce the directory inode lookup method (I broke the update recognition several versions ago, oops). This patch does this and applies cleanly against 2.6.9-rc1-mm4. As far as I can tell from testing it doesn't introduce any backward incompatibilities. Signed-off-by: Ian Kent <raven@themaw.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <rmk@flint.arm.linux.org.uk> [SERIAL] Keep trying to register our console device. Some serial drivers receive their serial port device information via the device model. This unfortunately means that the selected port may not be available when the console subsystem initialises, so we must keep trying to register the console after each port is added. <Natalie.Protasevich@unisys.com> [PATCH] Incorrect PCI interrupt assignment on ES7000 for platform GSI In arch/i386/kernel/acpi/boot.c, platform GSI does not propagate back from mp_register_gsi() to a calling routine which results in IRQ to be set for wrong GSI. This causes most of the PCI slots on the first PCI module to fail. This patch fixes the problem by returning new GSI back to acpi_register_gsi(). Signed-off-by: Natalie Protasevich <Natalie.Protasevich@unisys.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <wli@holomorphy.com> [PATCH] procfs: fix task_mmu.c text size reporting Not all binfmts page align ->end_code and ->start_code, so the task_mmu statistics calculations need to perform this alignment themselves. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <wli@holomorphy.com> [PATCH] make console_conditional_schedule() __sched and use cond_resched() Relatively minor add-on (not necessarily tied to it or required to be taken or a fix for any bug). Since cond_resched() is using PREEMPT_ACTIVE now, it may be useful to update the open-coded instance of cond_resched() to use the generic call. Also, it should probably be __sched so the caller shows up in wchan. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <wli@holomorphy.com> [PATCH] report per-process pagetable usage Andi Kleen requested that the number of pagetable pages in use by a process be reported in /proc/$PID/status; this patch implements that. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <stelian@popies.net> [PATCH] A simple FIFO implementation A simple ringbuffer implementation for various character drivers. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <agruen@suse.de> [PATCH] Replace hard-coded MODVERDIR in modpost When building external modules, MODVERDIR is relative to the external module instead of in the kernel source tree. Use the MODVERDIR environment variable instead of the hard-coded path in modpost. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hch@lst.de> [PATCH] remove MOD_INC_USE_COUNT/MOD_DEC_USE_COUNT They've been marked deprecated since 2.5.x and there's no more users. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hch@lst.de> [PATCH] mark inter_module_* deprecated These had been officially deprecated since Rusty's module rewrite, but never got the __deprecated marker. The only remaining users are drm and mtd, so we'll get some warnings for common builds. But maybe that's the only way to get the drm people to fix the mess :) Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hch@lst.de> [PATCH] don't include <linux/sysctl.h> in <linux/security.h> security.h gets pulled in in lots of places, so use forward declarations for struct ctl_table instead of pulling sysctl in everywhere. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <schwidefsky@de.ibm.com> [PATCH] cleanup: move call to update_process_times. For non-smp kernels the call to update_process_times is done in the do_timer function. It is more consistent with smp kernels to move this call to the architecture file which calls do_timer. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <schwidefsky@de.ibm.com> [PATCH] cleanup: remove unused definitions from timex.h The CLOCK_TICK_FACTOR and FINETUNE defines from <asm/timex.h> are not used anywhere. Kill them. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <schwidefsky@de.ibm.com> [PATCH] cleanup: time.h, times.h, timex.h and jiffies.h This patch moves some definitions among time.h, times.h, timex.h and jiffies.h. The purpose is to sort all jiffies related functions to jiffies.h, to get rid of the cyclic dependency between time.h & timex.h and to move all #include lines to the start of the header files. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <dipankar@in.ibm.com> [PATCH] Fix dcache lookup __d_lookup() has leftover stuff from earlier code to protect it against rename. The smp_rmb() there was needed for the sequence counter logic. Original dcache_rcu had : + move_count = dentry->d_move_count; + smp_rmb(); + if (dentry->d_name.hash != hash) continue; if (dentry->d_parent != parent) continue; This was to make sure that comparisons didn't happen before before the sequence counter was snapshotted. This logic is now gone and memory barrier is not needed. Removing this should also improve performance. The other change is the leftover smp_read_barrier_depends(), later converted to rcu_dereference(). Originally, the name comparison was not protected against d_move() and there could have been a mismatch of allocation size of the name string and dentry->d_name.len. This was avoided by making the qstr update in dentry atomic using a d_qstr pointer. Now, we do ->d_compare() or memcmp() with the d_lock held and it is safe against d_move(). So, there is no need to rcu_dereference() anything. In fact, the current code is meaningless. Signed-off-by: Dipankar Sarma <dipankar@in.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <dipankar@in.ibm.com> [PATCH] Remove d_bucket Tested using dcachebench and hevy rename test. http://lse.sourceforge.net/locking/dcache/rename_test/ While going over dcache code, I realized that d_bucket which was introduced to prevent hash chain traversals from going into an infinite loop earlier, is no longer necessary. Originally, when RCU based lock-free lookup was first introduced, dcache hash chains used list_head. Hash chain traversal was terminated when dentry->next reaches the list_head in the hash bucket. However, if renames happen during a lock-free lookup, a dentry may move to different bucket and subsequent hash chain traversal from there onwards may not see the list_head in the original bucket at all. In fact, this would result in the list_head in the bucket interpreted as a list_head in dentry and bad things will happen after that. Once hlist based hash chains were introduced in dcache, the termination condition changed and lock-free traversal would be safe with NULL pointer based termination of hlists. This means that d_bucket check is no longer required. There still exist some theoritical livelocks like a dentry getting continuously moving and lock-free look-up never terminating. But that isn't really any worse that what we have. In return for these changes, we reduce the dentry size by the size of a pointer. That should make akpm and mpm happy. Signed-off-by: Dipankar Sarma <dipankar@in.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <dipankar@in.ibm.com> [PATCH] Document RCU based dcache lookup Finally some in-tree documentation for RCU-based dcache look-up. Signed-off-by: Dipankar Sarma <dipankar@in.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <ak@muc.de> [PATCH] x86-64/i386: add mce tainting This patch adds machine check tainting. When a handled machine check occurs the oops gets a new 'M' flag. This is useful to ignore machines with hardware problems in oops reports. On i386 a thermal failure also sets this flag. Done for x86-64 and i386 so far. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Nick Piggin <nickpiggin@yahoo.com.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <nickpiggin@yahoo.com.au> [PATCH] taint: fix forced rmmod This taint didn't appear to be reported. Signed-off-by: Nick Piggin <nickpiggin@yahoo.com.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <nickpiggin@yahoo.com.au> [PATCH] taint on bad_page Hugh and I both thought this would be generally useful. Signed-off-by: Nick Piggin <nickpiggin@yahoo.com.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <haroldo.gamal@infolink.com.br> [PATCH] smbfs does not honor uid, gid, file_mode and dir_mode supplied by user mount This patch fixes "Samba Bugzilla Bug 999". The last version (2.6.8.1) of smbfs kernel module do not honor uid, gid, file_mode and dir_mode supplied by user during mount. This bug is also logged as "Kernel Bug Tracker Bug 3330". To fully work, some modifications are needed to samba smbmount.c and smbmnt.c files. Those patches are available at Samba and Kernel Bug Tracker pages. After those patches, if the user do not supply any of the parameters above, the uid, gid, file_mode and dir_mode on the server will be used by the client. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <drepper@redhat.com> [PATCH] Simplify last lib/idr.c change The last change to alloc_layer in lib/idr.c unnecessarily complicates the code and depending on the definition of spin_unlock will cause worse code to be generated than necessary. The following patch should improve the situation. Signed-off-by: Ulrich Drepper <drepper@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <medaglia@undl.org.br> [PATCH] Fix types.h This patch fixes troubles when compiling some applications that include <linux/byteorder/little_endian.h>, like xmms. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jmorris@redhat.com> [PATCH] xattr consolidation v3 - generic xattr API This patch consolidates common xattr handling logic into the core fs code, with modifications suggested by Christoph Hellwig (hang off superblock, remove locking, use generic code as methods), for use by ext2, ext3 and devpts, as well as upcoming tmpfs xattr code. Signed-off-by: James Morris <jmorris@redhat.com> Signed-off-by: Stephen Smalley <sds@epoch.ncsc.mil> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jmorris@redhat.com> [PATCH] xattr consolidation v3 - LSM This patch replaces the dentry parameter with an inode in the LSM inode_{set|get|list}security hooks, in keeping with the ext2/ext3 code. dentries are not needed here. Signed-off-by: James Morris <jmorris@redhat.com> Signed-off-by: Stephen Smalley <sds@epoch.ncsc.mil> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jmorris@redhat.com> [PATCH] xattr consolidation v3 - ext3 This patch converts the ext3 xattr and acl code to the generic xattr API. Signed-off-by: James Morris <jmorris@redhat.com> Signed-off-by: Stephen Smalley <sds@epoch.ncsc.mil> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jmorris@redhat.com> [PATCH] xattr consolidation v3 - ext2 This patch converts ext2 xattr and acl code to the new generic xattr API. Signed-off-by: James Morris <jmorris@redhat.com> Signed-off-by: Stephen Smalley <sds@epoch.ncsc.mil> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jmorris@redhat.com> [PATCH] xattr consolidation v3 - devpts This patch updates the devpts xattr handler code to the generic xattr API, also adds a GPL notice, author and copyright details. Signed-off-by: James Morris <jmorris@redhat.com> Signed-off-by: Stephen Smalley <sds@epoch.ncsc.mil> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jmorris@redhat.com> [PATCH] xattr consolidation v3 - tmpfs This patch adds xattr support to tmpfs, and a security xattr handler. The purpose of this is to allow udev to be mounted on tmpfs, as used currently by Fedora. Original patch from: Luke Kenneth Casson Leighton <lkcl@lkcl.net>. Signed-off-by: James Morris <jmorris@redhat.com> Signed-off-by: Stephen Smalley <sds@epoch.ncsc.mil> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <agruen@suse.de> [PATCH] xattr: re-introduce validity check before xattr cache insert * ext[23]_xattr_list(): - Before inserting an xattr block into the cache, make sure that the block is not corrupted. The check got moved after inserting into the cache in the xattr consolidation patches, so corrupted blocks could become visible to cache users. - Take a variable out of the loop that calls the ->list handlers. * A few cosmetic changes. Signed-off-by: Andreas Gruenbacher <agruen@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jmorris@redhat.com> [PATCH] SELinux: allow all filesystems to specify fscreate mount option The patch below allows all types of filesystems to specify the fscreate mount option (which is used to specify the security context of the filesystem itself). This was previously only available for filesystems with full xattr security labeling, but is also potentially required for filesystems with e.g. psuedo xattr labeling such as devpts and tmpfs. An example of use is to specify at mount time the fs security context of a tmpfs filesystem, overriding the default specified in policy for that filesystem. This patch has been in the Fedora kernel for some weeks with no problems. Signed-off-by: James Morris <jmorris@redhat.com> Signed-off-by: Stephen Smalley <sds@epoch.ncsc.mil> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <wli@holomorphy.com> [PATCH] profile: 512x Altix timer interrupt livelock fix I've been informed that /proc/profile livelocks some systems in the timer interrupt, usually at boot. The following patch attempts to amortize the atomic operations done on the profile buffer to address this stability concern. This patch has nothing to do with performance; kernels using periodic timer interrupts are under realtime constraints to complete whatever work they perform within timer interrupts before the next timer interrupt arrives lest they livelock, performing no work whatsoever apart from servicing timer interrupts. The latency of the cacheline bounce for prof_buffer contributes to the time spent in the timer interrupt, hence it must be amortized when remote access latencies or deviations from fair exclusive cacheline acquisition may cause cacheline bounces to take longer than the interval between timer ticks. What this patch does is to create a pair of per-cpu open-addressed hashtables indexed by profile buffer slot holding values representing the number of pending profile buffer hits for the profile buffer slot. When this hashtable overflows, one iterates over the hashtable accounting each of the pairs of profile buffer slots and hit counts to the global profile buffer. Zero is a legitimate profile buffer slot, so zero hit counts represent unused hashtable entries. The hashtable is furthermore protected from flush IPI's by interrupt disablement. In order to flush the pending profile hits for read_profile(), this patch flips betweeen the pairs of per-cpu profile buffer by signalling all cpus to flip via IPI at the time of read_profile(), followed by doing all the work to flush the profile hits from the older per-cpu buffers in the context of the caller of read_profile(), with exclusion provided by a semaphore ensuring that only one caller of profile_flip_buffers() may execute at a time, and using interrupt disablement to prevent buffer flip IPI's from altering the hashtables or flip state while an update is in progress. The flip state is per-cpu so that remote cpus need only disable interrupts locally for synchronization, which is both simple and busywait-free for remote cpus. The flip states all change in tandem when some cpu requests the hashtables be flipped, and the requester waits for the completion of smp_call_function() for notification that all cpus have finished flipping between their hashtables. The IPI handler merely toggles the flip state (which is an array index) between 0 and 1. This is expected to be a much stronger amortization than merely reducing the frequency of profile buffer access by a factor of the size of the hashtable because numerous hits may be held for each of its entries. This reduces what was before the patch a number of atomic increments equal to what after the patch becomes the sum of the hits held for each entry in the hashtable, to a number of atomic_add()'s equal to the number of entries in the per_cpu hashtable. This is nondeterministic, but as the profile hits tend to be concentrated in a very small number of profile buffer slots during any given timing interval, is likely to represent a very large number of atomic increments. This amortization of atomic increments does not depend on the hash function, only the sharp peakedness of the distribution of profile buffer hits. This algorithm has two advantages over full-size per-cpu profile buffers. The first is that the space footprint is much smaller. Per-cpu profile buffers would increase the space requirements by a factor of num_online_cpus(), where this algorithm only requires one page per cpu. The second is that reading the profile state is much faster, because the state that must be traversed is exactly the above space consumers, and the relative reduction in size concomitantly reduces the time required for a read operation. I also took the liberty of adding some commentary to the comments at the beginning of the file reflecting the major work done on profile.c in recent months and describing what the file implements. The reporters of this issue have verified that this resolves their timer interrupt livelock on 512x Altixen. In my own testing on 4x logical x86-64, this patch saw a rate of about 18 flushes per minute under load, or about one flush every 3 seconds, for about 38.4 atomic accesses to the profile buffer per second per cpu in one of the algorithm's worst cases, about 3.84% of the number of atomic profile buffer accesses per second per cpu as a normal kernel would commit. This represents a twenty-six-fold increase in the scalability on SMP systems with 4KB PAGE_SIZE, i.e. with a 4KB PAGE_SIZE, the number of atomic profile buffer accesses per second per cpu is reduced by a factor of 26, thereby increasing the number of cpus a system must have before it would experience a timer interrupt livelock by a factor of 26, with the proviso that cacheline bounces must take the same amount of time to service. This increase in the scalability of the kernel is expected to be much larger for ia64, which has a large PAGE_SIZE, because the distribution of profile buffer hits is so sharply peaked that doubling the hashtable size will much more than double the amortization factor. In fact, only 19 flushes were observed on a 64x Altix over an approximately 10 minute AIM7 run, and 1 flush on a 512x Altix over the course of an entire AIM7 run, for truly vast effective amortization factors. A prior version of this patch, which did not include the node-local hashtable allocation and bounded collision chains has been successfully tested on 64x and 512x ia64 vs 2.6.9-rc2, 8x ia64 vs. 2.6.9-rc2-mm1, 4x x86-64 vs. 2.6.9-rc2-mm1, and 6x sparc64 vs. 2.6.9-rc2-mm1. This patch minus the hashtable initialization fix has been successfully tested on 2x ppc64, 2x alpha, 8x ia64, 6x sparc64, and 4x x86-64, all vs. 2.6.9-rc2-mm1. This precise version of the patch has been successfully tested on 8x ia32 against 2.6.9-rc2-mm1 and 6x sparc64 vs. both 2.6.9-rc2-mm1 and 2.6.9-rc2-mm2. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <wli@holomorphy.com> [PATCH] sparc32: early tick_ops The zaphod scheduler likes to call scheduler_tick() before time_init(). sparc32 oopses. Perhaps a scheduler bug, but this robustifies things. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <Markus.Lidel@shadowconnect.com> [PATCH] i2o: code beautifying and cleanup - added KERN_* to printk where it was missing (original from Alan Cox) - removed unused code which was commented out already (original from Alan Cox) - make error messages more sane in i2o_block (original from Alan Cox) Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <Markus.Lidel@shadowconnect.com> [PATCH] i2o: added support for Promise controllers - added support for Promise I2O controllers, which need a different initialization sequence (original from Alan Cox) Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <Markus.Lidel@shadowconnect.com> [PATCH] i2o: new functions to convert messages to a virtual address - added new function i2o_msg_in_to_virt and i2o_msg_out_to_virt, to turn an I2O message to a virtual address (original from Alan Cox) - replaced readl with le32_to_cpu where it is not necessary (original from Alan Cox) Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <Markus.Lidel@shadowconnect.com> [PATCH] i2o: quieten sparse 1-bit-bitfield warnings in i2o.h - Single-bit bitfields should be unsigned. Quell sparse warnings for these. (from Randy Dunlap) Signed-off-by: Randy Dunlap <rddunlap@osdl.org> Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <janitor@sternwelten.at> [PATCH] janitor: cpqarray remove unused include remove unused #include <linux/version.h> Old ifdefs were removed that used it's definition. Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <janitor@sternwelten.at> [PATCH] janitor: remove old ifdefs dmascc Patches to remove some old ifdefs. remove most of the #include <linux/version.h> kill compat cruft like #define ahd_pci_set_dma_mask pci_set_dma_mask Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <janitor@sternwelten.at> [PATCH] janitor: remove old ifdefs fasttimer Patches to remove some old ifdefs. remove most of the #include <linux/version.h> kill compat cruft like #define ahd_pci_set_dma_mask pci_set_dma_mask Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <janitor@sternwelten.at> [PATCH] janitor: list_for_each: drivers-char-drm-radeon_mem.c s/for/list_for_each/ Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <janitor@sternwelten.at> [PATCH] janitor: char/rio_linux: replace schedule_timeout() with msleep()/msleep_interruptible() Use msleep()/msleep_interruptible() [as appropriate] instead of schedule_timeout() to guarantee the task delays as expected. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <janitor@sternwelten.at> [PATCH] janitor: char/sis-agp: replace schedule_timeout() with msleep() Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <janitor@sternwelten.at> [PATCH] janitor: char/fdc-io: replace direct assignment with set_current_state() Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <janitor@sternwelten.at> [PATCH] janitor: char/ipmi_si_intf: add set_current_state() Add set_current_state() before schedule_timeout() so a delay is achieved. Without the addition, schedule_timeout() returns immediately. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <janitor@sternwelten.at> [PATCH] janitor: char/sx: replace direct assignment with set_current_state() Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <janitor@sternwelten.at> [PATCH] drivers/char: replace schedule_timeout() with msleep_interruptible() Replace lots of open-coded sleeps with msleep_interruptible() under drivers/char. Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Rogier Wolff <R.E.Wolff@BitWizard.nl> Signed-off-by: Christoph Lameter <christoph@lameter.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <janitor@sternwelten.at> [PATCH] janitor: remove check_region from drivers/char/esp.c Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <janitor@sternwelten.at> [PATCH] janitor: mark __init/__exit static drivers/net/ppp_deflate Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <janitor@sternwelten.at> [PATCH] janitor: mark __init/__exit static drivers/net/bsd_comp Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <janitor@sternwelten.at> [PATCH] janitor: fix-typo-arm-dma arch/arm26/machine/dma.c caught by Domen Puncer <domen@coderock.org> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <janitor@sternwelten.at> [PATCH] janitor: kill KERNEL_VERSION duplicate in videocodec.c Kill KERNEL_VERSION duplicate. Funny that it insn't even used in here Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <janitor@sternwelten.at> [PATCH] janitor: video/radeon_base: replace MS_TO_HZ() with msecs_to_jiffies() Replace MS_TO_HZ() with msecs_to_jiffies(). Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <janitor@sternwelten.at> [PATCH] janitor: video/radeonfb: remove MS_TO_HZ() Removes definition of MS_TO_HZ() in favor of msecs_to_jiffies(). Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <janitor@sternwelten.at> [PATCH] janitor: drivers/media: replace schedule_timeout() with msleep() Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <janitor@sternwelten.at> [PATCH] janitor: drivers/message: replace schedule_timeout() with msleep_interruptible() Use msleep_interruptible() instead of schedule_timeout() under drivers/message. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <janitor@sternwelten.at> [PATCH] drivers/md: replace schedule_timeout() with msleep_interruptible() Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <janitor@sternwelten.at> [PATCH] ieee1394: replace schedule_timeout() with msleep_interruptible() Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <janitor@sternwelten.at> [PATCH] janitor: replace dprintk with pr_debug in drivers/scsi/tpam/ Replaced dprintk, and deleted it out of tpam.h. Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <janitor@sternwelten.at> [PATCH] janitor: isdn/icn: change units of ICN_BOOT_TIMEOUT1 Change units of ICN_BOOT_TIMEOUT1 to msecs instead of jiffies for msleep_interruptible() in icn.c. Also, remove unused constant ICN_CHANLOCK_DELAY. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <janitor@sternwelten.at> [PATCH] drivers/isdn: replace milliseconds() with msecs_to_jiffies() Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <janitor@sternwelten.at> [PATCH] janitor: replace dprintk with pr_debug in microcode.c Replaced dprintk with pr_debug from kernel.h Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <janitor@sternwelten.at> [PATCH] janitor: __FUNCTION__ string concatenation deprecated __FUNCTION__ string concatenation is deprecated Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <nacc@us.ibm.com> [PATCH] net/mac89x0: replace schedule_timeout() with msleep_interruptible() Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <Markus.Lidel@shadowconnect.com> [PATCH] i2o: correct error code if bus is busy in i2o_scsi - corrected the error code in i2o_scsi_reply to return the correct error code DID_BUS_BUSY if bus is busy (original from Alan Cox) Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <Markus.Lidel@shadowconnect.com> [PATCH] i2o: message conversion fix for le32_to_cpu parameters - fixed incorrect parameters to le32_to_cpu which was introduced with the I2O message conversion patch Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <rmk@flint.arm.linux.org.uk> [ARM] Add netconsole support to ARM AM79C961A driver. <rmk@flint.arm.linux.org.uk> [ARM] Convert to constant-optimising udelay() implementation. This allows us to eliminate a multiplication when we have a constant delay value, as per x86. <rmk@flint.arm.linux.org.uk> [ARM] Rehash iwmmxt signal handling. In the near future, VFP will want to save state onto the user stack. Therefore, separate out the iwmmxt specific parts, and implement a generic "safe copy to user space using random CPU instructions". This is necessary because iwmmxt and VFP both use special CPU instructions to load and/or save their state. <rmk@flint.arm.linux.org.uk> [ARM] Clean up footbridge configuration. <rmk@flint.arm.linux.org.uk> [ARM] Move machine specific boot variables to separate makefile. Move machine specific boot variables out of arch/arm/boot/Makefile into arch/arm/mach-*/Makefile.boot. <rmk@flint.arm.linux.org.uk> [ARM] Fix missed udelay usage - assembly needs to call __udelay now. <dtor_core@ameritech.net> [PATCH] ieee1394: SBP-2 - rename some constants to fix clash with new SCSI core defines. Acked by Ben Collins. Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <ben-linux@org.rmk.(none)> [ARM PATCH] 2132/1: Fix timer NULL pointer de-reference on suspend Patch from Ben Dooks Timer suspend code fails to check for NULL before calling the timer implementor's suspend or resume hooks. Signed-off-by: Ben Dooks <rmk@flint.arm.linux.org.uk> [ARM] Sanitise Footbridge machine class. Footbridge was suffering from a little lack of care and attention; it still had the nasty arch.c file with all the associated #ifdef gross-ness that entailed. Re-jig footbridge support so that each machine type contains all the necessary support code, with a separate common implementation which they all share. <holt@sgi.com> [IA64-SGI] Double spin_unlock in bte.c If all bte interfaces are in use, the current code will leave the bte pointer set when exiting from the loop trying to locate an interface to use. This results in two processes using the same interface and both trying to free the same one. With a premptible kernel, this results in the preempt count getting off. Signed-off-by: Robin Holt <holt@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com> <bzolnier@trik.(none)> [ide] add sg_init_one() helper and teach ide about it Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> <rmk@flint.arm.linux.org.uk> [ARM] Add generic RTC implementation. This provides a number of helper functions and data structures for RTC implementations to make use of, including a standard implemention for /proc/driver/rtc and the rtc miscdevice. It supports runtime registration of RTC timekeeping sources. <rmk@flint.arm.linux.org.uk> [ARM] Add documentation for ARM kernel timer infrastructure. <davej@dhcp83-103.boston.redhat.com> [AGPGART] Fix incorrect VIA PT880 entry. There was a mistake in the list of IDs I got from VIA, which meant this chipset was incorrectly recognised. Signed-off-by: Dave Jones <davej@redhat.com> <bzolnier@trik.(none)> [ide] add ide_hwif_t->dma_setup() * tag REQ_DRIVE_TASKFILE write requests with REQ_RW * split off ->dma_setup() from ->ide_dma_[read,write] functions * use ->dma_setup() directly in ATAPI drivers and remove media checks from ->ide_dma_[read,write] * ->ide_dma_[read,write,begin] cannot fail now * in Etrax ide.c setup DMA for ATAPI devices before sending command to drive (so setup order is the same as for disks) Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> <bzolnier@trik.(none)> [ide] add ide_hwif_t->dma_exec_cmd() * split off ->dma_exec_cmd() from ->ide_dma_[read,write] functions * choose command to execute by ->dma_exec_cmd() in higher layers and remove ->ide_dma_[read,write] * in Etrax ide.c driver REQ_DRIVE_TASKFILE requests weren't handled properly for drive->addressing == 0 * in trm290.c read and write commands were interchanged * in sgiioc4.c commands weren't sent to disk devices Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> <bzolnier@trik.(none)> [ide] convert ide_hwif_t->ide_dma_begin() to ->dma_start() Make ->ide_dma_begin() functions void and rename them to ->dma_start(). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> <pfg@sgi.com> [IA64-SGI] BUG_ON test was backwards Signed-off-by: Patrick Gefre <pfg@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com> <holt@sgi.com> [IA64-SGI] Correct BTE notification timeouts on SN2. The SN2 Block Transfer Engine occassionally fails to send a notification that it has completed a transfer to the kernel. This patch adds a timeout mechanism which will detect the failure, reset the interface, and then retry the transfer. Signed-off-by: Robin Holt Signed-off-by: Tony Luck <tony.luck@intel.com> <holt@sgi.com> [IA64-SGI] Distribute useage of BTE interfaces. During peak utilization periods, the first interface on a node has an inordinately large amount of contention. This is due to all cpus starting their scan for an interface at 0. This patch distributes that based upon the slice the requesting cpu is attached to. Signed-off-by: Robin Holt Signed-off-by: Tony Luck <tony.luck@intel.com> <pfg@sgi.com> [IA64-SGI] Fixes calling arg1 for bte_crb_error_handler() Signed-off-by: Patrick Gefre <pfg@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com> <greg@kroah.com> PCI: fix up pci_save/restore_state in via-agp due to api change. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <khali@linux-fr.org> [PATCH] I2C: Spare 1 byte in lm90 driver I just noticed the other day that the lm90 driver uses an u16 to store the value of the 8-bit alarms register. This is most probably due to the fact that I originally copied the lm90 driver from the lm83 driver, which actually has two 8-bit registers for alarms, and obviously forgot to change the variable type. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <khali@linux-fr.org> [PATCH] I2C: Fourth auto-fan control interface proposal Here comes my fourth (and hopefully last) sysfs interface proposal for implementing auto-fan control in 2.6. Previous proposals have been discussed here: [1] http://archives.andrew.net.au/lm-sensors/msg07517.html [2] http://archives.andrew.net.au/lm-sensors/msg08049.html [3] http://archives.andrew.net.au/lm-sensors/msg18008.html The interface is still made up of two parts: per fan temp channels selection, and trip points selection. Changes from the third proposal: pwm[1-*]_enable value 2 is now used to explicitely state the auto pwm mode. This was proposed by Mark D. Studebaker [4]. [4] http://archives.andrew.net.au/lm-sensors/msg18011.html Temp channels selection ======================= Renamed files from fan[1-*]_auto_channels to pwm[1-*]_auto_channels_temp. The change from fan tp pwm is to match the recent renaming suggested by Mark M. Hoffman [5]. The "_temp" suffix is to leave some room for a "_fan" suffix at a later time if new chips drive auto pwm according to fan speeds instead of temperature. [5] http://archives.andrew.net.au/lm-sensors/msg18797.html Trip points =========== Trip points are now numbered (point1, point2, etc...) instead of named (_off, _min, _max, _full...). This solves the problem of various chips having a different number of trip points. The interface is still chip independent in that it doesn't require chip-specific knowledge to be used by user-space apps. The reason for this change is that newer chips tend to have more trip points. the LM63 has 8, the LM93 has no less than 12. Also, I read in the LM63 datasheet that ideal pwm vs temperature curve were parabolic in shape. Seems hard to achieve this if we arbitrarily lock the number of trip points to 3 ;) I also introduced an optional hysteresis temperature for trip points. The LM63 has this. Since it makes full sense I'd expect other chips to propose this as well. As before, there are two sets of files, each chip driver picks the one matching its internal model: trip points are either temperature channel-dependent (ADM1031...) or pwm channel-dependent (IT87xx...). If we ever come accross fan speed-driven pwm outputs where trip points are fan channel-dependent we may have to offer a third set of files. We'll see when/if this happens. I hope I have taken everyone's comments and advice into account and we can make this interface proposal part of the sysfs interface standard now. I'm sorry it took so long. Comments welcome. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <R.Marek@sh.cvut.cz> [PATCH] I2C: fix it8712 detection Following patch fixes the bug introduced by me in VID VRM patch. Spotted (and later reviewed) by Jean Delvare. This bug is non-fatal, it8712 will be just treated as it was before my VID VRM patch. Tested on it8705 and it8712 hardware. Signed-off-by: Rudolf Marek <r.marek@sh.cvut.cz> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <nacc@us.ibm.com> [PATCH] I2C: replace schedule_timeout() with msleep_interruptible() in i2c-ibm_iic.c Use msleep_interruptible() instead of schedule_timeout() to guarantee the task delays as expected. Remove the unnecessary set_current_state() following the if, as schedule_timeout() [and thus, mlseep_interruptible()] is guaranteed to return in TASK_RUNNING. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <khali@linux-fr.org> [PATCH] I2C: Update Kconfig for AMD bus drivers This updates the AMD entries i2c/busses/Kconfig in two ways: * Add missing PCI dependancy. * Reword the help so that users know exactly what is supported by each driver. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <khali@linux-fr.org> [PATCH] I2C: Fix amd756 name This sets the proper name for busses supported by the i2c-amd756 driver. So far, all busses were named AMD756 regardless of the real hardware. Setting the real name is certainly less confusing for the user, and the sensors-detect script expects this too. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <khali@linux-fr.org> [PATCH] I2C: Clean up i2c-amd756 and i2c-prosavage messages A number of messages in the i2c-amd756 and i2c-prosavage drivers have a leading ": " (especially the former). This is a legacy from lm_sensors' printks of the 2.4 times. This patch cleans them up. While I was there, I dropped a couple useless white spaces and dots as well. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <ben-linux@fluff.org> [PATCH] I2C: S3C2410 I2C Bus driver Bus driver for the Samsung S3C2410 SoC onboard I2C controller Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <khali@linux-fr.org> [PATCH] I2C: lm87 driver ported to Linux 2.6 This is my port of the lm87 driver to Linux 2.6. It is based on the preliminary work of Jeff Oliver. I then significantly improved the code, added functionality, tested the whole thing on a real motherboard, fixed a couple remaining bugs, and here we are. I'll port a number of improvements and fixes back to the 2.4 version of the driver after lm_sensors 2.8.8 is released (i.e. soon). Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <rmk@flint.arm.linux.org.uk> [SERIAL] serial_reg.h update. This includes a fuller definition of the 8250 and compatible bits, and adding notes where the definition varies between different chips. This also fixes the following build error: drivers/serial/8250.c:185: error: `UART_FCR_R_TRIG_10' <kraxel@bytesex.org> [PATCH] I2C: i2c bus power management support The patch below adds power management support to the i2c bus. It adds just two small functions which call down to the devices power management functions if they are present, so the i2c device drivers will receive the suspend and resume events. From: Gerd Knorr <kraxel@bytesex.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> I2C: convert from pci_module_init to pci_register_driver for all i2c drivers. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <tgraf@suug.ch> [PKT_SCHED]: Replace tc_stats with new gnet_stats in struct Qdisc Replaces tc_stats with gnet_stats replacements in struct Qdisc and adapts all qdiscs to use them. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net> <tgraf@suug.ch> [PKT_SCHED]: Use gnet_stats API to copy statistics into netlink message Adapts qdisc API to use new gnet_stats functions to copy statistics into netlink message. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net> <tgraf@suug.ch> [PKT_SCHED]: Introduce gen_replace_estimator Introduces gen_replace_estimator. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net> <tgraf@suug.ch> [PKT_SCHED]: Use generic rate estimator Adapts qdiscs to use generic estimator. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net> <tgraf@suug.ch> [PKT_SCHED]: Qdisc are not supposed to dump TCA_STATS themselves hfsc and htb qdisc are not supposed to copy TCA_STATS on their own and queue length statistic is already updated in generic code part. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net> <davem@nuts.davemloft.net> [PKT_SCHED]: Fix sch_atm build. Move it over to use qstats/bstats. Signed-off-by: David S. Miller <davem@davemloft.net> <davem@nuts.davemloft.net> [SPARC64]: Re-export force_sig to modules. Used by sparc envctl drivers, specifically envctl.c and bbc_envctrl.c under drivers/sbus/char/ Signed-off-by: David S. Miller <davem@davemloft.net> <davem@nuts.davemloft.net> [SPARC]: Add entries for recently added system calls. Signed-off-by: David S. Miller <davem@davemloft.net> <tgraf@suug.ch> [PKT_SCHED]: CBQ; Destroy filters before destroying classes. CBQ destroys its classes by traversing the hashtable and thus classes are not destroyed from root to leafs which means that class Y being a subclass of class X may be destroyed before X. This is a problem if a filter is attached to class X (parent) classifying into class Y (result). In case Y gets deleted before X the filter references an already deleted class while trying to unbind (cbq_unbind_filter). Therefore all filters must be destroyed before destroying classes. An additional BUG_TRAP has been added to document this not so obvious case. The BUG can be triggered with the following commands: qdisc add dev root handle 10:0 cbq bandwidth 100Mbit avpkt 1400 mpu 64 class add dev parent 10:0 classid 10:12 cbq bandwidth 100mbit rate 100mbit allot 1514 prio 3 maxburst 1 avpkt 500 bounded class add dev parent 10:12 classid 10:13 cbq bandwidth 100mbit rate 100mbit allot 1514 prio 3 maxburst 1 avpkt 500 bounded filter add dev parent 10:12 protocol ip prio 10 u32 match ip protocol 6 0xff flowid 10:13 qdisc del dev root The deletion ordering in the above case is: 10:0 -> 10:13 -> 10:12 Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net> <solt2@dns.toxicfilms.tv> [TCP]: Document tcp_tso_win_divisor in ip-sysctl.txt Signed-off-by: David S. Miller <davem@davemloft.net> <davem@nuts.davemloft.net> [AF_UNIX]: Remove spurious len test in unix_mkname. Noticed by James Antill <james-linux-kernel@and.org> Signed-off-by: David S. Miller <davem@davemloft.net> <rddunlap@osdl.org> [NET]: Fix sprintf type warnings on 64-bit in pktgen.c Signed-off-by: Randy Dunlap <rddunlap@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net> <davem@nuts.davemloft.net> [NET]: More pktgen.c warnings not caught by Randys patch. Signed-off-by: David S. Miller <davem@davemloft.net> <hadi@cyberus.ca> [NET]: Add Mirred TC action. Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca> Signed-off-by: David S. Miller <davem@davemloft.net> <ak@suse.de> [TCP]: Remove bogus CONFIG_SYSCTL ifdef Modular IPv6 needs these variables always exported, even when CONFIG_SYSCTL is not enabled. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: David S. Miller <davem@davemloft.net> <herbert@gondor.apana.org.au> [TCP]: Create tcpdiag_dump_sock The first one move tcpdiag_bc_run calls into one place so that we can change its parameters next. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net> <herbert@gondor.apana.org.au> [TCP]: Make tcpdiag_bc_run take tcpdiag_entry This patch adds a tcpdiag_entry struct and makes tcpdiag_bc_run use it instead of a struct sock. This will allow us to use tcpdiag_bc_run on struct open_request in the next patch. Please note that I've left the CONFIG_IPV6 defines in as to support ipv6 modules we'll need to modularise tcpdiag itself. I'll probably do that after this is all fixed. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net> <herbert@gondor.apana.org.au> [TCP]: Dump SYN_RECV sockets in tcpdiag Finally this patch adds the code to list SYN_RECV sockets. A future enhancement would be to do this for the GET operation as well. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net> <herbert@gondor.apana.org.au> [NET]: Make sure to copy TSO fields in copy_skb_header(). Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net> <davem@nuts.davemloft.net> [NET]: Need to disable preempt in softirq check of netif_rx_ni. Signed-off-by: David S. Miller <davem@davemloft.net> <herbert@gondor.apana.org.au> [NETLINK]: Yield in netlink_broadcast when congested. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net> <herbert@gondor.apana.org.au> [TCP]: Fix new packet len calc in tcp_fragment() The following patch makes it allocate skb_headlen(skb) - len instead of skb->len - len. When skb is linear there is no difference. When it's non-linear we only ever copy the bytes in the header. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net> <davem@nuts.davemloft.net> [CRYPTO]: Fix typo in Kconfig. Signed-off-by: David S. Miller <davem@davemloft.net> <jmorris@redhat.com> [CRYPTO]: Add Tnepres cipher support This patch adds support for the kerneli 'Tnepres' cipher, a reversed form of Serpent which was implemented due to problems with the specification. This allows people to maintain compatibility between old kerneli and current kernels. Signed-off-by: Ruben Garcia <ruben@ugr.es> Signed-off-by: Fruhwirth Clemens <clemens@endorphin.org> Signed-off-by: James Morris <jmorris@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> <viro@www.linux.org.uk> [PATCH] lanstreamer fix copy from on-stack array is memcpy(), not memcpy_fromio() Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> <pablo@eurodev.net> [NETFILTER]: Fix removing invalid proc file Signed-off-by: Pablo Neira <pablo@eurodev.net> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net> <okir@suse.de> [NETFILTER]: Don't export common symbols from ipfwadm.ko Exported kernel symbols ip_conntrack_count and ip_conntrack_tcp_update were showing up both in ip_conntrack.ko and ipfwadm.ko, causing bogus dependencies in modules.dep. Signed-off-by: Olaf Kirch <okir@suse.de> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net> <yasuyuki.kozakai@toshiba.co.jp> [NETFILTER]: Fix multiple bugs in ip6rt.c The first patch fixes the following bugs - Wrong cast the pointer to extension header. - Segments Left field in Routing Header isn't treated as 1 octet. Signed-off-by: Yasuyuki KOZAKAI <yasuyuki.kozakai@toshiba.co.jp> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net> <yasuyuki.kozakai@toshiba.co.jp> [NETFILTER]: Fix checks in ip6t_multiport.c The first patch fixes following bugs in ip6t_multiport.c, - missing check the size of the preference data. - IP6T_INV_PROTO should check with not ip->flags but ip->invflags. Signed-off-by: Yasuyuki KOZAKAI <yasuyuki.kozakai@toshiba.co.jp> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net> <yasuyuki.kozakai@toshiba.co.jp> [NETFILTER]: Fix multiple bugs in ip6t_frag.c The first patch fixes following bugs in ip6t_frag.c, - Wrong cast the pointer to extension header. - header length of Fragment Header is statically 8 octets. Then the option --frag-len doesn't make sense. - There are endian issues where using frag->info. - Reserved fields are not 2 bit but 8bit + 2 bit. (see RFC2460) Signed-off-by: Yasuyuki KOZAKAI <yasuyuki.kozakai@toshiba.co.jp> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net> <tony.luck@intel.com> [IA64] Allow -mtune=merced for gcc 3.4 Patch submitted by H. J. Lu Gcc 3.4.2 fixed ia64 -mtune=merced regressions on Linux 2.6 kernel: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=16278 I have been using this patch for several months now. Signed-off-by: Tony Luck <tony.luck@intel.com> <arun.sharma@intel.com> [IA64] Add missing prototypes to kill warnings in sys_ia32.c Signed-off-by: Arun Sharma <arun.sharma@intel.com> Signed-off-by: Tony Luck <tony.luck@intel.com> <tony.luck@intel.com> [IA64] uninitialised flags element could cause crashes window is not zeroed, so the flags should be assigned, not modified. This can lead to crashes at boot if the IO and Memory resources overlap. Patch supplied by Matthew Wilcox Signed-off-by: Tony Luck <tony.luck@intel.com> <kaos@sgi.com> [IA64] Avoid a rare deadlock during unwind There is a rare deadlock condition during unwind script creation. If build_script() is interrupted in the middle of creating the script, it holds the script write lock. If the interrupt handler needs to call unwind for some failure condition, unwind will try to read the incomplete script and will deadlock on the script lock. The fix is to disable interrupts while building the script, so interrupt handlers never see partial scripts. Promoting spin_lock_irqsave() from script_new() to find_save_locs() changes the indentation, so the patch looks bigger than it really is. Signed-off-by: Keith Owens <kaos@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com> <suresh.b.siddha@intel.com> [IA64] fallback to swiotlb for consistent DMA mappings Patch supplied by Suresh Siddha This is mainly needed for EM64T platforms and makes sense for ia64 too. Need of this was broughtup sometime(long time?) back on lkml. http://www.ussg.iu.edu/hypermail/linux/kernel/0406.3/0112... Signed-off-by: Tony Luck <tony.luck@intel.com> <akpm@osdl.org> [PATCH] typhoon build fix Signed-off-by: Andrew Morton <akpm@osdl.org> <akpm@osdl.org> [PATCH] sata_sil mod15 quirk with Seagate ST3120026AS From: <stuart@cybertherial.com> Hardware Environment: AMD64, sil3512 controller on m/b. Harddrive: Seagate 120GB ST3120026AS Problem Description: Drive would lock when writing large files, eg video from firewire, audio editing. Checked dmesg, was obviously the sata drive. Have added the drive to the blacklist in sata_sil.c and the problem seems to have disappeared. Is there a good test to verify that the mod15 bug is really the problem? Signed-off-by: Andrew Morton <akpm@osdl.org> <rmk@flint.arm.linux.org.uk> [ARM] Cleanup some quirks. - Ensure FIQs are enabled when cpu_idle() is called. - Remove unused members of irq_cpustat_t. - Remove unnecessary #ifndef CONFIG_SMP...#endif around irq_exit() macro. - Rename __stf/__clf such that it stresses that they affect only local state (as per local_irq_xxx). - Move THREAD_SIZE such that it can be used in current_thread_info() <rmk@flint.arm.linux.org.uk> [ARM] Export find_{first,next}_bit_{l,b}e <bzolnier@trik.(none)> [ide] pmac: use more ide_hwif_t fields Use dmatable_dma, sg_table, sg_nents and sg_dma_direction fields of ide_hwif_t and remove their equivalents from pmac_ide_hwif_t. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> <bzolnier@trik.(none)> [ide] always allocate hwif->sg_table Allocate hwif->sg_table in hwif_init() so it can also be used for PIO. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> <rusty@rustcorp.com.au> [PATCH] module_param_array() should take a pointer module_param_array() takes a variable to put the number of elements in. Looking through the uses, many people don't care, so they declare a dummy or share one variable between several parameters. The latter is problematic because sysfs uses that number to decide how many to display. The solution is to change the variable arg to a pointer, and if the pointer is NULL, use the "max" value. This change is fairly small, but fixing up the callers is a lot of (trivial) churn. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <ak@muc.de> [PATCH] x86_64: drop old APIC workaround Suggested by Ingo Molnar. Drop APIC level workaround for old IO-APICs on x86-64 because it is a significant part of interrupt handling time. x86-64 only runs on modern chipsets that probably don't have this bug. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <ak@muc.de> [PATCH] x86_64: intialize hpet char driver Initialize HPET char driver Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <ak@muc.de> [PATCH] x86_64: use TSC on SMP EM64T machines x86-64 MP kernels always used HPET timing when available. This was done because AMD systems don't have synchronized TSCs in all cases. On Intel this is not true (except Summit), so use faster TSC timing for those. Also only enable HPET gettimeofday when there is more than one CPU online. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <ak@muc.de> [PATCH] x86_64: add notsc option Add an notsc option so that it can be turned off again. This may be useful on the Summit, but will only work when there is a HPET fallback. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <ak@muc.de> [PATCH] x86_64: add an option to configure oops stack dump Add an kstack= option to configure how much stack should be printed on a oops. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <ak@muc.de> [PATCH] x86_64: fix IOAPIC on Nvidia boards Originally suggested by Zwane Mwaikumbo Ignore all ACPI timer overrides on all Nvidia boards. The fallback doesn't work and no Nvidia boards needs a timer override. But some buggy BIOS have it anyways. Also enable IO-APIC mode by default for Nvidia then. Thanks to Andy Currid for confirming this. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <ak@muc.de> [PATCH] x86_64 Kconfig: Split CONFIG_NUMA_EMU and CONFIG_K8_NUMA Split CONFIG_NUMA_EMU and CONFIG_K8_NUMA because they are independent. Signed-off-by: Andi Kleen <ak@muc.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <gordon.jin@intel.com> [PATCH] x86_64: correct copy_user_generic return value when exception happens Fix a bug that arch/x86_64/lib/copy_user:copy_user_generic will return a wrong value when exception happens. In the case the address is not 8-byte aligned (i.e. go into Lbad_alignment), if exception happens in Ls11, %rdx will be wrong number of copied bytes, then copy_user_generic returns wrong value. It also fixed a bug of zeroing wrong number of bytes of destination at this situation. (In Lzero_rest) Signed-off-by: Yanmin Zhang <yanmin.zhang@intel.com> Signed-off-by: Nanhai Zou <nanhai.zou@intel.com> Signed-off-by: Gordon Jin <gordon.jin@intel.com> Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <rddunlap@osdl.org> [PATCH] x86_64/io_apic init section fixups Code section errors in i386/io_apic.c found by scripts/reference_init.pl. Looks like they could cause problems for a few drivers or in a real hotplug environment. Error: ./arch/i386/kernel/io_apic.o .text refers to 000018ff R_386_PC32 .init.text call chain: snd_mpu401_acpi_resource acpi_register_gsi mp_register_gsi io_apic_set_pci_routing {A} ioapic_register_intr IO_APIC_irq_trigger find_irq_entry Error: ./arch/i386/kernel/io_apic.o .text refers to 00001967 R_386_PC32 .init.text (as above thru {A}, then:) IO_APIC_irq_trigger irq_trigger MPBIOS_trigger >> removing __init from this led to needing to remove __init from EISA_ELCR also. Signed-off-by: Randy Dunlap <rddunlap@osdl.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <dwmw2@infradead.org> [PATCH] JFFS2: work around uninitialised use of usercompr field by old code. We didn't use the 'usercompr' field before recently. Unfortunately we didn't set it to zero either, so there's a lot of file systems out there with it set to 0x5a. Deal with that rather than getting confused. Signed-Off-By: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <kaigai@ak.jp.nec.com> [PATCH] atomic_inc_return() for i386 This patch implements atomic_inc_return() and so on for i386, and includes runtime check whether CPU is legacy 386. Signed-off-by: KaiGai, Kohei <kaigai@ak.jp.nec.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <kaigai@ak.jp.nec.com> [PATCH] atomic_inc_return() for x86_64 Signed-off-by: KaiGai, Kohei <kaigai@ak.jp.nec.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <kaigai@ak.jp.nec.com> [PATCH] atomic_inc_return() for arm This patch declares atomic_inc_return() as the alias of atomic_add_return() and atomic_dec_return() as an alias of atomic_dec_return(). Signed-off-by: KaiGai, Kohei <kaigai@ak.jp.nec.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <kaigai@ak.jp.nec.com> [PATCH] atomic_inc_return() for arm26 This patch implements atomic_inc_return() and so on for ARM26. Because Hugh says that SMP is not supported in arm26, it is implemented by normal operations between local_irq_save() and local_irq_restore() like another atomic operations. Signed-off-by: KaiGai, Kohei <kaigai@ak.jp.nec.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <kaigai@ak.jp.nec.com> [PATCH] atomic_inc_return() for sparc64 This patch declares atomic_add_return() as an alias of __atomic_add(). atomic64_add_return(),atomic_sub_return() and atomic64_sub_return() are same. Signed-off-by: KaiGai, Kohei <kaigai@ak.jp.nec.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <wli@holomorphy.com> [PATCH] sparc32: add atomic_sub_and_test() Add atomic_sub_and_test() to sparc32, implemented in terms of atomic_sub_return(), so reiser4 can be simultaneously microoptimized for x86 and made to pass compilation testing on sparc32. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hch@lst.de> [PATCH] remove dead exports from fs/fat/ These were used by the defunct umsdos code only. Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hirofumi@mail.parknet.co.jp> [PATCH] FAT: use hlist_head for fat_inode_hashtable Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hirofumi@mail.parknet.co.jp> [PATCH] FAT: rewrite the cache for file allocation table lookup This rewrites the cache stuff for file allocation table (FAT). This cache stocks the more pieces of FAT-chain by counting the number of contiguous data blocks. And if cache hit, since a block number can calculate without looking FAT-chain up, fat_get_block() become more fast. But if data blocks was fragmenting, unfortunately this cache is unuseful. read from block device [1st]# time dd if=/dev/hda6 of=/dev/null bs=1M count=2048 2147483648 bytes transferred in 229.524189 seconds (9356241 bytes/sec) real 3m49.557s, user 0m0.026s, sys 1m20.414s [2nd]# time dd if=/dev/hda6 of=/dev/null bs=1M count=2048 2147483648 bytes transferred in 229.539358 seconds (9355623 bytes/sec) real 3m49.647s, user 0m0.036s, sys 1m20.144s read from full contiguous file with this patch [1st]# time dd if=data of=/dev/null bs=1M count=2048 2147483648 bytes transferred in 337.959477 seconds (6354264 bytes/sec) real 5m37.970s, user 0m0.031s, sys 1m21.915s [2nd]# time dd if=data of=/dev/null bs=1M count=2048 2147483648 bytes transferred in 225.401699 seconds (9527362 bytes/sec) real 3m45.476s, user 0m0.027s, sys 1m19.286s read from full fragmented file with this patch [1st]# time dd if=data of=/dev/null bs=1M count=2048 2147483647 bytes transferred in 1146.529081 seconds (1873030 bytes/sec) real 19m6.538s, user 0m0.020s, sys 1m32.774s [2nd]# time dd if=data of=/dev/null bs=1M count=2048 2147483647 bytes transferred in 1045.084822 seconds (2054841 bytes/sec) real 17m25.152s, user 0m0.022s, sys 1m34.801s read from full contiguous file without this patch [1st]# time dd if=data of=/dev/null bs=1M count=2048 2147483648 bytes transferred in 348.144707 seconds (6168365 bytes/sec) real 5m48.169s, user 0m0.019s, sys 1m29.962s [2nd]# time dd if=data of=/dev/null bs=1M count=2048 2147483648 bytes transferred in 324.017361 seconds (6627681 bytes/sec) real 5m24.038s, user 0m0.023s, sys 1m20.602s read from full fragmented file without this patch [1st]# time dd if=data of=/dev/null bs=1M count=2048 2147483647 bytes transferred in 1156.845693 seconds (1856327 bytes/sec) real 19m16.855s, user 0m0.031s, sys 1m32.172s [2nd]# time dd if=data of=/dev/null bs=1M count=2048 2147483647 bytes transferred in 1066.518713 seconds (2013545 bytes/sec) real 17m46.526s, user 0m0.023s, sys 1m33.630s Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hirofumi@mail.parknet.co.jp> [PATCH] FAT: cache lock from per sb to per inode Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hirofumi@mail.parknet.co.jp> [PATCH] FAT: the inode hash from per module to per sb Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hirofumi@mail.parknet.co.jp> [PATCH] FAT: Fix the race bitween fat_free() and fat_get_cluster() This patch fixes the race condition | fat_free | fat_get_cluster +------------------------------+----------------------- fat_cache_lookup() (get the copy of cache) fat_cache_inval_inode() (invalidate caches on inode) fat_cache_add() (update/add the getted cache) The above race has possible that invalidated cache is added. This patch fixes the race condition by adding the cache-id to copy of cache. Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hirofumi@mail.parknet.co.jp> [PATCH] FAT: remove debug_pr() Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hirofumi@mail.parknet.co.jp> [PATCH] FAT: merge fix Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hirofumi@mail.parknet.co.jp> [PATCH] FAT: check free_clusters value This patch make sure it's <= sbi->clusters. Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hirofumi@mail.parknet.co.jp> [PATCH] FAT: removal of C[FT]_LE_[WL] macro Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hirofumi@mail.parknet.co.jp> [PATCH] FAT: remove validity check of FAT first entry The low byte of FAT's first entry must have same value with media-field. So, I added that validity check for some case. In fact, in some case this check detected non-FAT filesystem. But in real world, unfortunately too many devices is writing a wrong value. This patch removes that validity check. Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hugh@veritas.com> [PATCH] lighten mmlist_lock Let's lighten the global spinlock mmlist_lock. What's it for? 1. Its original role is to guard mmlist. 2. It later got a second role, to prevent get_task_mm from raising mm_users from the dead, just after it went down to 0. Firstly consider the second: __exit_mm sets tsk->mm NULL while holding task_lock before calling mmput; so mmlist_lock only guards against the exceptional case, of get_task_mm on a kernel workthread which did AIO's use_mm (which transiently sets its tsk->mm without raising mm_users) on an mm now exiting. Well, I don't think get_task_mm should succeed at all on use_mm tasks. It's mainly used by /proc/pid and ptrace, seems at best confusing for those to present the kernel thread as having a user mm, which it won't have a moment later. Define PF_BORROWED_MM, set in use_mm, clear in unuse_mm (though we could just leave it), get_task_mm give NULL if set. Secondly consider the first: and what's mmlist for? 1. Its original role was for swap_out to scan: rmap ended that in 2.5.27. 2. In 2.4.10 it got a second role, for try_to_unuse to scan for swapoff. So, make mmlist a list of mms which maybe have pages on swap: add mm to mmlist when first swap entry is assigned in try_to_unmap_one (pageout), or in copy_page_range (fork); and mmput remove it from mmlist as before, except usually list_empty and there's no need to lock. drain_mmlist added to swapoff, to empty out the mmlist if no swap is then in use. mmput leave mm on mmlist until after its exit_mmap, so try_to_unmap_one can still add mm to mmlist without worrying about the mm_users 0 case; but try_to_unuse must avoid the mm_users 0 case (when an mm might be removed from mmlist, and freed, while it's down in unuse_process): use atomic_inc_return now all architectures support that. Some of the detailed comments in try_to_unuse have grown out of date: updated and trimmed some, but leave SWAP_MAP_MAX for another occasion. Signed-off-by: Hugh Dickins <hugh@veritas.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <kraxel@bytesex.org> [PATCH] v4l: tuner update This is a update for the analog tv tuner module, it adds support for two new tuner chips. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <kraxel@bytesex.org> [PATCH] v4l: avoid using struct file ptrs in video-buf This patch makes the video-buf helper module pass through a void pointer instead of a struct file pointer, that makes the code also usable when no file pointer is available. This is needed for when using the video-buf infrastructure to manage DMA buffers for DVB cards. The file pointer was used by the videobuf_queue_ops callbacks to get the drivers private data via file->private_data, now a pointer to the drivers's private data can be passed directly. Adaptions of the drivers follow with separate patches. Signed-off-by: Gerd Knorr <kraxel@bytesex.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <kraxel@bytesex.org> [PATCH] v4l: adapt saa7146 to video-buf changes. This patch adapts the saa7146 driver to the video-buf changes. Signed-off-by: Gerd Knorr <kraxel@bytesex.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <kraxel@bytesex.org> [PATCH] v4l: bttv driver update This update for the bttv driver. Changes: * adapt the driver to video-buf changes. * It also added sanity checks for the bt878 risc code buffer sizes. * adds support for new tv cards. * cleanup i2c driver autoload. * misc cleanups (msleep, ...). * fix IRQ bug when stopping vbi capture. * drop check for cx2388x (bt878 successor) and the printk saying bttv doesn't support these. * set i2c class correctly for dvb cards. Signed-off-by: Gerd Knorr <kraxel@bytesex.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <kraxel@bytesex.org> [PATCH] v4l: cx88 driver update This is a major update of the cx88 driver. Main new feature is support for the MPEG PCI function of the cx2388x chips. The changes in detail: * A bunch of code restructions, to allow multiple modules (one per PCI function) work on top of the core module. * Add a new module with common code for the mpeg PCI function. * Add a new module to support mpeg encoder cards (connexant "blackbird" reference design). That one is not much tested yet and may have bugs. They can be easily workarounded by not loading the module through, it isn't needed to capture uncompressed video. * Add a new module to support DVB cards. That one is better tested than the blackbird one, but it needs additional cutting-edge stuff from the dvb project, thats why it is disabled in Kconfig for now. * Several cleanups along the way: use kthread, use msleep(), drop some 2.4.x compatibility code, move insmod options to 2.6 style, ... * adapt code to the video-buf changes. * suspend fixes. * as usual some new tv cards. Signed-off-by: Gerd Knorr <kraxel@bytesex.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <kraxel@bytesex.org> [PATCH] DVB/V4L dependency fix The problem is that dvb is way to much work-in-progress right now, it's almost impossible to build something which works on both mainline kernel + latest dvb cvs. Hope at least the interfaces are settled soon, for now I gave up on getting it work in mainline in short-term. The patch below compiles the DVB card configuration code only when VIDEO_CX88_DVB is enabled (which is commented right now in Kconfig due to being broken). Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <kraxel@bytesex.org> [PATCH] v4l: msp3400 cleanup This is a minor cleanup for the msp3400.c module: use the new msleep() function for delays. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hunold@linuxtv.org> [PATCH] DVB: update saa7146 - [DVB] fix videodev has no release callback - [DVB] use PAGE_SIZE for pagetables, not home-brewn SAA7146_PGTABLE_SIZE - [DVB] use cpu_to_le32() at various places for endianess independency - [DVB] turn some error checks into BUG()s - [DVB] make saa7146_i2c_adapter_prepare() support an adapter class - [DVB] add support for V4L2_PIX_FMT_RGB32 pixelformat - [DVB] replace generic saa7146 i2c name by card specific name, suggested by Uli Luckas <luckas@musoft.de> Signed-off-by: Michael Hunold <hunold@linuxtv.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hunold@linuxtv.org> [PATCH] DVB: documentation update - [DVB] add udev.txt which describes how to use dvb and udev/sysfs - [DVB] add Visionplus VisionDTV USB-Ter DVB-T adapter documentation - [DVB] update TT USB DEC documentation - [DVB] update various Kconfig entries - [DVB] remove obsolete firmware documentation Signed-off-by: Michael Hunold <hunold@linuxtv.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hunold@linuxtv.org> [PATCH] DVB: skystar2 dvb bt8xx update - [DVB] convert drivers from dvb-i2c to kernel-i2c - [DVB] convert MODULE_PARM() to module_param() - [DVB] convert dvb_delay() to mdelay() - [DVB] dvb-bt8xx: convert home-brewn bttv i2c access to a real bttv sub-driver Signed-off-by: Michael Hunold <hunold@linuxtv.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hunold@linuxtv.org> [PATCH] DVB: core update - [DVB] remove non-linux compatibility stuff from dvb_functions. rest in peace. - [DVB] remove home-brewn dvb-i2c stuff. rest in peace. - [DVB] convert MODULE_PARM() to module_param() - [DVB] convert dvb_delay() to mdelay() - [DVB] convert C++ comments to C comments - [DVB] dvb_ca_en50221: fix for matrix CAMs from Sjoerd Simons, use c99 initializers, Fix for aston CAM read timeout problems, Moved CAM CTRL IF reset to a better place, better debugging with multiple cards (Sjoerd Simons) - [DVB] dvb-frontend: patch by Wolfgang Fritz: suppress spurious events during tuning, Do not allow write (and related) ioctls when frontend is opened RDONLY, Properly lock the frontend module on open/close, patch by Christopher Pascoe: remove bogus up(fe->sem) on fe thread exit, patch by Christopher Pascoe: remove bogus up(fe->sem) on fe thread exit - [DVB] dvb-demux: using spin_lock instead of spin_lock_irq caused a race condition between irq/tasklet and user space task - [DVB] dvb-core: add sysfs/udev support using "class_simple", prevent Oops when PES filter is set with invalid pes_type, protect feed_list with spin_locks Signed-off-by: Michael Hunold <hunold@linuxtv.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hunold@linuxtv.org> [PATCH] DVB: frontend conversion - [DVB] stv0299, tda1004x, ves1820, ves1x93: convert from dvb-i2c to kernel-i2c, MODULE_PARM() to module_param(), dvb_delay() to mdelay() - [DVB] tda1004x: move from home-brewn firmware loading to firmware_class - [DVB] stv0299: support Cinergy1200, patch by Uli Luckas Signed-off-by: Michael Hunold <hunold@linuxtv.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hunold@linuxtv.org> [PATCH] DVB: frontend conversion #2 - [DVB] alps_tdlb7, alps_tdmb7, at76c651, cx24110, dst: convert from dvb-i2c to kernel-i2c, MODULE_PARM() to module_param(), dvb_delay() to mdelay() - [DVB] alps_tdlb7: move from home-brewn firmware loading to firmware_class - [DVB] dst: use sysfs attributes for type and flags for per-card parameters Signed-off-by: Michael Hunold <hunold@linuxtv.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hunold@linuxtv.org> [PATCH] DVB: frontend conversion #3 - [DVB] dvb_dummy_fe, grundig_29504-401, grundig_29504-491, mt312: convert from dvb-i2c to kernel-i2c, MODULE_PARM() to module_param(), dvb_delay() to mdelay() - [DVB] update frontend Kconfig Signed-off-by: Michael Hunold <hunold@linuxtv.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hunold@linuxtv.org> [PATCH] DVB: frontend conversion #4 - [DVB] nxt6000, sp887x: convert from dvb-i2c to kernel-i2c, MODULE_PARM() to module_param(), dvb_delay() to mdelay() - [DVB] sp887x: move from home-brewn firmware loading to firmware_class Signed-off-by: Michael Hunold <hunold@linuxtv.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hunold@linuxtv.org> [PATCH] DVB: add frontend - [DVB] add new driver for Zarlink DVB-T MT352 frontend - [DVB] add new driver for Conexant 22702 DVB OFDM frontend Signed-off-by: Michael Hunold <hunold@linuxtv.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hunold@linuxtv.org> [PATCH] DVB: add frontend #2 - [DVB] add new driver for mobile DVB-T demodulator DiBcom 3000-MB - [DVB] add new drivers to Makefile Signed-off-by: Michael Hunold <hunold@linuxtv.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hunold@linuxtv.org> [PATCH] DVB: new driver for mobile USB Budget DVB-T devices - [DVB] new driver for mobile USB Budget DVB-T devices, thanks to Patrick Boettcher Signed-off-by: Michael Hunold <hunold@linuxtv.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hunold@linuxtv.org> [PATCH] DVB: misc driver updates - [DVB] av7110: convert MODULE_PARM() to module_param(), replace home-brewn waiting stuff in osd code with wait_event_interruptible_timeout() - [DVB] av7110: put a semaphore around osd calls to make sure they're properly serialized, timeout variable in arm_thread() must be int, not unsigned long - [DVB] av7110: add additional OSD window types (patch by Jeremy Jones), new ioctl OSD_GET_CAPABILITY/OSD_CAP_MEMSIZE; returns size of OSD memory - [DVB] av7110: put audio/video initialization into separate function init_av7110_av(); call this function after system initialization and after arm crash to restore the previous state; thanks to Soeren Sonnenburg <bugreports@nn7.de> for this patch. - [DVB] av7110, budget, ttusb-budget: remove dvb i2c remains, support kernel i2c - [DVB] av7110, budget: use msleep() instead of my_wait(), thanks to Kernel Janitors/Nishanth Aravamudan <nacc@us.ibm.com> - [DVB] av7110, budget: fix videodev has no release callback - [DVB] av7110: more sparse annotiations - [DVB] budget: add support for TerraTec Cinergy 1200 DVB-S - [DVB] budget: fix race condition in irq handler - [DVB] skystar2, av7110, ttusb-budget, budget: make i2c client_(un)register() functions static Signed-off-by: Michael Hunold <hunold@linuxtv.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hunold@linuxtv.org> [PATCH] DVB: frontend updates - [DVB] all: replace dvb_unregister_frontend_new() with dvb_unregister_frontend() - [DVB] sp887x: fix firmware download, patch by Jose Alberto Reguero - [DVB] tda1004x: add firmware loading via firmware_class() - [DVB] dvb_frontend: without hierachical coding, code_rate_LP is irrelevant, so we tolerate the otherwise invalid FEC_NONE setting - [DVB] ves1x93: fixed dropouts on older DVB cards, fix tuning issues (Andreas Share / Gregoire Favre), Signed-off-by: Michael Hunold <hunold@linuxtv.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hunold@linuxtv.org> [PATCH] V4L: follow changes in saa7146 - [V4L] mxb, dpc7146, hexium_orion, hexium_gemini: follow latest changes in saa7146 driver Signed-off-by: Michael Hunold <hunold@linuxtv.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <akpm@osdl.org> [PATCH] module_parm_array fixups Fix up various things which Rusty's patch broke or missed. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <tharbaugh@lnxi.com> [PATCH] gen_init_cpio uses external file list This patch makes gen_init_cpio generate the initramfs_data.cpio from a file which contains a list of entries: file, dir, nod. I swapped the order of filename/location for the file arguments so that it would be more uniform with the dir and node tyes. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <azarah@nosferatu.za.org> [PATCH] Select cpio_list or source directory for initramfs image Attached is a patch that adds CONFIG_INITRAMFS_SOURCE, enabling you to either specify a file as cpio_list, or a directory to generate a list from. It depreciate the INITRAMFS_LIST environment variable introduced not long ago. There are some issues (suggestions/patches welcome) that I am not sure about: 1) I put the menu entry under block devices, but I am not sure if this is the correct location? 2) There might be a better (or more correct) way to do this with kbuild? 3) Variable names and especially help text needs some love. 4) I am not sure if I am duplicating work in progress? Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <akpm@osdl.org> [PATCH] select-cpio_list-or-source-directory-for-initramfs-image fix Kconfig barfs if it doesn't have leading spaces in the help. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <neilb@cse.unsw.edu.au> [PATCH] nfsd4: nfsd oopsed when encountering a conflict with a local lock Bug Fix: Non NFSD conflicting byte-range locks were causing an Oops. Encode a zero length owner and zero clientid for non NFSD conflicting locks in the lock_denied response. Signed-off-by: Andy Adamson <andros@umich.edu> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <neilb@cse.unsw.edu.au> [PATCH] nfsd: separate a little of logic from fh_verify into new function Separate out the little bit of logic in fh_verify that checks the i_mode into a separate function. This is nicely encapsulated, fh_verify() is overly long anyway, and this change helps make a subsequent nfs4 named attribute change clearer. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <neilb@cse.unsw.edu.au> [PATCH] nfsd4: don't take i_sem around call to ->getxattr The ->getxattr op doesn't take the i_sem (see Documentation/filesystems/Locking) Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <neilb@cse.unsw.edu.au> [PATCH] nfsd: make sure getxattr inode op is non-NULL before calling it Make sure getxattr inode op is non-NULL before calling it. Also, security hook should probably be called before calling the getxattr op the first time. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <neilb@cse.unsw.edu.au> [PATCH] nfsd4: reference count stateowners Reference-counting the nfsd4 stateowner structs will let us fix a race and simplify some of the xdr code a bit, and may also help us make the nfsd4 locking a little more fine-grained in the future. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <neilb@cse.unsw.edu.au> [PATCH] nfsd4: take a reference to preserve stateowner through xdr replay code Take a reference to preserve the stateowner through the xdr replay code, and simplify nfsd4_proc_compound a little. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <neilb@cse.unsw.edu.au> [PATCH] nfsd4: revert awkward extension of state lock over xdr for replay encoding With the addition of a reference count, we no longer need the code that conditionally extended the nfs4 state lock over the xdr encode stage. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <neilb@cse.unsw.edu.au> [PATCH] nfsd4: fix race in xdr encoding of lock_denied response. We take a reference on the stateowner, and copy the clientid, instead of just hoping no one destroys the stateowner before we reference it in nfsd4_encode_lock_denied. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <neilb@cse.unsw.edu.au> [PATCH] nfsd: remove incorrect stateid modification in nfsv4 open upgrade When we upgrade an open, we keep the same stateid and bump only the seqid. Signed-off-by: Andy Adamson <andros@umich.edu> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <neilb@cse.unsw.edu.au> [PATCH] nfsd4: move open owner checks from nfsd4_process_open2 into new function nfsd4_process_open2 has become a bit long and contorted. The following patches break nfsd4_process_open2 into smaller functions and add comments to describe logic flow, in preparation for delegation state. We begin by pulling out the code that searches for conflicting open owners into a separate function. Signed-off-by: Andy Adamson <andros@citi.umich.edu> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <neilb@cse.unsw.edu.au> [PATCH] nfsd: set OPEN_RESULT_LOCKTYPE_POSIX in open() We should set the OPEN_RESULT_LOCKTYPE_POSIX flag in the return to open, to indicate that we support locking. Signed-off-by: Andy Adamson <andros@citi.umich.edu> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <neilb@cse.unsw.edu.au> [PATCH] nfsd4: move seqid decrement on reclaim to separate function Move seqid decrement on reclaim to separate function Signed-off-by: Andy Adamson <andros@citi.umich.edu> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <neilb@cse.unsw.edu.au> [PATCH] nfsd4: reorganize "if" in nfsd4_process_open2 to make test clearer Reorganize "if" in nfsd4_process_open2 to make test clearer; there was no real reason to test for the negative here. Signed-off-by: Andy Adamson <andros@umich.edu> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <neilb@cse.unsw.edu.au> [PATCH] nfsd4: move open_upgrade code into a separate function Move most of the code for the open_upgrade case into a separate nfs4_upgrade_open. Signed-off-by: Andy Adamson <andros@umich.edu> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <neilb@cse.unsw.edu.au> [PATCH] nfsd4: move some nfsd4_process_open2 code to nfs4_new_open Move most of the code in the new_open case of nfsd4_process_open2 to nfs4_new_open. Signed-off-by: Andy Adamson <andros@umich.edu> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <neilb@cse.unsw.edu.au> [PATCH] nfsd: clean up nfsd4_process_open2 Comments, dprintk cleanup Signed-off-by: Andy Adamson <andros@citi.umich.edu> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <neilb@cse.unsw.edu.au> [PATCH] nfsd4: fix putrootfh return Thanks to Al Viro for noticing that putrootfh could return either a linux or an nfs error. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <neilb@cse.unsw.edu.au> [PATCH] nfsd4: move code to truncate on open to separate function for OPEN with O_TRUNC, if the truncate fails, the open fails. for nfs4_open_upgrade, this means undo the get_write_access. for new OPENs, this means release the newly created stateid. Signed-off-by: Andy Adamson <andros@citi.umich.edu> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <wli@holomorphy.com> [PATCH] vm: introduce remap_pfn_range() to replace remap_page_range() This patch introduces remap_pfn_range(), destined to replace remap_page_range(), to which all callers of remap_page_range() are converted in the sequel. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <wli@holomorphy.com> [PATCH] vm: convert references to remap_page_range() under arch/ and Documentation/ to remap_pfn_range() This patch converts all callers of remap_page_range() under arch/ and all references in Documentation/ to use remap_pfn_range(). Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <wli@holomorphy.com> [PATCH] vm: convert users of remap_page_range() under drivers/ and net/ to use remap_pfn_range() This patch converts all callers of remap_page_range() under arch/ and net/ to use remap_pfn_range() instead. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <wli@holomorphy.com> [PATCH] vm: convert users of remap_page_range() under include/asm-*/ to use remap_pfn_range() This patch converts uses of remap_page_range() via io_remap_page_range() in include/asm-*/ to use remap_pfn_range(). io_remap_page_range() has a similar physical address overflow issue that needs to be addressed later. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <wli@holomorphy.com> [PATCH] vm: convert users of remap_page_range() under sound/ to use remap_pfn_range() This patch converts all users of remap_page_range() under sound/ to use remap_pfn_range(), with the exception of maestro3 changelogs, which are likely expected to be preserved intact apart from additions (as most changelogs are), regardless of API changes. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <zwane@linuxpower.ca> [PATCH] Update 'noapic' description The 'noapic' kernel parameter only disables IOAPIC use and not all the APICs (which would include local APICs) in the system. Signed-off-by: Zwane Mwaikambo <zwane@fsmlabs.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <mingo@elte.hu> [PATCH] disk stats preempt safety The per-cpu disk stats are being updated in a non-preempt-safe manner in a couple of places. The patch introduces introduces preempt and non-preempt versions of the statistics code and updates the block code to use the appropriate ones. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jbglaw@lug-owl.de> [PATCH] Document DEC VSXXX-AB digitizer as known working Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <roland@redhat.com> [PATCH] move struct k_itimer out of linux/sched.h I don't know why struct k_itimer was ever declared in sched.h; perhaps at one time it was referenced by something else there. There is no need for it now. This patch moves the struct where it belongs, in linux/posix-timers.h. It has zero effect on anything except keeping the source easier to read. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <mahalcro@us.ibm.com> [PATCH] BSD Secure Levels LSM: add time hooks I have received positive feedback from various individuals who have applied my BSD Secure Levels LSM patch, and so at this point I am submitting it to you with a request to merge it in. Nothing has changed in this patch since when I last posted it to the LKML, so I am not re-sending it there. This first patch adds hooks to catch attempts to set the system clock back. Signed-off-by: Michael A. Halcrow <mahalcro@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <mahalcro@us.ibm.com> [PATCH] BSD Secure Levels LSM: core This patch modifies Kconfig and Makefile to support building the BSD Secure Levels LSM, in addition to the module itself. Signed-off-by: Michael A. Halcrow <mahalcro@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <mahalcro@us.ibm.com> [PATCH] BSD Secure Levels LSM: documentation This patch includes documentation on using the BSD Secure Levels LSM. Signed-off-by: Michael A. Halcrow <mahalcro@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <shemminger@osdl.org> [PATCH] register_chrdev_region(), alloc_chrdev_region() const char A couple chrdev routines take a constant string and should be declared with const char *. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <fhirtz@redhat.com> [PATCH] Display committed memory limit and available in meminfo The following patch will have the committed memory limit (per the current overcommit ratio) and the amount of memory remaining under this limit displayed in meminfo. It's presently somewhat difficult to use the strict memory overcommit settings as it's somewhat difficult to determine the amount of memory remaining under the cap. This patch would make using strict overcommit a good bit simpler. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <clameter@sgi.com> [PATCH] Posix compliant cpu clocks POSIX clocks are to be implemented in the following way according to V3 of the Single Unix Specification: 1. CLOCK_PROCESS_CPUTIME_ID Implementations shall also support the special clockid_t value CLOCK_PROCESS_CPUTIME_ID, which represents the CPU-time clock of the calling process when invoking one of the clock_*() or timer_*() functions. For these clock IDs, the values returned by clock_gettime() and specified by clock_settime() represent the amount of execution time of the process associated with the clock. 2. CLOCK_THREAD_CPUTIME_ID Implementations shall also support the special clockid_t value CLOCK_THREAD_CPUTIME_ID, which represents the CPU-time clock of the calling thread when invoking one of the clock_*() or timer_*() functions. For these clock IDs, the values returned by clock_gettime() and specified by clock_settime() shall represent the amount of execution time of the thread associated with the clock. These times mentioned are CPU processing times and not the time that has passed since the startup of a process. Glibc currently provides its own implementation of these two clocks which is designed to return the time that passed since the startup of a process or a thread. Moreover Glibc's clocks are bound to CPU timers which is problematic when the frequency of the clock changes or the process is moved to a different processor whose cpu timer may not be fully synchronized to the cpu timer of the current CPU. This patchset results in a both clocks working reliably. The patch also implements the access to other the thread and process clocks of linux processes by using negative clockid's: 1. For CLOCK_PROCESS_CPUTIME_ID: -pid 2. For CLOCK_THREAD_CPUTIME_ID: -(pid + PID_MAX_LIMIT) This allows clock_getcpuclockid(pid) to return -pid and pthread_getcpuiclock(pid) to return -(pid + PID_MAX_LIMIT) to allow access to the corresponding clocks. Todo: - The timer API to generate events by a non tick based timer is not usable in its current state. The posix timer API seems to be only useful at this point to define clock_get/set. Need to revise this. - Implement timed interrupts in mmtimer after API is revised. The mmtimer patch is unchanged from V6 and stays as is in 2.6.9-rc3-mm2. But I expect to update the driver as soon as the interface to setup hardware timer interrupts is usable. Single Thread Testing CLOCK_THREAD_CPUTIME_ID= 0.494140878 resolution= 0.000976563 CLOCK_PROCESS_CPUTIME_ID= 0.494140878 resolution= 0.000976563 Multi Thread Testing Starting Thread: 0 1 2 3 4 5 6 7 8 9 Joining Thread: 0 1 2 3 4 5 6 7 8 9 0 Cycles= 0 Thread= 0.000000000ns Process= 0.495117441ns 1 Cycles=1000000 Thread= 0.140625072ns Process= 2.523438792ns 2 Cycles=2000000 Thread= 0.966797370ns Process= 8.512699671ns 3 Cycles=3000000 Thread= 0.806641038ns Process= 7.561527309ns 4 Cycles=4000000 Thread= 1.865235330ns Process= 12.891608163ns 5 Cycles=5000000 Thread= 1.604493009ns Process= 11.528326215ns 6 Cycles=6000000 Thread= 2.086915131ns Process= 13.500983475ns 7 Cycles=7000000 Thread= 2.245118337ns Process= 13.947272766ns 8 Cycles=8000000 Thread= 1.604493009ns Process= 12.252935961ns 9 Cycles=9000000 Thread= 2.160157356ns Process= 13.977546219ns Clock status at the end of the timer tests: Gettimeofday() = 1097084999.489938000 CLOCK_REALTIME= 1097084999.490116229 resolution= 0.000000040 CLOCK_MONOTONIC= 177.071675109 resolution= 0.000000040 CLOCK_PROCESS_CPUTIME_ID= 13.978522782 resolution= 0.000976563 CLOCK_THREAD_CPUTIME_ID= 0.497070567 resolution= 0.000976563 CLOCK_SGI_CYCLE= 229.967982280 resolution= 0.000000040 PROCESS clock of 1 (init)= 4.833986850 resolution= 0.000976563 THREAD clock of 1 (init)= 0.009765630 resolution= 0.000976563 Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <clameter@sgi.com> [PATCH] Posix compliant cpu clocks V6: mmtimer provides CLOCK_SGI_CYCLE * Add CLOCK_SGI_CYCLE provided by drivers/char/mmtimer Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <oleg@tv-sign.ru> [PATCH] detach_pid(): restore optimization Kirill's kernel/pid.c rework broke optimization logic in detach_pid(). Non zero return from __detach_pid() was used to indicate, that this pid can probably be freed. Current version always (modulo idle threads) return non zero value, thus resulting in unneccesary pid_hash scanning. Also, uninlining __detach_pid() reduces pid.o text size from 2492 to 1600 bytes. Acked-By: Kirill Korotaev <dev@sw.ru> Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <oleg@tv-sign.ru> [PATCH] detach_pid(): eliminate one find_pid() call Now there is no point in calling costly find_pid(type) if __detach_pid(type) returned non zero value. Acked-By: Kirill Korotaev <dev@sw.ru> Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hch@lst.de> [PATCH] don't include <linux/irq.h> from drivers <linux/irq.h> is internals for the generic irq handler implementation, which is used on most but not all platforms. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <venkatesh.pallipadi@intel.com> [PATCH] x86[64]: display phys_proc_id only when it is initialized phys_proc_id gets initialized only when (smp_num_siblings > 1). But gets printed even when (smp_num_siblings == 1). As a result we print incorrect physical processor id in /proc/cpuinfo, when HT is disabled. Signed-off-by:: "Venkatesh Pallipadi" <venkatesh.pallipadi@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <oleg@tv-sign.ru> [PATCH] copy_thread(): unneeded child_tid initialization {set,clear}_child_tid initialized in copy_process() right after return from copy_thread(). These vars are not used in cleanup path if copy_thread() fails. grep -r _child_tid arch/ shows only ia64/kernel/asm-offsets.c, so i blindly patched non i386 archs too. Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <janitor@sternwelten.at> [PATCH] drivers: remove unused MOD_{DEC,INC}_USE_COUNT hch send in a patch to remove MOD_{DEC,INC}_USE_COUNT. Let's also remove useless references to it (comments, old ifdefs). Signed-off-by: maximilian attems <janitor@sternwelten.at> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <geert@linux-m68k.org> [PATCH] m68k: MM off-by-one Fix off-by-one error in zone size calculation (from Didier Mequignon and Petr Stehlik) Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <geert@linux-m68k.org> [PATCH] Atari ACSI dependencies Atari ACSI: Correct a small problem in the dependencies of ATARI_BIONET and ATARI_PAMSNET (e.g. ATARI_ACSI=m shouldn't allow ATARI_BIONET=y). Signed-off-by: Adrian Bunk <bunk@fs.tum.de> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <geert@linux-m68k.org> [PATCH] m68k: minmax-removal arch/m68k/kernel/bios32.c M68k PCI: Removes unnecessary min/max macros and change calls to use kernel.h macros instead. Signed-off-by: Michael Veeck <michael.veeck@gmx.net> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <geert@linux-m68k.org> [PATCH] M68k: don't emit empty stack program header in vmlinux Recent versions of ld add an empty stack program header to the kernel image, which makes it incompatible with current m68k bootstrap loaders. Modify the linker script to make sure we see only the program headers that are really needed. (from Roman Zippel) Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <geert@linux-m68k.org> [PATCH] Amifb: update pseudocolor bitfield lenghts Amiga frame buffer: The new convention (introduced in 2.6.9-rc1) requires that the usable color depth for pseudocolor visuals is indicated by the lengths of the color bitfields. Update amifb for this convention, and add a special case for HAM (Hold-and-Modify) mode (colormap has 16 (HAM6) or 64 (HAM8) entries). Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <geert@linux-m68k.org> [PATCH] Amiga frame buffer: kill obsolete DMI Resolver code Kill remainings of the DMI Resolver support code that got removed somewhere between 2.0 and 2.2. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <geert@linux-m68k.org> [PATCH] m68k: NULL vs. 0 cleanups A few more NULL vs. 0 cleanups, as detected by sparse. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <geert@linux-m68k.org> [PATCH] Amifb: use new amifb:off logic to enhance audio experience Amiga frame buffer: We used to have a local hack in fbmem.c to always call the fbdev setup() routines, even when an fbdev was explicitly disabled on the kernel command line (video=xxx:off). This allowed amifb to suspend the monitor, but program the sync generator of the video controller in Denise/Lisa to a 31 kHz/70 Hz mode, increasing the maximum audio playback frequency. Thanks to the recently introduced fb_get_options() routine, we can kill the local hack and just use the return value of fb_get_options(). Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <baldrick@free.fr> [PATCH] firmware_class: avoid double free The error exit path in request_firmware frees the allocated struct firmware *firmware, which is good. What is not so good is that the value of firmware has already been copied out to the caller as *firmware_p. The risk is that the caller will pass this to release_firmware, a double free. This is exactly what will happen if the caller copied the example code if(request_firmware(&fw_entry, $FIRMWARE, device) == 0) copy_fw_to_device(fw_entry->data, fw_entry->size); release(fw_entry); from the firmware documentation. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <olh@suse.de> [PATCH] remove scsi ioctl from udf/lowlevel.c I'm not sure why these defines and typedefs exists, the driver compiles fine without it. Signed-off-by: Olaf Hering <olh@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <ed@il.fontys.nl> [PATCH] nfsd: Insecure port warning shows decimal IPv4 address print a couple of ipv4 addresses as dotted quads, not as hex. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <yuasa@hh.iij4u.or.jp> [PATCH] mips: added missing definition and fixed typo This patch had added missing definition and had fixed typo for VRC4173. Cc: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Yoichi Yuasa <yuasa@hh.iij4u.or.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <rsa@us.ibm.com> [PATCH] hvc_console fix to prevent oops and late hangup and write operations This patch prevents execution of hvc_write() and hvc_hangup() after the tty layer has executed a final hvc_close() against a device. This patch provides a better method than was previously used. tty->driver_data is no longer invalidated so we'll no longer get oopses when the tty layer allows late hangup() and write() operations. - Removed silly tty->driver_data = NULL; from hvc_close which prevents possible oops in hvc_write() and hvc_hangup() due to improperly acting ldisc close ordering. - Added hp->count <= 0 check to hvc_write() and hvc_hangup() to prevent execution of these function after hvc_close() has been invoked by the tty layer. Same tty ldisc issues as above are the reason. - Added some comments to clarify the situation. - Awaiting a forth coming patch from Alan Cox which should clean up the close ordering and prevent the late hangup and write ops from happening. Signed-off-by: Ryan S. Arnold <rsa@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <Matt_Domsch@dell.com> [PATCH] EDD: use EXTENDED READ command, add CONFIG_EDD_SKIP_MBR Some controller BIOSes have problems with the legacy int13 fn02 READ SECTORS command. int13 fn42 EXTENDED READ is used in preference by most boot loaders today, so lets use that. If EXTENDED READ fails or isn't supported, fall back to READ SECTORS. This hopefully resolves the three reports of BIOSes which would either long-pause (30+ seconds) or hang completely on the legacy READ SECTORS command. This also adds CONFIG_EDD_SKIP_MBR to eliminate reading the MBR on each BIOS-presented disk, in case there are further problems in this area. Signed-off-by: Matt Domsch <Matt_Domsch@dell.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <aoki@sdl.hitachi.co.jp> [PATCH] vm thrashing control tuning This patch adds "swap_token_timeout" parameter in /proc/sys/vm. The parameter means expired time of token. Unit of the value is HZ, and the default value is the same as current SWAP_TOKEN_TIMEOUT (i.e. HZ * 300). Signed-off-by: Hideo Aoki <aoki@sdl.hitachi.co.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <aoki@sdl.hitachi.co.jp> [PATCH] proc.txt cleanup In Documentation/filesystems/proc.txt, explanation of /proc/meminfo is described in section 1.3 (IDE devices in /proc/ide). I think that it should be described in section 1.2 (Kernel data). Signed-off-by: Hideo Aoki <aoki@sdl.hitachi.co.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <colin@colino.net> [PATCH] Warning fix in drivers/macintosh/macio-adb.c This one fixes another unitialized var warning (which is harmless, but whatever). Signed-off-by: Colin Leroy <colin@colino.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <Matt_Domsch@dell.com> [PATCH] idefloppy: suppress media not present errors Below is a patch to suppress printing uninformative errors from ide-floppy.c in response to commands to floppy drives in which no media is present. Without this patch, commands sent to ide-floppy devices without media inserted cause error messages on the console (KERN_ERR level) such as: ide-floppy: ide: I/O error, pc = 0 key = 2, asc = 3a asq = 0 ide-floppy: ide: I/O error, pc = 1b key = 2, asc = 3a asq = 0 ide-floppy: ide: I/O error, pc = 23 key = 2, asc = 3a asq = 0 ide-floppy: ide: I/O error, pc = 1e key = 2, asc = 3a asq = 0 ide-floppy: ide: I/O error, pc = 1e key = 2, asc = 3a asq = 0 Dell's Virtual Floppy (system management presents to the local system an IDE floppy device, which is actually a floppy device in a remote system connected over an IP link) exhibits this also, when connecting to a remote floppy drive with no media present. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <Matt_Domsch@dell.com> [PATCH] modules: put srcversion checksum in each modinfo section Separate the module source and header checksum into a separate modinfo field srcversion. With CONFIG_MODULE_SRCVERSION_ALL=y, put srcversion into every module, not just those with MODULE_VERSION("something"). Patch by Rusty Russell, trivial merging and testing by Matt Domsch Signed-off-by: Matt Domsch <Matt_Domsch@dell.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <juhl-lkml@dif.dk> [PATCH] __copy_to_user return value checks in i2o_config.c Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <akpm@osdl.org> [PATCH] vmalloc_to_page() preempt cleanup remove unneeded preempt_disable/enable. pte_offset_map/unmap already does that. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <pavel@ucw.cz> [PATCH] __init poisoning for i386 Overwrite __init section so calls to __init functions from normal code are caught, reliably. (Plus a fix from Dave Hansen) Signed-off-by: Dave Hansen <haveblue@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <blaisorblade_spam@yahoo.it> [PATCH] use container_of() for rb_entry() Use, in the rb_entry definition, the container_of macro instead of reinventing the wheel; compared to using offset_of() as I did in the prev. version, it has type safety checking. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <haveblue@us.ibm.com> [PATCH] remove weird pmd cast I don't know what this is trying to do. It might be some kind of artifact from when get_pgd_slow() was removed. The expanded expression with __pa() ends up looking something like this: (unsigned long)(u64)(u32)pmd-PAGE_OFFSET and that is just nutty because pmd is a pointer now, anyway. Attached patch removes the casts. Signed-off-by: Dave Hansen <haveblue@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <bunk@stusta.de> [PATCH] #include <asm/bitops.h> -> #include <linux/bitops.h> There's no reason to directly #include <asm/bitops.h> since it's available on all architectures and also included by #include <linux/bitops.h>. This patch changes #include <asm/bitops.h> to #include <linux/bitops.h>. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <dino@in.ibm.com> [PATCH] ps shows wrong ppid /proc shows the wrong PID as parent in the following case Process A creates Threads 1 & 2 (using pthread_create) Thread 2 then forks and execs process B getppid() for Process B shows Process A (rightly) as parent, however /proc/B/status shows Thread 3 as PPid (incorrect). Signed-off-by: Dinakar Guniguntala <dino@in.ibm.com> Acked-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <marcelo.tosatti@cyclades.com> [PATCH] Remove redundant AND from swp_type() There is a useless AND in swp_type() function. We just shifted right SWP_TYPE_SHIFT() bits the value from the swp_entry_t, and then we AND it with "(1 << 5) - 1" (which is a mask corresponding to the number of bits used by "type"). Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <manfred@colorfullife.com> [PATCH] slab: reduce fragmentation due to kmem_cache_alloc_node Attached is a patch that fixes the fragmentation that Badri noticed with kmem_cache_alloc_node. kmem_cache_alloc_node tries to allocate memory from a given node. The current implementation contains two bugs: - the node aware code was used even for !CONFIG_NUMA systems. Fix: inline function that redefines kmem_cache_alloc_node as kmem_cache_alloc for !CONFIG_NUMA. - the code always allocated a new slab for each new allocation. This caused severe fragmentation. Fix: walk the slabp lists and search for a matching page instead of allocating a new page. - the patch also adds a new statistics field for node-local allocs. They should be rare - the codepath is quite slow, especially compared to the normal kmem_cache_alloc. Signed-Off-By: Manfred Spraul <manfred@colorfullife.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <neilb@cse.unsw.edu.au> [PATCH] md: convert %Lu to %llu in printk While %Lu works with gcc, %llu is the correct usage. Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <ed@il.fontys.nl> [PATCH] lockd: remove hardcoded maximum NLM cookie length At the moment, the NLM cookie length is fixed to 8 bytes, while 1024 is the theoretical maximum. FreeBSD uses 16 bytes, Mac OS X uses 20 bytes. Therefore we need to make the length dynamic (which I set to 32 bytes). This patch is based on an old patch for Linux 2.4.23-pre9, which I changed to patch properly (also added some stylish NIPQUAD fixes). From: Neil Brown <neilb@cse.unsw.edu.au> Further lockd tidyups. - NIPQUAD everywhere that is appropriate - use XDR_QUADLEN in more places as appropriate - discard QUADLEN which is a lockd-specific version of XDR_QUADLEN Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <castet.matthieu@free.fr> [PATCH] bttv IRQ fix Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <macro@linux-mips.org> [PATCH] "console=" parameter ignored I've noticed that under specific circumstances the "console=" kernel parameter is ignored. This happens when EARLY_PRINTK is enabled and the serial console is the only available. In this case unregister_console() when called for the early console sets preferred_console back to -1 replacing the value that was recorded by console_setup() -- the order of calls is as follows: 1. register_console() -- for the early console, 2. console_setup() -- recording the console index for the real console, 3. unregister_console() -- for the early console, erasing the console index recorded above, 4. register_console() -- for the real console, picking up the first device available, instead of the selected one. I've observed this problem with a DECstation system using ttyS3 -- its default console device from the firmware's point of view. The solution is to restore the setting of "console=" upon unregister_console(). This made a snapshot of 2.4.26 work for me. I wasn't able to test the changes with 2.6 because DECstation drivers don't support it yet, but the code responsible for console selection appears functionally the same. So I've concluded it needs the same change. Here's a patch. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <dean@arctic.org> [PATCH] transmeta efficeon support and cpuid update This patch adds efficeon as a cpu option, and makes a small update to the transmeta cpuid code. (i wasn't sure if the various doc files are UTF-8... if they are, then the e should be a U-275 ;) The compile options may not be ideal, but they're probably close. i used -march=pentium3, but -march=pentium4 would have been good enough too. The cpuid update teaches transmeta.c about the extended processor revision present in cpuid level 0x80860002... the external documentation does not indicate how to break apart this field, and instructs only that the 32-bit value should be printed in hex (alas). Signed-off-by: dean gaudet <dean@arctic.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <kaos@ocs.com.au> [PATCH] reference_init fix Treat .pci_fixup entries the same as .init code/data. Signed-off-by: Keith Owens <kaos@ocs.com.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <bunk@stusta.de> [PATCH] fix block/cciss.c with PROC_FS=n kernel/built-in.o(.text+0x1d42b): In function `crash_create_proc_entry': : undefined reference to `proc_vmcore' Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <bunk@stusta.de> [PATCH] make CONFIG_PM_DEBUG depend on CONFIG_PM Signed-off-by: Chris Wright <chrisw@osdl.org> Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <armin@melware.de> [PATCH] Remove obsolete file Documentation/isdn/README.eicon The file Documentation/isdn/README.eicon is outdated and obsolete in kernel 2.6. This file includes description of the old Eicon ISDN driver in kernel 2.4, which was removed in 2.6. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <kenneth.w.chen@intel.com> [PATCH] Enable config_schedstats for all arches Config option CONFIG_SCHEDSTATS is currently enabled via arch specific Kconfig.debug. Only x86 and ppc arches has code to turn it on. Why not put it in generic lib/Kconfig.debug so it is done once to enable everyone? Signed-off-by: Ken Chen <kenneth.w.chen@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jeffm@csh.rit.edu> [PATCH] reiserfs: support for REISERFS_UNSUPPORTED_OPT notation This patch adds a REISERFS_UNSUPPORTED_OPT flag to denote when a mount option is allowable, but is unsupported in the running configuration. This allows the potential for the set of mount options to be consistent, regardless of what features the kernel is compiled with. Rather than failing the mount, a warning is issued and the mount succeeds. Signed-off-by: Jeff Mahoney <jeffm@novell.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jeffm@csh.rit.edu> [PATCH] reiserfs: allow user_xattr and acl options to be ignored, with warning This patch uses the REISERFS_UNSUPPORTED_OPT flag to denote -o(no)acl, and -o(no)user_xattr as unsupported, but allowable, when support isn't built into the kernel. Signed-off-by: Jeff Mahoney <jeffm@novell.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <andros@thnk.citi.umich.edu> [PATCH] nfs4 lease: add a lock manager copy lock callback The following patches provide an interface to the lease subsystem in the current VFS locking code. NFSv4 delegations and Samba op-locks share most architecture features. The version 4 NFS server delegation implementation should use leases to co-ordinate behavior between local, Samba, and NFS access. The main design points are - Seperate the fcntl interface from the file_lock FL_LEASE processing in fcntl_setlease, creating __setlease() called by fcntl_setlease() - Add new lock_manager callbacks to enable lease properties to be set, leases to be broken, and leases to be cleaned up: with default callbacks preserving the current fcntl_setlease properties. - Add a new interface, setlease() which also calls __setlease(), and remove_lease() for kernel lease managers (e.g. the v4 NFS server) This patch: Add a lock manager copy lock callback to locks_copy_lock() so that nfsd can set lease properties. Signed-off-by: Andy Adamson <andros@citi.umich.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <andros@thnk.citi.umich.edu> [PATCH] nfs4 lease: add a lock manager release private callback Add a lock manager release private callback to locks_free_lock() for lock manger lease clean-up. Signed-off-by: Andy Adamson <andros@citi.umich.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <andros@thnk.citi.umich.edu> [PATCH] nfs4 lease: add a lock manager break callback - Add a lock manager break callback to break_lease() for lock managers to initiate breaking a lease. - Move the break_lease() kill_fasync() call to a default lock manager fl_break callback Signed-off-by: Andy Adamson <andros@citi.umich.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <andros@thnk.citi.umich.edu> [PATCH] nfs4 lease: aeparate the lease initialization code Separate the lease initialization code from lease_alloc(). set the default lock manager ops. Signed-off-by: Andy Adamson <andros@citi.umich.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <andros@thnk.citi.umich.edu> [PATCH] nfs4 lease: move the f_delown processing Move the f_delown processing from lease_modify() into a new default lock manager fl_release_private callback. Signed-off-by: Andy Adamson <andros@citi.umich.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <andros@thnk.citi.umich.edu> [PATCH] nfs4 lease: separate the lease processsing code nfsd will not have a file descriptor, nor an owner on the filp. nfsd also will not use signals. Seperate the lease processsing coe from fcntl_setlease() into a __setlease() call. Signed-off-by: Andy Adamson <andros@citi.umich.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <andros@thnk.citi.umich.edu> [PATCH] nfs4 lease: use the inode i_writecount Use the inode i_writecount to test for handing out a F_RDLCK lease. Signed-off-by: Andy Adamson <andros@citi.umich.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <andros@thnk.citi.umich.edu> [PATCH] nfs4 lease: export setlease Export setlease(), a direct interface to __setlease() used by nfsd Signed-off-by: Andy Adamson <andros@citi.umich.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <andros@thnk.citi.umich.edu> [PATCH] nfs4 lease: export remove_lease Export remove_lease(), an interface to time_out_leases() with an fl_break_time in the past. needed by nfsd Signed-off-by: Andy Adamson <andros@citi.umich.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <andros@thnk.citi.umich.edu> [PATCH] nfs4 lease: add the new lock manager callbacks to the documentation Add the new lock manager callbacks to the documentation Signed-off-by: Andy Adamson <andros@citi.umich.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <sct@redhat.com> [PATCH] ext3 directio block leak fix The orphan list holds inodes that need to be truncated on recovery. In the O_DIRECT case, it's used if we extend the inode --- the truncate on recovery means we'll recover the newly-allocated disk blocks if we crash after the IO starts but before i_size is updated on disk. Now, the orphan list is *also* used to delete inodes that are unlinked but still-open. Those get truncated but also deleted on recovery. The orphan list is held both in memory and on disk. So the rules are that the inode can't be reclaimed while on the orphan list. There are only two cases --- either the inode is actively being written(O_DIRECT) or truncated (in which case the inode is by definition not going to be reused), or it's unlinked but still open (again, non-reclaimable). But in the case where you're truncating or write(O_DIRECT)ing a file that is *ALSO* unlinked, there's a problem --- the final unlink would put the inode on the orphan list, but the write/truncate would try to add/remove it. End result is that the inode disappears from the orphan list while it's still unlinked-but-in-use. That's just a leak-on-crash, it's not going to be detectable in normal use. But it's still a bug, and the way we fix it is for direct-IO and truncate not to do the ext3_orphan_del if the file is unlinked (ie. i_nlink==0). Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <kernel@linuxace.com> [PATCH] doc: scsihosts parameter no longer exists The scsihosts boot parameter was removed in 2.5.73, but references to it still exist in docs. Cleanup below. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <akpm@osdl.org> [PATCH] typhoon build fix Fix incorrect attempt to doubly-initialise the ethtool ops. Cc: <jgarzik@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <bzolnier@trik.(none)> [ide] sg PIO for taskfile requests Use scatterlists for taskfile based PIO transfers instead of directly walking rq->[bio,cbio] lists. If CONFIG_IDE_TASKFILE_IO is defined this code will be used for fs requests. ide_pio_sector() is based on ata_pio_sector() from libata-core.c so kudos to Jeff. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> <bzolnier@trik.(none)> [ide] sg PIO for fs requests Convert CONFIG_IDE_TASKFILE_IO=n code to use scatterlists for PIO transfers. Fixes longstanding 'data integrity on error' issue and makes barriers work with PIO. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> <bzolnier@trik.(none)> [ide] ide-disk: unify PIO write/multiwrite code Merge multwrite_intr() into write_intr(). The only change in functionality is that rq->errors is now also cleared for multiwrite PIO (if there is no error). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> <bzolnier@trik.(none)> [ide] unify PIO code Use PIO code from ide-taskfile.c in ide-disk.c so: * drive status is checked after PIO read * request is failed if invalid data phase is detected during PIO write Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> <hawkes@sgi.com> [IA64] top level scheduler domain for ia64 Some have noticed that the overlapping sched domains code doesn't quite work as intended (it results in disjoint domains on some machines), and that a top level, machine spanning domain is needed. This patch from John Hawkes adds it to the ia64 code. This allows processes to run on all CPUs in large systems, though balancing is limited. It should go to Linus soon now otherwise large systems will only have ~16p (depending on topology) usable by the scheduler. I sanity checked it on a small system after rediffing John's original, and he's done some testing on very large systems. Nick, can you buy off on the sched.c change? Alternatively, do you want to send that fix separately John? Nick did indeed ACK this change, but it isn't dependent on this ia64 specific part ... so it's going to be submitted separately. Signed-off-by: John Hawkes <hawkes@sgi.com> Signed-off-by: Jesse Barnes <jbarnes@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com> <jbarnes@sgi.com> [IA64] mca.c: sparse cleanup Looks like we were casting a value into a union and sparse doesn't like that. Why not just assign it directly to the appropriate field? Signed-off-by: Jesse Barnes <jbarnes@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com> <jbarnes@sgi.com> [IA64] numa.c, discontig.c: sparse: use NULL, not 0 Clean up a couple of places that were using 0 instead of NULL, which is the more proper value. Signed-off-by: Jesse Barnes <jbarnes@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com> <pfg@sgi.com> [IA64] export sn_dma_mapping_error for libata Signed-off-by: Patrick Gefre <pfg@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com> <rmk@flint.arm.linux.org.uk> [ARM] Add seqlocking to timers. Sometimes, it's useful to have locking. Especially when we're talking about time keeping. It would appear that shemminger's patch of 5th February 2003 completely missed updating _ANY_ ARM timer implementations and, because linux-arch didn't exist at the time, there appears to have been no notification to any architecture developer that maybe, just maybe, some work was required. One wonders how many other changes are in the kernel which architecture maintainers have missed. <jbarnes@sgi.com> [IA64-SGI] snsc.c: snsc needs asm/sn/io.h The sn system controller driver needs asm/sn/io.h in order to build correctly (it was missing the numionodes declaration). Signed-off-by: Jesse Barnes <jbarnes@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com> <pfg@sgi.com> [IA64-SGI] Mod to allow functions other than zero to use virtual channel 1. Signed-off-by: Patrick Gefre <pfg@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com> <jbarnes@sgi.com> [IA64] fix sba_iommu build sba_iommu.c needs to include linux/nodemask.h for node_online now. Here's a patch to add it. Signed-off-by: Jesse Barnes <jbarnes@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com> <jbarnes@sgi.com> [IA64-SGI] sparse cleanups & misc fixes for sn2 This is a big patch mostly because I trimmed shub_mmr.h down from 17M to 11k or so. It fixes a number of things sparse discovered and removes some dead code, fixes up some prototypes, etc. Of note: o sn_proc_fs.c was directly dereferencing user pointers, fixed o sn_hwperf.c was missing an include and was using asm-ia64 directly o the I/O routines were all missing proper sparse annotations o dead code in prominfo_proc.c has been removed o fix generic build by putting numionodes into asm/sn/io.h With this patch applied, the check build is pretty clean. The sn_console bit depends on some of the other changes, so it's included here. Signed-off-by: Jesse Barnes <jbarnes@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com> <tglx@linutronix.de> Shared Reed-Solomon ECC library The attached patch contains a shared Reed-Solomon Library analogous to the shared zlib. (N)AND FLASH is gaining popularity and there are a lot of ASIC/SoC/FPGA controllers around which implement hardware support for Reed-Solomon error correction. As usual they use different implementations (polynomials etc.). So it's obvious to use a shared library for the common tasks of error correction. A short scan through the kernel revealed that at least the ftape driver uses Reed-Solomon error correction. It could be easily converted to use the shared library code. The encoder/decoder code is lifted from the GPL'd userspace RS-library written by Phil Karn. I modified/wrapped it to provide the different functions which we need in the MTD/NAND code. The library is tested in extenso under various MTD/NAND configurations. The lib should be usable for other purposes right out of the box. Adjustment for currently not implemented functionality is an easy task. I'm willing to take the maintainership of the library. Signed-Off-By: Thomas Gleixner <tglx@linutronix.de> Signed-Off-By: David Woodhouse <dwmw2@infradead.org> "No objections at all. Just keep the authorship notices." -- Phil Karn <tglx@linutronix.de> Add DocBook documentation for MTD NAND drivers Signed-Off-By: Thomas Gleixner <tglx@linutronix.de> Signed-Off-By: David Woodhouse <dwmw2@infradead.org> <tglx@linutronix.de> MTD updates for __iomem Signed-Off-By: Thomas Gleixner <tglx@linutronix.de> Signed-Off-By: David Woodhouse <dwmw2@infradead.org> <dwmw2@shinybook.infradead.org> MTD cmdlinepart: Allow partition definitions to be set from elsewhere ... by making mtdpart_setup() non-static Patch from Juha Yrjölä committed by Jarkko Lavinen. Signed-Off-By: David Woodhouse <dwmw2@infradead.org> <dwmw2@shinybook.infradead.org> MTD map driver update: Alchemy DB1xxx boards - Change Pete Popov's email address - Tglx's __iomem fixes - Include file cleanups Signed-Off-By: David Woodhouse <dwmw2@infradead.org> <dwmw2@shinybook.infradead.org> MTD map driver update: ppc44x 'ebony' board - Update mporter email address - Include file fixups - Tglx's __iomem fixes Signed-Off-By: David Woodhouse <dwmw2@infradead.org> <dwmw2@shinybook.infradead.org> MTD map access: Fix calculation of the number of longs in a bus access Patch from Ben Dooks <ben-mtd@fluff.org> Signed-Off-By: David Woodhouse <dwmw2@infradead.org> <jbarnes@sgi.com> [IA64-SGI] more sparse I/O accessor fixes I forgot to add 'const volatile' to the I/O read/write functions in the last patch, and also forgot to update the _relaxed variants. This patch fixes that by adding 'const volatile' to the sn2 specific read/write routines as well as the ia64 machine vector wrappers. Signed-off-by: Jesse Barnes <jbarnes@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com> <tglx@linutronix.de> MTD char device access -- return data when ECC errors happen. This is sane, as the driver returns the real data and the return value is for information of NAND aware filesystems. Userspace access to raw NAND is usually restricted to debugging tools which are aware of the NAND specific problems. Signed-Off-By: Thomas Gleixner <tglx@linutronix.de> Signed-Off-By: David Woodhouse <dwmw2@infradead.org> <dwmw2@shinybook.infradead.org> New MTD map drivers. - Technology Systems TS-5500 board - Simtec BAST - IBM 440GX Ocotea Signed-Off-By: David Woodhouse <dwmw2@infradead.org> <dwmw2@shinybook.infradead.org> MTD: NOR flash chip driver updates Mostly from Eric Biederman for supporting BIOS flash. - Move support firmware hub style lock and unlock into fhw_lock.h (from cfi_cmdset_0002) - Move cfi_varsize_frob into cfi_util from cfi_cmdset_0001.c and cfi_cmdset_0002.c - reduce gen_probe probe failuers to a debug level message - Modify cfi_fixup to take a struct mtd_info instead of a struct map_info So that the fixup routines can modify the mtd functions. - Modify cfi_cmdset_0001() to allocate and initialize the mtd structure before calling cfi_fixup. - Modify cfi_cmdset_0002() to allocate and initialize the mtd structure before calling cfi_fixup. - Refactor the hard coded fixups in cfi_cmdset_0001 and cfi_cmdset_0002 so the improved cfi_fixup infrastructure. - Rewrote amd76xrom and ichxrom. They now report their starting physical address in their name. They now both handle multiple bankwidth configurations They both can create multipe mtd devices. They both now assume the rom windows are properly opened by the BIOS or whatever runs previous to them. Their code is now synchromized so it is almost identical, and could be a starting point for a x86_rom_probe. Signed-Off-By: David Woodhouse <dwmw2@infradead.org> <davem@nuts.davemloft.net> [NET]: TSO requires SG, enforce this at device registry. Signed-off-by: David S. Miller <davem@davemloft.net> <dwmw2@shinybook.infradead.org> MTD translation layer helper: set PF_NOFREEZE to allow sleep Patch from Todd Poynor Signed-Off-By: David Woodhouse <dwmw2@infradead.org> <tglx@linutronix.de> MTD: M-Systems DiskOnChip translation layer (NFTL): fix unused variable. Signed-Off-By: Thomas Gleixner <tglx@linutronix.de> Signed-Off-By: David Woodhouse <dwmw2@infradead.org> <dwmw2@shinybook.infradead.org> MTD userspace ABI: fix userspace compilation w.r.t. __user Signed-Off-By: David Woodhouse <dwmw2@infradead.org> <davem@nuts.davemloft.net> [SPARC64]: Make iomap.o obj-y instead of lib-y for module exports. Signed-off-by: David S. Miller <davem@davemloft.net> <tglx@linutronix.de> MTD: NAND flash driver updates. - Use new RS library for ECC - Add support for new NAND flash chips - New board support: - iPAQ H1910 - Renesas AG-AND devel board - Simtec S3C210 - Support for shared controllers on multiple chips. Signed-Off-By: Thomas Gleixner <tglx@linutronix.de> Signed-Off-By: David Woodhouse <dwmw2@infradead.org> <davem@nuts.davemloft.net> [IEEE1394]: ohci1394.c/pcylynx.c need asm/irq.h Signed-off-by: David S. Miller <davem@davemloft.net> <davem@nuts.davemloft.net> [SPARC64]: Update defconfig. Signed-off-by: David S. Miller <davem@davemloft.net> <davem@nuts.davemloft.net> [NET]: Uninline netif_rx_ni(). It expands to a lot of code when SMP or PREEMPT is enabled. Signed-off-by: David S. Miller <davem@davemloft.net> <akpm@osdl.org> [PATCH] v4l: missing bits Missing parts of the v4l update Cc: Gerd Knorr <kraxel@bytesex.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <akpm@osdl.org> [PATCH] i2o: missing bits from merge A couple of functions got themselves lost. cc: <Markus.Lidel@shadowconnect.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <dwmw2@shinybook.infradead.org> JFFS2 updates - Reduce memory use by merging adjacent obsolete raw_node_refs - Error handling fixes - Respect kmalloc size limit in scan - NAND ECC updates Signed-Off-By: David Woodhouse <dwmw2@infradead.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] moxa iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] sparc32 kconfig fixes a) CONFIG_VT should set CONFIG_INPUT b) parport_pc and serial/8250 are broken for sparc32 same as for sparc64 Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] if_ppp.h __user annotation annotated ioctl structure Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] sx.c iomem annotations and fixes a bunch of missing readb() and check of 64Kb alignment of physical address done on remapped one. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] skystar2 iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] kyro iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] teles{0,pci} iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] isurf iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] ipr iomem annotations Annotated. Original reused the structure that contained pointers into remapped iomem for storing offsets in such area, so we need to split that beast. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] ips iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] megaraid iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] nsp32 iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] aac7xxx iomem annotations aic7xxx annotations - trivial part Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] ioremap cleanups in aic7xxx ioremap() is capable of dealing with addresses that are not page-aligned; no need to duplicate that in driver. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] qla1820 iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <torvalds@ppc970.osdl.org> Fix posix timer direct user space access This makes us do the proper copy_to_user() for the new posix timers code. Acked by Christoph Lameter <clameter@sgi.com>. <rddunlap@osdl.org> [TG3]: tg3_nvram_read_using_eeprom cannot be __init. Signed-off-by: Randy Dunlap <rddunlap@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net> <kaber@coreworks.de> [IPV6]: Fix netdevice/inet6_dev reference leaks in ip6_route_add error paths Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net> <linville@tuxdriver.com> [TG3]: Add MODULE_VERSION. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net> <linville@tuxdriver.com> [B44]: Add MODULE_VERSION. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net> <davem@nuts.davemloft.net> [TG3]: Update driver version and reldate. Signed-off-by: David S. Miller <davem@davemloft.net> <laforge@netfilter.org> [NETFILTER]: Add iptables CONNMARK match+target This is the first patch, adding something similar like nfmark, but on a per-conntrack (as opposed to per-skb) level. Very useful especially for asymmatric routing in combination with MASQUERADE, as often found on home DSL setups with dymamic IP address that also have e.g. a tunnel device with static IP. Signed-off-by: Henrik Nordstrom <hno@marasystems.com> Signed-off-by: Harald Welte <laforge@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net> <davem@nuts.davemloft.net> [TCP]: Add total num retransmits accounting. Signed-off-by: David S. Miller <davem@davemloft.net> <laforge@netfilter.org> [NETFILTER]: Add iptables hashlimit match It was previously known as dstlimit, but has now been generalized one step further. Signed-off-by: Harald Welte <laforge@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net> <davem@nuts.davemloft.net> [NET]: In netif_rx_ni, put netif_rx call inside preempt-disable. Noticed by Herbert Xu. Signed-off-by: David S. Miller <davem@davemloft.net> <herbert@gondor.apana.org.au> [XFRM]: Make {__,}xfrm_policy_check behave identically wrt. empty policy lists. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net> <kaber@coreworks.de> [XFRM]: Apply policy checks to packets with a secpath when the policy list is empty Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net> <herbert@gondor.apana.org.au> [XFRM]: Fix policy update bug when increasing priority of last policy. Based upon a patch by Patrick McHardy. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net> <chas@cmf.nrl.navy.mil> [ATM]: use RCV_SHUTDOWN to exit skb_recv_datagram() Signed-off-by: David S. Miller <davem@davemloft.net> <chas@cmf.nrl.navy.mil> [ATM]: point to multipoint signalling (from ekinzie@cmf.nrl.navy.mil) Signed-off-by: David S. Miller <davem@davemloft.net> <kaber@coreworks.de> [PKT_SCHED]: Fix netem qlen accounting. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net> <shemminger@osdl.org> [NET]: dst: use const in accessors Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net> <shemminger@osdl.org> [TCP]: use const in tcp.h Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net> <kaber@coreworks.de> [IPV4]: Fix inet6_dev reference leak in ndisc_dst_alloc error path. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net> <ak@suse.de> [ATALK]: Add appletalk 32-bit ioctl emulation. From: Helmut Tschemernjak <helmut@helios.de> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: David S. Miller <davem@davemloft.net> <akpm@osdl.org> [NETFILTER]: Avoid warning on CONNTRACK_STAT_INC in death_by_timeout() Module removal can call death_by_timeout() manually, which isn't in softirq context, so the CONNTRACK_STAT_INC() call there (which assumes preempt disabled) can give a warning. Of course, the warning here is spurious, but the simplest workaround is to call CONNTRACK_STAT_INC() inside the lock. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net> <rddunlap@osdl.org> MTD: dilnetpc: use %p for ptr printk arg. Use %p to print a pointer, so that its length doesn't matter and so that gcc won't complain. drivers/mtd/maps/dilnetpc.c:416: warning: long unsigned int format, pointer arg (arg 2) Signed-off-by: Randy Dunlap <rddunlap@osdl.org> Signed-off-by: David Woodhouse <dwmw2@infradead.org> <bzolnier@trik.(none)> [ide] remove broken pdc4030 driver Sigh, I broke it by accident 16 months ago and nobody has noticed (I suspect that it was non-functional even earlier). Additionally, this driver: * should be converted to use scatterlists * has verbose debugging enabled by default * needs hacks all over IDE code * is guilty of crimes against ide_hwifs[] Just remove it for now. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> <torvalds@evo.osdl.org> Update tty layer to not mix kernel and user pointers. Instead, tty_io.c will always copy user space data to kernel space, leaving the drivers to worry only about normal kernel buffers. No more "from_user" flag, and having the user copy in each driver. This cleans up the code and also fixes a number of locking bugs. <aoki@sdl.hitachi.co.jp> [PATCH] vm thrashing control tuning CONFIG_SWAP=n build fix Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <mporter@kernel.crashing.org> [PATCH] ppc32: remove bogus PPC44x prefetch workaround This patch removes the bogus workaround for dcache prefetch beyond the end of the physical memory. Signed-off-by: Eugene Surovegin <ebs@ebshome.net> Signed-off-by: Matt Porter <mporter@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <roland@topspin.com> [PATCH] ppc: fix build with O=$(output_dir) Recent changes to arch/ppc/boot/lib/Makefile cause CC arch/ppc/boot/lib/../../../../lib/zlib_inflate/infblock.o Assembler messages: FATAL: can't create arch/ppc/boot/lib/../../../../lib/zlib_inflate/infblock.o: No such file or directory when building a ppc kernel using O=$(output_dir) with CONFIG_ZLIB_INFLATE=n, because the $(output_dir)/lib/zlib_inflate directory doesn't get created. This patch, which makes arch/ppc/boot/lib/Makefile create the directory if needed, is one fix for the problem. Signed-off-by: Roland Dreier <roland@topspin.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <mporter@kernel.crashing.org> [PATCH] ppc32: fix ibm44x_common.c compile Fix ibm44x_common.c compile. Signed-off-by: Eugene Surovegin <ebs@ebshome.net> Signed-off-by: Matt Porter <mporter@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <sfr@canb.auug.org.au> [PATCH] ppc64: iSeries compile broken in 2.6.9-bk3 One of the iSeries specific files used HZ without including linux/param.h and previously got away with it. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paulus@samba.org> [PATCH] ppc64: fix XICS startup function to enable as well When the generic IRQ patch went in, it changed the behaviour of setup_irq (compared to the previous ppc64 version) in that we now don't call the handler's enable function if it has a startup function. The XICS interrupt controller has a startup function, and so we weren't getting any interrupts through the XICS because they never got enabled. This patch adds a call to xics_enable_irq to xics_startup and fixes the problem. Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <olof@austin.ibm.com> [PATCH] ppc64: fix CPU numa init code thinkos There seems to have been a couple of thinkos in the NUMA init code, in particular in find_cpu_node(): * Property size returned is in bytes, not words * Off-by-one error in loop iteration Signed-off-by: Nathan Lynch <nathanl@austin.ibm.com> Signed-off-by: Olof Johansson <olof@austin.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <werner@almesberger.net> [PATCH] x86_64: no TIOCSBRK/TIOCCBRK in ia32 emulation In ia32 emulation, the amd64 kernel refuses the ioctls TIOCSBRK and TIOCCBRK with EINVAL. I've attached a patch that adds them to the compatibility list. Since all architectures have these ioctls ("m68knommu" inherits them from "m68k", "um" from its host) and use the same code, I think adding them to compat_ioctl.h is the correct choice (as opposed to adding them to arch/x86_64/ia32/ia32_ioctl.c). Signed-off-by: Werner Almesberger <werner@almesberger.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <takata@linux-m32r.org> [PATCH] m32r: update SIO driver to use module_param() Here is a patch for M32R SIO driver, which replaces deprecated MODULE_PARAM() with modern module_param(). * drivers/serial/m32r_sio.c: - Replace MODULE_PARAM() with module_param(). - Fix a typo: UARRT_RSA_BASE --> UART_RSA_BASE. Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <rddunlap@osdl.org> [PATCH] saa7134: discarded reference Error: ./drivers/media/video/saa7134/saa7134-core.o .data refers to 0000000000000028 R_X86_64_64 .exit.text Signed-off-by: Randy Dunlap <rddunlap@osdl.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <rddunlap@osdl.org> [PATCH] bt878: discarded reference Error: ./drivers/media/dvb/bt8xx/bt878.o .data refers to 0000000000000048 R_X86_64_64 .exit.text Signed-off-by: Randy Dunlap <rddunlap@osdl.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <rddunlap@osdl.org> [PATCH] cx88: discarded reference Error: ./drivers/media/video/cx88/cx88-video.o .data refers to 0000000000000b28 R_X86_64_64 .exit.text Signed-off-by: Randy Dunlap <rddunlap@osdl.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <apw@shadowen.org> [PATCH] vm_dirty_ratio initialisation fix When a system has a very large imbalance of overall memory size to ZONE_NORMAL (for example when large amounts of numa remap space are in use) page_writeback_init() may incorrectly set vm_dirty_ratio and dirty_background_ratio to zero; leading to divide by zero errors elsewhere. This patch bounds these at 1%. Signed-off-by: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <s.esser@e-matters.de> [PATCH] smbfs protocol fixes From: <Urban.Widmark@enlight.net> The memset is because it was previously possible to send always the same CIFS fragment and use this to increase the data counters. When the data counter "exceeds" the amount of bytes expected this will return the buffer only partially initialised... With findfirst etc requests this should allow leaking kernel memory content. The other thing is that the data is only returned when data_tot and parm_tot both "exceed" the expected values. Previously it was possible to create a sequence of CIFS fragments that allowed exceeding the counters. The calling functions then would believe they received a number of bytes that does not fit into the allocated buffer. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <dino@in.ibm.com> [PATCH] stat shows wrong ppid One more place in fs/proc/array.c where ppid is wrong, which I missed in my previous mail to lkml. Signed-off-by: Dinakar Guniguntala <dino@in.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <yuasa@hh.iij4u.or.jp> [PATCH] mips: fixed MIPS Makefile The MIPS Makefile was changed so that the offset of data section may not be dependent on a specific machine header file. Signed-off-by: Yoichi Yuasa <yuasa@hh.iij4u.or.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <bunk@stusta.de> [PATCH] Another ISA PnP modem (USR0009) Below is a patch from Denis Zaitsev <zzz@anda.ru> with the following two adjustments: - applies with -p1 (not -p0) - USRobotics -> U.S. Robotics (consistent with the rest of the entries) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paulkf@microgate.com> [PATCH] ppp: terminate connection on hangup I reviewed, patched, and tested ppp_async.c to implement ldisc->hangup(). This correctly terminates the PPP connection on hangup. Paul Mackerras already did an excellent job of ensuring safe shutdown and I/O completion in ldisc->close so the change is trivial: just add the ldisc->hangup and call the existing close routine. Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paulkf@microgate.com> [PATCH] ppp: disconnect on hangup (synctty) Here is the hangup implementation for ppp_synctty.c (same as patch previously for ppp_asynctty.c) Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <wli@holomorphy.com> [PATCH] PA-RISC io_remap_page_range() fix It was pointed out to me that I typo'd and lost a backslash in the PA-RISC io_remap_page_range() definition. This patch corrects the one-character typo. <torvalds@ppc970.osdl.org> remap_pfn_range: make the region special. VM_IO tells the rest fo the world that the pages may have side effects on reads/writes etc, and VM_RESERVED historically told swap-out not to bother with it. <torvalds@ppc970.osdl.org> Make drivers/char/mem.c use remap_pfn_range() Rather than the deprecated remap_page_range() function that can't handle all of the PFN range anyway. Also, since that will now mark the vma as being special, there's no need to do it in mmap_mem() any more. <torvalds@ppc970.osdl.org> Make core-dumps have all the relevant regions in it. Based on input from Roland McGrath and Hugh Dickins. This simplifies the logic, and takes advantage of the "new" VM information in the form of vma->anon_vma. <viro@www.linux.org.uk> [PATCH] missing includes of asm/irq.h disable_irq() needs asm/irq.h and not everyone who needs it gets it included indirectly. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> <viro@www.linux.org.uk> [PATCH] depca removal of bogus virt_to_bus() uses Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> <pavel@ucw.cz> [PATCH] Fix suspend/resume support in via-rhine2 If I want via-rhine to work after resume, I need this patch. It stops interrupts during suspend and reinitializes them after that. <bzolnier@trik.(none)> [block] remove bio walking All users of this code were fixed to use scatterlists. Acked by Jens. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> <bzolnier@trik.(none)> [ide] kill CONFIG_IDE_TASKFILE_IO It is not needed any longer: * PIO code is unified and converted to use scatterlists * taskfile code doesn't support falling back to PIO * it is much easier to convert non-taskfile version of __ide_do_rw_disk() to something sane than taskfile one Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] aacraid iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] fusion iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] alpha writeq fixes Some drivers do ifdef on writeq; alpha has it as inline function, so they get confused. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] amd64 io.h annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] amd64 uaccess.h annotations sparse complains on casts from long to pointers; unsigned long is OK, though, and it's OK with all numeric cases. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] alpha io_remap_page_range() compile fix Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] ppc io.h annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] sparc64 missing volatile in io.h prototypes A bunch of places passes volatile pointers to readb() et.al.; sparc64 has their arguments declared as void __iomem *. Prototypes changed to match other platforms. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] added typechecking ot sparc64 ioremap() ioremap() made inlined function on sparc64; that had caught one bogosity in drivers, actually - cpwatchdog.c passed sizeof(structure that was never declared) as the second argument to ioremap(). It went unnoticed since that argument was never used in the body of macro, so it disappeared without a trace... Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <ajgrothe@yahoo.com> [CRYPTO]: Put khazad back into tcrypt table. Signed-off-by: David S. Miller <davem@davemloft.net> <shemminger@osdl.org> [NET]: Replace dst_release refcount error with standard WARN_ON Replace the dst count underflow bug message with a standard WARN message. This makes errors noticeable and also reduces the kernel text size by 600 since we aren't doing as much to setup the printk. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net> <akpm@osdl.org> [NET]: neigh_stat preempt fix On some code paths this code is playing with per-cpu data with preemption enabled. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net> <akpm@osdl.org> [CRYPTO]: Deinline large function in blowfish.c Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net> <akpm@osdl.org> [NET]: Add new sysfs attribute 'carrier' for net devices. From: Jesper Juhl <juhl-lkml@dif.dk> The patch adds a new sysfs attribute called carrier for net devices that exposes the result of netif_carrier_ok(). This allows a user to quickly and easily determine if a given netdevice has carrier or not. Reading /sys/class/net/<interface>/carrier yields a '1' when there is a carrier and a '0' when there is not. Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net> <akpm@osdl.org> [ATM]: ambassador printk warning fix From: Jesper Juhl <juhl-lkml@dif.dk> drivers/atm/ambassador.c:2295: warning: unsigned int format, long unsigned int arg (arg 2) Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net> <chas@cmf.nrl.navy.mil> [ATM]: [ambassador] eliminate pci_find_device() Signed-off-by: David S. Miller <davem@davemloft.net> <chas@cmf.nrl.navy.mil> [ATM]: [firestream] remove dead code (from Francois Romieu <romieu@fr.zoreil.com>) Signed-off-by: David S. Miller <davem@davemloft.net> <chas@cmf.nrl.navy.mil> [ATM]: [zatm] eliminate pci_find_device (from Francois Romieu <romieu@fr.zoreil.com>) Signed-off-by: David S. Miller <davem@davemloft.net> <jt@bougret.hpl.hp.com> [IRDA]: Fix lmp_lsap_inuse() o [CRITICA] Fix locking in error path in IrLMP (Stanford checker) o [CORRECT] Don't reuse unconnected LSAPs (listening sockets) o [CORRECT] Make sure the LSAP we are picking has just not been grabed o [CORRECT] Wrap around the LSAP space properly back to 0x10 Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com> Signed-off-by: David S. Miller <davem@davemloft.net> <jt@bougret.hpl.hp.com> [IRDA]: Fix nsc-ircc dongle_id input <Original patch from Maik Broemme> o [CRITICA] Don't Oops on invalid dongle-id in nsc-ircc driver Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com> Signed-off-by: David S. Miller <davem@davemloft.net> <jt@bougret.hpl.hp.com> [IRDA]: IrNET char dev alias o [FEATURE] Add module alias for IrNET char dev Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com> Signed-off-by: David S. Miller <davem@davemloft.net> <jt@bougret.hpl.hp.com> [IRDA]: IAS safety comments o [FEATURE] Make optional the del of IAS object when del IAS attrib o [FEATURE] Clarify when/why it's safe to to the above Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com> Signed-off-by: David S. Miller <davem@davemloft.net> <jt@bougret.hpl.hp.com> [IRDA]: Adaptive discovery query timer o [FEATURE] Adapt to the rate of the peer discovery (passive discovery) o [FEATURE] Add extra safety margin in passive discovery Allow to interoperate properly with device performing slow discovery Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com> Signed-off-by: David S. Miller <davem@davemloft.net> <jt@bougret.hpl.hp.com> [IRDA]: IrCOMM IAS object fix o [CORRECT] Restore properly the IAS object when IrCOMM disconnect. Allow 'pppd passive persist' to work properly. Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com> Signed-off-by: David S. Miller <davem@davemloft.net> <jt@bougret.hpl.hp.com> [IRDA]: via-ircc driver speed fixes o [CORRECT] Speed change fixes in via-ircc driver o [FEATURE] Add new dongle ID in via-ircc driver o [FEATURE] Various code cleanups in via-ircc driver Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com> Signed-off-by: David S. Miller <davem@davemloft.net> <jt@bougret.hpl.hp.com> [IRDA]: Debug module param <Patch from Stephen Hemminger> o [CORRECT] irda 2.6 - fix module info The module parameter info for irda is incorrect. The debug parameter is named debug, the variable is irda_debug. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com> Signed-off-by: David S. Miller <davem@davemloft.net> <jt@bougret.hpl.hp.com> [IRDA]: Stir driver usb reset fix <Patch from Stephen Hemminger> o [CORRECT] stir4200 - get rid of reset on speed change The Sigmatel 4200 doesn't accept the address setting which gets done on USB reset. The USB core recently changed to resend address (or something like that), so usb_reset_device is failing. The device works without doing the USB reset on speed change, it just will be less robust in recovering when things get wedged (like coming out of FIR mode). Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com> Signed-off-by: David S. Miller <davem@davemloft.net> <jt@bougret.hpl.hp.com> [IRDA]: Stir driver suspend fix <Patch from Stephen Hemminger> o [FEATURE] stir4200: don't need suspend/resume if !CONFIG_PM The suspend/resume code only needs to be compiled in if power management is enabled. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com> Signed-off-by: David S. Miller <davem@davemloft.net> <jt@bougret.hpl.hp.com> [IRDA]: Stir netdev and messages cleanups <Patch from Stephen Hemminger> o [FEATURE] stir4200: netdev_priv and message cleanup Stir4200 driver cleanup's: * use netdev_priv * make sure messages identify the driver * get rid of unneeded message Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com> Signed-off-by: David S. Miller <davem@davemloft.net> <tgraf@suug.ch> [PKT_SCHED]: Requeues statistics Introduces requeue statistics for qdiscs. Patch is based on a patch of Jamal Hadi Salim and adapted to new statistic API. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net> <tgraf@suug.ch> [PKT_SCHED]: Max TLV types cleanup Cleans up maximum TLV type of existing definitions and adds missing definitions for TBF, RED, GRED, and HTB. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net> <tgraf@suug.ch> [PKT_SCHED]: Add dump_stats qdisc op Adds a new qdisc operation dump_stats which qdiscs can use to dump statistics. The op is invoked between gnet_stats_start_copy and gnet_stats_finish_copy and therefore stats_lock is already held. This is required to ensure proper locking throughout the whole statistic dumping procedure. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net> <tgraf@suug.ch> [PKT_SCHED]: CBQ: use dump_stats Makes CBQ use dump_stats qdisc op to provide xstats. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net> <tgraf@suug.ch> [PKT_SCHED]: RED: use dump_stats Makes RED use dump_stats qdisc op. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net> <tgraf@suug.ch> [PKT_SCHED]: Add dump_stats class op Adds a new class operation dump_stats which classes can use to dump statistics. Unlike in qdiscs, there are no common statistics therefore classes must dump all statistics on their own. The qdisc stats_lock is being used for locking. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net> <tgraf@suug.ch> [PKT_SCHED]: CBQ: Use gnet_stats for class statistics Converts CBQ class statistics counters to gnet_stats structures. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net> <tgraf@suug.ch> [PKT_SCHED]: CBQ: Use dump_stats for class statistics dumping Makes CBQ use dump_stats to dump class statistics, i.e. moves the statistic dump code from cbq_dump_class to cbq_dump_class_stats. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net> <tgraf@suug.ch> [PKT_SCHED]: CBQ: Use generic rate estimator Makes CBQ use the generic rate estimator. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net> <tgraf@suug.ch> [PKT_SCHED]: HTB: Use gnet_stats for class statistics Converts HTB class statistic counters to gnet_stats structures. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net> <tgraf@suug.ch> [PKT_SCHED]: HTB: Use dump_stats for class statistics dumping Makes HTB use dump_stats to dump class statistics, i.e. moves the statistics dump code from htb_dump_class to htb_dump_class_stats. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net> <tgraf@suug.ch> [PKT_SCHED]: HTB: Remove unneeded rate estimator bits Removes old generic unused rate estimator bits. HTB has its own rate estimator routines and therefore no rate estimator is created so there is no need to try and delete one. We might want to convert it to the generic rate estimator at a later point. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net> <tgraf@suug.ch> [PKT_SCHED]: HTB: Use gnet_stats for class statistics Converts HTB class statistic counters to gnet_stats structures. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net> <tgraf@suug.ch> [PKT_SCHED]: HFSC: Use generic rate estimator Makes HFSC use the generic rate estimator. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net> <tgraf@suug.ch> [PKT_SCHED]: HFSC: Use dump_stats for class statistics dumping Makes HFSC use dump_stats to dump class statistics, i.e. moves the statistics dump code from hfsc_dump_class to hfsc_dump_class_stats. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net> <tgraf@suug.ch> [PKT_SCHED]: ATM: Use gnet_stats for class statistics and dump them Makes ATM qdisc use gnet_stats for class statistic counters and adds dumping bits to actually dump those. Althought the counters were updated they never got dumped to userspace. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net> <laforge@netfilter.org> [NETFILTER]: Add iptables CLUSTERIP target, seq_file version This enables you to build a static load sharing cluster between multiple nodes - without the requirement to have a load balancer. It uses a series of [evil] tricks like replying with linklayer multicast addresses to ARP requests, and using CONNMARK for stateful blocking all traffic not intended for the local node. Signed-off-by: Harald Welte <laforge@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net> <herbert@gondor.apana.org.au> [TCP]: Fix tcp_trim_head() calculations. Dave, we need to use the skb's MSS in trim_head as otherwise the counters will be screwed up. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net> <chrisw@osdl.org> [PKT_SCHED]: Trivial spelling fix in net/sched/Kconfig Signed-off-by: Chris Wright <chrisw@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net> <chrisw@osdl.org> [PKT_SCHED]: Make tcp_proto_lookup_ops() static Signed-off-by: Chris Wright <chrisw@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net> <paulus@samba.org> [PATCH] PPC64 remove __ioremap_explicit() error message This patch, from John Rose, is the counterpart of one recently forwarded by Greg KH. It has the same description, but isn't the same patch - this is the arch/ppc64 part of the change. As an unfortunate side effect of runtime addition/removal of PCI Host Bridges, the RPA DLPAR driver can no longer depend on the success of ioremap_explicit() (and therefore remap_page_range()) for the case of DLPAR adding an I/O Slot. Without addressing this, an attempt to add the first child slot of a newly added PHB will fail when __ioremap_explicit() determines the mappings for that range to already exist. For a little context, __ioremap_explicit() creates mappings for the range of a newly added slot. Here's why these calls will be expected to fail in some cases. Keep in mind that at boot-time, the PPC64 kernel calls ioremap() for the entire range spanned by each PHB. Consider the following scenarios of DLPAR-adding an I/O slot. 1) Just after boot, one removes an I/O slot. At this point the range associated with the parent PHB is fragmented, and the child range for the slot in question is iounmap()'ed. One then re-adds the slot, at which point remap_page_range()/ioremap_explicit() restores the mappings that were previously removed. 2) One adds a new PHB, at which point the ppc64-specific addition ioremaps the entire PHB range. One then performs a DLPAR-add of a child slot of that PHB. At this point, mappings already exist for the range of the slot to be added. So remap_page_range()/ioremap_explicit() will fail at this point. The problem is, there's not a good way to distinguish between cases 1 and 2 from the perspective of the DLPAR driver. Because of that, I believe the correct solution to be: - Removal of relevant error prints from iounmap_explicit(), which is only used for DLPAR. - Removal of error code checks from the RPA driver Here's the first of these. Signed-off-by: John Rose <johnrose@austin.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <benh@kernel.crashing.org> [PATCH] ppc64: Fix boot on some non-LPAR pSeries This patch fixes a problem when allocating the TCE tables (iommu) during early boot on some non-LPAR machines with a lot of memory. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <benh@kernel.crashing.org> [PATCH] ppc64: Fix typo in zImage boot wrapper This patch fixes a typo in the zImage boot wrapper (incorrect printf). Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Matthew Dharm <mdharm@momenco.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <benh@kernel.crashing.org> [PATCH] ppc64: Update G5 thermal control driver This patch updates the G5 thermal control driver, the main change is support for the new "PowerMac7,3" type desktops including the dual 2.5Ghz with liquid cooling. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <benh@kernel.crashing.org> [PATCH] ppc: Disable IRQ probe on ppc The current "generic" implementation of IRQ probing isn't well suited for ppc in it's current form, and causes issues with yenta_socket (and possibly others) on pmac laptops. We didn't have a probe implementation in the past, we probably don't need one anyway, so for now, the fix is to make this optional and enable it on x86 and x86_64 but not ppc and ppc64 (the 4 archs to use the generic IRQ code). Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <benh@kernel.crashing.org> [PATCH] ppc: Fix build of irq.c with CONFIG_TAU_INT This patch fixes build of arch/ppc/kernel/irc.c when CONFIG_TAU_INT is set. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paulus@samba.org> [PATCH] Fix PREEMPT_ACTIVE definition When the generic IRQ stuff went in, it seems that HARDIRQ_BITS got bumped from 9 (for ppc64) up to 12. Consequently, the PREEMPT_ACTIVE bit is now within HARDIRQ_MASK, and I get in_interrupt() falsely returning true when PREEMPT_ACTIVE is set, and thus a BUG_ON tripping in arch/ppc64/mm/tlb.c. The patch below fixes this by changing PREEMPT_ACTIVE to 0x10000000. I have changed the PREEMPT_ACTIVE definitions for each of the architectures that define CONFIG_GENERIC_HARDIRQS (i386, ppc, ppc64, x86_64) and fixed the comment in include/linux/hardirq.h. We could perhaps move the PREEMPT_ACTIVE definition to include/linux/hardirq.h - I don't know why it is still per-arch. Signed-off-by: Paul Mackerras <paulus@samba.org> Acked-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] qlogicisp iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] aic7xxx_old iomem annotations (for real, this time) annotated, ioremap() use simplified (it can deal with addresses that are not page-aligned just fine). Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] aty iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] initio.c NULL noise removal Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <axboe@suse.de> [PATCH] move io scheduler kconfig entries Currently they are in the generic setup, pretty confusing. This patch moves the io scheduler selection into a seperate menu under block devices. Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <matthew@wil.cx> [PATCH] PA-RISC sound update trivial sound/parisc updates: - substream->dma_device was removed (Stuart Brady) - Fix module unloading (Stuart Brady) - Fixed the off-by-one in snd_card_harmony_rate_bits (Stuart Brady) - Harmony is a GSC device, not available on pure PCI machines (Matthew Wilcox) - Fixed module parameter descriptions for ALSA Harmony (Stuart Brady) <chrisw@osdl.org> [PATCH] lsm: rename security_scaffolding_startup to security_init Rename security_scaffolding_startup() to security_init(). It always bothered me. Signed-off-by: Chris Wright <chrisw@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <chrisw@osdl.org> [PATCH] lsm: reduce noise during security_register Registering a security module can be a noisy operation, esp. when it retries registration with the primary module. Eliminate some noise, and distinguish the return values for register_security so a module can tell the difference between failure modes. Signed-off-by: Chris Wright <chrisw@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <chrisw@osdl.org> [PATCH] lsm: Lindent security/security.c Lindent security/security.c. Signed-off-by: Chris Wright <chrisw@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <nico@cam.org> [PATCH] fix PXA270 compile errors missing #include (and placement cleanup) Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <chrisw@osdl.org> [PATCH] make __sigqueue_alloc() a general helper Posix timers preallocate siqueue structures during timer creation and keep them for reuse. This allocation happens in user context with no locks held, however it's designated as an atomic allocation. Loosen this restriction, and while we're at it let's do a bit of code consolidation so signal sending uses same __sigqueue_alloc() helper. Signed-off-by: Chris Wright <chrisw@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <torvalds@ppc970.osdl.org> Fix up USB serial console for tty layer changes. This didn't show up in my "allmodconfig" tests, because the console requires things to be built-in, not modules. <akpm@osdl.org> [PATCH] Fix build for CONFIG_SECURITY=n .. broken by the rename. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Chris Wright <chrisw@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <nacc@us.ibm.com> [PATCH] pmac_cpufreq msleep cleanup/fixes Uses msleep() instead of schedule_timeout() to guarantee the task delays as expected. Two of the changes are reworks of previous msleep() calls which unnecessarily added a jiffy to the parameter. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <trini@kernel.crashing.org> [PATCH] remove unused arch/sh/tools/machgen.sh arch/sh/tools/machgen.sh is no longer used as it has been replaced by arch/sh/tools/gen-mach-types Signed-off-by: Tom Rini <trini@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <cw@f00f.org> [PATCH] UML IO sched support Signed-off-by: cw@f00f.org Signed-off-by: Linus Torvalds <torvalds@osdl.org> <torvalds@ppc970.osdl.org> Linux 2.6.10-rc1 New and Improved! "Woozy Numbat!" Pick up the phone in the next two minutes and phone in your order, and we'll throw in a second copy of Woozy Numbat, ABSOLUTELY FREE! You too could start a Numbat farm! (Log in to post comments)
|
|||||||||||||