commit 2f4ba45a75d6383b4a1201169a808ffea416ffa0 Author: Linus Torvalds Date: Mon Sep 12 20:12:09 2005 -0700 Linux 2.6.14-rc1 Two weeks after 2.6.13: starting to calm things down. commit 9c2aba4852c7e4a33741023109c3713e309d5f8f Author: Greg Ungerer Date: Tue Sep 13 11:14:08 2005 +1000 [PATCH] m68knommu: optimized local_irq_disable, and platform reboot code Switch to a space optimized version of local_irq_disable() for ColdFire platforms. Also add reboot support for the Freescale M5272 platform. Patch originally submitted by Philippe De Muyter . Add reboot support for the Freescale M523x ColdFire platform. Patch originally submitted by Jate Sujjavanich. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 9f5757476dc1c8eabc51e7d14722a2646bc2cb9d Author: Greg Ungerer Date: Tue Sep 13 11:14:08 2005 +1000 [PATCH] m68knommu: startup code for the Drangen Engine 68328 based board Specialized startup code for the 68328 based DragenEngine board. It doesn't easily fit into the common 68x328 startup code framework. It doesn't want any of the common hardware setup to be done here. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 7cf27cb4162bd586c015e32383f30bc7fbb3ff8a Author: Greg Ungerer Date: Tue Sep 13 11:14:08 2005 +1000 [PATCH] m68knommu: implement scatter/gather support macros Implement the scattergather support macros for m68knommu targets. Patch originally submitted by Leon Woestenberg . Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 962d69ed6f5c911fbdb23ef2304e3a5903e5ccbb Author: Greg Ungerer Date: Tue Sep 13 11:14:08 2005 +1000 [PATCH] m68knommu: fix cache actions for ColdFire 5249, 527x and 528x processors Add better support for flushing the cache's on some ColdFire processors. The 5249 cache code is now enabled (it was stubbed out), it really is needed. Add support for the 527x and 528x families - we only use the simple instruction cache on them. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit b9d36b851a5085d35b9598235a456604532f306e Author: Russell King Date: Mon Sep 12 22:56:56 2005 +0100 [ARM SMP] Add MPCore watchdog driver Add platform independent parts of the ARM MPCore watchdog driver. Signed-off-by: Russell King commit 24b8e05dc1b03c1f80828e642838511c16e17250 Author: John W. Linville Date: Mon Sep 12 14:45:08 2005 -0700 [BNX2]: Add support for ETHTOOL_GPERMADDR. Signed-off-by: John W. Linville Signed-off-by: David S. Miller commit 2ff436977ed3eeca2d39ae40bbfdb1ce58da8453 Author: John W. Linville Date: Mon Sep 12 14:44:20 2005 -0700 [TG3]: Add support for ETHTOOL_GPERMADDR. Signed-off-by: John W. Linville Signed-off-by: David S. Miller commit 4f63b877726135b19ae73108acf9e0ebb4323dda Author: John W. Linville Date: Mon Sep 12 14:43:18 2005 -0700 [TG3]: Do not count non-error frames dropped by the hardware as rx_errors. Instead, count them as part of rx_missed_errors. Signed-off-by: John W. Linville Signed-off-by: David S. Miller commit b88a762b6062f06d431af0045de4854a758646c0 Author: Ralf Baechle Date: Mon Sep 12 14:28:03 2005 -0700 [NETROM]: Introduct stuct nr_private NET/ROM's virtual interfaces don't have a proper private data structure yet. Create struct nr_private and put the statistics there. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller commit e21ce8c7c013fb223a002c70bb0a547de6c26c12 Author: Ralf Baechle Date: Mon Sep 12 14:27:37 2005 -0700 [NETROM]: Implement G8PZT Circuit reset for NET/ROM NET/ROM is lacking a connection reset like TCP's RST flag which at times may result in a connecting having to slowly timing out instead of just being reset. An earlier attempt to reset the connection by sending a NR_CONNACK | NR_CHOKE_FLAG transport was inacceptable as it did result in crashes of BPQ systems. An alternative approach of introducing a new transport type 7 (NR_RESET) has be implemented several years ago in Paula Jayne Dowie G8PZT's Xrouter. Implement NR_RESET for Linux's NET/ROM but like any messing with the state engine consider this experimental for now and thus control it by a sysctl (net.netrom.reset) which for the time being defaults to off. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller commit d2ce4bc340946d5b78484d638ac10df958c4c3bf Author: Ralf Baechle Date: Mon Sep 12 14:26:52 2005 -0700 [ROSE]: ROSE has no ARP ARP over ROSE does not exist so it's obviously not implemented on any ROSE stack, so the ROSE interfaces really should default to IFF_NOARP. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller commit 723772913e6caf82919754f9d73fa55fc762bb1b Author: Ralf Baechle Date: Mon Sep 12 14:26:26 2005 -0700 [NETROM]: NET/ROM has no ARP ARP over NET/ROM does not exist so it's obviously not implemented on any NET/ROM stack, so the NET/ROM interfaces really should default to IFF_NOARP. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller commit dd8aa40431d2776ef72fd36aab6a6a6bf0f45967 Author: Ralf Baechle Date: Mon Sep 12 14:25:57 2005 -0700 [NETROM] NET/ROM has no txqueue NET/ROM uses virtual interfaces so setting a queue length is wrong. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller commit 4676356b57ee767d5a95df8270f5c372b838dd33 Author: Ralf Baechle Date: Mon Sep 12 14:25:25 2005 -0700 [AX.25]: Reformat ax25_proto_ops initialization Reformat iniitalization of ax25_proto_ops. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller commit 20b7d10a3339cbfa2f7a52da0ad77b5a0723f0ca Author: Ralf Baechle Date: Mon Sep 12 14:24:55 2005 -0700 [AX.25/ROSE]: Whitespace formatting changes Small formatting changes. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller commit b01ef8ffafc5239a871bc24af74f604654e7de2b Author: Ralf Baechle Date: Mon Sep 12 14:24:24 2005 -0700 [AX.25]: Add descriptions to constants Comment the names used for the AX.25 state machine. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller commit 9b37ee75858ce35cf3c0e4724acaf4efabb45687 Author: Ralf Baechle Date: Mon Sep 12 14:23:52 2005 -0700 [NETROM/AX.25/ROSE]: Remove useless tests Remove error tests that have already been performed by the caller. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller commit 6ddcf626fd0a3cbf410ceb483cb76074ed1c5873 Author: Ralf Baechle Date: Mon Sep 12 14:23:06 2005 -0700 [NETROM]: statistics fix Calling an incoming NET/ROM-encapsulated IP packet an error if the interface isn't up is probably a bit over the top, so count it as dropped instead of an error. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller commit 3bf0ae7b57cade2003ffd0125ee30e80adb93d23 Author: Ralf Baechle Date: Mon Sep 12 14:22:30 2005 -0700 [AX.25]: Add more PIDs Add a few more PID definitions. AX.25 PIDs are the equivalent to IP protocol numbers. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller commit 3f2aadd041a7a3e732d182c3770b3fa95a2300b2 Author: Ralf Baechle Date: Mon Sep 12 14:21:48 2005 -0700 [NETROM]: Fix rebuild header mess For reason that probably nobody recalls NET/ROM does it's actual packet transmission in nr_rebuild_header and even treats invocation of it's hard_start_xmit method nr_xmit as a bug. Fix that by splitting the job done by nr_rebuild_header into two halves. Along with that we now also can get rid of the silly clone of the skb on transmit. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller commit 6f74998e5c3b4610e6eba06babf16547369c512a Author: Ralf Baechle Date: Mon Sep 12 14:21:01 2005 -0700 [AX.25]: Rename ax25_encapsulate to ax25_hard_header Rename ax25_encapsulate to ax25_hard_header which these days more accurately describes what the function is supposed to do. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller commit c4bc7ee2e474819d3932e8d726fdf7cb0bdc00c1 Author: Ralf Baechle Date: Mon Sep 12 14:19:26 2005 -0700 [HAMRADIO]: driver cleanups Misc related cleanups in hamradio drivers: o Use symbolic constants instead of magic numbers o Don't try to handle the case where AX.25 isn't configured - the kernel configuration doesn't permit that. o Remove useless headers Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller commit 59c2353dd045509626d7cc1953cb2d6b7358ab7a Author: Arnaldo Carvalho de Melo Date: Mon Sep 12 14:16:58 2005 -0700 [CCID3]: Listen socks doesn't have a private CCID block Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 074c5279ef671e4fcd2ce2960ecc9d7d9735fabd Author: Nishanth Aravamudan Date: Mon Sep 12 14:16:17 2005 -0700 [SPARC] drivers/sbus: fix-up schedule_timeout() usage Use schedule_timeout_uninterruptible() instead of set_current_state()/schedule_timeout() to reduce kernel size. Signed-off-by: Nishanth Aravamudan Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 121caf577dc61588c1128821873a08cec48baf58 Author: Nishanth Aravamudan Date: Mon Sep 12 14:15:34 2005 -0700 [NET]: fix-up schedule_timeout() usage Use schedule_timeout_{,un}interruptible() instead of set_current_state()/schedule_timeout() to reduce kernel size. Also use human-time conversion functions instead of hard-coded division to avoid rounding issues. Signed-off-by: Nishanth Aravamudan Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 210ce2a7504e429b7ccc191b1efba4c772c4d8b6 Author: Pierre Ossman Date: Mon Sep 12 20:36:19 2005 +0100 [MMC] Clean up wbsd detection handling The wbsd driver's card detection routing is a bit of a mess. This patch cleans up the routine and makes it a bit more comprihensible. Signed-off-by: Pierre Ossman Signed-off-by: Russell King commit e062c8ae85df633f2ecaa5a5af0d9922ced5e074 Author: Pierre Ossman Date: Mon Sep 12 20:35:54 2005 +0100 [MMC] Remove unused timer. Remove timer that was left from earlier cleanup. Signed-off-by: Pierre Ossman Signed-off-by: Russell King commit 877599fdef5ea4a7dd1956e22fa9d6923add97f8 Author: Evgeniy Polyakov Date: Mon Sep 12 17:12:43 2005 +0400 [PATCH] crc16: remove w1 specific comments. Remove w1 comments from crc16.h and move specific constants into w1_ds2433.c where they are used. Replace %d with %zd. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit a217e8c18113c4f3238b01307782b99aa1547ea2 Author: Linus Torvalds Date: Mon Sep 12 12:32:31 2005 -0700 Fix fallout from ATI Xpress timer workaround ACPI earlyquirks needs to honor the proper config variables, and include the right header file. (Fixes commit 66759a01adbfe8828dd063e32cf5ed3f46696181) Signed-off-by: Linus Torvalds commit f5e09b7cac4a2705f55830db64d448c062e84e8e Author: Ian Abbott Date: Mon Sep 12 12:23:25 2005 +0100 [PATCH] USB: ftdi_sio: custom baud rate fix ftdi_sio: I messed up the baud_base for custom baud rate support in 2.6.13. The attached one-liner patch fixes it. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit bc506517ec5dcc638eaa55672d5a924c1e2a2d0b Author: Pete Zaitcev Date: Thu Sep 1 14:35:05 2005 -0700 [PATCH] USB: Usbmon setup DMA patch Alan Stern sent me this patch. It goes on top of the patch the adds mon_dmapeek: http://ftp.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-usb/usb-usbmon-dma-areas.patch Please be warned about ordering requirements or the build may fail. Actually, mon_dmapeek is generic enough to support SETUP packets too. Signed-off-by: Pete Zaitcev Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 0f36163d3abefbda1b21a330b3fdf3c2dc076d94 Author: Thomas Sailer Date: Fri Sep 9 10:43:50 2005 +0200 [PATCH] usb: fix uss720 schedule with interrupts off This patch fixes the long standing schedule with interrupts off problem of the uss720 driver. The problem is caused by the parport layer calling the save and restore methods within a write_lock_irqsave guarded region. The fix is to issue the control transaction requests required by save and restore asynchronously. Signed-off-by: Thomas Sailer, Signed-off-by: Greg Kroah-Hartman commit ce441594e965e32965432404cfaba73e8fbc6ff7 Author: Harald Welte Date: Sat Sep 3 11:27:08 2005 +0200 [PATCH] USB: fix usbdevice_fs header breakage [USBDEVFS] fix inclusion of to avoud header mess Without moving the include of compat.h down, userspace programs that use usbdevice_fs.h end up including half the kernel includes (and eventually fail to compile). Signed-off-by: Harald Welte Signed-off-by: Greg Kroah-Hartman commit e1c37b8d83fb588cc1142938fb1a1476046c8d67 Author: Daniel Drake Date: Wed Aug 31 16:38:41 2005 +0100 [PATCH] USB: usb-storage: Add unusual_devs entry for Neuros Audio MP3 player Alan Stern wrote: > If the device sometimes reports the correct values, then you should > include NEED_OVERRIDE flag to prevent messages about unnecessary > overrides showing up in the system log. Also, if bInterfaceSubclass > is correct and only bInterfaceProtocol is wrong, then the entry should > say US_SC_DEVICE instead of US_SC_SCSI. Fair points, thanks. When connected over USB2, this device reports a nonsense bInterfaceProtocol value 6 and doesn't work with usb-storage. When connected over USB1, the device reports the correct bInterfaceProtocol value 0x50 (bulk) and works with no problems. Signed-off-by: Daniel Drake Signed-off-by: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman commit 1ea640ce1118b0742a6e8675bddc07fc3df326b7 Author: Phil Dibowitz Date: Mon Aug 29 22:38:28 2005 -0700 [PATCH] USB: storage: Add unusual_dev SINGLE_LUN entries This patch adds entries for several USB floppies that need the US_FL_SINGLE_LUN flag. These were reported by Sebastian Kapfer and Olaf Hering , with rediffing and cleaning from me. Reported-by: Sebastian Kapfer Reported-by: Olaf Hering Signed-off-by: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman commit 490dce15ce7b36026e5430d10ee28197a593c711 Author: Pete Zaitcev Date: Tue Aug 23 07:46:13 2005 -0700 [PATCH] USB Storage: unusual_devs.h request for Transcend The stick replies to the door lock commands with a check condition (e.g. FAIL status in a normal bulk CSW), but the subsequent REQUEST SENSE returns all-zero sense. The situation is documented in our Bugzilla, including usbmon traces. https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=162559 The error is purely cosmetic, data integrity is not in danger. But I thought we might as well do it. It looks nicer that way. I discussed this with Phil and he told me to submit directly. Signed-off-by: Pete Zaitcev Signed-off-by: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman commit 226173edae1c49c68ebb723771a02302c85e3475 Author: Matthew Dharm Date: Thu Aug 25 20:03:50 2005 -0700 [PATCH] USB: storage: Fix messed-up locking This is patch as550 from Alan Stern. Apparently someone changed the SCSI core so that it no longer holds the host lock when doing a device or bus reset. usb-storage was updated at the time, but the change was done carelessly. Some of the code depends on that lock being held. This patch reintroduces the host lock where needed and tries to clarify the comments explaining why the lock is necessary. It also moves the code that clears the TIMED_OUT and ABORTING bitflags so that it executes as soon as the timed-out command has completed (and while the host lock is held). Signed-off-by: Alan Stern Signed-off-by: Matthew Dharm Signed-off-by: Greg Kroah-Hartman commit b789696af8b4102b7cc26dec30c2c51ce51ee18b Author: David Brownell Date: Wed Aug 31 10:41:44 2005 -0700 [PATCH] USB: relax usbcore reset timings This appears to help some folk, please merge. This patch relaxes reset timings. There are some reports that it helps make enumeration work better on some high speed devices. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 5f9809487bf035b49ff470709a65fbce3b345f51 Author: Randy Dunlap Date: Thu Sep 8 21:56:56 2005 -0700 [PATCH] USB: proc_usb_info.txt: add blank lines Update Documentation/usb/proc_usb_info.txt: - remove some trailing whitespace - add a blank line before each T: line to match current kernel and to make the text more readable. Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 68e110a078a7e8a416ba06bfa6372ae28222809e Author: Robert Spanton Date: Tue Aug 30 23:38:23 2005 +0100 [PATCH] USB: PL2303: CA-42 Phone cable This patch adds the product ID and vendor ID for a Nokia CA-42 USB cable to the list of devices handled by the pl2303 driver. The patch is against 2.6.13. Signed-off-by: Robert Spanton Signed-off-by: Greg Kroah-Hartman commit 155faf5e1e36ca3a6127bdfb5c624d58e520c411 Author: David Brownell Date: Wed Aug 31 11:54:09 2005 -0700 [PATCH] USB: OHCI, pxa27x OHCI port power tweaks Now that it's in use on other boards, a bug in the original code needs fixing. There is no need for the PXA27x OHCI to set usb power during init, since the hub driver in usbcore handles that. Those platform-specific power control functions are also incorrect, and should therefore be removed. Add a check to clear the OTG pin hold bit until such times OTG is properly implemented. Signed-Off-By: Richard Purdie Signed-off-by: Greg Kroah-Hartman commit fdd13b36c4a501d8787a27e54635fbd943f2685d Author: David Brownell Date: Wed Aug 31 11:52:57 2005 -0700 [PATCH] USB: OHCI relies less on NDP register Some OHCI implementations have differences in the way the NDP register (in roothub_a) reports the number of ports present. This patch allows the platform specific code to optionally supply the number of ports. The driver just reads the value at init (if not supplied) instead of reading it every time its needed (except for an AMD756 bug workaround). It also sets the value correctly for the ARM pxa27x architecture. Signed-Off-By: Richard Purdie Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit e0fd3cbc50a8c925e8e7d8448df689015362c458 Author: David Brownell Date: Wed Aug 31 10:47:20 2005 -0700 [PATCH] USB: OHCI irq tweak Evidently there are some boards which care a lot about this, but as a rule it's been hard to notice. OHCI_INTR_RD wasn't always cleared in the ohci irq handler. On some systems this means certain remote wakeup scenarios could seem to hang (in an interrupt storm, RD never clearing). From: "William Morrow" Signed-off-by: Jordan Crouse Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 4809ecc29935893d954ab9244899777ffaca40ac Author: Pavol Kurina Date: Wed Sep 7 09:49:34 2005 -0700 [PATCH] USB gadgetfs: fixes an error on writing to endpoint file this patch fixes an "Invalid argument" error returned by a write to an endpoint-file after reopening it in the gadgetfs module in the kernel 2.6.12. This was testet only with dummy_hcd module! Signed-off-by: Pavol Kurina Signed-off-by: David Brownell commit 22c438632850c0d6257b45c90afed0cea6953afc Author: Nishanth Aravamudan Date: Mon Aug 15 11:30:11 2005 -0700 [PATCH] drivers/usb: fix-up schedule_timeout() usage Description: Use schedule_timeout_{,un}interruptible() instead of set_current_state()/schedule_timeout() to reduce kernel size. Signed-off-by: Nishanth Aravamudan Signed-off-by: Greg Kroah-Hartman commit dd16525b698528172899f10c14a3eb6ddb888a53 Author: David Brownell Date: Wed Aug 31 10:45:25 2005 -0700 [PATCH] USB: get rid of minor log spamming Routine cases like handoff-to-companion shouldn't trigger diagnostics. This gets rid of some recently added log spamming. It's routine for hub_port_wait_reset() to return -ENOTCONN to indicate handoff from highspeed hubs to companions, so an error message is incorrect. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit f7201c3dcd7799f2aa3d6ec427b194225360ecee Author: David Brownell Date: Fri Sep 2 18:58:09 2005 -0700 [PATCH] USB: EHCI workaround for NForce and mem > 2GB NVidia reports (via Mark Overby) that some of their EHCI controllers don't like certain data structure addresses beyond the 2GB mark. He provided an earlier version of this patch. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 10f6524a8ef1413a8cbd952673997013183fe2a9 Author: David Brownell Date: Wed Aug 31 10:55:38 2005 -0700 [PATCH] USB: EHCI port tweaks One change may improve some S1 or S3 resume cases, and the other seems mostly to explain some strange state "lsusb" would show. Two fixes: - On resume, don't think about resuming any unpowered port, or resetting any port with OWNER set to the OHCI/UHCI companion. This will make some S1 and S3 resume scenarios work better. - PORT_CSC was not being cleared correctly in ehci_hub_status_data. This was visible at least through current versions of "lsusb", and might have caused some other hub related strangeness. The fix addresses all three write-to-clear bits, using the same approach that UHCI happens to use: a mask of bits that are cleared in most writes to that port status register. Original patch seems to have been from from William.Morrow@amd.com and this version (from David) finishes the write-to-clear changes. Signed-off-by: Jordan Crouse Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 198b95170f2c7ad56b4ba92fe3d4d896f5be5c7e Author: Craig Shelley Date: Sun Aug 28 09:51:15 2005 +0100 [PATCH] USB: CP2101 New Device IDs Three new device IDs for CP2101 USB to UART Bridge Signed-off-by: Craig Shelley Signed-off-by: Greg Kroah-Hartman commit 1f09df8bfe358994fcb5f3dc4f890694c4069621 Author: Alan Stern Date: Mon Sep 5 13:59:51 2005 -0400 [PATCH] USB UHCI: remove the FSBR kernel timer This patch (as558) removes from the UHCI driver a kernel timer used for checking Full Speed Bandwidth Reclamation (FSBR). The checking can be done during normal root-hub polling; it doesn't need a separate timer. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit f1a15606d5be8490a122f1c94c554bd0f07d8d26 Author: Alan Stern Date: Mon Sep 5 13:55:23 2005 -0400 [PATCH] usbcore: small changes to HCD glue layer This patch (as549) introduces two small changes in the HCD glue layer. The first simply removes a redundant test. The second allows root-hub polling to continue for a single iteration after a host controller dies; this is needed for the patch that follows. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit f7214ff4e8248513ec626212b2c1a3ca0b2a0888 Author: Stelian Pop Date: Thu Sep 8 10:19:48 2005 +0200 [PATCH] USB: add apple usb touchpad driver This is a driver for the USB touchpad which can be found on post-February 2005 Apple PowerBooks. This driver is derived from Johannes Berg's appletrackpad driver [1], but it has been improved in some areas: * appletouch is a full kernel driver, no userspace program is necessary * appletouch can be interfaced with the synaptics X11 driver[2], in order to have touchpad acceleration, scrolling, two/three finger tap, etc. This driver has been tested by the readers of the 'debian-powerpc' mailing list for a few weeks now and I believe it is now ready for inclusion into the mainline kernel. Credits go to Johannes Berg for reverse-engineering the touchpad protocol, Frank Arnold for further improvements, and Alex Harper for some additional information about the inner workings of the touchpad sensors. Signed-off-by: Stelian Pop Signed-off-by: Greg Kroah-Hartman commit 1bbb4f2035d94d86e52e9b5341c142dcb39bb879 Author: Thomas Winischhofer Date: Mon Aug 29 17:01:16 2005 +0200 [PATCH] USB: sisusb[vga] update here is a new and extended version of the sisusbvga (previously: sisusb) driver. The patch is against 2.6.13 and updates the driver to version 0.0.8. Additions include complete VGA/EGA text console support and a build-in display mode infrastructure for userland applications that don't know about the graphics internals. Fixes include some BE/LE issues and a get/put_dev bug in the previous version. Other changes include a change of the module name from "sisusb" to "sisusbvga". The previous one was too generic IMHO. Please note that the patch also affects the Makefile in drivers/video/console as the driver requires the VGA 8x16 font in case the text console part is selected. Heavily tested, as usual. Please apply. One thing though: I already prepared for removal of the "mode" field and the changed "name" field in the usb_class_driver structure. This will perhaps need some refinement depending on whether you/Linus merge the respective core changes before or after 2.6.14. Signed-off-by: Thomas Winischhofer Signed-off-by: Greg Kroah-Hartman commit 80908309ce44677a07763e24e6ec9371cfa3ab5f Author: Greg KH Date: Mon Sep 12 11:58:07 2005 -0700 Revert "[PATCH] USB: Prevent hid-core claiming Apple Bluetooth device on new G4 powerbooks" This reverts 22af8878d2d641c6b15fe39fe4de3c05b2c477f0 commit. Signed-off-by: Greg Kroah-Hartman commit 2ade81473636b33aaac64495f89a7dc572c529f0 Author: Andi Kleen Date: Mon Sep 12 18:49:25 2005 +0200 [PATCH] x86-64: clean up local_add/sub arguments Signed-off-by: Linus Torvalds commit 4b6a455c7472dabcc624faa740a297d50815b4c7 Author: Andi Kleen Date: Mon Sep 12 18:49:25 2005 +0200 [PATCH] x86-64: Use correct mask to compute conflicting nodes in SRAT The nodes are not set online yet at this point. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 2bce2b54ae91aac76b62e8110b627ba5e5cbbffd Author: Andi Kleen Date: Mon Sep 12 18:49:25 2005 +0200 [PATCH] x86-64: reset apicid<->node tables when SRAT cannot be parsed Signed-off-by: Linus Torvalds commit e58e0d03120d6c2aa134fd3be4f0f762f0bb25e7 Author: Andi Kleen Date: Mon Sep 12 18:49:25 2005 +0200 [PATCH] x86-64: Clean up the SRAT node list before computing the hash function Also use for_each_node_mask instead of hand crafted loops. Signed-off-by: Linus Torvalds commit 66759a01adbfe8828dd063e32cf5ed3f46696181 Author: Chuck Ebbert <76306.1226@compuserve.com> Date: Mon Sep 12 18:49:25 2005 +0200 [PATCH] x86-64: i386/x86-64: Fix time going twice as fast problem on ATI Xpress chipsets Original patch from Bertro Simul This is probably still not quite correct, but seems to be the best solution so far. Signed-off-by: Linus Torvalds commit 049cdefe19f95b67b06b70915cd8e4ae7173337a Author: Jan Beulich Date: Mon Sep 12 18:49:25 2005 +0200 [PATCH] x86-64: reduce x86-64 bug frame by 4 bytes As mentioned before, the size of the bug frame can be further reduced while continuing to use instructions to encode the information. Signed-off-by: Jan Beulich Signed-off-by: Linus Torvalds commit c47a3167d0454c0af5fb0a0322b01a0e3487798e Author: Andi Kleen Date: Mon Sep 12 18:49:25 2005 +0200 [PATCH] x86-64: Make dmi_find_device for !DMI case inline Otherwise it will generate warnings and be generated many times. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit aeb39986ec8bf31c8d55eba22f0a9996363482fb Author: Andi Kleen Date: Mon Sep 12 18:49:25 2005 +0200 [PATCH] x86-64: Allow frame pointer and fix help text. Allow frame pointer and fix help text. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 9cdd304b20b921507fa1670aaf751496627c8d9c Author: Al Viro Date: Mon Sep 12 18:49:25 2005 +0200 [PATCH] x86-64: more gratitious linux/irq.h includes ... and with that all instances in arch/x86_64 are gone. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit ff347b221512a83e7b08356729e3e2c14346e29e Author: Chuck Ebbert <76306.1226@compuserve.com> Date: Mon Sep 12 18:49:25 2005 +0200 [PATCH] x86-64: Fix incorrect FP signals This is the same patch that went into i386 just before 2.6.13 came out. I still can't build 64-bit user apps, so I tested with program (see below) in 32-bit mode on 64-bit kernel: Before: $ fpsig handler: nr = 8, si = 0x0804bc90, vuc = 0x0804bd10 handler: altstack is at 0x0804b000, ebp = 0x0804bc7c handler: si_signo = 8, si_errno = 0, si_code = 0 [unknown] handler: fpu cwd = 0xb40, fpu swd = 0xbaa0 handler: i387 unmasked precision exception, rounded up After: $ fpsig handler: nr = 8, si = 0x0804bc90, vuc = 0x0804bd10 handler: altstack is at 0x0804b000, ebp = 0x0804bc7c handler: si_signo = 8, si_errno = 0, si_code = 6 [inexact result] handler: fpu cwd = 0xb40, fpu swd = 0xbaa0 handler: i387 unmasked precision exception, rounded up Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 847815760cc0f41985b3185d780aa4369fcb475d Author: Chuck Ebbert <76306.1226@compuserve.com> Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Clean up nmi error message The x86_64 nmi code is missing a newline in one of its messages. I added a space before the CPU id for readability and killed the trailing space on the previous line as well. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Linus Torvalds commit a2d236b3ac8fcbbf1bae7d815294d258ba24e3f5 Author: Jan Beulich Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Lose constraints on cmpxchg While only cosmetic for x86-64, this adjusts the cmpxchg code appearantly inherited from i386 to use more generic constraints. Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 1a426cb76443f5b0a021a9df57d3446d14763c21 Author: Jan Beulich Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Declare NMI_VECTOR and handle it in the IPI sending code. Signed-off-by: Jan Beulich Signed-off-by: Linus Torvalds commit a2a0c992e9da823dc23abcb92a42ec5faf856b8b Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Remove unused vxtime.hz field Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit a0d58c9741e4ef42f5fbdfb2a6b86f03c6e9092f Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Set the stack pointer correctly in init_thread and init_tss Signed-off-by: Jan Beulich Signed-off-by: Linus Torvalds commit 1209140c3c70aaa32d1a0462d79557f2a44a4ef8 Author: Jan Beulich Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Safe interrupts in oops_begin/end Rather than blindly re-enabling interrupts in oops_end(), save their state in oope_begin() and then restore that state. Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 059bf0f6c33058680e4381f17d554baaa4f45d68 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Merge msr.c with i386 version The only difference was the inline assembly, so move that into asm/msr.h and merge with the i386 version. This adds some missing sysfs support code to x86-64. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 55679edb19f5ee1dcb0147afe2f198a10ef963f0 Author: Al Viro Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Clean up includes in arch/x86_64/kernel/suspend.c Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 7effaa882af523085f7acadc5871b75a7e506baf Author: Jan Beulich Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Fix CFI information Being the foundation for reliable stack unwinding, this fixes CFI unwind annotations in many low-level x86_64 routines, plus a config option (available to all architectures, and also present in the previously sent patch adding such annotations to i386 code) to enable them separatly rather than only along with adding full debug information. Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit b3ab8382245541ea030faaa1645f66258fde452d Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Fix gcc 4 warnings about pointer signedness Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 5bf97e01192f0fcdff2f0e9eae063e7785f6f915 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Use physflat on Intel for < 8 CPUs with CPU hotplug This avoids races with the APIC broadcast/mask modes. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 27183ebd330a676fe29f7eb9b7ff582492246ec8 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Add dma_sync_single_range_for_{cpu,device} Currently just defined to their non range parts. Pointed out by John Linville Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 05d1fa4bf6a1528e4d4e39fa537f11e6cfca4720 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Improve error handling for overlapping PXMs in SRAT. - Report PXMs instead of nodes - Report the correct PXM, not always the one of node 1. - Only warn for the case of a PXM overlapping by itself Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 2e8ad43ec07545780ce7992cb18e2d82c7abd24c Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Prevent gcc 4 from optimizing away vsyscalls They were previously static. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit c1a71a1ede8f743209237b2736893f3aebe13bb0 Author: Ashok Raj Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Delivery mode should be APIC_DM_FIXED when using physical mode. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 9c0aa0f9a16557a3dd9b7b0d39bc67ddf1fa0b32 Author: Adrian Bunk Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] Replace extern inline with static inline in asm-x86_64/* They should be identical in the kernel now, but this makes it consistent with other code. Signed-off-by: Adrian Bunk Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 47e5701e37cf10948c3f2952870d9f18b6e84965 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Remove freeing of SMP trampoline pages Nick points out it never worked because PageReserved was set and it might cause problems later on. Also HOTPLUG_CPU is much more common now so let's care not too much about the !hotplug case. Cc: nickpiggin@yahoo.com.au Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 016102dea838e8526a4bc57821309f0cd9db81b7 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Fix typo CONFIG_CPU_HOTPLUG -> CONFIG_HOTPLUG_CPU in genapic.c Noted by Ashok Raj Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 24dead8ac9c8fa78b9bfb45b06080a7018fd2ed3 Author: Alexander Nyberg Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] Remove unnecessary BUG_ON in irq.c Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit f297e4e5e4245a5c3fb36e7f754cde96cdb4bc43 Author: Nakul Saraiya Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] Increase nodemap hash. Needed for some newer Opteron systems with E stepping and memory relocation enabled. The node addresses are different in lower bits now so the nodemap hash function needs to be enlarged. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit fb048927ad93420b6dd2eddcdde71ea7b6ff95e4 Author: Jim Paradis Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Fix off by one in pfn_valid When I gave proposed the fix to pfn_valid() for RHEL4, Stephen Tweedie's sharp eyes caught this: Signed-off-by: Linus Torvalds commit 6e44f12ba64a58f25f8e6f35aa4c175f613001be Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] i386: add memory clobbers to syscall macros As noted by matz@suse.de The problem is, that on i386 the syscallN macro is defined like so: long __res; \ __asm__ volatile ("int $0x80" \ : "=a" (__res) \ : "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2)), \ "d" ((long)(arg3)),"S" ((long)(arg4)),"D" ((long)(arg5))); \ If one of the arguments (in the _llseek syscall it's the arg4) is a pointer which the syscall is expected to write to (to the memory pointed to by this ptr), then this side-effect is not captured in the asm. If anyone uses this macro to define it's own version of the syscall (sometimes necessary when not using glibc) and it's inlined, then GCC doesn't know that this asm write to "*dest", when called like so for instance: out = 1; llseek (fd, bla, blubb, &out, trara) use (out); Here nobody tells GCC that "out" actually is written to (just a pointer to it is passed to the asm). Hence GCC might (and in the above bug did) copy-propagate "1" into the second use of "out". The easiest solution would be to add a "memory" clobber to the definition of this syscall macro. As this is a syscall, it shouldn't inhibit too many optimizations. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e92343cc8e9ca4bc0db4b007dd37d33a207ef637 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Fix show_mem a little bit - Add KERN_INFO to printks (from i386) - Use longs instead of ints to accumulate pages. - Fix broken indenting. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 083044e63b4d10ebf9afb231bc0d34aec72169b4 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Remove disable_tsc code in context switch It only offers extremly dubious security advantages and is not worth the overhead in this critical path. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit fe5d5f073eb133b65a8814b48af1722a1ca5aa25 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Print version at end of kernel build (from i386) Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 48496e349554f3704fd1cdf16f389e0615956909 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Fix (harmless) typo in head.S early level2 page table The global bit was not set in the first 2MB page, instead it had a bit in the free AVL section which is useless. Fixed thus. Noticed by Eric Biederman Cc: Eric W. Biederman Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit b8f68e9ffaf5e7c9c463ecd2598cc33f8e6df75e Author: Hugh Dickins Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Fix idle=poll x86_64 idle=poll might be a little less responsive than it should: unlike mwait_idle, and unlike i386, its poll_idle left TIF_POLLING_NRFLAG set. Signed-off-by: Hugh Dickins Signed-off-by: Linus Torvalds commit e99b861a3e9ec93a48b985519e09b2515c201e8d Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Only allocate per cpu data for possible CPUs, not compiled in CPUs. Saves some memory except for hotplug situations. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 2b4a08150e0ce2f6eb5d0987fdfe3524ec799313 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Increase TLB flush array size The generic TLB flush functions kept upto 506 pages per CPU to avoid too frequent IPIs. This value was done for the L1 cache of older x86 CPUs, but with modern CPUs it does not make much sense anymore. TLB flushing is slow enough that using the L2 cache is fine. This patch increases the flush array on x86-64 to cache 5350 pages. That is roughly 20MB with 4K pages. It speeds up large munmaps in multithreaded processes on SMP considerably. The cost is roughly 42k of memory per CPU, which is reasonable. I only increased it on x86-64 for now, but it would probably make sense to increase it everywhere. Embedded architectures with SMP may keep it smaller to save some memory per CPU. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 165aeb82848c81ee1774f8defc74df4341e9184b Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Don't include config.h in asm/timex.h asm-x86-64/timex.h does not reference CONFIG constants. Do not need to include config.h. Signed-off-by: Grant Grundler Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 3f74478b5fd7263e9311cdb320923d599c73a792 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Some cleanup and optimization to the processor data area. - Remove unused irqrsp field - Remove pda->me - Optimize set_softirq_pending slightly Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 459192c92cde49d1a2f721c90adf45d774c2dcf5 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Add simnow console This adds console and earlyprintk support for a host file on AMD's SimNow simulator. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e5bc8b6baf86538f3d0407cf0880f86aec828a13 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Make remote TLB flush more scalable Instead of using a global spinlock to protect the state of the remote TLB flush use a lock and state for each sending CPU. To tell the receiver where to look for the state use 8 different call vectors. Each CPU uses a specific vector to trigger flushes on other CPUs. Depending on the received vector the target CPUs look into the right per cpu variable for the flush data. When the system has more than 8 CPUs they are hashed to the 8 available vectors. The limited global vector space forces us to this right now. In future when interrupts are split into per CPU domains this could be fixed, at the cost of needing more IPIs in flat mode. Also some minor cleanup in the smp flush code and remove some outdated debug code. Requires patch to move cpu_possible_map setup earlier. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 83b942bd3437d84d6ddf582477120b6b86369052 Author: Tsuneo.Yoshioka@f-secure.com Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Fix 32bit sendfile If we use 64bit kernel on ia64/x86_64/s390 architecture, and we run 32bit binary on 32bit compatibility mode, sendfile system call seems be not set offset argument. This is because sendfile's return value is not zero but the code regards the result by return value is zero or not. This problem will be affect to ia64/x86_64/s390 and not affect to other architecture does not affect other architecture (mips/parisc/ppc64/sparc64). Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 9acf23c42b13d682abbd5db1d293c7a77ae54b61 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Include build number in oops output Include build number in oops output Helps me to match oopses to correct kernel. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 69e1a33f62eff9b228a8cc2c3e4429dbee8966c9 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Use ACPI PXM to parse PCI<->node assignments Since this is shared code I had to implement it for i386 too Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 413588c7cb8113c03d0044f1d41b832ad7201c29 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Remove code to resume machine check state of other CPUs. The resume code uses CPU hotplug now so at resume time we only ever see one CPU. Pointed out by Yu Luming. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit b9aac10dddd927f0b9cfcca19a272ded87015574 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Remove redundant max_mapnr and replace with end_pfn The FLATMEM people added it, but there doesn't seem a good reason because end_pfn is identical. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 0a43e4bf7489074c667f24b9670ecd88f6eb0a07 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Use e820_find_hole to compute reserved pages Avoids a very dumb loop Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 7c7a3897f678cfafebc8ec0a5e61a814f2f24e42 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Fix harmless off by one in e820 code Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 117090b5e815d0075bff85c2be954d68a11ac4ed Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Micro optimization to dma_alloc_coherent node lookup Use pcibus_to_node directly Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 1d3fbbf9fe8d5cd5f94256781cc69a4ac289a767 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Don't trust boot_cpu_id in the mptable. It could be wrong for kexec or other cases. Read it from the CPU instead. Signed-off-by: Murali Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 8c566ef5f3eb5d9daf61d0fa31d82c211f601ba0 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Add command line option to set machine check tolerance level Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 673242c10d535bfe238d9d8e82ac93432d35b88e Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Make lockless machine check record passing a bit more robust. One machine is constantly throwing NMI watchdog timeouts in mce_log This was one attempt to fix it. (AK: this doesn't actually fix the bug I'm seeing unfortunately, probably drop. I don't like it that the reader can spin forever now waiting for a writer) Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit a54e678b8f476d6f28e6aa4409f6b88ce476af1b Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Remove redundant swiotlb=force handling It's already handled in the main swiotlb code. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 63f02fd7ceb2fa4065d8a0c9943e4af2876b6c91 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Don't allocate aperture when swiotlb is enabled and no AGP found No-one needs it then Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 5d3d0f7704ed0bc7eaca0501eeae3e5da1ea6c87 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Reverse order of bootmem lists This leads to bootmem allocating first from node 0 instead of from the last node. This avoids swiotlb allocating on the last node, which doesn't really work on a machine with >4GB. Note: there is a better patch around from someone else that gets rid of the pgdat list completely. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 6142891a0c0209c91aa4a98f725de0d6e2ed4918 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Avoid unnecessary double bouncing for swiotlb PCI_DMA_BUS_IS_PHYS has to be zero even when the GART IOMMU is disabled and the swiotlb is used. Otherwise the block layer does unnecessary double bouncing. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 357e11d4cbbbb959a88a9bdbbf33a10f160b0823 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Don't assume APIC for boot processor has an APIC ID of zero Originally from Stuart Hayes. When setting up the APIC for the Uniprocessor kernel don't assume the CPU has an APIC ID of zero. This fixes boot with the UP kernel on Dell PowerEdge 6800/6850 4way systems. Cc: Stuart.Hayes@dell.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit df0cc26b1b7f88f46307eea50a7469f0b58132d9 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Use SRAT data on Intel systems too. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 3f098c2605bdf50176b26f4fa724e9b9c99e5242 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Support dualcore and 8 socket systems in k8 fallback node parsing In particular on systems where the local APIC space and node space is very different from the Linux CPU number space. Previously the older NUMA setup code directly parsing the K8 northbridge registers had some issues on 8 socket or dual core systems. This patch fixes them. This is mainly done by fixing some confusion between Linux CPU numbers and local APIC ids. We now pass the local APIC IDs to later code, which avoids mismatches. Also add some heuristics to detect cases where the Hypertransport nodeids and the local APIC IDs don't match, but are shifted by a constant offset. This is still all quite hackish, hopefully BIOS writers fill in correct SRATs instead. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit b91691164be174b780f5c1bb145a7ab5d33fce2f Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Don't cache align PDA on UP builds Suggested by someone I forgot who sorry. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 8675b1a454016c7c50215552ea5c5c4a2413fda0 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Fix the apic version that gets printed during boot Signed-off-by: Suresh Sidda Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 0b07e984fc7a51b1a7c75e1bfdcf59d1ad065353 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Don't assign CPU numbers in SRAT parsing Do that later when the CPU boots. SRAT just stores the APIC<->Node mapping node. This fixes problems on systems where the order of SRAT entries does not match the MADT. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit f1f4e83fd9b5ce77d05825586d0426a54b8f3a68 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: White space and comment fixes for smp_call_function_single No functional changes Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit b4452218c4b7a579056d439b73a668b71654c137 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Enable interrupts during delay calibration on APs We used to disable them to work around a bug, but that is not needed anymore. Keeping them enabled avoids the NMI watchdog triggering in some cases. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 70556463487f33bc6728a7596b97f86b811aad22 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Use largest APIC number, not number of CPUs to decide on physflat mode Handles case where BIOS gives CPUs very large APIC numbers correctly. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 5a40b7c2abdedcf53c9a6ee790991acfcef5b6c7 Author: Andi Kleen Date: Mon Sep 12 18:49:24 2005 +0200 [PATCH] x86-64: Remove code for outdated APICs No x86-64 chipset has these APICs. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 61c11341ed798db9b99b30c1711c1cf458457806 Author: Andi Kleen Date: Mon Sep 12 18:49:23 2005 +0200 [PATCH] x86-64: Remove esr disable hack in APIC code This was just needed for the Numasaurus, which fortunately doesn't support x86-64 CPUs. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit eddfb4ed290383abf912630fa8dac5acf65c9e55 Author: Andi Kleen Date: Mon Sep 12 18:49:23 2005 +0200 [PATCH] x86-64: Remove obsolete APIC "write around" bug workaround No x86-64 chipset has this bug Generated code doesn't change because it was always disabled. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit c1507eb2ee845b123ace751bec9c992a1937872c Author: Andi Kleen Date: Mon Sep 12 18:49:23 2005 +0200 [PATCH] x86-64: Remove apic_write_around from smpboot.c We don't do workarounds for ancient hardware bugs. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit affc9b844905f749064752faebb1af699f2d13bf Author: Andi Kleen Date: Mon Sep 12 18:49:23 2005 +0200 [PATCH] x86-64: Update defconfig Allow diskless booting. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit f343bb4cd7cc76d49d72415c8b867b1073d3c6db Author: Andi Kleen Date: Mon Sep 12 18:49:23 2005 +0200 [PATCH] x86{-64}: Remove old hack that disabled mmconfig support on AMD systems. Now that Greg implemented MCFG/_SEG support this shouldn't be needed anymore Cc: gregkh@suse.de Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit b3426599af9524104be6938bcb1fcaab314781c7 Author: Paul Jackson Date: Mon Sep 12 04:30:30 2005 -0700 [PATCH] cpuset semaphore depth check optimize Optimize the deadlock avoidance check on the global cpuset semaphore cpuset_sem. Instead of adding a depth counter to the task struct of each task, rather just two words are enough, one to store the depth and the other the current cpuset_sem holder. Thanks to Nikita Danilov for the idea. Signed-off-by: Paul Jackson [ We may want to change this further, but at least it's now a totally internal decision to the cpusets code ] Signed-off-by: Linus Torvalds commit f24ec7f6c6278c0ea4c00efe96d50b1e66796c44 Author: Evgeniy Polyakov Date: Mon Sep 12 17:12:43 2005 +0400 [PATCH] crc16: remove w1 specific comments. Remove w1 comments from crc16.h and move specific constants into w1_ds2433.c where they are used. Replace %d with %zd. Signed-off-by: Evgeniy Polyakov Signed-off-by: Linus Torvalds commit 1df5c10a5b40d1ad747e3de3caf28764153c5c8e Author: Linus Torvalds Date: Mon Sep 12 07:59:21 2005 -0700 Mark ia64-specific MCA/INIT scheduler hooks as dangerous ..and only enable them for ia64. The functions are only valid when the whole system has been totally stopped and no scheduler activity is ongoing on any CPU, and interrupts are globally disabled. In other words, they aren't useful for anything else. So make sure that nobody can use them by mistake. Signed-off-by: Linus Torvalds commit c3ff8ec31c1249d268cd11390649768a12bec1b9 Author: Roland McGrath Date: Sun Sep 11 01:44:45 2005 -0700 [PATCH] i386: Don't miss pending signals returning to user mode after signal processing Signed-off-by: Roland McGrath Acked-by: Atsushi Nemoto Acked-by: Ingo Molnar Signed-off-by: Linus Torvalds commit 89ecf38c7aee6eb3f6aaf40a6d196ddff4b6d4a8 Author: Anton Altaparmakov Date: Mon Sep 12 15:43:03 2005 +0100 NTFS: Mask out __GFP_HIGHMEM when doing kmalloc() in __ntfs_malloc() as it otherwise causes a BUG(). Signed-off-by: Anton Altaparmakov commit 5d46770f5f8bb0eff0a82596860958be13e7baf1 Author: Anton Altaparmakov Date: Mon Sep 12 14:33:47 2005 +0100 NTFS: Change the mount options {u,f,d}mask to always parse the number as an octal number to conform to how chmod(1) works, too. Thanks to Giuseppe Bilotta and Horst von Brand for pointing out the errors of my ways. Signed-off-by: Anton Altaparmakov commit fecf92ba050a426b3bd302b6ba1c1525d576ccb9 Author: Pierre Ossman Date: Mon Sep 12 12:09:25 2005 +0100 [MMC] Remove trailing whitespace in wbsd Clean out trailing whitespace caused by not-so-great editor since it generates a lot of problems with editors configured to automatically strip whitespace. Signed-off-by: Pierre Ossman Signed-off-by: Russell King commit 2d909d08db7655a53f3afb31c7627c5c8c87142a Author: Anton Blanchard Date: Mon Sep 12 13:19:51 2005 +1000 [PATCH] ppc64: Remove unused code ppc64_attention_msg and ppc64_dump_msg are not used so remove them. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 1ed2fd2d3a8d18f184ba2d06e0f03bff773f28ab Author: Anton Blanchard Date: Mon Sep 12 13:17:27 2005 +1000 [PATCH] ppc64: Fix for missing start-cpu rtas token If the rtas start-cpu token doesnt exist then presume the cpu is already spinning. If it isnt we will catch it later on when the cpu doesnt respond. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 3238e9c9735cd5ebe30a59df1f8f5af2687344de Author: Anton Blanchard Date: Mon Sep 12 13:14:26 2005 +1000 [PATCH] ppc64: indent pci code Fix up some badly indented code. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 26370322d8e3504db61cb8d438a9fca3b87ac0db Author: Anton Blanchard Date: Mon Sep 12 13:12:11 2005 +1000 [PATCH] ppc64: xics cleanup A few xics cleanups: - Make some things static. - Be more consistent with error printing - interrupts are unsigned, error values are signed. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit fd9648dff6f9797ecc509bcd181706a274dc074d Author: Anton Blanchard Date: Sat Sep 10 16:01:11 2005 +1000 [PATCH] ppc64: Add ptrace data breakpoint support Add hardware data breakpoint support. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit a94d308513bdb2b926b45c11d7ce7fac6d6ca865 Author: Anton Blanchard Date: Sat Sep 10 16:01:10 2005 +1000 [PATCH] ppc64: Add definitions for new PTRACE calls - Add PTRACE_GET_DEBUGREG/PTRACE_SET_DEBUGREG. The definition is as follows: /* * Get or set a debug register. The first 16 are DABR registers and the * second 16 are IABR registers. */ #define PTRACE_GET_DEBUGREG 25 #define PTRACE_SET_DEBUGREG 26 DABR == data breakpoint and IABR = instruction breakpoint in IBM speak. We could split out the IABR into 2 more ptrace calls but I figured there was no need and 16 DABR registers should be more than enough (POWER4/POWER5 have one). - Add 2 new SIGTRAP si_codes: TRAP_HWBKPT and TRAP_BRANCH. I couldnt find any standards on either of these so I copied what ia64 is doing. Again this might be better placed in include/asm-generic/siginfo.h Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit df09ce4a15bac7b05356b2f00fbb600c5890b1f3 Author: Anton Blanchard Date: Sat Sep 10 16:01:09 2005 +1000 [PATCH] ppc64: Fix up some whitespace issues in ptrace32.c Fix up some whitespace issues in ptrace32.c Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit a0987224dc80b3eb98cc7a135422acbda8538146 Author: Anton Blanchard Date: Sat Sep 10 16:01:08 2005 +1000 [PATCH] ppc64: ptrace cleanups - Remove the PPC_REG* defines - Wrap some more stuff with ifdef __KERNEL__ - Add missing PT_TRAP, PT_DAR, PT_DSISR defines - Add PTRACE_GETEVRREGS/PTRACE_SETEVRREGS, even though we dont use it on ppc64 we dont want to allocate them for something else. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 962bca7f389229a30ced441d7b37f55f203006a2 Author: Robert Jennings Date: Sat Sep 10 16:01:07 2005 +1000 [PATCH] ppc64: Add PTRACE_{GET|SET}VRREGS The ptrace get and set methods for VMX/Altivec registers present in the ppc tree were missing for ppc64. This patch adds the 32-bit and 64-bit methods. Updated with the suggestions from Anton following the lines of his code snippet. Added: - flush_altivec_to_thread calls as suggested by Anton - piecewise copy of structure to preserve 32-bit vrsave data as per Anton (I consolidated the 32 and 64bit versions with 2 helper macros - Anton) Signed-off-by: Robert C Jennings Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 4267292b0f368c1633ff3316a53b5f7fbada95f8 Author: Paul Mackerras Date: Mon Sep 12 17:17:36 2005 +1000 ppc64: Set up PCI tree from Open Firmware device tree This adds code which gives us the option on ppc64 of instantiating the PCI tree (the tree of pci_bus and pci_dev structs) from the Open Firmware device tree rather than by probing PCI configuration space. The OF device tree has a node for each PCI device and bridge in the system, with properties that tell us what addresses the firmware has configured for them and other details. There are a couple of reasons why this is needed. First, on systems with a hypervisor, there is a PCI-PCI bridge per slot under the PCI host bridges. These PCI-PCI bridges have special isolation features for virtualization. We can't write to their config space, and we are not supposed to be reading their config space either. The firmware tells us about the address ranges that they pass in the OF device tree. Secondly, on powermacs, the interrupt controller is in a PCI device that may be behind a PCI-PCI bridge. If we happened to take an interrupt just at the point when the device or a bridge on the path to it was disabled for probing, we would crash when we try to access the interrupt controller. I have implemented a platform-specific function which is called for each PCI bridge (host or PCI-PCI) to say whether the code should look in the device tree or use normal PCI probing for the devices under that bridge. On pSeries machines we use the device tree if we're running under a hypervisor, otherwise we use normal probing. On powermacs we use normal probing for the AGP bridge, since the device for the AGP bridge itself isn't shown in the device tree (at least on my G5), and the device tree for everything else. This has been tested on a dual G5 powermac, a partition on a POWER5 machine (running under the hypervisor), and a legacy iSeries partition. Signed-off-by: Paul Mackerras commit c93a777103263c2a610a49771c6336f7a53d8ab7 Author: Antonino A. Daplas Date: Mon Sep 12 09:18:12 2005 +0800 [PATCH] i810fb: Update i810fb documentation Update i810fb documentation to describe new features and configuration changes. Signed-off-by: Antonino Daplas Signed-off-by: Linus Torvalds commit 747a5054c0663a21c440524bdac1bca31be0d20e Author: Antonino A. Daplas Date: Mon Sep 12 09:16:47 2005 +0800 [PATCH] i810fb: Change option ext_vga to extvga to match documentation Reported by: Manuel Lauss He was getting random initial video modes depending on the kernel configuration. His option line includes 'extvga'. The i810fb documentation describes the option 'extvga', however the driver accepts 'ext_vga'. Besides 'extvga' being ignored by i810fb, it also confuses the option parser of i810fb and assigns 'extvga' to 'mode_option'. This leads to an incorrect video mode at boot time. Signed-off-by: Antonino Daplas Signed-off-by: Linus Torvalds commit 595e8a97f48619fe7952f31259d3e61af9118f49 Author: Antonino A. Daplas Date: Mon Sep 12 09:15:16 2005 +0800 [PATCH] i810fb: Restore xres and yres option parameters If i810fb successfully probed for the EDID, it will disregard the boot option parameters 'xres' and 'yres'. Fix this regression. Excellent testing done by Manuel Lauss . Signed-off-by: Antonino Daplas Signed-off-by: Linus Torvalds commit 883f64510718e7df9abbfeec4748d92745d8cc3e Author: Antonino A. Daplas Date: Mon Sep 12 09:13:32 2005 +0800 [PATCH] i810fb: Fix oops if CONFIG_FB_I810_I2C is set to no Reported by: Manuel Lauss compiled with CONFIG_FB_I810_I2C = n and CONFIG_FB_I810 = y it oopses at boot in file drivers/video/i810/i810_main.c:1884 ... Unable to handle kernel NULL pointer dereference at virtual address 00000054 printing eip: c02543c0 *pde = 00000000 Oops: 0000 [#1] last sysfs file: Modules linked in: CPU: 0 EIP: 0060:[] Not tainted VLI EFLAGS: 00010286 (2.6.13-mm2) EIP is at i810fb_find_init_mode+0x53/0x93 eax: c113ddd4 ebx: c1194000 ecx: c04be2dd edx: c1194000 esi: c1194008 edi: c113ddd4 ebp: c1194240 esp: c113ddcc ds: 007b es: 007b ss: 0068 struct fb_monspecs *specs is initialized to NULL causing the oops. Signed-off-by: Antonino Daplas Signed-off-by: Linus Torvalds commit 81d4903d2d17a9f33ece2666185a8b51e6935ae0 Author: Greg Ungerer Date: Mon Sep 12 11:18:10 2005 +1000 [PATCH] m68knommu: common RAM based 68360 startup code Create common start code for all 68360 based platforms that are loaded and run directly from RAM (as opposed to running from flash/ROM). This replaces the old specific startup code for each board. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit d871629b83774fc24db6dd2775ceaf46b433b056 Author: Greg Ungerer Date: Mon Sep 12 11:18:10 2005 +1000 [PATCH] m68knommu: allow for SDRAM and GPIO differences on 5270/1 and 5274/5 processors Allow for differences in the SDRAM controller setup and GPIO pin setup of the 5270/1 and 5274/5 parts. With separate config options for each now this no longer needs to be board specific. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 2d9d166e1cb2909bd8d3ac0d1ee8db83abb9fd86 Author: Greg Ungerer Date: Mon Sep 12 11:18:10 2005 +1000 [PATCH] m68knommu: FEC eth definitions support for the 523x Coldfire processor family Add support for the FEC ethernet driver of the Freescale 523x processor family to the FEC header definitions. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 7ce4d42503949b62f481be989d8f5a25f5af10ff Author: Greg Ungerer Date: Mon Sep 12 11:18:10 2005 +1000 [PATCH] m68knommu: add SPI register definitions for 528x processors Add QSPI register definitions of ColdFIre 528x processor SPI controller. Patch originally submitted by Derek Cheung Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 66aa2b4b1cf9a61f1550251c56fc6f0d48287591 Author: Greg Ungerer Date: Mon Sep 12 11:18:10 2005 +1000 [PATCH] uclinux: add NULL check, 0 end valid check and some more exports to nommu.c Move call to get_mm_counter() in update_mem_hiwater() to be inside the check for tsk->mm being null. Otherwise you can be following a null pointer here. This patch submitted by Javier Herrero . Modify the end check for munmap regions to allow for the legacy behavior of 0 being valid. Pretty much all current uClinux system libc malloc's pass in 0 as the end point. A hard check will fail on these, so change the check so that if it is non-zero it must be valid otherwise it fails. A passed in value will always succeed (as it used too). Also export a few more mm system functions - to be consistent with the VM code exports. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 966cdb2fdf1776392c98f7d38e0eb9c6dd1c4715 Author: Greg Ungerer Date: Mon Sep 12 11:18:10 2005 +1000 [PATCH] m68knommu: dma support for 523x processors Support the DMA unit of the ColdFire 523x processor family. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit f6515db47e6d8cb502e4b0fd7255652da4ba1393 Author: Greg Ungerer Date: Mon Sep 12 11:18:10 2005 +1000 [PATCH] uclinux: remove use of mtd_put_device() in uclinux MTD map driver We should not call mtd_put_device() in the uclinux MTD map driver. Also consistently use phys/virt fields of maps map_info struct, instead of mixing it with map_priv_1. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit b0433b99339a9fdc2effe213491812556e4896fb Author: Greg Ungerer Date: Mon Sep 12 11:18:10 2005 +1000 [PATCH] m68knommu: add ColdFire serial driver support for 523x processor family Add support for the new Freescale 523x processor family to ColdFire serial driver. Also set different default baud rate for MOD5272 board. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 9c1ee9387c0ce06d573e2d27de10cbc24179941e Author: Greg Ungerer Date: Mon Sep 12 11:18:10 2005 +1000 [PATCH] m68knommu: change addr arg to const in bitops.h/find_next_zero_bit() Change addr arg to find_next_zero_bit to be a const. Cleans up compiler warning. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit df28f34bf998795c4d4e08c1604eac0a6d84f502 Author: Greg Ungerer Date: Mon Sep 12 11:18:10 2005 +1000 [PATCH] m68knommu: correct prototype args in checksum.h Bring arg types for csum_partial_copy and csum_paritial_copy_from_user prototypes into line with their actual implementation. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 42ae766fffdad89267151acddaf936df58ab2267 Author: Greg Ungerer Date: Mon Sep 12 11:18:10 2005 +1000 [PATCH] m68knommu: common ROM/flash based 68360 startup code Create common start code for all 68360 based platforms that are loaded and run directly from ROM/flash (as opposed to running from RAM). This replaces the old specific startup code for each board. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 8a6e43e9ee84eb8fb39bfdf8f0b6e466905491d0 Author: Greg Ungerer Date: Mon Sep 12 11:18:10 2005 +1000 [PATCH] m68knommu: cache support for 523x/528x processors Add support for the cache of the ColdFIre 523x family of processors. Enable the 528x cache by default now, all final shipping silicon has the cache bug fixed. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 7dd6a2aa27a7a8036fbaf60cbce38a64128d1d4d Author: Greg Ungerer Date: Mon Sep 12 11:18:10 2005 +1000 [PATCH] m68knommu: ColdFire FEC eth driver improvements A few improvements to the Freescale/ColdFire FEC driver: . some formatting cleanups . add support for the FEC device in the ColdFire 523x processor family . add support for MAC address setting on MOD5272 and M5272C3 boards . don't re-read the PHY status register many times . ack status interrupt before reading status register . move printing init message to after full init (so that the ethX name is filled out for printing) Some parts of this patch submitted by Philippe De Muyter Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 2af6921f6382456ed69163be9d2ee2c339134496 Author: Greg Ungerer Date: Mon Sep 12 11:18:10 2005 +1000 [PATCH] m68knommu: config support for FEC eth of 523x Coldfire processor family Add configuration support for the FEC ethernet controller in the Freescale 523x processor family. Also add and option to configure the second FEC controller on some Freescale processors. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 7caaeabb17758295edff9703c18a840073c5b8f4 Author: Al Viro Date: Sun Sep 11 20:14:07 2005 -0700 [SPARC]: Fix dot-symbol exporting for good. From: Al Viro Instead of playing all of these hand-coded assembler aliasing games, just translate symbol names in the name space ".sym" to "_Sym" at module load time. Signed-off-by: David S. Miller commit 7672d0b54411371e0b6a831c1cb2f0ce615de6dc Author: Evgeniy Polyakov Date: Sun Sep 11 19:15:07 2005 -0700 [NET]: Add netlink connector. Kernel connector - new userspace <-> kernel space easy to use communication module which implements easy to use bidirectional message bus using netlink as it's backend. Connector was created to eliminate complex skb handling both in send and receive message bus direction. Connector driver adds possibility to connect various agents using as one of it's backends netlink based network. One must register callback and identifier. When driver receives special netlink message with appropriate identifier, appropriate callback will be called. From the userspace point of view it's quite straightforward: socket(); bind(); send(); recv(); But if kernelspace want to use full power of such connections, driver writer must create special sockets, must know about struct sk_buff handling... Connector allows any kernelspace agents to use netlink based networking for inter-process communication in a significantly easier way: int cn_add_callback(struct cb_id *id, char *name, void (*callback) (void *)); void cn_netlink_send(struct cn_msg *msg, u32 __groups, int gfp_mask); struct cb_id { __u32 idx; __u32 val; }; idx and val are unique identifiers which must be registered in connector.h for in-kernel usage. void (*callback) (void *) - is a callback function which will be called when message with above idx.val will be received by connector core. Using connector completely hides low-level transport layer from it's users. Connector uses new netlink ability to have many groups in one socket. [ Incorporating many cleanups and fixes by myself and Andrew Morton -DaveM ] Signed-off-by: Evgeniy Polyakov Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 49a28cc8fd26f5317c47a9aeb2bdd1c33e21738e Author: Keith Owens Date: Sun Sep 11 17:24:42 2005 +1000 [IA64] MCA/INIT: remove obsolete unwind code Delete the special case unwind code that was only used by the old MCA/INIT handler. Signed-off-by: Keith Owens Signed-off-by: Tony Luck commit 05f335ea04881ecb912b572c83e281a016149169 Author: Keith Owens Date: Sun Sep 11 17:23:42 2005 +1000 [IA64] MCA/INIT: remove the physical mode path from minstate.h Remove the physical mode path from minstate.h. Signed-off-by: Keith Owens Signed-off-by: Tony Luck commit 7f613c7d2203ae137d98fc1c38abc30fd7048637 Author: Keith Owens Date: Sun Sep 11 17:22:53 2005 +1000 [PATCH] MCA/INIT: use per cpu stacks The bulk of the change. Use per cpu MCA/INIT stacks. Change the SAL to OS state (sos) to be per process. Do all the assembler work on the MCA/INIT stacks, leaving the original stack alone. Pass per cpu state data to the C handlers for MCA and INIT, which also means changing the mca_drv interfaces slightly. Lots of verification on whether the original stack is usable before converting it to a sleeping process. Signed-off-by: Keith Owens Signed-off-by: Tony Luck commit 289d773ee89ea80dcc364ef97d1be7ad1817387e Author: Keith Owens Date: Sun Sep 11 17:21:46 2005 +1000 [IA64] MCA/INIT: avoid reading INIT record during INIT event Reading the INIT record from SAL during the INIT event has proved to be unreliable, and a source of hangs during INIT processing. The new MCA/INIT handlers remove the need to get the INIT record from SAL. Change salinfo.c so mca.c can just flag that a new record is available, without having to read the record during INIT processing. This patch can be applied without the new MCA/INIT handlers. Also clean up some usage of NR_CPUS which should have been using cpu_online(). Signed-off-by: Keith Owens Signed-off-by: Tony Luck commit e619ae0b96b6ace6629a6a0c6a5db23861ddaa78 Author: Keith Owens Date: Sun Sep 11 17:20:14 2005 +1000 [IA64] MCA/INIT: add an extra thread_info flag Add an extra thread_info flag to indicate the special MCA/INIT stacks. Mainly for debuggers. Signed-off-by: Keith Owens Signed-off-by: Tony Luck commit a2a979821b6ab75a4f143cfaa1c4672cc259ec10 Author: Keith Owens Date: Sun Sep 11 17:19:06 2005 +1000 [PATCH] MCA/INIT: scheduler hooks Scheduler hooks to see/change which process is deemed to be on a cpu. Signed-off-by: Keith Owens Signed-off-by: Tony Luck commit e6c69bd39199656a8bbd0569edaff60574ff9cac Author: Sam Ravnborg Date: Sun Sep 11 22:35:18 2005 +0200 mips: rename offsets.c to asm-offsets.c Cannot build MIPS now. We need to change offset.c to asm-offsets.c Signed-off-by: Yoichi Yuasa Signed-off-by: Sam Ravnborg commit 5011cdd01bedd66b314e330a638c97984c71b53d Author: Sam Ravnborg Date: Sun Sep 11 22:32:57 2005 +0200 kbuild: fix silentoldconfig with make O= Al Viro reported that sometimes silentoldconfig failed because output directory was missing. So create it unconditionally before executing conf Signed-off-by: Sam Ravnborg commit 5bb78269000cf326bfdfa19f79449c02a9158020 Author: Sam Ravnborg Date: Sun Sep 11 22:30:22 2005 +0200 kbuild: rename prepare to archprepare to fix dependency chain When introducing the generic asm-offsets.h support the dependency chain for the prepare targets was changed. All build scripts expecting include/asm/asm-offsets.h to be made when using the prepare target would broke. With the limited number of prepare targets left in arch Makefiles the trivial solution was to introduce a new arch specific target: archprepare The dependency chain looks like this now: prepare | +--> prepare0 | +--> archprepare | +--> scripts_basic +--> prepare1 | +---> prepare2 | +--> prepare3 So prepare 3 is processed before prepare2 etc. This guaantees that the asm symlink, version.h, scripts_basic are all updated before archprepare is processed. prepare0 which build the asm-offsets.h file will need the actions performed by archprepare. The head target is now named prepare, because users scripts will most likely use that target, but prepare-all has been kept for compatibility. Updated Documentation/kbuild/makefiles.txt. Signed-off-by: Sam Ravnborg commit ce1289adeb67b5480f35cb257cbf6e9881153783 Author: Willy Tarreau Date: Sun Sep 11 09:04:07 2005 +0200 [PATCH] Sun HME: enable and map PCI ROM properly This ports the Sun GEM ROM mapping/enable fixes it sunhme (which used the same PCI ROM mapping code). Without this, I get NULL MAC addresses for all 4 ports (it's a SUN QFE). With it, I get the correct addresses (the ones printed on the label on the card). Signed-off-by: Linus Torvalds commit 4120b028dd231743935d954732045a87edda2a0a Author: Linus Torvalds Date: Sun Sep 11 09:26:20 2005 -0700 Sun GEM ethernet: enable and map PCI ROM properly This same patch was reported to fix the MAC address detection on sunhme (next patch). Most people seem to be running this on Sparcs or PPC machines, where we get the MAC address from their respective firmware rather than from the (previously broken) ROM mapping routines. Signed-off-by: Linus Torvalds commit 9ec4ff421f032f24416217f23b0c82dc9a5f38f6 Author: Linus Torvalds Date: Sun Sep 11 09:22:50 2005 -0700 hpt366: write the full 4 bytes of ROM address, not just low 1 byte This is one heck of a confused driver. It uses a byte write to a dword register to enable a ROM resource that it doesn't even seem to be using. "Lost and wandering in the desert of confusion" Signed-off-by: Linus Torvalds commit 5437775e0bc38d633c0a4b7660812f15b6693b69 Author: Pavel Machek Date: Sun Sep 11 10:28:00 2005 +0100 [MFD] Cleanups suggested by Dmitri, Vojtech and lists. These are small ucb1x00-ts cleanups, as suggested by Vojtech, Dmitri and the lists. Signed-off-by: Pavel Machek Signed-off-by: Russell King commit 48c92022ad264cb8084cee78a499f183b264e45f Author: Russell King Date: Sun Sep 11 10:27:23 2005 +0100 [MFD] Add code UCB1200/UCB1300 assabet platform support Add support for Intel assabet specific board support for UCB1200/UCB1300 devices. Signed-off-by: Russell King commit acb45439a89c6830349c02405f00a7208db0a66b Author: Russell King Date: Sun Sep 11 10:26:57 2005 +0100 [MFD] Add code UCB1200/UCB1300 touchscreen support Add support for Philips UCB1200 and UCB1300 touchscreen interfaces found on ARM devices. Signed-off-by: Russell King commit 05c45ca9aa4ec57e8e22341633c7a98cc879423d Author: Russell King Date: Sun Sep 11 10:26:31 2005 +0100 [MFD] Add code UCB1200/UCB1300 device support Add the core device support code for the Philips UCB1200 and UCB1300 devices. Also includes the following from Pavel: This fixes u32 vs. pm_message_t confusion and uses cleaner try_to_freeze() [fixing compilation as a side-effect on newer kernels.] Signed-off-by: Pavel Machek Signed-off-by: Russell King commit 70c83e110541e894fa16aee0f57bcf4207b33e7b Author: Tejun Heo Date: Sun Sep 11 09:37:19 2005 +0900 [SCSI] scsi: Error handler description document This patch adds Documentation/scsi/scs_eh.txt. I've chosen plain text over DocBook as most other scsi docs are in plain text and it's more accessible. Signed-off-by: Tejun Heo Signed-off-by: James Bottomley commit 6f16b5359ceb96780eac4178393b0e8a3c8aa1ea Author: Mike Christie Date: Sat Sep 10 16:45:35 2005 -0500 [SCSI] set error value when failing commands in prep_fn set DID_NO_CONNECT for the BLKPREP_KILL case and correct a few BLKPREP_DEFER cases that weren't checking for the need to plug the queue. Signed-Off-By: Mike Christie Signed-off-by: James Bottomley commit 2d21247998c5d183179a7e822c4032974a53ff49 Author: Alexey Dobriyan Date: Sun Sep 11 04:01:09 2005 +0400 [PATCH] Fix breakage on ppc{,64} by "nvidiafb: Fallback to firmware EDID" Fix drivers/video/nvidia/nv_of.c:34: error: conflicting types for 'nvidia_probe_i2c_connector' drivers/video/nvidia/nv_proto.h:38: error: previous declaration of 'nvidia_probe_i2c_connector' was here Signed-off-by: Alexey Dobriyan Acked-by: Al Viro Acked-by: Antonino Daplas Signed-off-by: Linus Torvalds commit e130af5dab2abbf01c5d92ec5ac05912cf3d9aa7 Author: Herbert Xu Date: Sat Sep 10 17:19:09 2005 -0700 [TCP]: Fix double adjustment of tp->{lost,left}_out in tcp_fragment(). There is an extra left_out/lost_out adjustment in tcp_fragment which means that the lost_out accounting is always wrong. This patch removes that chunk of code. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit d3fd4c2d48ac4590a922f2a950a2d46386c97a8a Author: Al Viro Date: Sun Sep 11 00:24:27 2005 +0100 [PATCH] uml spinlock breakage mingo missed that one... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 146f7262ee0ec7fc6882f06e5fcb13883308073c Author: James Bottomley Date: Sat Sep 10 12:44:09 2005 -0500 [SCSI] Alter the scsi_add_device() API to conform to what users expect The original API returned either an ERR_PTR() or a refcounted sdev. Unfortunately, if it's successful, you need to do a scsi_device_put() on the sdev otherwise the refcounting is wrong. Everyone seems to expect that scsi_add_device() should be callable without doing the ref put, so alter the API so it is (we still have __scsi_add_device with the original behaviour). The only actual caller that needs altering is the one in firewire ... not because it gets this right, but because it acts on the error if one is returned. Acked-by: Stefan Richter Signed-off-by: James Bottomley commit 8d36a62364b6b04dc7b0e9fe09f6968f4e5a1f0a Author: Sam Ravnborg Date: Sat Sep 10 21:05:36 2005 +0200 kbuild: fix generic asm-offsets.h support iThis fixes a bug where the generated asm-offsets.h file was saved in the source tree even with make O=. Thanks to Stephen Rothwell for the report. Signed-off-by: Sam Ravnborg commit 0a504f259c90fb41d3495d490fc9dbe2530c8749 Author: Sam Ravnborg Date: Sat Sep 10 21:02:11 2005 +0200 kbuild: add objectify Use foo := $(call objectify, $(foo)) to prefix $(foo) with $(obj)/ unless $(foo) is an absolute path. For now no in-tree users - soon to come. Signed-off-by: Sam Ravnborg commit 16b036786a6bd08cf7a91e0cd58219a6717da2a6 Author: Paolo 'Blaisorblade' Giarrusso Date: Sat Sep 10 19:44:58 2005 +0200 [PATCH] uml: avoid already done dirtying The PTE returned from handle_mm_fault is already marked as dirty and accessed if needed. Also, since this is not set with set_pte() (which sets NEWPAGE and NEWPROT as needed), this wouldn't work anyway. This version has been updated and fixed, thanks to some feedback from Jeff Dike. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit d129f31236c241c07e583e8bc695c382365d02ce Author: Paolo 'Blaisorblade' Giarrusso Date: Sat Sep 10 19:44:57 2005 +0200 [PATCH] uml: fix fault handler on write The UML fault handler was recently changed to enforce PROT_NONE protections, by requiring VM_READ or VM_EXEC on VMA's. However, by mistake, things were changed such that VM_READ is always checked, also on write faults; so a VMA mapped with only PROT_WRITE is not readable (unless it's prefaulted with MAP_POPULATE or with a write), which is different from i386. Discovered while testing remap_file_pages protection support. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit d99c4022f60a9aa3a8dc6b7d71f3d0998c696912 Author: Paolo 'Blaisorblade' Giarrusso Date: Sat Sep 10 19:44:56 2005 +0200 [PATCH] uml: inline mk_pte and various friends Turns out that, for UML, a *lot* of VM-related trivial functions are not inlined but rather normal functions. In other sections of UML code, this is justified by having files which interact with the host and cannot therefore include kernel headers, but in this case there's no such justification. I've had to turn many of them to macros because of missing declarations. While doing this, I've decided to reuse some already existing macros. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 4413a511f22ec771edc0b7c93e5b34e05511acb5 Author: Paolo 'Blaisorblade' Giarrusso Date: Sat Sep 10 19:44:55 2005 +0200 [PATCH] x86_64 linker script cleanups for debug sections Use the new macros for x86_64 too. Note that the current scripts includes different definitions; more exactly, it only contains part of the DWARF2 sections and the .comment one from Stabs. Shouldn't be a problem, anyway. Cc: Sam Ravnborg Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit a7d0c210337246fa9c25b73cf76dfdbb159f642b Author: Paolo 'Blaisorblade' Giarrusso Date: Sat Sep 10 19:44:54 2005 +0200 [PATCH] i386 / uml: add dwarf sections to static link script Inside the linker script, insert the code for DWARF debug info sections. This may help GDB'ing a Uml binary. Actually, it seems that ld is able to guess what I added correctly, but normal linker scripts include this section so it should be correct anyway adding it. On request by Sam Ravnborg , I've added it to asm-generic/vmlinux.lds.s. I've also moved there the stabs debug section, used the new macro in i386 linker script and added DWARF debug section to that. In the truth, I've not been able to verify the difference in GDB behaviour after this change (I've seen large improvements with another patch). This may depend on my binutils version, older one may have worse defaults. However, this section is present in normal linker script, so add it at least for the sake of cleanness. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Sam Ravnborg Signed-off-by: Linus Torvalds commit 2d5cbf324c0fd4d0e1427bcb50b8bc00069e81b8 Author: Paolo 'Blaisorblade' Giarrusso Date: Sat Sep 10 19:44:53 2005 +0200 [PATCH] Uml: more cleaning We must remove even arch/um/os-Linux/util/mk_user_constants, which we don't do. Also, Kconfig_arch must be listed only once, between CLEAN_FILES. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 0aaaa028297a0e2aed9671419a11d8e17510cb51 Author: viro@ZenIV.linux.org.uk Date: Fri Sep 9 22:09:08 2005 +0100 [PATCH] envctrl fixes envctrl doesn't need unistd.h; moreover, since it declares errno static gcc4 gets very unhappy about including unistd.h. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit fe08ac3178243fbed61f24878ffcf5cfb53fceb1 Author: viro@ZenIV.linux.org.uk Date: Fri Sep 9 22:03:44 2005 +0100 [PATCH] __user annotations (scsi/ch) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit b35b7072178b76814a088ac71ac4702de8bf7c7b Author: Stephen Rothwell Date: Sun Sep 11 00:00:14 2005 +1000 [PATCH] powerpc: Move include3 to arch/$(ARCH)/include This is less troublesome and makes more sense. Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit 35797132b311b3b7d4add48393b0a03f3566cbc1 Author: Jens Axboe Date: Sat Sep 10 14:17:10 2005 +0200 [PATCH] cfq-iosched: reverse bad reference count fix The reference count fix merged isn't fully bug free. It doesn't leak now, but instead it crashes due to looking at freed memory. So for now, lets reverse the change and I'll fix it for real next week. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 31139971b3dc9fbb2e8a8572fb81e6e8470f363a Author: Paul Mackerras Date: Sat Sep 10 21:13:13 2005 +1000 [PATCH] ppc32: support hotplug cpu on powermacs This allows cpus to be off-lined on 32-bit SMP powermacs. When a cpu is off-lined, it is put into sleep mode with interrupts disabled. It can be on-lined again by asserting its soft-reset pin, which is connected to a GPIO pin. With this I can off-line the second cpu in my dual G4 powermac, which means that I can then suspend the machine (the suspend/resume code refuses to suspend if more than one cpu is online, and making it cope with multiple cpus is surprisingly messy). Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit bb0bb3b6596cdb08adb0b72453cc67d48e139c2c Author: Paul Mackerras Date: Sat Sep 10 21:13:11 2005 +1000 [PATCH] ppc32: Kill init on unhandled synchronous signals This is a patch that I have had in my tree for ages. If init causes an exception that raises a signal, such as a SIGSEGV, SIGILL or SIGFPE, and it hasn't registered a handler for it, we don't deliver the signal, since init doesn't get any signals that it doesn't have a handler for. But that means that we just return to userland and generate the same exception again immediately. With this patch we print a message and kill init in this situation. This is very useful when you have a bug in the kernel that means that init doesn't get as far as executing its first instruction. :) Without this patch the system hangs when it gets to starting the userland init; with it you at least get a message giving you a clue about what has gone wrong. Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 1e63bc7342c40f0f1dd83d80d368665bd06f4963 Author: Nishanth Aravamudan Date: Sat Sep 10 00:27:31 2005 -0700 [PATCH] telephony: fix-up schedule_timeout() usage Use schedule_timeout_uninterruptible() instead of set_current_state()/schedule_timeout() to reduce kernel size. Signed-off-by: Nishanth Aravamudan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7b4ccf8db4c1dc343ad5d6ed19240bbc3b5f945f Author: Nishanth Aravamudan Date: Sat Sep 10 00:27:31 2005 -0700 [PATCH] parport: fix-up schedule_timeout() usage Use schedule_timeout_interruptible() instead of set_current_state()/schedule_timeout() to reduce kernel size. Also use human-time to jiffies units conversion functions rather than direct HZ division to avoid rounding issues. Signed-off-by: Nishanth Aravamudan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da4cd8dfe18ee901b880f94ca0fa79d5cc1cd0eb Author: Nishanth Aravamudan Date: Sat Sep 10 00:27:30 2005 -0700 [PATCH] drivers/char: fix-up schedule_timeout() usage Use schedule_timeout_interruptible() instead of set_current_state()/schedule_timeout() to reduce kernel size. Signed-off-by: Nishanth Aravamudan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ddee1b7a732dc96d479afaa7d0a26aa53990089 Author: Nishanth Aravamudan Date: Sat Sep 10 00:27:29 2005 -0700 [PATCH] drivers/cdrom: fix-up schedule_timeout() usage Use schedule_timeout_{un,}interruptible() instead of set_current_state()/schedule_timeout() to reduce kernel size. Signed-off-by: Nishanth Aravamudan Cc: Jens Axboe Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86e8486245a01f05a3267b2e8b5c02c2303b670d Author: Nishanth Aravamudan Date: Sat Sep 10 00:27:28 2005 -0700 [PATCH] drivers/block: fix-up schedule_timeout() usage Use schedule_timeout_{un,}interruptible() instead of set_current_state()/schedule_timeout() to reduce kernel size. Signed-off-by: Nishanth Aravamudan Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 310b587e011ce02328c8e4c29eccd9f14d9007c5 Author: Nishanth Aravamudan Date: Sat Sep 10 00:27:27 2005 -0700 [PATCH] mips: fix-up schedule_timeout() usage Use schedule_timeout_interruptible() instead of set_current_state()/schedule_timeout() to reduce kernel size. Also, replace custom timespectojiffies() function with globally availabe timespec_to_jiffies(). Signed-off-by: Nishanth Aravamudan Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52e6e6308801697ae8e59e7a577f9ca71231a35c Author: Nishanth Aravamudan Date: Sat Sep 10 00:27:26 2005 -0700 [PATCH] i386: fix-up schedule_timeout() usage Use schedule_timeout_interruptible() instead of set_current_state()/schedule_timeout() to reduce kernel size. Signed-off-by: Nishanth Aravamudan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 20c6abd1fd3a6296282f63fae82e589aa81862ff Author: Nishanth Aravamudan Date: Sat Sep 10 00:27:25 2005 -0700 [PATCH] alpha: fix-up schedule_timeout() usage Use schedule_timeout_interruptible() instead of set_current_state()/schedule_timeout() to reduce kernel size. Signed-off-by: Nishanth Aravamudan Cc: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 13e4b57f6a4e23ceb99794a650d777e74831f4a6 Author: Nishanth Aravamudan Date: Sat Sep 10 00:27:25 2005 -0700 [PATCH] mm: fix-up schedule_timeout() usage Use schedule_timeout_{,un}interruptible() instead of set_current_state()/schedule_timeout() to reduce kernel size. Signed-off-by: Nishanth Aravamudan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 75bcc8c5e1de78616b04ef9f317a293a7c1c163c Author: Nishanth Aravamudan Date: Sat Sep 10 00:27:24 2005 -0700 [PATCH] kernel: fix-up schedule_timeout() usage Use schedule_timeout_{,un}interruptible() instead of set_current_state()/schedule_timeout() to reduce kernel size. Signed-off-by: Nishanth Aravamudan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 041e0e3b1970c508dc9a95b7dd9dc86271a7d7ac Author: Nishanth Aravamudan Date: Sat Sep 10 00:27:23 2005 -0700 [PATCH] fs: fix-up schedule_timeout() usage Use schedule_timeout_{,un}interruptible() instead of set_current_state()/schedule_timeout() to reduce kernel size. Also use helper functions to convert between human time units and jiffies rather than constant HZ division to avoid rounding errors. Signed-off-by: Nishanth Aravamudan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 373016e9e1353f2af871993d27d00768f08cc883 Author: Andrew Morton Date: Sat Sep 10 00:27:23 2005 -0700 [PATCH] time.h: remove ifdefs Remove these ifdefs - there's no need to have more than one definition of these multipliers anywhere. Cc: Nishanth Aravamudan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 84f902c0903a98a315b45a4fba3d2ac0de388256 Author: Nishanth Aravamudan Date: Sat Sep 10 00:27:22 2005 -0700 [PATCH] include: update jiffies/{m,u}secs conversion functions Clarify the human-time units to jiffies conversion functions by using the constants in time.h. This makes many of the subsequent patches direct copies of the current code. Signed-off-by: Nishanth Aravamudan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 64ed93a268bc18fa6f72f61420d0e0022c5e38d1 Author: Nishanth Aravamudan Date: Sat Sep 10 00:27:21 2005 -0700 [PATCH] add schedule_timeout_{,un}interruptible() interfaces Add schedule_timeout_{,un}interruptible() interfaces so that schedule_timeout() callers don't have to worry about forgetting to add the set_current_state() call beforehand. Signed-off-by: Nishanth Aravamudan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 672289e9faa56acd4e39ad866ea258b7be7c99a6 Author: Adrian Bunk Date: Sat Sep 10 00:27:21 2005 -0700 [PATCH] i386/x86_64: make get_cpu_vendor() static get_cpu_vendor() no longer has any users in other files. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e711700a0e6a6824fcfd5519d6b6982850a648ee Author: Adrian Bunk Date: Sat Sep 10 00:27:20 2005 -0700 [PATCH] fs/cramfs/uncompress.c should #include Every file should #include the header with the prototypes of the global functions it is offering. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b01d8684e9e5b04270970c97df856d47668267e3 Author: Pavel Machek Date: Sat Sep 10 00:27:19 2005 -0700 [PATCH] remove ACPI S4bios support Remove S4BIOS support. It is pretty useless, and only ever worked for _me_ once. (I do not think anyone else ever tried it). It was in feature-removal for a long time, and it should have been removed before. Signed-off-by: Pavel Machek Signed-off-by: Adrian Bunk Cc: "Brown, Len" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c2d08dade7743bd3a28cc5f68163e71c00a2a908 Author: Adrian Bunk Date: Sat Sep 10 00:27:18 2005 -0700 [PATCH] include/linux/bio.h: "extern inline" -> "static inline" "extern inline" doesn't make much sense. Signed-off-by: Adrian Bunk Acked-by: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9adeb1b409e832c31d93106ce52482a5f0078439 Author: Adrian Bunk Date: Sat Sep 10 00:27:18 2005 -0700 [PATCH] "extern inline" -> "static inline" "extern inline" doesn't make much sense. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2befb9e36dc52d715c3a67a9dbad36ac1edc376f Author: Adrian Bunk Date: Sat Sep 10 00:27:17 2005 -0700 [PATCH] include/linux/blkdev.h: "extern inline" -> "static inline" "extern inline" doesn't make much sense. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e2afe67453e5b1499459ee3596b1e7924a5208f5 Author: Adrian Bunk Date: Sat Sep 10 00:27:16 2005 -0700 [PATCH] include/asm-i386/: "extern inline" -> "static inline" "extern inline" doesn't make much sense. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ea0e0a4f53a75ed9d0812352c0410f6fc2a0b62a Author: James Lamanna Date: Sat Sep 10 00:27:16 2005 -0700 [PATCH] janitor: reiserfs: super.c - vfree() checking cleanups super.c vfree() checking cleanups. Signed-off by: James Lamanna Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2aad5f03d97bbaf1b19f31347656de953247c7da Author: Nishanth Aravamudan Date: Sat Sep 10 00:27:15 2005 -0700 [PATCH] janitor: ide/ide-cs: replace schedule_timeout() with msleep() Uses msleep() in place of schedule_timeout() to guarantee the task delays as expected. Signed-off-by: Nishanth Aravamudan Signed-off-by: Maximilian Attems Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f6a2f3404a3b09281a264058fa8dd318bac51178 Author: Nishanth Aravamudan Date: Sat Sep 10 00:27:14 2005 -0700 [PATCH] janitor: block/xd: replace schedule_timeout() with msleep()/msleep_interruptible() Use msleep() or msleep_interruptible() [as appropriate] instead of schedule_timeout() to gurantee the task delays as expected. As a result changed the units of the timeout variable from jiffies to msecs. Signed-off-by: Nishanth Aravamudan Signed-off-by: Maximilian Attems Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 31a34571e5eed7cb1d70d5e7edd013261fe602e9 Author: Michael Veeck Date: Sat Sep 10 00:27:13 2005 -0700 [PATCH] janitor: sh: hd64465: minmax-removal Patch removes unnecessary min/max macros and changes calls to use kernel.h macros instead. Signed-off-by: Michael Veeck Signed-off-by: Maximilian Attems Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0e8bbf59bd1ff78ad7e6c7afe6acef91372914e1 Author: Michael Veeck Date: Sat Sep 10 00:27:11 2005 -0700 [PATCH] janitor: sh: bigsur/io: minmax-removal Patch removes unnecessary min/max macros and changes calls to use kernel.h macros instead. Signed-off-by: Michael Veeck Signed-off-by: Maximilian Attems Signed-off-by: Domen Puncer Cc: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0c5719c43d34073f6b4b0a2dd99f5317a5f63abd Author: Domen Puncer Date: Sat Sep 10 00:27:10 2005 -0700 [PATCH] janitor: tulip/de4x5: list_for_each s/for/list_for_each/ Signed-off-by: Maximilian Attems Signed-off-by: Domen Puncer Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 46308c0bbbb066305e0798a2fa03328467a3c7d6 Author: Domen Puncer Date: Sat Sep 10 00:27:09 2005 -0700 [PATCH] janitor: block/umem: replace PRINTK with pr_debug Removed unused dprintk, replaced PRINTK with pr_debug. Signed-off-by: Maximilian Attems Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 80ce45fd961ba8c951adc9857bfda87102b1f5b1 Author: Nishanth Aravamudan Date: Sat Sep 10 00:27:08 2005 -0700 [PATCH] janitor: ide-tape: replace schedule_timeout() with msleep() Uses msleep() instead of schedule_timeout() to guarantee the task delays at least the desired time amount. Signed-off-by: Nishanth Aravamudan Signed-off-by: Maximilian Attems Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0cdca3f9806a3dbaa07b5e8175000cd513ba92d4 Author: Domen Puncer Date: Sat Sep 10 00:27:07 2005 -0700 [PATCH] janitor: fs/dcache.c: list_for_each* First one is list_for_each_entry (thanks maks), second 2 list_for_each_safe. Signed-off-by: Maximilian Attems Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fdadd65fbce0ff966cb8e74247d9636f52a7fc7a Author: Domen Puncer Date: Sat Sep 10 00:27:07 2005 -0700 [PATCH] janitor: fs/namespace.c: list_for_each_entry Make code more readable with list_for_each_entry. Signed-off-by: Maximilian Attems Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 216d81bb35fc50923993462cc4fbc7029f9be1a9 Author: Domen Puncer Date: Sat Sep 10 00:27:05 2005 -0700 [PATCH] janitor: jffs/intrep: list_for_each_entry Use list_for_each_entry to make code more readable. Signed-off-by: Maximilian Attems Signed-off-by: Domen Puncer Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 81616c5a0811564667ef39928da4573d99c70bed Author: Domen Puncer Date: Sat Sep 10 00:27:04 2005 -0700 [PATCH] janitor: net/ppp-generic: list_for_each_entry Make code more readable with list_for_each_entry. Signed-off-by: Maximilian Attems Signed-off-by: Domen Puncer Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2665b891c42ef67eb4cb51d665b523892f992749 Author: Clemens Buchacher Date: Sat Sep 10 00:27:00 2005 -0700 [PATCH] janitor: ide: min/max macros in ide-timing.h I replaced the custom MIN/MAX macros with the type safe min/max macros from linux/kernel.h. Signed-off-by: Maximilian Attems Signed-off-by: Domen Puncer Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ecec4cb7a9df5f61fe00710d2f2c69ce9a3b1d40 Author: Adrian Bunk Date: Sat Sep 10 00:26:59 2005 -0700 [PATCH] lib/sort.c: small cleanups This patch contains the following small cleanups: - make two needlessly global functions static - every file should #include the header files containing the prototypes of it's global functions Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 207f36eec9e7b1077d7a0aaadb4800e2c9b4cfa4 Author: Renaud Lienhart Date: Sat Sep 10 00:26:59 2005 -0700 [PATCH] remove invalid comment in mm/page_alloc.c free_pages_bulk() doesn't free the entire list if count == 0. Signed-off-by: Renaud Lienhart Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9dcbb32f1654e79c212c20d9cd9d48509ee1eaf7 Author: Tobias Klauser Date: Sat Sep 10 00:26:58 2005 -0700 [PATCH] Spelling and whitespace fixes for REPORTING-BUGS The attached patch fixes some spelling errors in REPORTING-BUGS and also removes all trailing whitespaces. Signed-off-by: Tobias Klauser Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 96757701336365e30bea9fccdfac087338954e09 Author: Marcelo Feitoza Parisi Date: Sat Sep 10 00:26:57 2005 -0700 [PATCH] drivers/char/lp.c : Use of the time_after() macro Use of the time_after() macro, defined at linux/jiffies.h, which deals with wrapping correctly and are nicer to read. Signed-off-by: Marcelo Feitoza Parisi Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 82b44429e0c8a8fec8f36e98a725f516227dabc0 Author: Adrian Bunk Date: Sat Sep 10 00:26:56 2005 -0700 [PATCH] patch] remove sound/oss/skeleton.c We do no longer need a template for OSS drivers. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f8e38dde33b839bb9e9f98e88688bfac1811d57a Author: Adrian Bunk Date: Sat Sep 10 00:26:55 2005 -0700 [PATCH] include/asm-arm26/hardirq.h: remove #define irq_enter() This patch removes a #define for irq_enter that is superfluous due to a similar one in include/linux/hardirq.h. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 338cec3253a6d43d02e5e96abc327197565efcc8 Author: Adrian Bunk Date: Sat Sep 10 00:26:54 2005 -0700 [PATCH] merge some from Rusty's trivial patches This patch contains the most trivial from Rusty's trivial patches: - spelling fixes - remove duplicate includes Signed-off-by: Adrian Bunk Cc: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f9101210e7aa72daf92722d451a2f7e3af5f781f Author: Jesper Juhl Date: Sat Sep 10 00:26:54 2005 -0700 [PATCH] vfree and kfree cleanup in drivers/ This patch does a full cleanup of 'NULL checks before vfree', and a partial cleanup of calls to kfree for all of drivers/ - the kfree bit is partial in that I only did the files that also had vfree calls in them. The patch also gets rid of some redundant (void *) casts of pointers being passed to [vk]free, and a some tiny whitespace corrections also crept in. Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 887c27f369abc458556a5ce8ab22ddd498474307 Author: Adrian Bunk Date: Sat Sep 10 00:26:52 2005 -0700 [PATCH] fix unusual placement of inline keyword in hpet With gcc -W: drivers/char/hpet.c:102: warning: `inline' is not at beginning of declaration drivers/char/hpet.c:109: warning: `inline' is not at beginning of declaration Signed-off-by: Jesper Juhl Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b3358a116c25267446a45e4164cb2b8e98276da0 Author: Pekka J Enberg Date: Sat Sep 10 00:26:51 2005 -0700 [PATCH] update FSF address in COPYING FSF has moved so update the address as per http://www.gnu.org/licenses/gpl.txt. Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aeb8397b6a289a358f04fa12b69194af6c259ad6 Author: Nishanth Aravamudan Date: Sat Sep 10 00:26:50 2005 -0700 [PATCH] i386/smpboot: use msleep() instead of schedule_timeout() Replace schedule_timeout() with msleep() to guarantee the task delays as expected. Signed-off-by: Nishanth Aravamudan Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f4c9925ccc185da68c2d42230711d017f222e420 Author: Nishanth Aravamudan Date: Sat Sep 10 00:26:50 2005 -0700 [PATCH] telephony/ixj: use msleep() instead of schedule_timeout() Replace schedule_timeout() with msleep() to guarantee the task delays as expected. Signed-off-by: Nishanth Aravamudan Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3a11ec5e502cb61ee31095008318f9c107d9db60 Author: Victor Fusco Date: Sat Sep 10 00:26:49 2005 -0700 [PATCH] dmapool: Fix "nocast type" warnings Fix the sparse warning "implicit cast to nocast type" Signed-off-by: Victor Fusco Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 00b61f51922e432fd92a482ba1e0b5f8f326ef46 Author: Victor Fusco Date: Sat Sep 10 00:26:48 2005 -0700 [PATCH] lib/radix-tree: Fix "nocast type" warnings Fix the sparse warning "implicit cast to nocast type" Signed-off-by: Victor Fusco Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d533f671852cc4e481ea7070aa1a3b6fc75b8e44 Author: Tobias Klauser Date: Sat Sep 10 00:26:46 2005 -0700 [PATCH] Spelling fixes for Documentation/ The attached patch fixes the following spelling errors in Documentation/ - double "the" - Several misspellings of function/functionality - infomation - memeory - Recieved - wether and possibly others which I forgot ;-) Trailing whitespaces on the same line as the typo are also deleted. Signed-off-by: Tobias Klauser Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9de75d110c9681d4aaa7fe87b8db99d5562012a2 Author: Victor Fusco Date: Sat Sep 10 00:26:46 2005 -0700 [PATCH] mm/swap_state: Fix "nocast type" warnings Fix the sparse warning "implicit cast to nocast type" Signed-off-by: Victor Fusco Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e776eba0feaea9a3eba7aff73f50701b9804b57f Author: Pekka J Enberg Date: Sat Sep 10 00:26:44 2005 -0700 [PATCH] Add kerneldoc reference to CodingStyle Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c05e0664e1d080344d6ce346de43e51895541e21 Author: Thomas Gleixner Date: Sat Sep 10 00:26:44 2005 -0700 [PATCH] SH64: C99 initializers for hw_interrupt_type structures Convert the initializers of hw_interrupt_type structures to C99 initializers. Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aecd4568ac8abcedc1e46fc3804439ac8e1b8ff4 Author: Thomas Gleixner Date: Sat Sep 10 00:26:43 2005 -0700 [PATCH] V850: C99 initializers for hw_interrupt_type structures Convert the initializers of hw_interrupt_type structures to C99 initializers. Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 08d0fd07c3f0b6e561260f0b078d03d6fa1ac59f Author: Thomas Gleixner Date: Sat Sep 10 00:26:42 2005 -0700 [PATCH] SH: C99 initializers for hw_interrupt_type structures Convert the initializers of hw_interrupt_type structures to C99 initializers. Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2830e21eb3c600865245478cd7a28ae73191b6b7 Author: Thomas Gleixner Date: Sat Sep 10 00:26:40 2005 -0700 [PATCH] PPC: C99 initializers for hw_interrupt_type structures Convert the initializers of hw_interrupt_type structures to C99 initializers. Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 417ef531415c070926b071b75fd1c1ac4b6e2f7e Author: Randy Dunlap Date: Sat Sep 10 00:26:39 2005 -0700 [PATCH] kernel/acct: add kerneldoc for kernel/acct.c: - fix typos - add kerneldoc for non-static functions Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 621a4d1a823e1ec631fbfbe6e53ad036e2d2abc6 Author: Victor Fusco Date: Sat Sep 10 00:26:38 2005 -0700 [PATCH] char/n_tty: fix sparse warnings (__nocast type) Fix the sparse warning "implicit cast to nocast type" Signed-off-by: Victor Fusco Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b2d550736f8b2186b8ef7e206d0bfbfec2238ae8 Author: Victor Fusco Date: Sat Sep 10 00:26:36 2005 -0700 [PATCH] mm/slab: fix sparse warnings Fix the sparse warning "implicit cast to nocast type" Signed-off-by: Victor Fusco Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dfc866e5059561cc79a0cc1c68ff1492f4c78508 Author: Alexey Dobriyan Date: Sat Sep 10 00:26:35 2005 -0700 [PATCH] sb16_csp: untypedef Signed-off-by: Alexey Dobriyan Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 31bbf8f5d55c706f2e429f7cfa7b339a332e785e Author: Alexey Dobriyan Date: Sat Sep 10 00:26:34 2005 -0700 [PATCH] sb16_csp: remove home-grown le??_to_cpu macros Signed-off-by: Alexey Dobriyan Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1ac19f4ccd8636dbe76a97cec36c95d7548cc871 Author: Christophe Lucas Date: Sat Sep 10 00:26:33 2005 -0700 [PATCH] hdpu_cpustate.c: misc_register() can fail Signed-off-by: Christophe Lucas Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cf85d5ca880c9611906e0ca0c729fdf01c724501 Author: Christophe Lucas Date: Sat Sep 10 00:26:32 2005 -0700 [PATCH] drivers/char/lcd.c: misc_register() can fail Signed-off-by: Christophe Lucas Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 819a3eba4233ffc6c125e1bf0a15ae093b97c3a6 Author: Christophe Lucas Date: Sat Sep 10 00:26:29 2005 -0700 [PATCH] applicom: fix error handling misc_register() can fail. Signed-off-by: Christophe Lucas Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ce7852cdf07ab903fb1c72d0915ac492c6e07c7 Author: Adrian Bunk Date: Sat Sep 10 00:26:28 2005 -0700 [PATCH] mm/filemap.c: make two functions static With Nick Piggin Give some things static scope. Signed-off-by: Adrian Bunk Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd81eca83c8300c95d8a1eaf0d38f56513711535 Author: Paul E. McKenney Date: Sat Sep 10 00:26:24 2005 -0700 [PATCH] Yet another RCU documentation update Update RCU documentation based on discussions and review of RCU-based tree patches. Add an introductory whatisRCU.txt file. Signed-off-by: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12c62c2e9abf8da804fe1def1f5bb44d023f569f Author: Arthur Othieno Date: Sat Sep 10 00:26:22 2005 -0700 [PATCH] Remove even more stale references to Documentation/smp.tex Randy cleaned out the bulk of these stale references to the now long gone Documentation/smp.tex back in 2004. I followed this up with a few more sweeps. Somehow, these have managed to sneak back in since. I can't seem to figure out a contact point for M32R (no one listed in MAINTAINERS!), but, these patches are only but trivial. Signed-off-by: Arthur Othieno Acked-by: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0c117f1b4d14380baeed9c883f765ee023da8761 Author: Siddha, Suresh B Date: Sat Sep 10 00:26:21 2005 -0700 [PATCH] sched: allow the load to grow upto its cpu_power Don't pull tasks from a group if that would cause the group's total load to drop below its total cpu_power (ie. cause the group to start going idle). Signed-off-by: Suresh Siddha Signed-off-by: Nick Piggin Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fa3b6ddc3f4a8eadba52234134cdb59c28b5332d Author: Siddha, Suresh B Date: Sat Sep 10 00:26:21 2005 -0700 [PATCH] sched: don't kick ALB in the presence of pinned task Jack Steiner brought this issue at my OLS talk. Take a scenario where two tasks are pinned to two HT threads in a physical package. Idle packages in the system will keep kicking migration_thread on the busy package with out any success. We will run into similar scenarios in the presence of CMP/NUMA. Signed-off-by: Suresh Siddha Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5927ad78ec75870b1bdfa65a10ad1300cd664d36 Author: Renaud Lienhart Date: Sat Sep 10 00:26:20 2005 -0700 [PATCH] sched: use cached variable in sys_sched_yield() In sys_sched_yield(), we cache current->array in the "array" variable, thus there's no need to dereference "current" again later. Signed-Off-By: Renaud Lienhart Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5969fe0618051e8577316555a81a6e44b7b7d640 Author: Nick Piggin Date: Sat Sep 10 00:26:19 2005 -0700 [PATCH] sched: HT optimisation If an idle sibling of an HT queue encounters a busy sibling, then make higher level load balancing of the non-idle variety. Performance of multiprocessor HT systems with low numbers of tasks (generally < number of virtual CPUs) can be significantly worse than the exact same workloads when running in non-HT mode. The reason is largely due to poor scheduling behaviour. This patch improves the situation, making the performance gap far less significant on one problematic test case (tbench). Signed-off-by: Nick Piggin Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e17224bf1d01b461ec02a60f5a9b7657a89bdd23 Author: Nick Piggin Date: Sat Sep 10 00:26:18 2005 -0700 [PATCH] sched: less locking During periodic load balancing, don't hold this runqueue's lock while scanning remote runqueues, which can take a non trivial amount of time especially on very large systems. Holding the runqueue lock will only help to stabilise ->nr_running, however this doesn't do much to help because tasks being woken will simply get held up on the runqueue lock, so ->nr_running would not provide a really accurate picture of runqueue load in that case anyway. What's more, ->nr_running (and possibly the cpu_load averages) of remote runqueues won't be stable anyway, so load balancing is always an inexact operation. Signed-off-by: Nick Piggin Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6d5cfaf4551aa7713ca6ab73bb77e832602204b Author: Nick Piggin Date: Sat Sep 10 00:26:16 2005 -0700 [PATCH] sched: less newidle locking Similarly to the earlier change in load_balance, only lock the runqueue in load_balance_newidle if the busiest queue found has a nr_running > 1. This will reduce frequency of expensive remote runqueue lock aquisitions in the schedule() path on some workloads. Signed-off-by: Nick Piggin Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 67f9a619e7460b7d07284a9d0745727a77d3ade6 Author: Ingo Molnar Date: Sat Sep 10 00:26:16 2005 -0700 [PATCH] sched: fix SMT scheduler latency bug William Weston reported unusually high scheduling latencies on his x86 HT box, on the -RT kernel. I managed to reproduce it on my HT box and the latency tracer shows the incident in action: _------=> CPU# / _-----=> irqs-off | / _----=> need-resched || / _---=> hardirq/softirq ||| / _--=> preempt-depth |||| / ||||| delay cmd pid ||||| time | caller \ / ||||| \ | / du-2803 3Dnh2 0us : __trace_start_sched_wakeup (try_to_wake_up) .............................................................. ... we are running on CPU#3, PID 2778 gets woken to CPU#1: ... .............................................................. du-2803 3Dnh2 0us : __trace_start_sched_wakeup <<...>-2778> (73 1) du-2803 3Dnh2 0us : _raw_spin_unlock (try_to_wake_up) ................................................ ... still on CPU#3, we send an IPI to CPU#1: ... ................................................ du-2803 3Dnh1 0us : resched_task (try_to_wake_up) du-2803 3Dnh1 1us : smp_send_reschedule (try_to_wake_up) du-2803 3Dnh1 1us : send_IPI_mask_bitmask (smp_send_reschedule) du-2803 3Dnh1 2us : _raw_spin_unlock_irqrestore (try_to_wake_up) ............................................... ... 1 usec later, the IPI arrives on CPU#1: ... ............................................... -0 1Dnh. 2us : smp_reschedule_interrupt (c0100c5a 0 0) So far so good, this is the normal wakeup/preemption mechanism. But here comes the scheduler anomaly on CPU#1: -0 1Dnh. 2us : preempt_schedule_irq (need_resched) -0 1Dnh. 2us : preempt_schedule_irq (need_resched) -0 1Dnh. 3us : __schedule (preempt_schedule_irq) -0 1Dnh. 3us : profile_hit (__schedule) -0 1Dnh1 3us : sched_clock (__schedule) -0 1Dnh1 4us : _raw_spin_lock_irq (__schedule) -0 1Dnh1 4us : _raw_spin_lock_irqsave (__schedule) -0 1Dnh2 5us : _raw_spin_unlock (__schedule) -0 1Dnh1 5us : preempt_schedule (__schedule) -0 1Dnh1 6us : _raw_spin_lock (__schedule) -0 1Dnh2 6us : find_next_bit (__schedule) -0 1Dnh2 6us : _raw_spin_lock (__schedule) -0 1Dnh3 7us : find_next_bit (__schedule) -0 1Dnh3 7us : find_next_bit (__schedule) -0 1Dnh3 8us : _raw_spin_unlock (__schedule) -0 1Dnh2 8us : preempt_schedule (__schedule) -0 1Dnh2 8us : find_next_bit (__schedule) -0 1Dnh2 9us : trace_stop_sched_switched (__schedule) -0 1Dnh2 9us : _raw_spin_lock (trace_stop_sched_switched) -0 1Dnh3 10us : trace_stop_sched_switched <<...>-2778> (73 8c) -0 1Dnh3 10us : _raw_spin_unlock (trace_stop_sched_switched) -0 1Dnh1 10us : _raw_spin_unlock (__schedule) -0 1Dnh. 11us : local_irq_enable_noresched (preempt_schedule_irq) -0 1Dnh. 11us < (0) we didnt pick up pid 2778! It only gets scheduled much later: <...>-2778 1Dnh2 412us : __switch_to (__schedule) <...>-2778 1Dnh2 413us : __schedule <-0> (8c 73) <...>-2778 1Dnh2 413us : _raw_spin_unlock (__schedule) <...>-2778 1Dnh1 413us : trace_stop_sched_switched (__schedule) <...>-2778 1Dnh1 414us : _raw_spin_lock (trace_stop_sched_switched) <...>-2778 1Dnh2 414us : trace_stop_sched_switched <<...>-2778> (73 1) <...>-2778 1Dnh2 414us : _raw_spin_unlock (trace_stop_sched_switched) <...>-2778 1Dnh1 415us : trace_stop_sched_switched (__schedule) the reason for this anomaly is the following code in dependent_sleeper(): /* * If a user task with lower static priority than the * running task on the SMT sibling is trying to schedule, * delay it till there is proportionately less timeslice * left of the sibling task to prevent a lower priority * task from using an unfair proportion of the * physical cpu's resources. -ck */ [...] if (((smt_curr->time_slice * (100 - sd->per_cpu_gain) / 100) > task_timeslice(p))) ret = 1; Note that in contrast to the comment above, we dont actually do the check based on static priority, we do the check based on timeslices. But timeslices go up and down, and even highprio tasks can randomly have very low timeslices (just before their next refill) and can thus be judged as 'lowprio' by the above piece of code. This condition is clearly buggy. The correct test is to check for static_prio _and_ to check for the preemption priority. Even on different static priority levels, a higher-prio interactive task should not be delayed due to a higher-static-prio CPU hog. There is a symmetric bug in the 'kick SMT sibling' code of this function as well, which can be solved in a similar way. The patch below (against the current scheduler queue in -mm) fixes both bugs. I have build and boot-tested this on x86 SMT, and nice +20 tasks still get properly throttled - so the dependent-sleeper logic is still in action. btw., these bugs pessimised the SMT scheduler because the 'delay wakeup' property was applied too liberally, so this fix is likely a throughput improvement as well. I separated out a smt_slice() function to make the code easier to read. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d79fc0fc6645b0cf5cd980da76942ca6d6300fa4 Author: Ingo Molnar Date: Sat Sep 10 00:26:12 2005 -0700 [PATCH] sched: TASK_NONINTERACTIVE This patch implements a task state bit (TASK_NONINTERACTIVE), which can be used by blocking points to mark the task's wait as "non-interactive". This does not mean the task will be considered a CPU-hog - the wait will simply not have an effect on the waiting task's priority - positive or negative alike. Right now only pipe_wait() will make use of it, because it's a common source of not-so-interactive waits (kernel compilation jobs, etc.). Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 95cdf3b799a481969a48d69a1a52916ad5da6694 Author: Ingo Molnar Date: Sat Sep 10 00:26:11 2005 -0700 [PATCH] sched cleanups whitespace cleanups. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da5a5522709a030da91932d4d4c2b179a481a8c0 Author: M.Baris Demiray Date: Sat Sep 10 00:26:09 2005 -0700 [PATCH] sched: make idlest_group/cpu cpus_allowed-aware Add relevant checks into find_idlest_group() and find_idlest_cpu() to make them return only the groups that have allowed CPUs and allowed CPUs respectively. Signed-off-by: M.Baris Demiray Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fc38ed7531eefa332c8c69ee288487860cd6b426 Author: Con Kolivas Date: Sat Sep 10 00:26:08 2005 -0700 [PATCH] sched: run SCHED_NORMAL tasks with real time tasks on SMT siblings The hyperthread aware nice handling currently puts to sleep any non real time task when a real time task is running on its sibling cpu. This can lead to prolonged starvation by having the non real time task pegged to the cpu with load balancing not pulling that task away. Currently we force lower priority hyperthread tasks to run a percentage of time difference based on timeslice differences which is meaningless when comparing real time tasks to SCHED_NORMAL tasks. We can allow non real time tasks to run with real time tasks on the sibling up to per_cpu_gain% if we use jiffies as a counter. Cleanups and micro-optimisations to the relevant code section should make it more understandable as well. Signed-off-by: Con Kolivas Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a7482a2e7775d163aecd8c95af7bb1b8c83890cc Author: Paul Fulghum Date: Sat Sep 10 00:26:07 2005 -0700 [PATCH] synclink_cs add statistics clear Add ability to clear statistics. Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4247bdc60048018b98f71228b45cfbc5f5270c86 Author: Paul Jackson Date: Sat Sep 10 00:26:06 2005 -0700 [PATCH] cpuset semaphore depth check deadlock fix The cpusets-formalize-intermediate-gfp_kernel-containment patch has a deadlock problem. This patch was part of a set of four patches to make more extensive use of the cpuset 'mem_exclusive' attribute to manage kernel GFP_KERNEL memory allocations and to constrain the out-of-memory (oom) killer. A task that is changing cpusets in particular ways on a system when it is very short of free memory could double trip over the global cpuset_sem semaphore (get the lock and then deadlock trying to get it again). The second attempt to get cpuset_sem would be in the routine cpuset_zone_allowed(). This was discovered by code inspection. I can not reproduce the problem except with an artifically hacked kernel and a specialized stress test. In real life you cannot hit this unless you are manipulating cpusets, and are very unlikely to hit it unless you are rapidly modifying cpusets on a memory tight system. Even then it would be a rare occurence. If you did hit it, the task double tripping over cpuset_sem would deadlock in the kernel, and any other task also trying to manipulate cpusets would deadlock there too, on cpuset_sem. Your batch manager would be wedged solid (if it was cpuset savvy), but classic Unix shells and utilities would work well enough to reboot the system. The unusual condition that led to this bug is that unlike most semaphores, cpuset_sem _can_ be acquired while in the page allocation code, when __alloc_pages() calls cpuset_zone_allowed. So it easy to mistakenly perform the following sequence: 1) task makes system call to alter a cpuset 2) take cpuset_sem 3) try to allocate memory 4) memory allocator, via cpuset_zone_allowed, trys to take cpuset_sem 5) deadlock The reason that this is not a serious bug for most users is that almost all calls to allocate memory don't require taking cpuset_sem. Only some code paths off the beaten track require taking cpuset_sem -- which is good. Taking a global semaphore on the main code path for allocating memory would not scale well. This patch fixes this deadlock by wrapping the up() and down() calls on cpuset_sem in kernel/cpuset.c with code that tracks the nesting depth of the current task on that semaphore, and only does the real down() if the task doesn't hold the lock already, and only does the real up() if the nesting depth (number of unmatched downs) is exactly one. The previous required use of refresh_mems(), anytime that the cpuset_sem semaphore was acquired and the code executed while holding that semaphore might try to allocate memory, is no longer required. Two refresh_mems() calls were removed thanks to this. This is a good change, as failing to get all the necessary refresh_mems() calls placed was a primary source of bugs in this cpuset code. The only remaining call to refresh_mems() is made while doing a memory allocation, if certain task memory placement data needs to be updated from its cpuset, due to the cpuset having been changed behind the tasks back. Signed-off-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fb1c8f93d869b34cacb8b8932e2b83d96a19d720 Author: Ingo Molnar Date: Sat Sep 10 00:25:56 2005 -0700 [PATCH] spinlock consolidation This patch (written by me and also containing many suggestions of Arjan van de Ven) does a major cleanup of the spinlock code. It does the following things: - consolidates and enhances the spinlock/rwlock debugging code - simplifies the asm/spinlock.h files - encapsulates the raw spinlock type and moves generic spinlock features (such as ->break_lock) into the generic code. - cleans up the spinlock code hierarchy to get rid of the spaghetti. Most notably there's now only a single variant of the debugging code, located in lib/spinlock_debug.c. (previously we had one SMP debugging variant per architecture, plus a separate generic one for UP builds) Also, i've enhanced the rwlock debugging facility, it will now track write-owners. There is new spinlock-owner/CPU-tracking on SMP builds too. All locks have lockup detection now, which will work for both soft and hard spin/rwlock lockups. The arch-level include files now only contain the minimally necessary subset of the spinlock code - all the rest that can be generalized now lives in the generic headers: include/asm-i386/spinlock_types.h | 16 include/asm-x86_64/spinlock_types.h | 16 I have also split up the various spinlock variants into separate files, making it easier to see which does what. The new layout is: SMP | UP ----------------------------|----------------------------------- asm/spinlock_types_smp.h | linux/spinlock_types_up.h linux/spinlock_types.h | linux/spinlock_types.h asm/spinlock_smp.h | linux/spinlock_up.h linux/spinlock_api_smp.h | linux/spinlock_api_up.h linux/spinlock.h | linux/spinlock.h /* * here's the role of the various spinlock/rwlock related include files: * * on SMP builds: * * asm/spinlock_types.h: contains the raw_spinlock_t/raw_rwlock_t and the * initializers * * linux/spinlock_types.h: * defines the generic type and initializers * * asm/spinlock.h: contains the __raw_spin_*()/etc. lowlevel * implementations, mostly inline assembly code * * (also included on UP-debug builds:) * * linux/spinlock_api_smp.h: * contains the prototypes for the _spin_*() APIs. * * linux/spinlock.h: builds the final spin_*() APIs. * * on UP builds: * * linux/spinlock_type_up.h: * contains the generic, simplified UP spinlock type. * (which is an empty structure on non-debug builds) * * linux/spinlock_types.h: * defines the generic type and initializers * * linux/spinlock_up.h: * contains the __raw_spin_*()/etc. version of UP * builds. (which are NOPs on non-debug, non-preempt * builds) * * (included on UP-non-debug builds:) * * linux/spinlock_api_up.h: * builds the _spin_*() APIs. * * linux/spinlock.h: builds the final spin_*() APIs. */ All SMP and UP architectures are converted by this patch. arm, i386, ia64, ppc, ppc64, s390/s390x, x64 was build-tested via crosscompilers. m32r, mips, sh, sparc, have not been tested yet, but should be mostly fine. From: Grant Grundler Booted and lightly tested on a500-44 (64-bit, SMP kernel, dual CPU). Builds 32-bit SMP kernel (not booted or tested). I did not try to build non-SMP kernels. That should be trivial to fix up later if necessary. I converted bit ops atomic_hash lock to raw_spinlock_t. Doing so avoids some ugly nesting of linux/*.h and asm/*.h files. Those particular locks are well tested and contained entirely inside arch specific code. I do NOT expect any new issues to arise with them. If someone does ever need to use debug/metrics with them, then they will need to unravel this hairball between spinlocks, atomic ops, and bit ops that exist only because parisc has exactly one atomic instruction: LDCW (load and clear word). From: "Luck, Tony" ia64 fix Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Grant Grundler Cc: Matthew Wilcox Signed-off-by: Hirokazu Takata Signed-off-by: Mikael Pettersson Signed-off-by: Benoit Boissinot Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4327edf6b8a7ac7dce144313947995538842d8fd Author: Alan Cox Date: Sat Sep 10 00:25:49 2005 -0700 [PATCH] Subject: PATCH: fix numa caused compile warnings pcibus_to_cpumask expands into more than just an initialiser so gcc moans about code before variable declarations. Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b4012a9895b3e28e3bff3aa534d58c7827af6d4f Author: Andrew Morton Date: Sat Sep 10 00:25:47 2005 -0700 [PATCH] ntfs build fix *** Warning: "bit_spin_lock" [fs/ntfs/ntfs.ko] undefined! *** Warning: "bit_spin_unlock" [fs/ntfs/ntfs.ko] undefined! Cc: Anton Altaparmakov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d39969deee4b541be4ee5789a2e4c14511c886e2 Author: Dmitry Torokhov Date: Sat Sep 10 12:04:42 2005 -0500 Input: i8042 - use kzalloc instead of kcalloc Signed-off-by: Dmitry Torokhov commit fe1e86049813641a518d15adf7191bd711b4f611 Author: Dmitry Torokhov Date: Sat Sep 10 12:03:38 2005 -0500 Input: clean up whitespace and formatting in drivers/char/keyboard.c Signed-off-by: Dmitry Torokhov commit b70d37bf61f278f9d9adf17c52af6b2d0ae7800c Author: Alan Stern Date: Tue Jul 26 10:30:40 2005 -0400 [SCSI] Fix module removal/device add race This patch (as546) fixes an oops-causing failure to check the return code from scsi_device_get. The call can return an error if the LLD is being unloaded from memory. Signed-off-by: Alan Stern Signed-off-by: James Bottomley commit f631b4be76355dc3bf49563c706a9fb938993bde Author: Andrew Vasquez Date: Wed Aug 31 15:23:12 2005 -0700 [SCSI] lpfc: use wwn_to_u64() transport helper Signed-off-by: Andrew Vasquez Acked-by: Smart, James Signed-off-by: James Bottomley commit f8b02a85ebbf5eed63163ca9ed915bf8c47309c5 Author: Andrew Vasquez Date: Wed Aug 31 15:21:20 2005 -0700 [SCSI] qla2xxx: use wwn_to_u64() transport helper Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 218fba0004390b0101e681f6db1b8920c1109e54 Author: Andrew Vasquez Date: Wed Aug 31 15:18:35 2005 -0700 [SCSI] fc_transport: Generalize WWN to u64 interger conversions. On some platforms the hard-casting of 8 byte node_name and port_name arrays to an u64 would cause unaligned-access warnings. Generalize the conversions with a transport helper function which performs consistent shifting of WWN bytes. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit caba0233bc85ec311159a35f138d957d05cf2fe8 Author: Roland McGrath Date: Sat Sep 3 13:57:15 2005 -0700 [PATCH] kbuild: ignore all debugging info sections in scripts/reference_discarded.pl GCC 4 emits more DWARF debugging information than before and there is now a .debug_loc section as well. This causes "make buildcheck" to fail. Rather than just add that one to the special case list, I used a regexp to ignore any .debug_ANYTHING sections in case more show up in the future. Signed-off-by: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit cd05e6bdc6001ac6e8ab13720693b7e1302d9848 Author: Jan Beulich Date: Tue Sep 6 11:47:04 2005 +0200 [PATCH] kbuild: fix split-include dependency Splitting of autoconf.h requires that split-include was built before, and needs to be-re-done when split-include changes. This dependency was previously missing. Additionally, since autoconf.h is (suppoosed to be) generated as a side effect of executing config targets, include/linux should be created prior to running the respective sub-make. Signed-off-by: Jan Beulich Signed-off-by: Sam Ravnborg commit 4e25d8bb9550fb5912165196fe8502cdb831a336 Author: Jan Beulich Date: Thu Sep 8 17:07:35 2005 +0200 [PATCH] kbuild: adjust .version updating In order to maintain a more correct build number, updates to the version number should only be commited after a successful link of vmlinux, not before (so that errors in the link process don't lead to pointless increments). Signed-off-by: Jan Beulich Signed-off-by: Sam Ravnborg commit 7b49bb9aff8b14d15da58111d8908c877c0a525e Author: viro@ZenIV.linux.org.uk Date: Fri Sep 9 21:14:35 2005 +0100 [PATCH] kbuild: CF= passes arguments to sparse Allows to add to sparse arguments without mutilating makefiles - just pass CF= and they will be added to CHECKFLAGS. Signed-off-by: Al Viro Signed-off-by: Sam Ravnborg commit 6d12884259ac65f74538b7819f5fadf4ebb0d569 Author: Zach Brown Date: Wed Sep 7 12:08:23 2005 -0700 [PATCH] kbuild: add kernelrelease to 'make help' Dunno if there was a conscious decision to leave it out, but if you're happy with adding some help text for it here's a patch against 2.6.13-mm1.. Signed-off-by: Sam Ravnborg commit c4a72cbdb39fd559988b16d118f7e5782935ff11 Author: Russell King Date: Sat Sep 10 11:58:21 2005 +0100 [MMC] Add mmc_detect_change() delay support for wbsd driver Convert wbsd to use the new delay functionality in mmc_detect_change() rather than implementing its own timer. Signed-off-by: Russell King commit e6df439b89dbf9eb977c2dc6f7b0644be3704df4 Author: Brian Haley Date: Sat Sep 10 00:15:06 2005 -0700 [IPV6]: Bring Type 0 routing header in-line with rfc3542. Signed-off-by: Brian Haley Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 1b205c2d2464bfecbba80227e74b412596dc5521 Author: Roland Dreier Date: Fri Sep 9 20:52:00 2005 -0700 [PATCH] IB: fix CM use-after-free If the CM REQ handling function gets to error2, then it frees cm_id_priv->timewait_info. But the next line goes through ib_destroy_cm_id() -> ib_send_cm_rej() -> cm_reset_to_idle(), which ends up calling cm_cleanup_timewait(), which dereferences the pointer we just freed. Make sure we clear cm_id_priv->timewait_info after freeing it, so that doesn't happen. Signed-off-by: Roland Dreier commit dd27466df9924706ae34639ce3f4f837875d45c1 Author: YOSHIFUJI Hideaki Date: Sat Sep 10 11:32:45 2005 +0900 [IPV6]: Note values allocated for ip6_tables. To avoid future conflicts, add a note values allocated for ip6_tables. Signed-off-by: YOSHIFUJI Hideaki commit 9928890c1f94da58bf753ede937b7324f6832866 Author: YOSHIFUJI Hideaki Date: Sat Sep 10 11:26:34 2005 +0900 [IPV6]: rearrange constants for new advanced API to solve conflicts. 64, 65 are already used in ip6_tables. Pointed out by Patrick McHardy . Signed-off-by: YOSHIFUJI Hideaki commit 354ba39cf96e439149541acf3c6c7c0df0a3ef25 Author: John Kingman Date: Fri Sep 9 18:23:32 2005 -0700 [PATCH] IB CM: support CM redir Changes to CM to support CM and port redirection (REJ reason 24). Signed-off-by: John Kingman storagegear.com> Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 37be6eeb4990c05fc7dd683ceaf1501d46ebe9a4 Author: James Bottomley Date: Fri Sep 9 18:38:27 2005 -0500 [SCSI] SAS transport class: fixup prototype of sas_host_setup Signed-off-by: James Bottomley commit 87fc767b832ef5a681a0ff9d203c3289bc3be2bf Author: NeilBrown Date: Fri Sep 9 16:24:04 2005 -0700 [PATCH] md: fix BUG when raid10 rebuilds without enough drives This shouldn't be a BUG. We should cope. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6d508242b231cb6e6803faaef54456abe846edb8 Author: NeilBrown Date: Fri Sep 9 16:24:03 2005 -0700 [PATCH] md: fix raid10 assembly when too many devices are missing If you try to assemble an array with too many missing devices, raid10 will now reject the attempt, instead of allowing it. Also check when hot-adding a drive and refuse the hot-add if the array is beyond hope. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 611815651b2640449bda928079160b9263efac1c Author: NeilBrown Date: Fri Sep 9 16:24:02 2005 -0700 [PATCH] md: really get sb_size setting right in all cases There was another case where sb_size wasn't being set, so instead do the sensible thing and set if when filling in the content of a superblock. That ensures that whenever we write a superblock, the sb_size MUST be set. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 188c18fd7982d220f4dea234cbb5cc6c75d0f512 Author: NeilBrown Date: Fri Sep 9 16:24:01 2005 -0700 [PATCH] md: make sure the new 'sb_size' is set properly device added without pre-existing superblock. There are two ways to add devices to an md/raid array. It can have superblock written to it, and then given to the md driver, which will read the superblock (the new way) or md can be told (through SET_ARRAY_INFO) the shape of the array, and the told about individual drives, and md will create the required superblock (the old way). The newly introduced sb_size was only set for drives being added the new way, not the old ways. Oops :-( Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b325a32e5732d7aef70ca3c58acb3953ed20f66c Author: NeilBrown Date: Fri Sep 9 16:24:00 2005 -0700 [PATCH] md: report spare drives in /proc/mdstat Just like failed drives have (F), so spare drives now have (S). Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1cd6bf19bbe8098153d7a478d8fc551edbea9305 Author: NeilBrown Date: Fri Sep 9 16:24:00 2005 -0700 [PATCH] md: add information about superblock version to /proc/mdstat Leave it unchanged if the original (0.90) is used, incase it might be a compatability problem. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 720a3dc39b030e273bc955641f2517874fd38fc5 Author: NeilBrown Date: Fri Sep 9 16:23:59 2005 -0700 [PATCH] md: use queue_hardsect_size instead of block_size for md superblock size calc. Doh. I want the physical hard-sector-size, not the current block size... Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53e87fbb5dc887766229eef3ba8bd8ab8853b066 Author: NeilBrown Date: Fri Sep 9 16:23:58 2005 -0700 [PATCH] md: choose better default offset for bitmap. On reflection, a better default location for hot-adding bitmaps with version-1 superblocks is immediately after the superblock. There might not be much room there, but there is usually atleast 3k, and that is a good start. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 500af87abb81098da47474c81f29ea315a056dc5 Author: NeilBrown Date: Fri Sep 9 16:23:58 2005 -0700 [PATCH] md: tidy up daemon stop/start code in md/bitmap.c The bitmap code used to have two daemons, so there is some 'common' start/stop code. But now there is only one, so the common code is just noise. This patch tidies this up somewhat. Signed-off-by: Neil Brown Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ba00538ada7ecb4fb8bd71ba734a8eada987817 Author: NeilBrown Date: Fri Sep 9 16:23:57 2005 -0700 [PATCH] md: ensure bitmap_writeback_daemon handles shutdown properly. mddev->bitmap gets clearred before the writeback daemon is stopped. So the write_back daemon needs to be careful not to dereference the 'bitmap' if it is NULL. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a6fb0934f923f889055152cb0b033674f627460b Author: NeilBrown Date: Fri Sep 9 16:23:56 2005 -0700 [PATCH] md: use kthread infrastructure in md Switch MD to use the kthread infrastructure, to simplify the code and get rid of tasklist_lock abuse in md_unregister_thread. Also don't flush signals in md_thread, as the called thread will always do that. Signed-off-by: Christoph Hellwig Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 934ce7c840992a771ffc478b132092db9c935c42 Author: NeilBrown Date: Fri Sep 9 16:23:55 2005 -0700 [PATCH] md: write-intent bitmap support for raid6 This is a direct port of the raid5 patch. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 72626685dc66d455742a7f215a0535c551628b9e Author: NeilBrown Date: Fri Sep 9 16:23:54 2005 -0700 [PATCH] md: add write-intent-bitmap support to raid5 Most awkward part of this is delaying write requests until bitmap updates have been flushed. To achieve this, we have a sequence number (seq_flush) which is incremented each time the raid5 is unplugged. If the raid thread notices that this has changed, it flushes bitmap changes, and assigned the value of seq_flush to seq_write. When a write request arrives, it is given the number from seq_write, and that write request may not complete until seq_flush is larger than the saved seq number. We have a new queue for storing stripes which are waiting for a bitmap flush and an extra flag for stripes to record if the write was 'degraded' and so should not clear the a bit in the bitmap. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0002b2718dd04da67c21f8a7830de8d95a9b0345 Author: NeilBrown Date: Fri Sep 9 16:23:53 2005 -0700 [PATCH] md: limit size of sb read/written to appropriate amount version-1 superblocks are not (normally) 4K long, and can be of variable size. Writing the full 4K can cause corruption (but only in non-default configurations). With this patch the super-block-flavour can choose a size to read, and set a size to write based on what it finds. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 773f7834425e83144c95fbbc553ced3c2b74b828 Author: NeilBrown Date: Fri Sep 9 16:23:53 2005 -0700 [PATCH] md: remove old cruft from md_k.h header file These inlines haven't been used for ages, they should go. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab904d634625ef8dc590240b7ee06c7b724e636b Author: NeilBrown Date: Fri Sep 9 16:23:52 2005 -0700 [PATCH] md: fix bitmap/read_sb_page so that it handles errors properly. read_sb_page() assumed that if sync_page_io fails, the device would be marked faultly. However it isn't. So in the face of error, read_sb_page would loop forever. Redo the logic so that this cannot happen. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 71c0805cb48462c99fbe0e5fcc6c12d7b9929c09 Author: NeilBrown Date: Fri Sep 9 16:23:51 2005 -0700 [PATCH] md: allow md to load a superblock with feature-bit '1' set As this is used to flag an internal bitmap. Also, introduce symbolic names for feature bits. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7b1e35f6d666693e8f376ce02242efca3ec09aaf Author: NeilBrown Date: Fri Sep 9 16:23:50 2005 -0700 [PATCH] md: allow hot-adding devices to arrays with non-persistant superblocks. It is possibly (and occasionally useful) to have a raid1 without persistent superblocks. The code in add_new_disk for adding a device to such an array always tries to read a superblock. This will obviously fail. So do the appropriate test and call md_import_device with appropriate args. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3178b0dbdf67322f6506582e494bdf553cc85c32 Author: NeilBrown Date: Fri Sep 9 16:23:50 2005 -0700 [PATCH] md: do not set mddev->bitmap until bitmap is fully initialised When hot-adding a bitmap, bitmap_daemon_work could get called while the bitmap is being created, so don't set mddev->bitmap until the bitmap is ready. This requires freeing the bitmap inside bitmap_create if creation failed part-way through. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 585f0dd5a955c420ff3af5193aa07d6f789bf81a Author: NeilBrown Date: Fri Sep 9 16:23:49 2005 -0700 [PATCH] md: make sure bitmap_daemon_work actually does work. The 'lastrun' time wasn't being initialised, so it could be half a jiffie-cycle before it seemed to be time to do work again. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9e6603da9b9cfb14a6aca3845227f8c59f7eeb9b Author: NeilBrown Date: Fri Sep 9 16:23:48 2005 -0700 [PATCH] md: raid1_quiesce is back to front, fix it. A state of 0 mean 'not quiesced' A state of 1 means 'is quiesced' The original code got this wrong. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 15945fee6f09bff1f86b1a735b5888dc59cf38e3 Author: NeilBrown Date: Fri Sep 9 16:23:47 2005 -0700 [PATCH] md: support md/linear array with components greater than 2 terabytes. linear currently uses division by the size of the smallest componenet device to find which device a request goes to. If that smallest device is larger than 2 terabytes, then the division will not work on some systems. So we introduce a pre-shift, and take care not to make the hash table too large, much like the code in raid0. Also get rid of conf->nr_zones, which is not needed. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b6d287f627b5fb6a49f78f9e81649ff98c62bb7 Author: NeilBrown Date: Fri Sep 9 16:23:47 2005 -0700 [PATCH] md: add write-behind support for md/raid1 If a device is flagged 'WriteMostly' and the array has a bitmap, and the bitmap superblock indicates that write_behind is allowed, then write_behind is enabled for WriteMostly devices. Write requests will be acknowledges as complete to the caller (via b_end_io) when all non-WriteMostly devices have completed the write, but will not be cleared from the bitmap until all devices complete. This requires memory allocation to make a local copy of the data being written. If there is insufficient memory, then we fall-back on normal write semantics. Signed-Off-By: Paul Clements Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8ddf9efe6708f3674f0ddfeb6425fd27bea109a2 Author: NeilBrown Date: Fri Sep 9 16:23:45 2005 -0700 [PATCH] md: support write-mostly device in raid1 This allows a device in a raid1 to be marked as "write mostly". Read requests will only be sent if there is no other option. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 36fa30636fb84b209210299684e1be66d9e58217 Author: NeilBrown Date: Fri Sep 9 16:23:45 2005 -0700 [PATCH] md: all hot-add and hot-remove of md intent logging bitmaps Both file-bitmaps and superblock bitmaps are supported. If you add a bitmap file on the array device, you lose. This introduces a 'default_bitmap_offset' field in mddev, as the ioctl used for adding a superblock bitmap doesn't have room for giving an offset. Later, this value will be setable via sysfs. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a07997fc34ac15a1c5dc650285d79b7604a2276 Author: NeilBrown Date: Fri Sep 9 16:23:44 2005 -0700 [PATCH] md: improve handling of bitmap initialisation. When we find a 'stale' bitmap, possibly because it is new, we should just assume every bit needs to be set, but rather base the setting of bits on the current state of the array (degraded and recovery_cp). Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1923b99a0f4748aa6be0b9b9523ce224a3449b17 Author: NeilBrown Date: Fri Sep 9 16:23:43 2005 -0700 [PATCH] md: don't allow new md/bitmap file to be set if one already exists ... otherwise we loose a reference and can never free the file. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 844e8d904a7c1446e3f040683b4a0645c3eb168f Author: Jun'ichi Nomura Date: Fri Sep 9 16:23:42 2005 -0700 [PATCH] dm: fix rh_dec()/rh_inc() race in dm-raid1.c Fix another bug in dm-raid1.c that the dirty region may stay in or be moved to clean list and freed while in use. It happens as follows: CPU0 CPU1 ------------------------------------------------------------------------------ rh_dec() if (atomic_dec_and_test(pending)) rh_inc() if the region is clean mark the region dirty and remove from clean list mark the region clean and move to clean list atomic_inc(pending) At this stage, the region is in clean list and will be mistakenly reclaimed by rh_update_states() later. Signed-off-by: Jun'ichi Nomura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5dcdd80a60627371f40797426273048630dc8ca Author: NeilBrown Date: Fri Sep 9 16:23:41 2005 -0700 [PATCH] md: fail IO request to md that require a barrier. md does not yet support BIO_RW_BARRIER, so be honest about it and fail (-EOPNOTSUPP) any such requests. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3ec67ac1a399d576d48b0736096bcce7721fe3cf Author: NeilBrown Date: Fri Sep 9 16:23:40 2005 -0700 [PATCH] md: fix minor error in raid10 read-balancing calculation. 'this_sector' is a virtual (array) address while 'head_position' is a physical (device) address, so substraction doesn't make any sense. devs[slot].addr should be used instead of this_sector. However, this patch doesn't make much practical different to the read balancing due to the effects of later code. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d327d082325a0d4afb3748ef8b59e734e57cfe4c Author: adam radford Date: Fri Sep 9 15:55:13 2005 -0700 [SCSI] 3ware 9000: handle use_sg != 0 for emulated commands The attached patch updates the driver for the 3ware 9000 series to do the following: - Correctly handle single sgl's with use_sg = 1. This is needed with the latest scsi-block-2.6 merge otherwise the 3w-9xxx driver will not work. I tested the patch James sent a few weeks back to fix this, and it had a bug where the request_buffer was accessed in twa_scsiop_execute_scsi_complete() when it was invalid. This is a corrected variation of that patch. Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit 59d203f9e989c81defc2cb1c559d678e16dbe684 Author: Arnaldo Carvalho de Melo Date: Fri Sep 9 20:01:25 2005 -0300 [CCID3] Cleanup ccid3 debug calls Also use some BUG_ON where appropriate and use LIMIT_NETDEBUG for the unlikely cases where we, at this stage, want to know about, that in my tests hasn't appeared in the radar. Signed-off-by: Arnaldo Carvalho de Melo commit dc19336c76d213fd9ae7b6a352e837f509418012 Author: Arnaldo Carvalho de Melo Date: Fri Sep 9 19:59:26 2005 -0300 [DCCP] Only call the HC _exit() routines in dccp_v4_destroy_sock Signed-off-by: Arnaldo Carvalho de Melo commit d7e0fb985cb033e605c3167ff183b5e98b7f7644 Author: Arnaldo Carvalho de Melo Date: Fri Sep 9 19:58:18 2005 -0300 [CCID3] Initialize ccid3hctx_t_ipi to 250ms To match more closely what is described in RFC 3448. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Ian McDonald commit 63aaf647529e8a56bdf31fd8f2979d4371c6a332 Author: Roland Dreier Date: Fri Sep 9 15:55:08 2005 -0700 Make sure that userspace does not retrieve stale asynchronous or completion events after destroying a CQ, QP or SRQ. We do this by sweeping the event lists before returning from a destroy calls, and then return the number of events already reported before the destroy call. This allows userspace wait until it has processed all events for an object returned from the kernel before it frees its context for the object. The ABI of the destroy CQ, destroy QP and destroy SRQ commands has to change to return the event count, so bump the ABI version from 1 to 2. The userspace libibverbs library has already been updated to handle both the old and new ABI versions. Signed-off-by: Roland Dreier commit 2e9f7cb7869059e55cd91f5e23c6380f3763db56 Author: Roland Dreier Date: Fri Sep 9 15:45:57 2005 -0700 [PATCH] IB: Add struct for ClassPortInfo Add structure definition for ClassPortInfo format. This is needed for (at least) handling CM redirects. Signed-off-by: Roland Dreier commit 9c8550ee25e26d14a8f0fe1b761a676e23fe3cf0 Author: Linus Torvalds Date: Fri Sep 9 15:43:46 2005 -0700 Remove "must_check" attributes in PCI-land Don't just irritate all other kernel developers. Fix the users first, then you can re-introduce the must-check infrastructure to avoid new cases creeping in. Signed-off-by: Linus Torvalds commit ac5b8b6f22118620cd1133d9943b1f31dc40a913 Author: Linus Torvalds Date: Fri Sep 9 15:42:34 2005 -0700 Preempt-safe RCU file usage Fix up fs/compat.c fixes. commit f0eca9626c6becb6fc56106b2e4287c6c784af3d Author: Daniel Ritz Date: Fri Sep 9 00:57:14 2005 +0200 [PATCH] Update PCI IOMEM allocation start This fixes the problem with "Averatec 6240 pcmcia_socket0: unable to apply power", which was due to the CardBus IOMEM register region being allocated at an address that was actually inside the RAM window that had been reserved for video frame-buffers in an UMA setup. The BIOS _should_ have marked that region reserved in the e820 memory descriptor tables, but did not. It is fixed by rounding up the default starting address of PCI memory allocations, so that we leave a bigger gap after the final known memory location. The amount of rounding depends on how big the unused memory gap is that we can allocate IOMEM from. Based on example code by Linus. Acked-by: Greg KH Acked-by: Ivan Kokshaysky Signed-off-by: Linus Torvalds commit fbed8eee70cf7e11fbf231afafc0ccb313acc62e Author: Hal Rosenstock Date: Fri Sep 9 15:24:04 2005 -0700 [PATCH] IB: Move SA attributes to ib_sa.h SA: Move SA attributes to ib_sa.h so are accessible to more than sa_query.c. Also, remove deprecated attributes and add one missing one. Signed-off-by: Hal Rosenstock Signed-off-by: Roland Dreier commit a4531edd75522804dd2b268d8ccc5eaa70748011 Author: Linus Torvalds Date: Fri Sep 9 15:10:52 2005 -0700 Fix up lost patch in compat_sys_select() for new RCU files world order Andrew lost this in patch reject resolution, and never noticed, since the compat code isn't in use on x86. Signed-off-by: Linus Torvalds commit c7ebbbce366c02e5657ac6b6059933fe0353b175 Author: Christoph Hellwig Date: Fri Sep 9 16:22:50 2005 +0200 [SCSI] SAS transport class The SAS transport class contains common code to deal with SAS HBAs, an aproximated representation of SAS topologies in the driver model, and various sysfs attributes to expose these topologies and managment interfaces to userspace. In addition to the basic SCSI core objects this transport class introduces two additional intermediate objects: The SAS PHY as represented by struct sas_phy defines an "outgoing" PHY on a SAS HBA or Expander, and the SAS remote PHY represented by struct sas_rphy defines an "incoming" PHY on a SAS Expander or end device. Note that this is purely a software concept, the underlying hardware for a PHY and a remote PHY is the exactly the same. There is no concept of a SAS port in this code, users can see what PHYs form a wide port based on the port_identifier attribute, which is the same for all PHYs in a port. This submission doesn't handle hot-plug addition or removal of SAS devices and thus doesn't do scanning in a workqueue yet, that will be added in phase2 after this submission. In a third phase I will add additional managment infrastructure. I think this submission is ready for 2.6.14, but additional comments are of course very welcome. I'd like to thanks James Smart a lot for his very useful input on the design. Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit 942fc2fb73f2cac53484ebaf1c4f9af7aefaca83 Author: Douglas Gilbert Date: Fri Sep 9 20:07:32 2005 +1000 [SCSI] permit READ DEFECT DATA in block/scsi_ioctl The soon to be released smartmontools 5.34 uses the READ DEFECT DATA command on SCSI disks. A disk that has defect list entries (or worse, an increasing number of them) is at risk. Currently the first invocation of smartctl causes this: scsi: unknown opcode 0x37 message to appear the console and in the log. The READ DEFECT DATA SCSI command does not change the state of a disk. Its opcode (0x37) is valid for SBC devices (e.g. disks) and SMC-2 devices (media changers) where it is called INITIALIZE STATUS ELEMENT WITH RANGE and again doesn't change the external state of the device. Changelog: - mark SCSI opcode 0x37 (READ DEFECT DATA) as safe_for_read Signed-off-by: Douglas Gilbert Acked-by: Jens Axboe Signed-off-by: James Bottomley commit 1c8e71d72026ed4c6ba0fdfd7eebd865f4fd1415 Author: Douglas Gilbert Date: Fri Sep 9 17:18:57 2005 +1000 [SCSI] sg: do not set VM_IO flag on mmap-ed pages Further to the problem discussed in this post: http://marc.theaimsgroup.com/?l=linux-scsi&m=112540053711489&w=2 It seems that the sg driver does not need to set the VM_IO flag on pages that it memory maps to the user space since they are not from the IO space. Ahmed Teirelbar wants the facility and has tested this patch as I have without adverse effects. The oops protection is still important. Some users really did try and use dio transfers from the sg driver to memory mapped IO space (on a video capture card if my memory serves) during the lk 2.4 series. I'm not sure how successful it was but that will now be politely refused in lk 2.6.13+ . Changelog: - set the page flags for sg's reserved buffer mmap-ed to the user space to VM_RESERVED (rather than VM_RESERVED | VM_IO ) Signed-off-by: Douglas Gilbert Signed-off-by: James Bottomley commit 6b7839007098a6b5612d31690e11277d4242e6ae Author: Jean Delvare Date: Tue Sep 6 21:23:25 2005 +0200 [PATCH] I2C: i2c-nforce2: drop unused define One more cleanup in i2c-nforce2. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 2251cf1a4b37bd483501614c2d78f5b8286f20d7 Author: Jean Delvare Date: Sun Sep 4 22:52:17 2005 +0200 [PATCH] hwmon: w83627hf: no reset by default Make the reset of the chips in w83627hf optional rather than the default. This reset has been causing trouble several times already. It may even go completely away unless it proves to be useful to at least one user. Closes bug #5168: http://bugzilla.kernel.org/show_bug.cgi?id=5168 Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 0db9714a0ca2a1a36721a2e90fbfcbdf3d5ff117 Author: Jean Delvare Date: Tue Sep 6 21:21:54 2005 +0200 [PATCH] hwmon: Update smsc47m1 head comment Update the head comment of the smsc47m1 driver to mention all the supported devices. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit b51f64c0de0355338480093abb35d5232f6d349a Author: Jean Delvare Date: Thu Sep 8 22:42:36 2005 +0200 [PATCH] hwmon: fix sis5595, via686a force_addr module parameter Recent changes to the i2c-isa design broke the force_addr parameter of two hardware monitoring drivers as a side effect: sis5595 and via686a. The last address test was in fact useless beforehand, and the redesign turned it into a bug. I'm sorry about that. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 788ce43aa1ad7158f894b6bb3df8ba2f63794c20 Author: James Bottomley Date: Fri Sep 9 13:40:23 2005 -0500 [SCSI] SCSI core: fix leakage of scsi_cmnd's Actually, just one problem and one cosmetic fix: 1) We need to dequeue for the loop and kill case (it seems easiest simply to dequeue in the scsi_kill_request() routine) 2) There's no real need to drop the queue lock. __scsi_done() is lock agnostic, so since there's no requirement, let's just leave it in to avoid any locking issues. Signed-off-by: James Bottomley commit d99901d6fdfb4098b9996de89ffbbae890e08288 Author: Kirill Korotaev Date: Fri Sep 9 13:59:48 2005 +0400 [PATCH] Lost sockfd_put() in routing_ioctl() This patch adds lost sockfd_put() in 32bit compat rounting_ioctl() on 64bit platforms Signed-Off-By: Kirill Korotaev Signed-Off-By: Maxim Giryaev Signed-off-By: Linus Torvalds commit 20dd026d7f5a6972dc78b4928a99620001fa547d Author: Christophe Lucas Date: Thu Sep 8 08:55:53 2005 +0200 [PATCH] printk : Documentation/firmware_class/firmware_sample_driver.c printk() calls should include appropriate KERN_* constant. Signed-off-by: Christophe Lucas Signed-off-by: Greg Kroah-Hartman commit 49a1fd60d2a8e671222515cf6055e91781278517 Author: Ed L Cashin Date: Fri Aug 19 17:05:21 2005 -0400 [PATCH] aoe [2/2]: update driver version number to twelve Update driver version number to twelve. Signed-off-by: Ed L. Cashin Signed-off-by: Greg Kroah-Hartman commit e39526e6e7a96904c9f1c85375d49ff437c18c44 Author: Ed L Cashin Date: Fri Aug 19 16:54:43 2005 -0400 [PATCH] aoe [1/2]: support 16 AoE slot addresses per AoE shelf Change the number of supported AoE slot addresses per AoE shelf address to 16. Signed-off-by: Ed L. Cashin Signed-off-by: Greg Kroah-Hartman commit 860e1d6b46bd4cbc67d8d065f0f682143513382f Author: Robert Love Date: Wed Aug 31 23:57:59 2005 -0400 [PATCH] updated hdaps driver. Driver for the IBM Hard Drive Active Protection System (HDAPS), an accelerometer found in most modern ThinkPads. Signed-off-by: Robert Love Signed-off-by: Greg Kroah-Hartman commit 35311d6478077f7bfe35c1c653193e658bf32686 Author: Kirill Korotaev Date: Fri Sep 9 13:05:53 2005 -0700 [PATCH] lost fput in 32bit ioctl on x86-64 This adds a lost fput in 32bit tiocgdev ioctl on x86-64 [ chrisw: Updated to use fget_light/fput_light ] Signed-Off-By: Kirill Korotaev Signed-Off-By: Maxim Giryaev Signed-off-by: Chris Wright Signed-off-by: Linus Torvalds commit f64a227b6b5cc1f8cc7f6ef9cc3351343636bac9 Author: Sam Ravnborg Date: Fri Sep 9 23:10:54 2005 +0200 kbuild: um fix so it compile with generic asm-offsets.h support um has it own set of files for asm-offsets. So for now the gen-asm-offset macro is just duplicated in the um Makefile. This may well be the final solution since um is a bit special compared to other architectures - time will tell. Also added a dummy arch/um/kernel/asm-offsets.h file to keep kbuild happy. Signed-off-by: Sam Ravnborg commit b95adac775aad29f79ffbbaf5db0e4d8d57f2714 Author: viro@ZenIV.linux.org.uk Date: Fri Sep 9 21:42:25 2005 +0100 [PATCH] trivial iomem annotations in qla2xxx/qla_dbg.c Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 87162a28acceda05dadf10a8333183f6d2b55265 Author: viro@ZenIV.linux.org.uk Date: Fri Sep 9 20:36:43 2005 +0100 [PATCH] trivial __user annotations (md) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 01703597ead8194b46932ba2bcda897e872e91e0 Author: viro@ZenIV.linux.org.uk Date: Fri Sep 9 20:29:12 2005 +0100 [PATCH] trivial __user annotations (evdev) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 21b29229086bcaf14c02b160c253095f3bb95f99 Author: viro@ZenIV.linux.org.uk Date: Fri Sep 9 20:26:01 2005 +0100 [PATCH] trivial __user cleanup (video1394) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 18fb9442576c79fc2f4bca1fd90c3aa4d1115e97 Author: viro@ZenIV.linux.org.uk Date: Fri Sep 9 20:14:05 2005 +0100 [PATCH] trivial __user annotations (ipmi) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a9f6a0dd54efea2a5d57a27e6c232f9197c25154 Author: Ingo Molnar Date: Fri Sep 9 13:10:41 2005 -0700 [PATCH] more SPIN_LOCK_UNLOCKED -> DEFINE_SPINLOCK conversions This converts the final 20 DEFINE_SPINLOCK holdouts. (another 580 places are already using DEFINE_SPINLOCK). Build tested on x86. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d06afab73a75f40ae2864e6c296356bab1ab473 Author: Ingo Molnar Date: Fri Sep 9 13:10:40 2005 -0700 [PATCH] timer initialization cleanup: DEFINE_TIMER Clean up timer initialization by introducing DEFINE_TIMER a'la DEFINE_SPINLOCK. Build and boot-tested on x86. A similar patch has been been in the -RT tree for some time. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7c352bdf048811b8128019ffc1e886161e09c11c Author: Miklos Szeredi Date: Fri Sep 9 13:10:39 2005 -0700 [PATCH] FUSE: don't allow restarting of system calls This patch removes ability to interrupt and restart operations while there hasn't been any side-effect. The reason: applications. There are some apps it seems that generate signals at a fast rate. This means, that if the operation cannot make enough progress between two signals, it will be restarted for ever. This bug actually manifested itself with 'krusader' trying to open a file for writing under sshfs. Thanks to Eduard Czimbalmos for the report. The problem can be solved just by making open() uninterruptible, because in this case it was the truncate operation that slowed down the progress. But it's better to solve this by simply not allowing interrupts at all (except SIGKILL), because applications don't expect file operations to be interruptible anyway. As an added bonus the code is simplified somewhat. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8254798199332966e2ab647380c990193af7e854 Author: Miklos Szeredi Date: Fri Sep 9 13:10:38 2005 -0700 [PATCH] FUSE: add fsync operation for directories This patch adds a new FSYNCDIR request, which is sent when fsync is called on directories. This operation is available in libfuse 2.3-pre1 or greater. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b36c31ba95f0fe0a03c727300d9c4c54438a5636 Author: Miklos Szeredi Date: Fri Sep 9 13:10:38 2005 -0700 [PATCH] fuse: don't update file times Don't change mtime/ctime/atime to local time on read/write. Rather invalidate file attributes, so next stat() will force a GETATTR call. Bug reported by Ben Grimm. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 45323fb76465a9576220c7427dbac7b1e7ad3caf Author: Miklos Szeredi Date: Fri Sep 9 13:10:37 2005 -0700 [PATCH] fuse: more flexible caching Make data caching behavior selectable on a per-open basis instead of per-mount. Compatibility for the old mount options 'kernel_cache' and 'direct_io' is retained in the userspace library (version 2.4.0-pre1 or later). Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 04730fef1f9c7277e5c730b193e681ac095b0507 Author: Miklos Szeredi Date: Fri Sep 9 13:10:36 2005 -0700 [PATCH] fuse: transfer readdir data through device This patch removes a long lasting "hack" in FUSE, which used a separate channel (a file descriptor refering to a disk-file) to transfer directory contents from userspace to the kernel. The patch adds three new operations (OPENDIR, READDIR, RELEASEDIR), which have semantics and implementation exactly maching the respective file operations (OPEN, READ, RELEASE). This simplifies the directory reading code. Also disk space is not necessary, which can be important in embedded systems. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 413ef8cb302511d8e995e2b0e5517ee1a65b9c77 Author: Miklos Szeredi Date: Fri Sep 9 13:10:35 2005 -0700 [PATCH] FUSE - direct I/O This patch adds support for the "direct_io" mount option of FUSE. When this mount option is specified, the page cache is bypassed for read and write operations. This is useful for example, if the filesystem doesn't know the size of files before reading them, or when any kind of caching is harmful. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a53368277efa2d80dd2206dddc1f4b19ef0c32a Author: Miklos Szeredi Date: Fri Sep 9 13:10:34 2005 -0700 [PATCH] fuse: stricter mount option checking Check for the presence of all mandatory mount options. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 87729a5514e855ce2c71e3e33833a106b8caf2ae Author: Miklos Szeredi Date: Fri Sep 9 13:10:34 2005 -0700 [PATCH] FUSE: tighten check for processes allowed access This patch tightens the check for allowing processes to access non-privileged mounts. The rational is that the filesystem implementation can control the behavior or get otherwise unavailable information of the filesystem user. If the filesystem user process has the same uid, gid, and is not suid or sgid application, then access is safe. Otherwise access is not allowed unless the "allow_other" mount option is given (for which policy is controlled by the userspace mount utility). Thanks to everyone linux-fsdevel, especially Martin Mares who helped uncover problems with the previous approach. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit db50b96c0f28a21c5a4a19ecaba12d0972aab06a Author: Miklos Szeredi Date: Fri Sep 9 13:10:33 2005 -0700 [PATCH] FUSE - readpages operation This patch adds readpages support to FUSE. With the help of the readpages() operation multiple reads are bundled together and sent as a single request to userspace. This can improve reading performace. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 06663267b4b1e85ece73236ea720355668d4f736 Author: Miklos Szeredi Date: Fri Sep 9 13:10:32 2005 -0700 [PATCH] FUSE: add padding Add padding to structures to make sizes the same on 32bit and 64bit archs. Initial testing and test machine generously provided by Franco Broi. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 92a8780e1136c5ca0c7ed940000d399943d1576e Author: Miklos Szeredi Date: Fri Sep 9 13:10:31 2005 -0700 [PATCH] FUSE - extended attribute operations This patch adds the extended attribute operations to FUSE. The following operations are added: o getxattr o setxattr o listxattr o removexattr Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e9a4ed9396e9c31139721b639550ffb1df17065 Author: Miklos Szeredi Date: Fri Sep 9 13:10:31 2005 -0700 [PATCH] FUSE - mount options This patch adds miscellaneous mount options to the FUSE filesystem. The following mount options are added: o default_permissions: check permissions with generic_permission() o allow_other: allow other users to access files o allow_root: allow root to access files o kernel_cache: don't invalidate page cache on open Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6aeadeda22a9aa322fdfcd3f4c69ccf0da5cbdd Author: Miklos Szeredi Date: Fri Sep 9 13:10:30 2005 -0700 [PATCH] FUSE - file operations This patch adds the file operations of FUSE. The following operations are added: o open o flush o release o fsync o readpage o commit_write Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9e6268db496a2592e89457537ea54a496feabb77 Author: Miklos Szeredi Date: Fri Sep 9 13:10:29 2005 -0700 [PATCH] FUSE - read-write operations This patch adds the write filesystem operations of FUSE. The following operations are added: o setattr o symlink o mknod o mkdir o create o unlink o rmdir o rename o link Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5e5558e923f35839108a12718494ecb73fb782f Author: Miklos Szeredi Date: Fri Sep 9 13:10:28 2005 -0700 [PATCH] FUSE - read-only operations This patch adds the read-only filesystem operations of FUSE. This contains the following files: o dir.c - directory, symlink and file-inode operations The following operations are added: o lookup o getattr o readlink o follow_link o directory open o readdir o directory release o permission o dentry revalidate o statfs Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 334f485df85ac7736ebe14940bf0a059c5f26d7d Author: Miklos Szeredi Date: Fri Sep 9 13:10:27 2005 -0700 [PATCH] FUSE - device functions This adds the FUSE device handling functions. This contains the following files: o dev.c - fuse device operations (read, write, release, poll) - registers misc device - support for sending requests to userspace Signed-off-by: Miklos Szeredi Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d8a5ba45457e4a22aa39c939121efd7bb6c76672 Author: Miklos Szeredi Date: Fri Sep 9 13:10:26 2005 -0700 [PATCH] FUSE - core This patch adds FUSE core. This contains the following files: o inode.c - superblock operations (alloc_inode, destroy_inode, read_inode, clear_inode, put_super, show_options) - registers FUSE filesystem o fuse_i.h - private header file Requirements ============ The most important difference between orinary filesystems and FUSE is the fact, that the filesystem data/metadata is provided by a userspace process run with the privileges of the mount "owner" instead of the kernel, or some remote entity usually running with elevated privileges. The security implication of this is that a non-privileged user must not be able to use this capability to compromise the system. Obvious requirements arising from this are: - mount owner should not be able to get elevated privileges with the help of the mounted filesystem - mount owner should not be able to induce undesired behavior in other users' or the super user's processes - mount owner should not get illegitimate access to information from other users' and the super user's processes These are currently ensured with the following constraints: 1) mount is only allowed to directory or file which the mount owner can modify without limitation (write access + no sticky bit for directories) 2) nosuid,nodev mount options are forced 3) any process running with fsuid different from the owner is denied all access to the filesystem 1) and 2) are ensured by the "fusermount" mount utility which is a setuid root application doing the actual mount operation. 3) is ensured by a check in the permission() method in kernel I started thinking about doing 3) in a different way because Christoph H. made a big deal out of it, saying that FUSE is unacceptable into mainline in this form. The suggested use of private namespaces would be OK, but in their current form have many limitations that make their use impractical (as discussed in this thread). Suggested improvements that would address these limitations: - implement shared subtrees - allow a process to join an existing namespace (make namespaces first-class objects) - implement the namespace creation/joining in a PAM module With all that in place the check of owner against current->fsuid may be removed from the FUSE kernel module, without compromising the security requirements. Suid programs still interesting questions, since they get access even to the private namespace causing some information leak (exact order/timing of filesystem operations performed), giving some ptrace-like capabilities to unprivileged users. BTW this problem is not strictly limited to the namespace approach, since suid programs setting fsuid and accessing users' files will succeed with the current approach too. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 04578f174f43d29b569500f01ba772afa4016330 Author: Miklos Szeredi Date: Fri Sep 9 13:10:22 2005 -0700 [PATCH] FUSE - MAINTAINERS, Kconfig and Makefile changes This patch adds FUSE filesystem to MAINTAINERS, fs/Kconfig and fs/Makefile. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e272d50688a1cae66a12426da128483197843d9f Author: Ben Dooks Date: Fri Sep 9 13:10:20 2005 -0700 [PATCH] Documentation/sparse snapshot URL The URL for Documentation/sparse is wrong now that it is in git. Signed-off-by: Ben Dooks Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ea626aac1ab9a34aed62dc651070cf1e5134247 Author: Pekka J Enberg Date: Fri Sep 9 13:10:19 2005 -0700 [PATCH] VFS: update documentation This patch brings the now out-of-date Documentation/filesystems/vfs.txt back to life. Thanks to Carsten Otte, Trond Myklebust, and Anton Altaparmakov for their help on updating this documentation. Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 952b649272f96d58817be889ed4b932f638a4dbe Author: Vivek Goyal Date: Fri Sep 9 13:10:19 2005 -0700 [PATCH] Kdump: Documentation Update There are minor changes in command line options in kexec-tools for kdump. This patch updates the documentation to reflect those changes. Signed-off-by: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9d01a82e46a8dd18233121a6bc140e5576649583 Author: Martin Waitz Date: Fri Sep 9 13:10:17 2005 -0700 [PATCH] DocBook: fix kernel-api documentation generation This patch changes a macro definition so that kernel-doc can understand it. Signed-off-by: Martin Waitz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 80e93effce55044c5a7fa96e8b313640a80bd4e9 Author: Pekka Enberg Date: Fri Sep 9 13:10:16 2005 -0700 [PATCH] update kfree, vfree, and vunmap kerneldoc This patch clarifies NULL handling of kfree() and vfree(). I addition, wording of calling context restriction for vfree() and vunmap() are changed from "may not" to "must not." Signed-off-by: Pekka Enberg Acked-by: Manfred Spraul Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit af97c7220a0376beed827e72e3bb27731af7109d Author: Chuck Ebbert <76306.1226@compuserve.com> Date: Fri Sep 9 13:10:15 2005 -0700 [PATCH] docs: fix misinformation about overcommit_memory Someone complained about the docs for vm_overcommit_memory being wrong. This patch copies the text from the vm documentation into procfs. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ddb99f3d35b178f0715aab2f9d9ab25f61814347 Author: Pierre Ossman Date: Fri Sep 9 13:10:13 2005 -0700 [PATCH] ISA DMA API documentation Documentation for how the ISA DMA controller is handled in the kernel. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 754c79768eed257dabd922b85cb9271822e50794 Author: Jesper Juhl Date: Fri Sep 9 13:10:12 2005 -0700 [PATCH] Documentation: how to apply patches for various trees Add a new document describing the major kernel trees and how to apply their patches. Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6c17ea4eff360359d1741272028610035bb2da9 Author: Rusty Russell Date: Fri Sep 9 13:10:11 2005 -0700 [PATCH] Update Documentation/DocBook/kernel-hacking.tmpl Update the hacking guide, before CONFIG_PREEMPT_RT goes in and it needs rewriting again. Changes include modernization of quotes, removal of most references to bottom halves (some mention required because we still use bh in places to mean softirq). It would be nice to have a discussion of sparse and various annotations. Please send patches straight to akpm. Signed-off-by: Rusty Russell (authored) Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f92273c1653feadc8231c0bc4fa37fd4dc1c180f Author: Arnaud Patard Date: Fri Sep 9 13:10:10 2005 -0700 [PATCH] s3c2410fb: Platform support for ARM S3C2410 framebuffer driver This patch add the plateform specific stuff needed to configure and use the driver. Signed-Off-By: Arnaud Patard Signed-off-by: Antonino Daplas Cc: Russell King Cc: Ben Dooks Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 20fd5767689124a920c1deb9c380304e082f026c Author: Arnaud Patard Date: Fri Sep 9 13:10:07 2005 -0700 [PATCH] s3c2410fb: ARM S3C2410 framebuffer driver This set of two patches add support for the framebuffer of the Samsung S3C2410 ARM SoC. This driver was started about one year ago and is now used on iPAQ h1930/h1940, Acer n30 and probably other s3c2410-based machines I'm not aware of. I've also heard yesterday that it's working also on iPAQ rx3715/rx3115 (s3c2440-based machines). Signed-Off-By: Arnaud Patard Signed-off-by: Antonino Daplas Signed-off-by: Ben Dooks Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b4abffbadf728996fb9243b4af1df48dd771e86 Author: Olaf Hering Date: Fri Sep 9 13:10:06 2005 -0700 [PATCH] quiet non-x86 option ROM warnings Quiet an incorrect warning in aty128fb and radeonfb about the PCI ROM content. Macs work just find without that signature. Signed-off-by: Olaf Hering Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 63edceac69889e48b1b39f40ca0a4c00fdc3bbb0 Author: Antonino A. Daplas Date: Fri Sep 9 13:10:05 2005 -0700 [PATCH] i810fb: Stop LCD displays from flickering Stop LCD displays from flickering during high loads. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74f6ae84b2315c2fa8a4110b09a1c0f3dca92674 Author: Antonino A. Daplas Date: Fri Sep 9 13:10:04 2005 -0700 [PATCH] i810fb: Add i2c/DDC support Add ddc/i2c support for i810fb. This will allow the driver to get display information, especially for monitors with fickle timings. The i2c support depends on CONFIG_FB_I810_GTF. Changed __init* to __devinit* Signed-off-by: Antonino Daplas Signed-off-by: Alexander Nyberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 829e79b680210c4f4de435af6e1f90451922fc7d Author: Antonino A. Daplas Date: Fri Sep 9 13:10:04 2005 -0700 [PATCH] fbcon: Break up bit_putcs into its component functions The function bit_putcs() in drivers/video/console/bitblit.c is becoming large. Break it up into its component functions (bit_putcs_unaligned and bit_putcs_aligned). Incorporated fb_pad_aligned_buffer() optimization by Roman Zippel. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba44cd2d8abc3271a608b42cdbf55e1e575e2ba5 Author: Richard Purdie Date: Fri Sep 9 13:10:03 2005 -0700 [PATCH] pxafb: Add hsync time reporting hook To solve touchscreen interference problems devices like the Sharp Zaurus SL-C3000 need to know the length of the horitzontal sync pulses. This patch adds a hook to pxafb so the touchscreen driver can function correctly. Signed-Off-By: Richard Purdie Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 61ab7903b8cd772d3bfb28bc26d02c599cfb0e5b Author: Antonino A. Daplas Date: Fri Sep 9 13:10:02 2005 -0700 [PATCH] fbdev: Initialize var structure in calc_mode_timings The var structure in calc_mode_timings is not properly initialized (zero set) which leads to undefined behavior when it is passed to fb_get_mode(). Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7c1cd6fd5efeb95603e37f35b5da293b452d8b64 Author: Antonino A. Daplas Date: Fri Sep 9 13:10:01 2005 -0700 [PATCH] nvidiafb: Fixed mirrored characters in big endian machines nvidiafb_imageblit converts the bitdata stream from big_endian to little endian. This produces mirrored characters when machine is big_endian. Do not endian convert on big endian machines. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 88fb2c6efba8d9e941e9fb61f37dbeafc869fd75 Author: Antonino A. Daplas Date: Fri Sep 9 13:10:00 2005 -0700 [PATCH] fbcon: Stop cursor timer if console is inactive If console is blanked or in KD_GRAPHICS mode, delete cursor timer. No sense flashing the cursor when there's nothing to be seen. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c52890cc366429798b3c97266d0a377810e08400 Author: Antonino A. Daplas Date: Fri Sep 9 13:09:59 2005 -0700 [PATCH] savagefb: Make mode_option available when compiled as a module Make "mode_option" available when compiled as a module. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 948a95ff5efb018d08d104c283081dba6472f801 Author: Antonino A. Daplas Date: Fri Sep 9 13:09:59 2005 -0700 [PATCH] nvidiafb: Use CVT to get mode for digital displays If no EDID block is probed, if the display is digital and if no mode option is specified by the user, get the timings by CVT instead of using the global mode database. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 96fe6a2109db29cd15b90a093c16e6cb4b19371a Author: Antonino A. Daplas Date: Fri Sep 9 13:09:58 2005 -0700 [PATCH] fbdev: Add VESA Coordinated Video Timings (CVT) support The Coordinated Video Timings (CVT) is the latest standard approved by VESA concerning video timings generation. It addresses the limitation of GTF which is designed mainly for CRT displays. CRT's have a high blanking requirement (as much as 25% of the horizontal frame length) which artificially increases the pixelclock. Digital displays, on the other hand, needs to conserve the pixelclock as much as possible. The GTF also does not take into account the different aspect ratios in its calculation. The new function added is fb_find_mode_cvt(). It is called by fb_find_mode() if it recognizes a mode option string formatted for CVT. The format is: x[M][R][-][][i][m] The 'M' tells the function to calculate using CVT. On it's own, it will compute a timing for CRT displays at 60Hz. If the 'R' is specified, 'reduced blanking' computation will be used, best for flatpanels. The 'i' and the 'm' is for 'interlaced mode' and 'with margins' respectively. To determine if CVT was used, check for dmesg for something like this: CVT Mode - M[-R], ie: .480M3-R (800x600 reduced blanking) where: pix - product of xres and yres, in MB M - is a CVT mode n - the aspect ratio (3 - 4:3; 4 - 5:4; 9 - 16:9, 15:9; A - 16:10) -R - reduced blanking Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cdb9b9f730eac4f947a2c552806a3a550bf019ef Author: Paul Mackerras Date: Tue Sep 6 09:31:03 2005 +1000 [PATCH] PCI: Small rearrangement of PCI probing code This patch makes some small rearrangements of the PCI probing code in order to make it possible for arch code to set up the PCI tree without needing to duplicate code from the PCI layer unnecessarily. PPC64 will use this to set up the PCI tree from the Open Firmware device tree, which we need to do on logically-partitioned pSeries systems. Signed-off-by: Paul Mackerras Signed-off-by: Greg Kroah-Hartman commit c87f883edbe969ca68c21dfa8a29674c828c22a3 Author: Rumen Ivanov Zarev Date: Tue Sep 6 13:39:32 2005 -0700 [PATCH] PCI: Unhide SMBus on Compaq Evo N620c Trivial patch against 2.6.13 to unhide SMBus on Compaq Evo N620c laptop using Intel 82855PM chipset. Signed-off-by: Rumen Zarev Signed-off-by: Greg Kroah-Hartman commit 7c56075e60caaff1314decdb61b72ef576915270 Author: Rajesh Shah Date: Tue Aug 16 17:32:04 2005 -0700 [PATCH] PCI: Fix PCI bus mastering enable problem in pciehp Martin Franc reported that the pciehp driver was not enabling bus master capability on his hot-plugged card. pciehprm_enable_card() was updating the PCI command register only if _HPP indicated a value for SERR or PERR that was different from the current setting. I don't have hardware that reproduces this problem, but Martin reports that this patch fixes the problem for him. Signed-off-by: Rajesh Shah Signed-off-by: Greg Kroah-Hartman From rzarev@its.caltech.edu Tue Sep 6 18:29:50 2005 Date: Tue, 6 Sep 2005 13:39:32 -0700 (PDT) From: Rumen Ivanov Zarev Message-Id: <200509062039.j86KdWMr014934@inky.its.caltech.edu> To: gregkh@suse.de Subject: PCI: Unhide SMBus on Compaq Evo N620c Cc: linux-kernel@vger.kernel.org Trivial patch against 2.6.13 to unhide SMBus on Compaq Evo N620c laptop using Intel 82855PM chipset. Signed-off-by: Rumen Zarev Signed-off-by: Greg Kroah-Hartman --- drivers/pci/quirks.c | 6 ++++++ 1 file changed, 6 insertions(+) --- gregkh-2.6.orig/drivers/pci/quirks.c 2005-09-09 10:28:55.000000000 -0700 +++ gregkh-2.6/drivers/pci/quirks.c 2005-09-09 13:51:44.000000000 -0700 @@ -876,6 +876,12 @@ static void __init asus_hides_smbus_host case 0xC00C: /* Samsung P35 notebook */ asus_hides_smbus = 1; } + } else if (unlikely(dev->subsystem_vendor == PCI_VENDOR_ID_COMPAQ)) { + if (dev->device == PCI_DEVICE_ID_INTEL_82855PM_HB) + switch(dev->subsystem_device) { + case 0x0058: /* Compaq Evo N620c */ + asus_hides_smbus = 1; + } } } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82845_HB, asus_hides_smbus_hostbridge ); commit 5251bffc9b4ca699993c79166adf02faf1bbc043 Author: Daniel Burcaw Date: Fri Sep 9 13:04:59 2005 -0700 [PATCH] radeonfb: Only request resources we need This patch changes radeon to request only resources 0 and 2 instead of all 3. This works around problems with some setups where BAR 1 (IO BAR) has not been assigned by the firmware since it's not used on the machine and the kernel fails to assign something to it due to the card being between a P2P bridge that was configured without an IO range at all. This typically fixes radeonfb on some Apple Xserve G5 machines Signed-off-by: Daniel Burcaw Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c5eb5c1ea919f3f717236c5d0892f9c37f19de37 Author: Knut Petersen Date: Fri Sep 9 13:04:59 2005 -0700 [PATCH] framebuffer: bit_putcs() optimization for 8x* fonts This trivial patch gives a performance boost to the framebuffer console Constructing the bitmaps that are given to the bitblit functions of the framebuffer drivers is time consuming. Here we avoide a call to the slow fb_pad_aligned_buffer(). The patch replaces that call with a simple but much more efficient bytewise copy. The kernel spends a significant time at this place if you use 8x* fonts. Every pixel displayed on your screen is prepared here. Some benchmark results: Displaying a file of 2000 lines with 160 characters each takes 889 ms system time using cyblafb on my system (I´m using a 1280x1024 video mode, resulting in a 160x64 character console) Displaying the same file with the enclosed patch applied to 2.6.13 only takes 760 ms system time, saving 129 ms or 14.5%. Font widths other than 8 are not affected. The advantage and correctness of this patch should be obvious. Signed-off-by: Knut Petersen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9fa68eae9f8291a98bfe00b94b78f72eb253165a Author: Knut Petersen Date: Fri Sep 9 13:04:56 2005 -0700 [PATCH] framebuffer: new driver for cyberblade/i1 graphics core This is a framebuffer driver for the Cyberblade/i1 graphics core. Currently tridenfb claims to support the cyberblade/i1 graphics core. This is of very limited truth. Even vesafb is faster and provides more working modes and a much better quality of the video signal. There is a great number of bugs in tridentfb ... but most often it is impossible to decide if these bugs are real bugs or if fixing them for the cyberblade/i1 core would break support for one of the other supported chips. Tridentfb seems to be unmaintained,and documentation for most of the supported chips is not available. So "fixing" cyberblade/i1 support inside of tridentfb was not an option, it would have caused numerous if(CYBERBLADEi1) else ... cases and would have rendered the code to be almost unmaintainable. A first version of this driver was published on 2005-07-31. A fix for a bug reported by Jochen Hein was integrated as well as some changes requested by Antonino A. Daplas. A message has been added to tridentfb to inform current users of tridentfb to switch to cyblafb if the cyberblade/i1 graphics core is detected. This patch is one logical change, but because of the included documentation it is bigger than 70kb. Therefore it is not sent to lkml and linux-fbdev-devel, Signed-off-by: Knut Petersen Cc: Muli Ben-Yehuda Acked-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6062bfa1644f401c08e78d5c8a161f7d11c5c830 Author: Olaf Hering Date: Fri Sep 9 13:04:55 2005 -0700 [PATCH] better error handing in savagefb_probe err remains uninitialized of pci_request_regions fails. Found by Thorsten Kukuk, I added a few more checks. Signed-off-by: Olaf Hering Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 544393fe584d333480659a4bed30f5295355df11 Author: Thomas Winischhofer Date: Fri Sep 9 13:04:45 2005 -0700 [PATCH] sisfb update This lifts sisfb from version 1.7.17 to version 1.8.9. Changes include: - Added support for XGI V3XT, V5, V8, Z7 chipsets, including POSTing of all of these chipsets. - Added support for latest SiS chipsets (761). - Added support for SiS76x memory "hybrid" mode. - Added support for new LCD resolutions (eg 1280x854, 856x480). - Fixed support for 320x240 STN panels (for embedded devices). - Fixed many HDTV modes (525p, 750p, 1080i). - Fixed PCI config register reading/writing to use proper kernel functions for this purpose. - Fixed PCI ROM handling to use the kernel's proper functions. - Removed lots of "typedef"s. - Removed lots of code which was for X.org/XFree86 only. - Fixed coding style in many places. - Removed lots of 2.4 cruft. - Reduced stack size by unifying two previously separate structs into one. - Added new hooks for memory allocation (for DRM). Now the driver can truly handle multiple cards, including memory management. - Fixed numerous minor bugs. Signed-off-by: Thomas Winischhofer Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c06e2aa6339112befdc87b350b8bf712890d7a7 Author: Ian Romanick Date: Fri Sep 9 13:04:42 2005 -0700 [PATCH] matroxfb: read MGA PInS data on PowerPC This updates the matroxfb code so that it can find the PInS data embedded in the BIOS on PowerPC cards. The process for finding the data is different on OpenFirmware cards than on x86 cards, and the code for doing so was missing. After patching, building, installing, and booting a kernel, you should grep for "PInS" in /var/log/messages. You should see two messages in the log: PInS data found at offset XXXXX PInS memtype = X On the GXT135p card I get "31168" and "5". The first value is irrelevant, but it's presence lets me know that the PInS data was actually found. On a GXT130p, the second value should be 3. Since I don't have access to that hardware, if someone can verify that, I will submit a follow-on patch that rips out all the memtype parameter stuff. Signed-off-by: Ian Romanick Signed-off-by: Petr Vandrovec Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f510a3c3d48fd5aaa7757aebbc37e9ee417913a3 Author: Antonino A. Daplas Date: Fri Sep 9 13:04:41 2005 -0700 [PATCH] radeonfb_old: Fix broken link The link for ATI's product page in drivers/video/Kconfig for FB_RADEON is broken. Replace with a product comparison page. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2a43b58589eac1fdcf62624e86c67c0f92f45bf7 Author: Alexander Kern Date: Fri Sep 9 13:04:40 2005 -0700 [PATCH] atyfb: Remove code that sets sync polarity unconditionally Currently, atyfb has code that sets the hsync and vsync polarity based on the current video mode, without letting the user override the settings. Remove this particular code. The sync polarities are set by the PROM, the user or by the videomode. Signed-off-by: Alexander Kern Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b41dc1a3c7839a765ffa560a5ae07aa5d253cc8 Author: Antonino A. Daplas Date: Fri Sep 9 13:04:39 2005 -0700 [PATCH] console: Fix buffer copy on vc resize On a vc resize, the contents of the old screen buffer are transferred to the new screenbuffer. If the new screenbuffer is smaller than the old one, only the contents from the bottom are copied to new. If the contents of the old buffer are located at the top, then the contents will not be copied to the new buffer resulting in a blank screen. This bug will happen only if the vc in question is not in the foreground. Doing an fbset -a or con2fbmap will trigger this bug. To fix this problem, base the start of the copy from the location of the current cursor. If the cursor is near the top of the buffer, copy the contents at the top, and if the cursor is near the bottom of the buffer, then copy the contents at the bottom. In the unlikely case where the new row size is greater than 2x smaller than the old one, and the cursor is in the middle, copy 1/2 screenful from the top and bottom of the cursor position. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2cc38ed13f1b0f9d80a2d0acc2916af94922f27e Author: Antonino A. Daplas Date: Fri Sep 9 13:04:38 2005 -0700 [PATCH] fbcon: Saner 16-color to 4-color conversion Currently, the default linux 16-colors are converted to 4-colors by simply dividing the values by 4. However, this is not necessarily correct since the first 4 colors are converted to black, rendering them invisible. So, for black, no conversion; for light colors, convert to gray, for normal text color, no conversion, and for bright colors, convert to intense white. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b8c909454f046b59065c6997b651fe20cd90c0f4 Author: Antonino A. Daplas Date: Fri Sep 9 13:04:37 2005 -0700 [PATCH] fbdev: Fix greater than 1 bit monochrome color handling Currently, fbcon assumes that the visual FB_VISUAL_MONO* is always 1 bit. According to Geert, there are old hardware where it's possible to have monochrome at 8-bit, but has only 2 colors, black - 0x00 and white - 0xff. Fix color handlers (fb_get_color_depth, and get_color) for this special case. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 094bb659f53b6d90aab6067268d6d14f1f352d30 Author: Antonino A. Daplas Date: Fri Sep 9 13:04:36 2005 -0700 [PATCH] nvidiafb: Fallback to firmware EDID If nvidiafb fails to probe the EDID block, get the EDID from the BIOS. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 13776711ce4b234b5ad153e55e8b5d6703c6b1ef Author: Antonino A. Daplas Date: Fri Sep 9 13:04:35 2005 -0700 [PATCH] savagefb: Driver updates - Fallback to firmware EDID if chipset has no DDC/I2C support or if I2C probing failed - Add fb_blank hook - Fix savagefb_suspend/resume to enable driver to successfully suspend and resume from S3, memory or disk Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e518d7672dea4cd7c60871e40d0490c52f01d13 Author: Antonino A. Daplas Date: Fri Sep 9 13:04:34 2005 -0700 [PATCH] fbdev: Resurrect hooks to get EDID from firmware For the i386, code is already present in video.S that gets the EDID from the video BIOS. Make this visible so drivers can also use this data as fallback when i2c does not work. To ensure that the EDID block is returned for the primary graphics adapter only, by check if the IORESOURCE_ROM_SHADOW flag is set. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53eed4ec8bcd8701b9135859ec46b10a0d88ba25 Author: David Vrabel Date: Fri Sep 9 13:04:32 2005 -0700 [PATCH] fbdev: geode updates Geode framebuffer driver updates: - Local mode list (taken from modedb.c) containing only relevant modes. This also makes the driver work as a module. - Make it a PCI driver (from James Simmons ). - A few other minor cosmetic bits and pieces. Signed-off-by: David Vrabel Signed-off-by: James Simmons Cc: "Antonino A. Daplas" Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c7ffe0b9f7f40bd818fe3af51342f64c483908e Author: James Simmons Date: Fri Sep 9 13:04:31 2005 -0700 [PATCH] fbdev: prevent drivers that have hardware cursors from calling software cursor code This patch removes drivers that have hardware cursors from calling the software cursor code. Also if the driver sets a no hardware cursor flag then the driver reports a error it someone attempts to use the cursor. Signed-off-by: James Simmons Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d2d58384fc5d4c0fe2d8e34bc2d15a90a9bb372a Author: Antonino A. Daplas Date: Fri Sep 9 13:04:31 2005 -0700 [PATCH] vesafb: Add blanking support Add rudimentary support by manipulating the VGA registers. However, not all vesa modes are VGA compatible, so VGA compatiblity is checked first. Only 2 levels are supported, powerup and powerdown. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7726e9e10fc6e026ed2dc00e48f4a3ffc1254ad2 Author: Antonino A. Daplas Date: Fri Sep 9 13:04:29 2005 -0700 [PATCH] fbdev: Add fbset -a support Add capability to fbdev to listen to the FB_ACTIVATE_ALL flag. If set, it notifies fbcon that all consoles must be set to the current var. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cb2e87a65d6cd735eb06fa595bf90497af28c37b Author: Eric Van Hensbergen Date: Fri Sep 9 13:04:28 2005 -0700 [PATCH] v9fs: fix handling of malformed 9P messages This patch attempts to do a better job of cleaning up after detecting errors on the transport. This should also improve error reporting on broken connections to servers. Signed-off-by: Latchesar Ionkov Signed-off-by: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b501611a6f78558eafcf09b228abd866d4ea5d9f Author: Eric Van Hensbergen Date: Fri Sep 9 13:04:27 2005 -0700 [PATCH] v9fs: readlink extended mode check LANL reported some issues with random crashes during mount of legacy protocol servers (9P2000 versus 9P2000.u) -- crash was always happening in readlink (which should never happen in legacy mode). Added some sanity conditionals to the get_inode code which should prevent the errors LANL was seeing. Code tested benign through regression. Signed-off-by: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d58bec5b7a8b8303df0a4dcb9a18feeefac6091 Author: Eric Van Hensbergen Date: Fri Sep 9 13:04:27 2005 -0700 [PATCH] v9fs: Fix support for special files (devices, named pipes, etc.) Fix v9fs special files (block, char devices) support. Signed-off-by: Latchesar Ionkov Signed-off-by: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 73c592b9b844cc353bbaea690fb4aa652ac168a6 Author: Eric Van Hensbergen Date: Fri Sep 9 13:04:26 2005 -0700 [PATCH] v9fs: Clean-up vfs_inode and setattr functions Cleanup code in v9fs vfs_inode as suggested by Alexey Dobriyan. Did some major revamping of the v9fs setattr code to remove unnecessary allocations and clean up some dead-code. Signed-off-by: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1346f51ede71fc1e5021062898d150e192dc4dc8 Author: Eric Van Hensbergen Date: Fri Sep 9 13:04:25 2005 -0700 [PATCH] v9fs: Change error magic numbers to defined constants Change magic error numbers to system defined constants in v9fs error.h As suggested by Jan-Benedict Glaw. Signed-off-by: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3ed8491c8a75cefe95b57f7f428a3e2ddd421e97 Author: Eric Van Hensbergen Date: Fri Sep 9 13:04:24 2005 -0700 [PATCH] v9fs: debug and support routines This part of the patch contains debug and other misc routines. Signed-off-by: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 322b329ab787de5f45abca9c9eabfd33bc5927e8 Author: Eric Van Hensbergen Date: Fri Sep 9 13:04:23 2005 -0700 [PATCH] v9fs: Support to force umount Support for force umount Signed-off-by: Latchesar Ionkov Signed-off-by: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 426cc91aa651b50713d06d45e5c3c3e90cfd40d9 Author: Eric Van Hensbergen Date: Fri Sep 9 13:04:22 2005 -0700 [PATCH] v9fs: transport modules This part of the patch contains transport routines. Signed-off-by: Eric Van Hensbergen Signed-off-by: Latchesar Ionkov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b8cf945b3166c4394386f162a527c9950f396ce2 Author: Eric Van Hensbergen Date: Fri Sep 9 13:04:21 2005 -0700 [PATCH] v9fs: 9P protocol implementation This part of the patch contains the 9P protocol functions. Signed-off-by: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9e82cf6a802a72f0f447eb4c76d6a3fc8736a31d Author: Eric Van Hensbergen Date: Fri Sep 9 13:04:20 2005 -0700 [PATCH] v9fs: VFS superblock operations and glue This part of the patch contains VFS superblock and mapping code. Signed-off-by: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2bad8471511ce5cc3ea90d0940622bd4b56b9cce Author: Eric Van Hensbergen Date: Fri Sep 9 13:04:19 2005 -0700 [PATCH] v9fs: VFS inode operations This part of the patch contains the VFS inode interfaces. Signed-off-by: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e69e7fe5b0c86b7271045444a3a681136234c659 Author: Eric Van Hensbergen Date: Fri Sep 9 13:04:18 2005 -0700 [PATCH] v9fs: VFS file, dentry, and directory operations This part of the patch contains the VFS file, dentry & directory interfaces. Signed-off-by: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 93fa58cb831337fdf5d36b3b913441100a484dae Author: Eric Van Hensbergen Date: Fri Sep 9 13:04:18 2005 -0700 [PATCH] v9fs: Documentation, Makefiles, Configuration OVERVIEW V9FS is a distributed file system for Linux which provides an implementation of the Plan 9 resource sharing protocol 9P. It can be used to share all sorts of resources: static files, synthetic file servers (such as /proc or /sys), devices, and application file servers (such as FUSE). BACKGROUND Plan 9 (http://plan9.bell-labs.com/plan9) is a research operating system and associated applications suite developed by the Computing Science Research Center of AT&T Bell Laboratories (now a part of Lucent Technologies), the same group that developed UNIX , C, and C++. Plan 9 was initially released in 1993 to universities, and then made generally available in 1995. Its core operating systems code laid the foundation for the Inferno Operating System released as a product by Lucent Bell-Labs in 1997. The Inferno venture was the only commercial embodiment of Plan 9 and is currently maintained as a product by Vita Nuova (http://www.vitanuova.com). After updated releases in 2000 and 2002, Plan 9 was open-sourced under the OSI approved Lucent Public License in 2003. The Plan 9 project was started by Ken Thompson and Rob Pike in 1985. Their intent was to explore potential solutions to some of the shortcomings of UNIX in the face of the widespread use of high-speed networks to connect machines. In UNIX, networking was an afterthought and UNIX clusters became little more than a network of stand-alone systems. Plan 9 was designed from first principles as a seamless distributed system with integrated secure network resource sharing. Applications and services were architected in such a way as to allow for implicit distribution across a cluster of systems. Configuring an environment to use remote application components or services in place of their local equivalent could be achieved with a few simple command line instructions. For the most part, application implementations operated independent of the location of their actual resources. Commercial operating systems haven't changed much in the 20 years since Plan 9 was conceived. Network and distributed systems support is provided by a patchwork of middle-ware, with an endless number of packages supplying pieces of the puzzle. Matters are complicated by the use of different complicated protocols for individual services, and separate implementations for kernel and application resources. The V9FS project (http://v9fs.sourceforge.net) is an attempt to bring Plan 9's unified approach to resource sharing to Linux and other operating systems via support for the 9P2000 resource sharing protocol. V9FS HISTORY V9FS was originally developed by Ron Minnich and Maya Gokhale at Los Alamos National Labs (LANL) in 1997. In November of 2001, Greg Watson setup a SourceForge project as a public repository for the code which supported the Linux 2.4 kernel. About a year ago, I picked up the initial attempt Ron Minnich had made to provide 2.6 support and got the code integrated into a 2.6.5 kernel. I then went through a line-for-line re-write attempting to clean-up the code while more closely following the Linux Kernel style guidelines. I co-authored a paper with Ron Minnich on the V9FS Linux support including performance comparisons to NFSv3 using Bonnie and PostMark - this paper appeared at the USENIX/FREENIX 2005 conference in April 2005: ( http://www.usenix.org/events/usenix05/tech/freenix/hensbergen.html ). CALL FOR PARTICIPATION/REQUEST FOR COMMENTS Our 2.6 kernel support is stabilizing and we'd like to begin pursuing its integration into the official kernel tree. We would appreciate any review, comments, critiques, and additions from this community and are actively seeking people to join our project and help us produce something that would be acceptable and useful to the Linux community. STATUS The code is reasonably stable, although there are no doubt corner cases our regression tests haven't discovered yet. It is in regular use by several of the developers and has been tested on x86 and PowerPC (32-bit and 64-bit) in both small and large (LANL cluster) deployments. Our current regression tests include fsx, bonnie, and postmark. It was our intention to keep things as simple as possible for this release -- trying to focus on correctness within the core of the protocol support versus a rich set of features. For example: a more complete security model and cache layer are in the road map, but excluded from this release. Additionally, we have removed support for mmap operations at Al Viro's request. PERFORMANCE Detailed performance numbers and analysis are included in the FREENIX paper, but we show comparable performance to NFSv3 for large file operations based on the Bonnie benchmark, and superior performance for many small file operations based on the PostMark benchmark. Somewhat preliminary graphs (from the FREENIX paper) are available (http://v9fs.sourceforge.net/perf/index.html). RESOURCES The source code is available in a few different forms: tarballs: http://v9fs.sf.net CVSweb: http://cvs.sourceforge.net/viewcvs.py/v9fs/linux-9p/ CVS: :pserver:anonymous@cvs.sourceforge.net:/cvsroot/v9fs/linux-9p Git: rsync://v9fs.graverobber.org/v9fs (webgit: http://v9fs.graverobber.org) 9P: tcp!v9fs.graverobber.org!6564 The user-level server is available from either the Plan 9 distribution or from http://v9fs.sf.net Other support applications are still being developed, but preliminary version can be downloaded from sourceforge. Documentation on the protocol has historically been the Plan 9 Man pages (http://plan9.bell-labs.com/sys/man/5/INDEX.html), but there is an effort under way to write a more complete Internet-Draft style specification (http://v9fs.sf.net/rfc). There are a couple of mailing lists supporting v9fs, but the most used is v9fs-developer@lists.sourceforge.net -- please direct/cc your comments there so the other v9fs contibutors can participate in the conversation. There is also an IRC channel: irc://freenode.net/#v9fs This part of the patch contains Documentation, Makefiles, and configuration file changes. Signed-off-by: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2822541893d88f84dd4f1525108d73effecd9d39 Author: Dipankar Sarma Date: Fri Sep 9 13:04:15 2005 -0700 [PATCH] files: files locking doc Add documentation describing the new locking scheme for file descriptor table. Signed-off-by: Dipankar Sarma Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b835996f628eadb55c5fb222ba46fe9395bf73c7 Author: Dipankar Sarma Date: Fri Sep 9 13:04:14 2005 -0700 [PATCH] files: lock-free fd look-up With the use of RCU in files structure, the look-up of files using fds can now be lock-free. The lookup is protected by rcu_read_lock()/rcu_read_unlock(). This patch changes the readers to use lock-free lookup. Signed-off-by: Maneesh Soni Signed-off-by: Ravikiran Thirumalai Signed-off-by: Dipankar Sarma Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab2af1f5005069321c5d130f09cce577b03f43ef Author: Dipankar Sarma Date: Fri Sep 9 13:04:13 2005 -0700 [PATCH] files: files struct with RCU Patch to eliminate struct files_struct.file_lock spinlock on the reader side and use rcu refcounting rcuref_xxx api for the f_count refcounter. The updates to the fdtable are done by allocating a new fdtable structure and setting files->fdt to point to the new structure. The fdtable structure is protected by RCU thereby allowing lock-free lookup. For fd arrays/sets that are vmalloced, we use keventd to free them since RCU callbacks can't sleep. A global list of fdtable to be freed is not scalable, so we use a per-cpu list. If keventd is already handling the current cpu's work, we use a timer to defer queueing of that work. Since the last publication, this patch has been re-written to avoid using explicit memory barriers and use rcu_assign_pointer(), rcu_dereference() premitives instead. This required that the fd information is kept in a separate structure (fdtable) and updated atomically. Signed-off-by: Dipankar Sarma Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e72ad2c581de121cc7e772469e2a8f6b1fd4379 Author: Dipankar Sarma Date: Fri Sep 9 13:04:12 2005 -0700 [PATCH] files-sparc64-fix 2 Fix sparc64 timod to use the new files_fdtable() api to get the fd table. This is necessary for RCUification. Signed-off-by: Dipankar Sarma Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit badf16621c1f9d1ac753be056fce11b43d6e0be5 Author: Dipankar Sarma Date: Fri Sep 9 13:04:10 2005 -0700 [PATCH] files: break up files struct In order for the RCU to work, the file table array, sets and their sizes must be updated atomically. Instead of ensuring this through too many memory barriers, we put the arrays and their sizes in a separate structure. This patch takes the first step of putting the file table elements in a separate structure fdtable that is embedded withing files_struct. It also changes all the users to refer to the file table using files_fdtable() macro. Subsequent applciation of RCU becomes easier after this. Signed-off-by: Dipankar Sarma Signed-Off-By: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c0dfb2905126e9e94edebbce8d3e05001301f52d Author: Dipankar Sarma Date: Fri Sep 9 13:04:09 2005 -0700 [PATCH] files: rcuref APIs Adds a set of primitives to do reference counting for objects that are looked up without locks using RCU. Signed-off-by: Ravikiran Thirumalai Signed-off-by: Dipankar Sarma Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b6490e5faafb3a16ea45654fb55f9ff086f1495 Author: Dipankar Sarma Date: Fri Sep 9 13:04:07 2005 -0700 [PATCH] files: fix rcu initializers First of a number of files_lock scaability patches. Here are the x86 numbers - tiobench on a 4(8)-way (HT) P4 system on ramdisk : (lockfree) Test 2.6.10-vanilla Stdev 2.6.10-fd Stdev ------------------------------------------------------------- Seqread 1400.8 11.52 1465.4 34.27 Randread 1594 8.86 2397.2 29.21 Seqwrite 242.72 3.47 238.46 6.53 Randwrite 445.74 9.15 446.4 9.75 The performance improvement is very significant. We are getting killed by the cacheline bouncing of the files_struct lock here. Writes on ramdisk (ext2) seems to vary just too much to get any meaningful number. Also, With Tridge's thread_perf test on a 4(8)-way (HT) P4 xeon system : 2.6.12-rc5-vanilla : Running test 'readwrite' with 8 tasks Threads 0.34 +/- 0.01 seconds Processes 0.16 +/- 0.00 seconds 2.6.12-rc5-fd : Running test 'readwrite' with 8 tasks Threads 0.17 +/- 0.02 seconds Processes 0.17 +/- 0.02 seconds I repeated the measurements on ramfs (as opposed to ext2 on ramdisk in the earlier measurement) and I got more consistent results from tiobench : 4(8) way xeon P4 ----------------- (lock-free) Test 2.6.12-rc5 Stdev 2.6.12-rc5-fd Stdev ------------------------------------------------------------- Seqread 1282 18.59 1343.6 26.37 Randread 1517 7 2415 34.27 Seqwrite 702.2 5.27 709.46 5.9 Randwrite 846.86 15.15 919.68 21.4 4-way ppc64 ------------ (lock-free) Test 2.6.12-rc5 Stdev 2.6.12-rc5-fd Stdev ------------------------------------------------------------- Seqread 1549 91.16 1569.6 47.2 Randread 1473.6 25.11 1585.4 69.99 Seqwrite 1096.8 20.03 1136 29.61 Randwrite 1189.6 4.04 1275.2 32.96 Also running Tridge's thread_perf test on ppc64 : 2.6.12-rc5-vanilla -------------------- Running test 'readwrite' with 4 tasks Threads 0.20 +/- 0.02 seconds Processes 0.16 +/- 0.01 seconds 2.6.12-rc5-fd -------------------- Running test 'readwrite' with 4 tasks Threads 0.18 +/- 0.04 seconds Processes 0.16 +/- 0.01 seconds The benefits are huge (upto ~60%) in some cases on x86 primarily due to the atomic operations during acquisition of ->file_lock and cache line bouncing in fast path. ppc64 benefits are modest due to LL/SC based locking, but still statistically significant. This patch: RCU head initilizer no longer needs the head varible name since we don't use list.h lists anymore. Signed-off-by: Dipankar Sarma Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f97a931b337e4662e736ca67f1fab0a187f5852 Author: Mauro Carvalho Chehab Date: Fri Sep 9 13:04:05 2005 -0700 [PATCH] v4l: tveeprom improved to support newer Hauppage cards - tveeprom improved and updated to reflect newer Hauppage cards. - CodingStyle fixes. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 18fc59e230bbda9725736f8f526ef88aab212348 Author: Mauro Carvalho Chehab Date: Fri Sep 9 13:04:05 2005 -0700 [PATCH] v4l: TVaudio cleanup and better debug messages - adds the adapter number + i2c address to printk msgs. - Some CodingStyle cleanups. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc75fc1b924ccf44ca9f0446701acc0081605b49 Author: Mauro Carvalho Chehab Date: Fri Sep 9 13:04:04 2005 -0700 [PATCH] v4l: Remove kernel version dependency from tea575x-tuner.h - Removed kernel version dependency from tea575x-tuner.h Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 10b89ee387fd6cc38532a881f64b3d35f338ea0b Author: Mauro Carvalho Chehab Date: Fri Sep 9 13:04:03 2005 -0700 [PATCH] v4l: include saa6588 compiler option and files / fixes comments on tuner.h - Include saa6588 compiler option and files. - Fix comment on tuner.h - linux/utsname.h replaced by linux/version.h to compile on vanilla 2.6.13 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 67e49a1abe3e9458c7ffba66775b350b5ceffae0 Author: Mauro Carvalho Chehab Date: Fri Sep 9 13:04:00 2005 -0700 [PATCH] v4l: make the input event device for IR matchable by udev rules. - Makes the input event device created by the V4L drivers for the infrared remote matchable by udev rules. Signed-off-by: Rudo Thomas Signed-off-by: Michael Fair Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5129b1589883d6eaa54886f3e0c5d918dafe329e Author: Mauro Carvalho Chehab Date: Fri Sep 9 13:04:00 2005 -0700 [PATCH] v4l: add some missing parameter descriptions in msp3400.c - added some missing parameter descriptions at msp3400.c Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 21d4df375be2c9e5f1002800036fbfb793cf031f Author: Mauro Carvalho Chehab Date: Fri Sep 9 13:03:59 2005 -0700 [PATCH] v4l: print warning if pal= or secam= argument is unrecognized - print warning if pal= or secam= argument is unrecognized Signed-off-by: Philip Rowlands Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a989d7328aa4a0b4793ea05b13871bf1b500b1e Author: Mauro Carvalho Chehab Date: Fri Sep 9 13:03:57 2005 -0700 [PATCH] v4l: correct the amux for composite and s-video inputs on the Sabrent SBT-TVFM card. - correct the amux for composite and s-video inputs on the Sabrent SBT-TVFM card. Signed-off-by: Michael Rodriquez-Torrent Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fccdf1bd362452d5e2bc0a1874b2b504b481e367 Author: Mauro Carvalho Chehab Date: Fri Sep 9 13:03:57 2005 -0700 [PATCH] v4l: #include no longer needed. - #include no longer needed. Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 33ac6b52679743c3dbb7c7245f1df90588ee1097 Author: Mauro Carvalho Chehab Date: Fri Sep 9 13:03:56 2005 -0700 [PATCH] v4l: the Microtune 4049FM5 uses an IF frequency of 33.3 MHz for FM radio. - The Microtune 4049FM5 uses an IF frequency of 33.3 MHz for FM radio. Signed-off-by: Hans Verkuil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 08adb9e20be83bb4c5322bf15b966c537038f6d9 Author: Mauro Carvalho Chehab Date: Fri Sep 9 13:03:55 2005 -0700 [PATCH] v4l: some error treatment implemented at resume functions. - Some error treatment implemented at resume functions. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c93b07a48039cee1d845f38294abec0f803e05e Author: Mauro Carvalho Chehab Date: Fri Sep 9 13:03:54 2005 -0700 [PATCH] v4l: change LG TDVS H062F from NTSC to ATSC - Change LG TDVS H062F from NTSC to ATSC. Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1c94aeecd3fd2aed66d9a1135f5329df622e6137 Author: Mauro Carvalho Chehab Date: Fri Sep 9 13:03:52 2005 -0700 [PATCH] v4l: normalize whitespace and comments in tuner lists - normalize whitespace and comments in tuner lists Signed-off-by: Philip Rowlands Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 10c35cf8fd89e166d13bc93175f2b05d9cb85e07 Author: Mauro Carvalho Chehab Date: Fri Sep 9 13:03:52 2005 -0700 [PATCH] v4l: cx88-dvb incorrect reporting fixed and remove bad PCI ID for Sabrent - cx88-dvb has been incorrectly reporting the card name instead of frontend name - Removes a bad PCI subsystem ID for saa713x Sabrent card - Renames DVICO --> DViCO for bttv. - #include no longer needed. Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4279f02478c2c4f106ec9efb80ca152e8d406844 Author: Mauro Carvalho Chehab Date: Fri Sep 9 13:03:51 2005 -0700 [PATCH] v4l: add saa713x card #66: Yuan TUN-900 (saa7135) - Add saa713x card #66: Yuan TUN-900 (saa7135) Signed-off-by: De Greef Sebastien Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 260784dcca44b5a526cece1f275cb81ccd186a3e Author: Mauro Carvalho Chehab Date: Fri Sep 9 13:03:49 2005 -0700 [PATCH] v4l: add saa713x card #65 Kworld V-Stream Studio TV Terminator - Add saa713x card #65 Kworld V-Stream Studio TV Terminator Signed-off-by: James R Webb Signed-off-by: Peter Missel Signed-off-by: Nickolay V. Shmyrev Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5adc1c306b1ce5b297bd8ee010a62f39cd32b9e4 Author: Mauro Carvalho Chehab Date: Fri Sep 9 13:03:48 2005 -0700 [PATCH] v4l: correct LG NTSC TALN mini tuner takeover - correct LG NTSC TALN mini tuner takeover as far we can empirically determine for now. Signed-off-by: Hermann Pitton Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 272435dc44f7254c7174d69b41eb430a50583d1a Author: Mauro Carvalho Chehab Date: Fri Sep 9 13:03:47 2005 -0700 [PATCH] v4l: syncs tveeprom tuners list with the list from ivtv - Syncs tveeprom tuners list with the list from ivtv. - Fixes the incorrect reporting of the radio presence. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c0e9eae60e8f1a18e2e6502b3e738dd2886d18ff Author: Mauro Carvalho Chehab Date: Fri Sep 9 13:03:47 2005 -0700 [PATCH] v4l: change the prefix of msp34xx and error while reading chip version - Changes the prefix to 'msp34xx' instead of 'msp3400'. - Changes the message 'error while reading chip version' to a debug printk at msp3400.c Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2f1807102a3a5c9b9782b6e8d271fc8ccef91f0a Author: Mauro Carvalho Chehab Date: Fri Sep 9 13:03:46 2005 -0700 [PATCH] v4l: SAA7134 updates and board additions - Remove $Id CVS logs for V4L files - linux/version.h replaced by linux/utsname.h - Add new Digimatrix card and LG TAPC Mini tuner for it Signed-off-by: Hermann Pitton Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e52e98a7eccfb0e7e91630d01690fb11d77db77d Author: Mauro Carvalho Chehab Date: Fri Sep 9 13:03:41 2005 -0700 [PATCH] v4l: CX88 updates and card additions - Remove $Id CVS logs for V4L files - add ioctl indirection via cx88_ioctl_hook and cx88_ioctl_translator to cx88-blackbird.c. - declare the indirection hooks from cx88-blackbird.c. - dcprintk macro which uses core instead of dev->core on cx88-video.c. - replace dev->core occurances with core on cx88-video.c. - CodingStyle fixes. - MaxInput replaced by a define. - cx8801 structures moved from cx88.h. - The output_mode needs to be set for the Hauppauge Nova-T DVB-T for versions after 2.6.12. - Corrected GPIO values for cx88 cards #28 & #31 for s-video and composite. - Updated DViCO FusionHDTV5 Gold & added DVB support. - Fixed DViCO FusionHDTV 3 Gold-Q GPIO. - Some clean up in cx88-tvaudio.c - replaced hex values when writing to AUD_CTL to EN_xx for better reading. - Allow select by hand between Mono, Lang1, Lang2 and Stereo for BTSC. - Support for stereo NICAM and BTSC improved. - Broken stereo check removed. - Added support for remote control to Cinergy DVBT-1400. - local var renamed from rc5 to a better name (ircode). - LGDT330X QAM lock bug fixes. - Some reorg: move some bits to struct cx88_core, factor out common ioctl's to cx88_do_ioctl. - Get rid of '//' comments, replace them with #if 0 and /**/. - Minor clean-ups: remove dcprintk and replace all instances of "dev->core" with "core". - Added some registers to control PCI controller at CX2388x chips. - New tuner standby API. - Small mpeg fixes and cleanups for blackbird. - fix mpeg packet size & count - add VIDIOC_QUERYCAP ioctl for the mpeg stream - return more information in struct v4l2_format - fix default window height - small cleanups Signed-off-by: Uli Luckas Signed-off-by: Torsten Seeboth Signed-off-by: Nickolay V. Shmyrev Signed-off-by: Michael Krufky Signed-off-by: Patrick Boettcher Signed-off-by: Catalin Climov Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 24a70fdce872d70171b1f49dcd1a7c3a4e8396b2 Author: Mauro Carvalho Chehab Date: Fri Sep 9 13:03:39 2005 -0700 [PATCH] v4l: BTTV updates and card additions - Remove $Id CVS logs for V4L files - Added DVICO FusionHDTV 5 Lite card. - Added Acorp Y878F. - CodingStyle fixes. - Added tuner_addr to bttv cards structure. - linux/version.h replaced by linux/utsname.h on bttvp.h - kernel module for acquiring RDS data from a SAA6588. - Allow multiple open() and reading calls to /dev/radio on bttv-driver.c - added i2c address for lgdt330x. Signed-off-by: Hans J. Koch Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 793cf9e6a54c698e109a599c8b8e303658fcaae6 Author: Mauro Carvalho Chehab Date: Fri Sep 9 13:03:37 2005 -0700 [PATCH] v4l: common part Updates and tuner additions - Remove $Id CVS logs for V4L files - Included newer cards. - Added a new NEC protocol for ir based on pulse distance. - Enable ATSC support for DViCO FusionHDTV5 Gold. - Added tuner LG NTSC (TALN mini series). - Fixed tea5767 autodetection. - Resolve more tuner types. - Commented debug function removed from mainstream. - Remove comments from mainstream. Still on development tree. - linux/version dependencies removed. - BTSC Lang1 now is set to auto_stereo mode. - New tuner standby API. - i2c-core.c uses hexadecimal for the i2c address, so it should stay consistent. Signed-off-by: Uli Luckas Signed-off-by: Mac Michaels Signed-off-by: Michael Krufky Signed-off-by: Hermann Pitton Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a1938038dd7e4188a8663e49242fa77dd2adb7ed Author: Adrian Bunk Date: Fri Sep 9 13:03:34 2005 -0700 [PATCH] VIDEO_BT848: remove not required part of the help text Things that are already expressed through the dependencies don't have to be mentioned in the help text. Signed-off-by: Adrian Bunk Cc: Mauro Carvalho Chehab Cc: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e498be7dafd72fd68848c1eef1575aa7c5d658df Author: Christoph Lameter Date: Fri Sep 9 13:03:32 2005 -0700 [PATCH] Numa-aware slab allocator V5 The NUMA API change that introduced kmalloc_node was accepted for 2.6.12-rc3. Now it is possible to do slab allocations on a node to localize memory structures. This API was used by the pageset localization patch and the block layer localization patch now in mm. The existing kmalloc_node is slow since it simply searches through all pages of the slab to find a page that is on the node requested. The two patches do a one time allocation of slab structures at initialization and therefore the speed of kmalloc node does not matter. This patch allows kmalloc_node to be as fast as kmalloc by introducing node specific page lists for partial, free and full slabs. Slab allocation improves in a NUMA system so that we are seeing a performance gain in AIM7 of about 5% with this patch alone. More NUMA localizations are possible if kmalloc_node operates in an fast way like kmalloc. Test run on a 32p systems with 32G Ram. w/o patch Tasks jobs/min jti jobs/min/task real cpu 1 485.36 100 485.3640 11.99 1.91 Sat Apr 30 14:01:51 2005 100 26582.63 88 265.8263 21.89 144.96 Sat Apr 30 14:02:14 2005 200 29866.83 81 149.3342 38.97 286.08 Sat Apr 30 14:02:53 2005 300 33127.16 78 110.4239 52.71 426.54 Sat Apr 30 14:03:46 2005 400 34889.47 80 87.2237 66.72 568.90 Sat Apr 30 14:04:53 2005 500 35654.34 76 71.3087 81.62 714.55 Sat Apr 30 14:06:15 2005 600 36460.83 75 60.7681 95.77 853.42 Sat Apr 30 14:07:51 2005 700 35957.00 75 51.3671 113.30 990.67 Sat Apr 30 14:09:45 2005 800 33380.65 73 41.7258 139.48 1140.86 Sat Apr 30 14:12:05 2005 900 35095.01 76 38.9945 149.25 1281.30 Sat Apr 30 14:14:35 2005 1000 36094.37 74 36.0944 161.24 1419.66 Sat Apr 30 14:17:17 2005 w/patch Tasks jobs/min jti jobs/min/task real cpu 1 484.27 100 484.2736 12.02 1.93 Sat Apr 30 15:59:45 2005 100 28262.03 90 282.6203 20.59 143.57 Sat Apr 30 16:00:06 2005 200 32246.45 82 161.2322 36.10 282.89 Sat Apr 30 16:00:42 2005 300 37945.80 83 126.4860 46.01 418.75 Sat Apr 30 16:01:28 2005 400 40000.69 81 100.0017 58.20 561.48 Sat Apr 30 16:02:27 2005 500 40976.10 78 81.9522 71.02 696.95 Sat Apr 30 16:03:38 2005 600 41121.54 78 68.5359 84.92 834.86 Sat Apr 30 16:05:04 2005 700 44052.77 78 62.9325 92.48 971.53 Sat Apr 30 16:06:37 2005 800 41066.89 79 51.3336 113.38 1111.15 Sat Apr 30 16:08:31 2005 900 38918.77 79 43.2431 134.59 1252.57 Sat Apr 30 16:10:46 2005 1000 41842.21 76 41.8422 139.09 1392.33 Sat Apr 30 16:13:05 2005 These are measurement taken directly after boot and show a greater improvement than 5%. However, the performance improvements become less over time if the AIM7 runs are repeated and settle down at around 5%. Links to earlier discussions: http://marc.theaimsgroup.com/?t=111094594500003&r=1&w=2 http://marc.theaimsgroup.com/?t=111603406600002&r=1&w=2 Changelog V4-V5: - alloc_arraycache and alloc_aliencache take node parameter instead of cpu - fix initialization so that nodes without cpus are properly handled. - simplify code in kmem_cache_init - patch against Andrews temp mm3 release - Add Shai to credits - fallback to __cache_alloc from __cache_alloc_node if the node's cache is not available yet. Changelog V3-V4: - Patch against 2.6.12-rc5-mm1 - Cleanup patch integrated - More and better use of for_each_node and for_each_cpu - GCC 2.95 fix (do not use [] use [0]) - Correct determination of INDEX_AC - Remove hack to cause an error on platforms that have no CONFIG_NUMA but nodes. - Remove list3_data and list3_data_ptr macros for better readability Changelog V2-V3: - Made to patch against 2.6.12-rc4-mm1 - Revised bootstrap mechanism so that larger size kmem_list3 structs can be supported. Do a generic solution so that the right slab can be found for the internal structs. - use for_each_online_node Changelog V1-V2: - Batching for freeing of wrong-node objects (alien caches) - Locking changes and NUMA #ifdefs as requested by Manfred Signed-off-by: Alok N Kataria Signed-off-by: Shobhit Dayal Signed-off-by: Shai Fultheim Signed-off-by: Christoph Lameter Cc: Manfred Spraul Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd65a68574b787304a0cd90f22cfd44540ce3695 Author: Brice Goglin Date: Fri Sep 9 13:03:29 2005 -0700 [PATCH] pcmcia: add pcmcia to IRQ information Add a devname parameter to the pcmcia_device structure, fills it with "pcmcia" in pcmcia_device_add, and passes it to request_irq in pcmcia_request_irq. Signed-off-by: Brice Goglin Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d3feb1844ad33911ab1fe9df1ead66082b3bce9b Author: Dominik Brodowski Date: Fri Sep 9 13:03:28 2005 -0700 [PATCH] pcmcia: more IDs for ide_cs (Partly From: David Brownell ) Make ID-CS recognize the CF card manufacturer records for Samsung, Lexar and STI. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f74e48a51c38f54fa26eb86a7a42f592156eccc2 Author: David Brownell Date: Fri Sep 9 13:03:28 2005 -0700 [PATCH] pcmcia: OMAP CF controller This adds a socket driver for the OMAP CF controller; it's currently in use on OSK boards. Signed-off-by: David Brownell Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 71ed90d89eff51a1137cbef727f11b8f7d5b20f1 Author: Dominik Brodowski Date: Fri Sep 9 13:03:27 2005 -0700 [PATCH] pcmcia: remove unused Vpp1, Vpp2 and Vcc config_t->Vpp1, Vpp2 and Vcc are never read, so remove them. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 76d82ec526b0549cedf332d80929c8c225b653fa Author: Dominik Brodowski Date: Fri Sep 9 13:03:26 2005 -0700 [PATCH] pcmcia: remove unused client_t client_t and CLIENT_MAGIC are unused, so remove them Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c8751e4c0bd32ecb76434240a56a087fa223280c Author: Daniel Ritz Date: Fri Sep 9 13:03:25 2005 -0700 [PATCH] pcmcia/yenta: avoid PCI write posting problem extend cb_writel(), exca_writeb(), exca_writel() to do a read[lb]() after the write[lb]() to avoid possible problem with PCI write posting. Seems to fix Bug #5061. Signed-off-by: Daniel Ritz Cc: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c181e0e00ff778623c7fda055fd404a06d2c7845 Author: Daniel Ritz Date: Fri Sep 9 13:03:25 2005 -0700 [PATCH] fix pcmcia_request_irq() for multifunction card multifunction cards need to have the same irq assigned to both functions. the code tries that but fails because ret is still set to CS_IN_USE which results in the function having the CB irq assigned. yenta_set_socket then just changes the irq routing to use the PCI interrupt but the first functions irq handler is registered on an ISA interrupt. boom. Signed-off-by: Daniel Ritz Cc: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bf4de6f2db79f3c396bd884f546cd2ea91a686f2 Author: Daniel Ritz Date: Fri Sep 9 13:03:23 2005 -0700 [PATCH] pcmcia/cs: fix possible missed wakeup - thread_done should only be completed when the wait_queue is installed. - all wake up conditions should be checked before schedule() this fixes a hang of rmmod in the sequence modprobe yenta_socket; rmmod yenta_socket as reported by Andreas Steinmetz. w/o this rmmod yenta_socket can hang on wait_for_completion() in pcmcia_unregister_socket() Signed-off-by: Daniel Ritz Cc: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b3743fa4442fc172e950ff0eaf6aa96e7d5ce9be Author: Dominik Brodowski Date: Fri Sep 9 13:03:23 2005 -0700 [PATCH] yenta: share code with PCI core Share code between setup-bus.c and yenta_socket.c: use the write-out code of resources to the bridge also in yenta_socket.c, as it provides useful debug output. In addition, it fixes the bug that the CPU-centric resource view might need to be transferred to the PCI-centric view: setup-bus.c does that, while yenta-socket.c did not. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 76fa82fb7156aa7191dfd1fdede1fc0da51d45dd Author: Ingo Molnar Date: Fri Sep 9 13:03:21 2005 -0700 [PATCH] pcmcia: reduce ds.c stack footprint This patch reduces the stack footprint of pcmcia_device_query() from 416 bytes to 36 bytes. Signed-off-by: Ingo Molnar Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4da006c63fb4758ee2d688aa65a461337b3ed065 Author: Marcelo Feitoza Parisi Date: Fri Sep 9 13:03:15 2005 -0700 [PATCH] dvb: ttusb-budget: use time_after_eq() Use of the time_after_eq() macro, defined at linux/jiffies.h, which deal with wrapping correctly and are nicer to read. Signed-off-by: Marcelo Feitoza Parisi Signed-off-by: Domen Puncer Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1ac2854cbc637de7e958cfa8d153ccf9e6668dda Author: Philipp Matthias Hahn Date: Fri Sep 9 13:03:13 2005 -0700 [PATCH] dvb: saa7146: i2c vs. sysfs fix Integrate saa7146_i2c adapter into device model: Moves entries from /sys/device/platform to /sys/device/pci*. Signed-off-by: Philipp Hahn Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6af4ee10f0b2bec2b8c40150298a9f7c1e9e46c6 Author: Karl Herz Date: Fri Sep 9 13:03:13 2005 -0700 [PATCH] dvb: ttpci: add PCI ids for old Siemens/TT DVB-C card Add PCI-ids of Siemens-DVB-C card with Technotrend manufacturer id. Signed-off-by: Karl Herz Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 03388ae30260475650bab24223151397afb72ec9 Author: Oliver Endriss Date: Fri Sep 9 13:03:12 2005 -0700 [PATCH] dvb: ttpci: av7110: RC5+ remote control support Improved remote control support for av7110-based cards: o extended rc5 protocol, firmware >= 0x2620 required o key-up timer slightly adjusted o completely moved remote control code to av7110_ir.c o support for multiple ir receivers o for now, all av7110 cards share the same ir configuration and event device Signed-off-by: Oliver Endriss Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a7b102e7f5ccb2826a81315abc89f95adaf4421 Author: Oliver Endriss Date: Fri Sep 9 13:03:11 2005 -0700 [PATCH] dvb: av7110: conditionally disable workaround for broken firmware Disable COM_IF_LOCK workaround for firmware > 0x261f. Signed-off-by: Oliver Endriss Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ce7d3c11aee415c76bcbd5f43cace16132b48a21 Author: Johannes Stezenbach Date: Fri Sep 9 13:03:10 2005 -0700 [PATCH] dvb: av7110: disable superflous firmware handshake Disable superflous firmware handshake. Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 87b2ecaebceb35c6f6199edd29ae24963d3f9c35 Author: Andrew de Quincey Date: Fri Sep 9 13:03:09 2005 -0700 [PATCH] dvb: budget-av: enable frontend on KNC1 Plus cards Enable frontend on KNC plus cards. Signed-off-by: Andrew de Quincey Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b548747d78f8840024ac3439b7149348a282e086 Author: Andrew de Quincey Date: Fri Sep 9 13:03:08 2005 -0700 [PATCH] dvb: budget-av: fixes for CI interface Fixes for CI interface. Signed-off-by: Andrew de Quincey Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc27a1696089a9a9d317fc815915e6761e22eeb5 Author: Andrew de Quincey Date: Fri Sep 9 13:03:07 2005 -0700 [PATCH] dvb: budget-ci: add support for TT DVB-C CI card Add support for TT DVB-C CI card. Signed-off-by: Andrew de Quincey Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f63f5346c943008fe8f6ac66a9026f6c35e24947 Author: thomas schorpp Date: Fri Sep 9 13:03:06 2005 -0700 [PATCH] dvb: av7110: Siemens DVB-C analog video input support Add support for analog video inputs (CVBS and Y/C) of the analog module for the Siemens DVB-C card. Signed-off-by: thomas schorpp Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6d78933c291bd0b6292e2c631e2f5e346c14d3fa Author: Johannes Stezenbach Date: Fri Sep 9 13:03:05 2005 -0700 [PATCH] dvb: cinergyT2: remote control fixes IR RC fixes: - EVIOCSKEYCODE is not supported by this driver, fix potential crash when it is used by not setting rc_input_dev->keycodesize - fix key repeat handling (hopefully) - reduce default poll internal to 50msec (necessary for key repeat handling) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d6e7322b5f63d62ec8785c5fbf469c9a233baff Author: Manu Abraham Date: Fri Sep 9 13:03:04 2005 -0700 [PATCH] dvb: dst: Updated Documentation Updated Documentation Signed-off-by: Manu Abraham Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9dea88514c476d303f59e19b27ef26bb52dc193a Author: Manu Abraham Date: Fri Sep 9 13:03:03 2005 -0700 [PATCH] dvb: dst: ci doc update Updated documentation Signed-off-by: Manu Abraham Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 62867429d0d79e47e19ceedc3133efe74993932f Author: Manu Abraham Date: Fri Sep 9 13:03:02 2005 -0700 [PATCH] dvb: dst: fix DVB-C tuning Fix BUG in DVB-C frequency setting. Thanks to Peng Cao Signed-off-by: Manu Abraham Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 62121b1f9e25377ff50121f8c34a4aa92c47f465 Author: Manu Abraham Date: Fri Sep 9 13:03:01 2005 -0700 [PATCH] dvb: dst: identify boards Identify board properly: Add functions to retrieve MAC Address, FW details, Card type and Vendor Information. Signed-off-by: Manu Abraham Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a427de6f72bc0d83ebb1d87f9003c5e1009f21cd Author: Manu Abraham Date: Fri Sep 9 13:03:00 2005 -0700 [PATCH] dvb: dst: dprrintk cleanup Code Cleanup: o Remove debug noise o Remove debug module parameter debug level is achieved using the verbosity level o Updated to kernel coding style (case labels should not be indented) Signed-off-by: Manu Abraham Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94b7410c8a2d23fad5937b326a0a9e8c5a876e2d Author: Manu Abraham Date: Fri Sep 9 13:02:59 2005 -0700 [PATCH] dvb: dst: remove unnecessary code Code Simplification: CA PMT object is not parsed in the driver anymore. Signed-off-by: Manu Abraham Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f612c5793449ac653b2f4531696d8e74e771e3d3 Author: Manu Abraham Date: Fri Sep 9 13:02:58 2005 -0700 [PATCH] dvb: dst: fix symbol rate setting Make the Symbolrate setting card specific. Signed-off-by: Manu Abraham Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f30db067a593aeb3fdd97ec0a3e6399ea566f2ad Author: Stuart Auchterlonie Date: Fri Sep 9 13:02:56 2005 -0700 [PATCH] dvb: nebula DigiTV nxt6000 fix Fix bug in Nebula DigiTV frontend detection for nxt6000. Signed-off-by: Stuart Auchterlonie Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 05ade5a5cd32f8393c22fc454b0546df2ed497c5 Author: David Johnson Date: Fri Sep 9 13:02:55 2005 -0700 [PATCH] dvb: bt8xx: Nebula DigiTV mt352 support Add support for Nebula DigiTV PCI cards with the MT352 frontend. Signed-off-by: David Johnson Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1f15ddd0b79d1722049952b7359533a18a72f106 Author: David Johnson Date: Fri Sep 9 13:02:54 2005 -0700 [PATCH] dvb: bt8xx: cleanup Indentation fixes and remove unnecessary braces. Signed-off-by: David Johnson Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 466d725ac8d9c58a5de87f72b4fe066c4bad3d9d Author: Johannes Stezenbach Date: Fri Sep 9 13:02:53 2005 -0700 [PATCH] dvb: bt8xx: endianness fix Endianness fix for risc DMA start address setting. (reported by Stefan Haubenthal/Peter Hettkamp) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5b5b53452be0b1132cfb8e22fbe5fe43c25140a0 Author: Johannes Stezenbach Date: Fri Sep 9 13:02:52 2005 -0700 [PATCH] dvb: remove noisy debug print comment out noisy dprintk in dst_get_signal() (why are errors only visible with debug on? this needs to be cleaned up so we can disable debug by default) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e2efeab26b77061ba5418f4c98c3b3ed100fb608 Author: Patrick Boettcher Date: Fri Sep 9 13:02:51 2005 -0700 [PATCH] dvb: usb: cxusb: fixes for new firmware This patch changes two things: 1) a firmware update made by the vendor, which has to be done in Windows for now, changes the DVB-data-pipe from isochronous to bulk: it fixes the data distortions (and thus the video-distortions) in DVB-T mode; there is no backwards compatibility with the old firmware as it didn't work anyway 2) with the help of Steve Toth some reverse-engineered functionality is now named correctly, thank you Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3beab78f8ad5a483fdbdcbb8599fb06da102b8b7 Author: Patrick Boettcher Date: Fri Sep 9 13:02:50 2005 -0700 [PATCH] dvb: usb: white space cleanup white space cleanup Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 115eea4e91049a42d81e5284cbb0f50acab6eb39 Author: Svante Olofsson Date: Fri Sep 9 13:02:48 2005 -0700 [PATCH] dvb: usb: digitv: support for nxt6000 demod Add support for the NXT6000-based digitv-box. Add .get_tune_settings callback for the NXT6000 to have a min_tune_delay of 500ms. Signed-off-by: Svante Olofsson Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 47dc3d688d04f06d8ef90a06c48930906fbc4a8c Author: Patrick Boettcher Date: Fri Sep 9 13:02:47 2005 -0700 [PATCH] dvb: usb: core: change dvb_usb_device_init() API Change the init call to optionally return the new dvb_usb_device directly. Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 62703b9d72114a563488cd4be6d0827618395589 Author: Patrick Boettcher Date: Fri Sep 9 13:02:46 2005 -0700 [PATCH] dvb: usb: dtt200u: add proper device names Added names for clones of the DVB-T stick. Whitespace cleanups. Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 43bc3f41e4b1bb88adaef593f50c1f032bf0e876 Author: Ye Jianjun (Joey Date: Fri Sep 9 13:02:44 2005 -0700 [PATCH] dvb: usb: dtt200u: copy frontend_ops before modifying Fix: copy frontend_ops before modifying Signed-off-by: Ye Jianjun (Joey) Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 54127d64d2094207e0e12a4a9eec33573f25f7ac Author: Andreas Oberritter Date: Fri Sep 9 13:02:43 2005 -0700 [PATCH] dvb: usb: removed empty module_init/exit calls Removed empty module_init/exit calls. Signed-off-by: Andreas Oberritter Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e69339d9a43d4691f6a05c5a54a00d54814aaa68 Author: Patrick Boettcher Date: Fri Sep 9 13:02:42 2005 -0700 [PATCH] dvb: usb: dibusb: Kworld Xpert DVB-T USB2.0 support Add USB IDs of the Kworld Xpert DVB-T USB2.0 (clone of the ADStech box). Thanks to Marcus Hagn for testing. Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3706a4da2012679631da6d22e86c6a34cde7419a Author: Patrick Boettcher Date: Fri Sep 9 13:02:41 2005 -0700 [PATCH] dvb: usb: add TwinhanDTV StarBox support Add driver for the TwinhanDTV StarBox and clones. Thanks to Ralph Metzler for his initial work on this box and thanks to Twinhan for their support. Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 80e27e20619902b11aa255081fd83eab10fc0839 Author: Mac Michaels Date: Fri Sep 9 13:02:40 2005 -0700 [PATCH] dvb: frontend: or51132: remove bogus optimization attempt This fix has also been applied to lgdt330x. There is an optimization that keeps track of the frequency tuned by the digital decoder. The digital driver does not set the frequency if it has not changed since it was tuned. The analog tuner driver knows nothing about the frequency saved by the digital driver. When the frequency is set using the video4linux code with tvtime, the hardware get changed but the digital driver's state does not get updated. Switch back to the same digital channel and the driver finds no change in frequency so the tuner is not reset to the digital frequency. The work around is to remove the check and always set the tuner to the specified frequency. Signed-off-by: Mac Michaels Signed-off-by: Michael Krufky Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 593cbf3dcbffc852cf91a30951eb518b59bf7322 Author: Patrick Boettcher Date: Fri Sep 9 13:02:38 2005 -0700 [PATCH] dvb: frontend: stv0297: QAM128 tuning improvement while investigating the QAM_128-issue with the stv0297-driver for the Cablestar (which is not the same as the one in dvb-kernel CVS, yet), I fixed it, not by increasing the timeout, but by disabling the corner-detection for QAM_128 and higher. This patch has been tested on dvb-kernel cvs, and has been reported to work by multiple users. Some cards still need timeout increase on top of this patch. This will be addressed later. Signed-off-by: Patrick Boettcher Signed-off-by: Michael Krufky Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c589ebfce79834a9617c44d7ec0f608fa70eb42d Author: Johannes Stezenbach Date: Fri Sep 9 13:02:37 2005 -0700 [PATCH] dvb: frontend: cx24110: clean up timeout handling. Clean up timeout handling. Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 296c786a0d2122b1e47c80ca717d8a8ac36402c1 Author: Adam Szalkowski Date: Fri Sep 9 13:02:35 2005 -0700 [PATCH] dvb: frontend: cx24110: another DiSEqC fix Fix DiSEqC problems. Signed-off-by: Adam Szalkowski Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d897275500d8fac919a11073eb587ce0e3fcc36c Author: Johannes Stezenbach Date: Fri Sep 9 13:02:34 2005 -0700 [PATCH] dvb: frontend: cx24110: DiSEqC fix Fix DiSEqC switching (one bug fix suggested by Peter Hettkamp, and one experimentally determined msleep(30) suggested by Adam Szalkowski). Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6816a4c183e62bca1fa4812214e483ab503dcb7d Author: Johannes Stezenbach Date: Fri Sep 9 13:02:34 2005 -0700 [PATCH] dvb: frontend: ves1820: improve tuning Reset acgconf register after tuning to improve locking, as suggested by Marco Schluessler. Minor cleanups in ves1820_init(). Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c2026b3af0c8ad33ef253a950c271f2d0da111b6 Author: Andrew de Quincey Date: Fri Sep 9 13:02:33 2005 -0700 [PATCH] dvb: frontend: tda1004x: fix SNR reading Fix SNR reading Signed-off-by: Andrew de Quincey Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 78639a3f81d14117d1841476771d7a4736e7b9d1 Author: Andrew de Quincey Date: Fri Sep 9 13:02:32 2005 -0700 [PATCH] dvb: frontend: stv0299: support reading both BER and UCBLOCKS Allow the stv0299 to read the BER and UCBLOCKS. Signed-off-by: Andrew de Quincey Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a9d6a80b41c04e8ff4c7442cc35f5df610863841 Author: Andrew de Quincey Date: Fri Sep 9 13:02:31 2005 -0700 [PATCH] dvb: frontend: s5h1420: fixes Misc. fixes. Signed-off-by: Andrew de Quincey Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cfbfce1566f11c0dbad8a16173f0448b0c78cecb Author: Andreas Oberritter Date: Fri Sep 9 13:02:30 2005 -0700 [PATCH] dvb: frontend: stv0299: pass i2c bus to pll callback Pass a pointer to the i2c bus to the pll callbacks (stv0299 only). It was not possible to tell which i2c bus should be used if an adapter has multiple frontends on multiple i2c buses. Signed-off-by: Andreas Oberritter Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ff4ac1beae58a2fea7ec2ad43d6c3b60d90ec61 Author: Barry Scott Date: Fri Sep 9 13:02:29 2005 -0700 [PATCH] dvb: frontend: mt352: fix signal strength reading Fix two problems with the signal strength value in the mt352.c frontend: 1. the 4 most significant bits are zeroed - shift and mask wrong way round 2. need to align the 12 bits from the registers at the top of the 16 bit returned value - otherwise the range is not 0 to 0xffff its 0xf000 to 0xffff Signed-off-by: Barry Scott Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 50b447d5b70dc4021ae3b4eaf8ce98932f61a413 Author: Dominique Dumont Date: Fri Sep 9 13:02:27 2005 -0700 [PATCH] dvb: core: CI timeout fix Patch from Dominique Dumont to get the SCM Red Viaccess CAM working with the budget-ci. Signed-off-by: Dominique Dumont Signed-off-by: Andrew de Quincey Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dad4a73071532448f6cee29791476494a8eb3a58 Author: Andreas Oberritter Date: Fri Sep 9 13:02:26 2005 -0700 [PATCH] dvb: core: dvb_demux formatting fixes Formatting fixes (Lindent + some handwork). Signed-off-by: Andreas Oberritter Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit db574d7d6e38fe37bbb97e2b0a0363b5d2ffa203 Author: Andreas Oberritter Date: Fri Sep 9 13:02:26 2005 -0700 [PATCH] dvb: core: dvb_demux: use INIT_LIST_HEAD Use INIT_LIST_HEAD for frontend_list. Signed-off-by: Andreas Oberritter Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d2cd1631e97f5eb9c8666ff9cd8011cd5c12e7d Author: Andreas Oberritter Date: Fri Sep 9 13:02:24 2005 -0700 [PATCH] dvb: core: dvb_demux: remove more unused cruft Removed more unused variables and constants. Signed-off-by: Andreas Oberritter Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 218721b8ef334a7c778fe3bc033922edef911a1f Author: Andreas Oberritter Date: Fri Sep 9 13:02:24 2005 -0700 [PATCH] dvb: core: dvb_demux: remove unsused descramble callbacks Removed unused descramble_mac_address and descramble_section_payload callbacks. Signed-off-by: Andreas Oberritter Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 936534676ef6c6af389eb9e61de7d725ee79a316 Author: Andreas Oberritter Date: Fri Sep 9 13:02:23 2005 -0700 [PATCH] dvb: core: dvb_demux: remove unused cruft Removed some useless functions and variables. Signed-off-by: Andreas Oberritter Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e0ae280e91a4f69b08770c6ab72808711dd4f2b Author: Andreas Oberritter Date: Fri Sep 9 13:02:22 2005 -0700 [PATCH] dvb: core: dvb_demux: fix continuity counter error handling Don't return immediately from dvb_dmx_swfilter_section_packet() if CC is not ok. Otherwise a new feed drops all packets until the first packet with CC=0 arrives. Signed-off-by: Andreas Oberritter Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c05100528efe997a27d841230f9f5b2f4adf3d0f Author: Andreas Oberritter Date: Fri Sep 9 13:02:21 2005 -0700 [PATCH] dvb: core: glue code for DMX_GET_CAPS and DMX_SET_SOURCE Glue code for DMX_GET_CAPS and DMX_SET_SOURCE ioctls. Signed-off-by: Andreas Oberritter Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3cc2176cbbee6adfaceac2df6d77312cf30cee83 Author: Johannes Stezenbach Date: Fri Sep 9 13:02:20 2005 -0700 [PATCH] dvb: avoid building empty built-in.o Don't build empty built-in.o when DVB/V4L is not configured. Thanks to Sam Ravnborg and Keith Owens. Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34f7373aaec80564cc87b7829e4e2a0e3c20c4b7 Author: Olaf Hering Date: Fri Sep 9 13:02:20 2005 -0700 [PATCH] dvb: remove version.h dependencies Remove all #include and all references to LINUX_VERSION_CODE and KERNEL_VERSION. Based on patch by Olaf Hering. Signed-off-by: Olaf Hering Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a8d995c99ef56a3dbcdbe291bb71658bf00e9ad6 Author: Johannes Stezenbach Date: Fri Sep 9 13:02:19 2005 -0700 [PATCH] dvb: email address update Update email address of Peter Hettkamp. Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 59f4e7d572980a521b7bdba74ab71b21f5995538 Author: Truxton Fulton Date: Fri Sep 9 13:02:18 2005 -0700 [PATCH] fix reboot via keyboard controller reset I have a system (Biostar IDEQ210M mini-pc with a VIA chipset) which will not reboot unless a keyboard is plugged in to it. I have tried all combinations of the kernel "reboot=x,y" flags to no avail. Rebooting by any method will leave the system in a wedged state (at the "Restarting system" message). I finally tracked the problem down to the machine's refusal to fully reboot unless the keyboard controller status register had bit 2 set. This is the "System flag" which when set, indicates successful completion of the keyboard controller self-test (Basic Assurance Test, BAT). I suppose that something is trying to protect against sporadic reboots unless the keyboard controller is in a good state (a keyboard is present), but I need this machine to be headless. I found that setting the system flag (via the command byte) before giving the "pulse reset line" command will allow the reboot to proceed. The patch is simple, and I think it should be fine for everybody whether they have this type of machine or not. This affects the "hard" reboot (as done when the kernel boot flags "reboot=c,h" are used). Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e8dcee3e63f5a2cba4affff4bbb6e228f4b258a Author: Paul Fulghum Date: Fri Sep 9 13:02:17 2005 -0700 [PATCH] synclinkmp.c: fix async internal loopback Fix async internal loopback by not using enable_loopback function which reprograms clocking and should only be used for hdlc mode. Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 166692e4a045348109f66b493e1b41afde6f3769 Author: Paul Fulghum Date: Fri Sep 9 13:02:16 2005 -0700 [PATCH] synclinkmp.c: add statistics clear Add ability to clear statistics. Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 761a444d8d059e4e2de326383b1dec4a636e0a92 Author: Paul Fulghum Date: Fri Sep 9 13:02:15 2005 -0700 [PATCH] synclinkmp.c: disable burst transfers Disable burst transfers on adapter local bus. Hardware feature does not work on latest version of adapter. Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f3edb94564d319cd58cc11c2c986b7ec25643d8 Author: Paul Fulghum Date: Fri Sep 9 13:02:14 2005 -0700 [PATCH] synclinkmp.c: fix double mapping of signals Serial signals were incorrectly mapped twice to events. Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7c1fff58cfaaf1c4b6a31a569e18cb7d2d8db0a6 Author: Paul Fulghum Date: Fri Sep 9 13:02:14 2005 -0700 [PATCH] synclink.c: add loopback to async mode Add internal loopback support for asynchronous mode operation. Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9661239f7f698ba3a79db5e8ab5bb2f4090663d9 Author: Paul Fulghum Date: Fri Sep 9 13:02:13 2005 -0700 [PATCH] synclink.c: add clear stats Add the ability to clear statistics. Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4a918bc233c8b9537fbc05a8bbb33928a4980cc5 Author: Paul Fulghum Date: Fri Sep 9 13:02:12 2005 -0700 [PATCH] synclink.c: compiler optimisation fix Make some fields of DMA descriptor volatile to prevent compiler optimizations. Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9d5c1e1bf2b906966609f8cf4a844e61adb86bcd Author: Andrew Morton Date: Fri Sep 9 13:02:12 2005 -0700 [PATCH] deadline: clean up question mark operator That ?: trick gives us the creeps. Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 24b20ac6e1c80082889b3d6ae08aadda777519e5 Author: Kenji Kaneshige Date: Fri Sep 9 13:02:11 2005 -0700 [PATCH] remove unnecessary handle_IRQ_event() prototypes The function prototype for handle_IRQ_event() in a few architctures is not needed because they use GENERIC_HARDIRQ. Signed-off-by: Kenji Kaneshige Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 73a358d1892a8233801e3fd54668075b52ec42da Author: KUROSAWA Takahiro Date: Fri Sep 9 13:02:10 2005 -0700 [PATCH] fix for cpusets minor problem This patch fixes minor problem that the CPUSETS have when files in the cpuset filesystem are read after lseek()-ed beyond the EOF. Signed-off-by: KUROSAWA Takahiro Acked-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac0b1bc1edbe81c0cb36cad7e7f5b91f4d9e12ed Author: Benjamin LaHaise Date: Fri Sep 9 13:02:09 2005 -0700 [PATCH] aio: kiocb locking to serialise retry and cancel Implement a per-kiocb lock to serialise retry operations and cancel. This is done using wait_on_bit_lock() on the KIF_LOCKED bit of kiocb->ki_flags. Also, make the cancellation path lock the kiocb and subsequently release all references to it if the cancel was successful. This version includes a fix for the deadlock with __aio_run_iocbs. Signed-off-by: Benjamin LaHaise Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f58202bf6b915656e116ece3bc4ace14bfe533a Author: Wendy Cheng Date: Fri Sep 9 13:02:08 2005 -0700 [PATCH] change io_cancel return code for no cancel case Note that other than few exceptions, most of the current filesystem and/or drivers do not have aio cancel specifically defined (kiob->ki_cancel field is mostly NULL). However, sys_io_cancel system call universally sets return code to -EAGAIN. This gives applications a wrong impression that this call is implemented but just never works. We have customer inquires about this issue. Changed by Benjamin LaHaise to EINVAL instead of ENOSYS Signed-off-by: S. Wendy Cheng Acked-by: Benjamin LaHaise Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6f519165a97924ab3eeb99f388718d12ff97f1f4 Author: Deepak Saxena Date: Fri Sep 9 13:02:07 2005 -0700 [PATCH] cs89x0: add netpoll support Signed-off-by: Deepak Saxena Cc: Matt Mackall Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fac92becdaecff64dd91daab0292c5131de92f0d Author: Andrew Stribblehill Date: Fri Sep 9 13:02:04 2005 -0700 [PATCH] bfs: fix endianness, signedness; add trivial bugfix * Makes BFS code endianness-clean. * Fixes some signedness warnings. * Fixes a problem in fs/bfs/inode.c:164 where inodes not synced to disk don't get fully marked as clean. Here's how to reproduce it: # mount -o loop -t bfs /bfs.img /mnt # df -i /mnt Filesystem Inodes IUsed IFree IUse% Mounted on /bfs.img 48 1 47 3% /mnt # df -k /mnt Filesystem 1K-blocks Used Available Use% Mounted on /bfs.img 512 5 508 1% /mnt # cp 60k-archive.zip /mnt/mt.zip # df -k /mnt Filesystem 1K-blocks Used Available Use% Mounted on /bfs.img 512 65 447 13% /mnt # df -i /mnt Filesystem Inodes IUsed IFree IUse% Mounted on /bfs.img 48 2 46 5% /mnt # rm /mnt/mt.zip # echo $? 0 [If the unlink happens before the buffers flush, the following happens:] # df -i /mnt Filesystem Inodes IUsed IFree IUse% Mounted on /bfs.img 48 2 46 5% /mnt # df -k /mnt Filesystem 1K-blocks Used Available Use% Mounted on /bfs.img 512 65 447 13% /mnt fs/bfs/bfs.h | 1 Signed-off-by: Andrew Stribblehill Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 383f2835eb9afb723af71850037b2f074ac9db60 Author: Chen, Kenneth W Date: Fri Sep 9 13:02:02 2005 -0700 [PATCH] Prefetch kernel stacks to speed up context switch For architecture like ia64, the switch stack structure is fairly large (currently 528 bytes). For context switch intensive application, we found that significant amount of cache misses occurs in switch_to() function. The following patch adds a hook in the schedule() function to prefetch switch stack structure as soon as 'next' task is determined. This allows maximum overlap in prefetch cache lines for that structure. Signed-off-by: Ken Chen Cc: Ingo Molnar Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b0d62e6d5b3318b6b722121d945afa295f7201b5 Author: Jason Baron Date: Fri Sep 9 13:02:01 2005 -0700 [PATCH] fix disassociate_ctty vs. fork race Race is as follows. Process A forks process B, both being part of the same session. Then, A calls disassociate_ctty while B forks C: A B ==== ==== fork() copy_signal() dissasociate_ctty() .... attach_pid(p, PIDTYPE_SID, p->signal->session); Now, C can have current->signal->tty pointing to a freed tty structure, as it hasn't yet been added to the session group (to have its controlling tty cleared on the diassociate_ctty() call). This has shown up as an oops but could be even more serious. I haven't tried to create a test case, but a customer has verified that the patch below resolves the issue, which was occuring quite frequently. I'll try and post the test case if i can. The patch simply checks for a NULL tty *after* it has been attached to the proper session group and clears it as necessary. Alternatively, we could simply do the tty assignment after the the process is added to the proper session group. Signed-off-by: Jason Baron Cc: Roland McGrath Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f76baf9365bd66216bf0e0ebfc083e22eda6215b Author: Alexander Krizhanovsky Date: Fri Sep 9 13:01:59 2005 -0700 [PATCH] autofs: fix "busy inodes after umount..." This patch for old autofs (version 3) cleans dentries which are not putted after killing the automount daemon (it's analogue of recent patch for autofs4). Signed-off-by: Alexander Krizhanovsky Cc: Ian Kent Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 28254d439b8c65f93cb331f5aa741efa6a8ec62f Author: Samuel Thibault Date: Fri Sep 9 13:01:58 2005 -0700 [PATCH] vga text console and stty cols/rows Some people use 66-cells braille devices for reading the console, and hence would like to reduce the width of the screen by using: stty cols 66 However, the vga text console doesn't behave correctly: the 14 first characters of the second line are put on the right of the first line and so forth. Here is a patch to correct that. It corrects the disp_end and offset registers of the vga board on console resize and console switch. On usual screens, you then correctly get a right and/or bottom blank margin. On some laptop panels, the output is resized so that text actually gets magnified, which can be great for some people (see http://dept-info.labri.fr/~thibault/ls.jpg ). Signed-off-by: Samuel Thibault Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ff55fe2075e3901db4dbdc00e0b44a71bef97afd Author: Jason Baron Date: Fri Sep 9 13:01:57 2005 -0700 [PATCH] pty_chars_in_buffer oops fix The idea of this patch is to lock both sides of a ptmx/pty pair during line discipline changing. This is needed to ensure that say a poll on one side of the pty doesn't occur while the line discipline is actively being changed. This resulted in an oops reported on lkml, see: http://marc.theaimsgroup.com/?l=linux-kernel&m=111342171410005&w=2 A 'hacky' approach was previously implmemented which served to eliminate the poll vs. line discipline changing race. However, this patch takes a more general approach to the issue. The patch only adds locking on a less often used path, the line-discipline changing path, as opposed to locking the ptmx/pty pair on read/write/poll paths. The patch below, takes both ldisc locks in either order b/c the locks are both taken under the same spinlock(). I thought about locking the ptmx/pty separately, such as master always first but that introduces a 3 way deadlock. For example, process 1 does a blocking read on the slave side. Then, process 2 does an ldisc change on the slave side, which acquires the master ldisc lock but not the slave's. Finally, process 3 does a write which blocks on the process 2's ldisc reference. This patch does introduce some changes in semantics. For example, a line discipline change on side 'a' of a ptmx/pty pair, will now wait for a read/write to complete on the other side, or side 'b'. The current behavior is to simply wait for any read/writes on only side 'a', not both sides 'a' and 'b'. I think this behavior makes sense, but I wanted to point it out. I've tested the patch with a bunch of read/write/poll while changing the line discipline out from underneath. This patch obviates the need for the above "hide the problem" patch. Signed-off-by: Jason Baron Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 69ac59647e66c1b53fb98fe8b6d0f2099cffad60 Author: Chaskiel Grundman Date: Fri Sep 9 13:01:54 2005 -0700 [PATCH] alpha: process_reloc_for_got confuses r_offset and r_addend arch/alpha/kernel/module.c:process_reloc_for_got(), which figures out how big the .got section for a module should be, appears to be confusing r_offset (the file offset that the relocation needs to be applied to) with r_addend (the offset of the relocation's actual target address from the address of the relocation's symbol). Because of this, one .got entry is allocated for each relocation instead of one each unique symbol/addend. In the module I am working with, this causes the .got section to be almost 10 times larger than it needs to be (75544 bytes instead of 7608 bytes). As the .got is accessed with global-pointer-relative instructions, it needs to be within the 64k gp "zone", and a 75544 byte .got clearly does not fit. The result of this is that relocation overflows are detected during module load and the load is aborted. Change struct got_entry/process_reloc_for_got to fix this. Acked-by: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 092c948811359d8715790af0eedefc7dff1cd619 Author: Ashok Raj Date: Fri Sep 9 13:01:53 2005 -0700 [PATCH] x86_64: Don't call enforce_max_cpus when hotplug is enabled enforce_max_cpus nukes out cpu_present_map and cpu_possible_map making it impossible to add new cpus in the system. Since it doesnt provide any additional value apart this call and reference is removed. Signed-off-by: Ashok Raj Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fdf26d933a8171c2a5bd35b4a5ca3b099a216a35 Author: Ashok Raj Date: Fri Sep 9 13:01:52 2005 -0700 [PATCH] x86_64: Don't do broadcast IPIs when hotplug is enabled in flat mode. The use of non-shortcut version of routines breaking CPU hotplug. The option to select this via cmdline also is deleted with the physflat patch, hence directly placing this code under CONFIG_HOTPLUG_CPU. We dont want to use broadcast mode IPI's when hotplug is enabled. This causes bad effects in send IPI to a cpu that is offline which can trip when the cpu is in the process of being kicked alive. Signed-off-by: Ashok Raj Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c7fc7220f6a3cce9b3f4bd66362176df67df577 Author: Andrea Arcangeli Date: Fri Sep 9 13:01:51 2005 -0700 [PATCH] i386: seccomp fix for auditing/ptrace This is the same issue as ppc64 before, when returning to userland we shouldn't re-compute the seccomp check or the task could be killed during sigreturn when orig_eax is overwritten by the sigreturn syscall. This was found by Roland. This was harmless from a security standpoint, but some i686 users reported failures with auditing enabled system wide (some distro surprisingly makes it the default) and I reproduced it too by keeping the whole workload under strace -f. Patch is tested and works for me under strace -f. nobody@athlon:~/cpushare> strace -o /tmp/o -f python seccomp_test.py make: Nothing to be done for `seccomp_test'. Starting computing some malicious bytecode init load start stop receive_data failure kill exit_code 0 signal 9 The malicious bytecode has been killed successfully by seccomp Starting computing some safe bytecode init load start stop 174 counts kill exit_code 0 signal 0 The seccomp_test.py completed successfully, thank you for testing. (akpm: collaterally cleaned up a bit of do_syscall_trace() too) Signed-off-by: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4d666d7ada2e14d71d463c85b8b5ef2e2e6723f2 Author: Yoichi Yuasa Date: Fri Sep 9 13:01:49 2005 -0700 [PATCH] mips: add TANBAC TB0287 support Add TANBAC TB0287 support. Signed-off-by: Yoichi Yuasa Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 95409aaca734700e8dcba9db685b8600b67ba05d Author: Tom Rini Date: Fri Sep 9 13:01:48 2005 -0700 [PATCH] ppc32: Kill PVR_440* defines The following patch changes the usages of PVR_440* into strcmp's with the cpu_name field, and removes the defines altogether. The Ebony portion was briefly tested long ago. One benefit of moving from PVR-tests to string tests in general is that not all CPUs can be on and be able to do this type of comparison. See http://patchwork.ozlabs.org/linuxppc/patch?id=1250 for the original thread. Signed-off-by: Tom Rini Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66b375bf7d9c995fd6169191c3862071e710f456 Author: Tom Rini Date: Fri Sep 9 13:01:47 2005 -0700 [PATCH] ppc32: In the boot code, don't rely on BASE_BAUD directly Modifies serial_init to get base baud rate from the rs_table entry instead of BAUD_BASE. This patch eliminates duplication between the SERIAL_PORT_DFNS macro and BAUD_BASE. Without the patch, if a port set the baud rate in SERIAL_PORT_DFNS, but did not update BASE_BAUD, the BASE_BAUD value would still be used. Signed-off-by: Grant Likely Signed-off-by: Tom Rini Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 99cc2192132ab28c495d015ed2e95dc29e2a27ad Author: Frank van Maarseveen Date: Fri Sep 9 13:01:46 2005 -0700 [PATCH] ppc32: Correct an instruction in the boot code In the flush and invalidate bootcode on PPC4xx we were accidentally using the wrong instruction. Use cmplw, which reads from a register like we want. Signed-off-by: Tom Rini Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 83f7da8acd81354e921ff12d6efbeae5b1a5d6a4 Author: Marcelo Tosatti Date: Fri Sep 9 13:01:45 2005 -0700 [PATCH] ppc32: make perfmon.o CONFIG_E500 specific Subject says it all, there is no need to link perfmon.o on sub-architectures other than CONFIG_E500. Signed-off-by: Marcelo Tosatti Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e31e14ec356f36b131576be5bc31d8fef7e95483 Author: Stephen Smalley Date: Fri Sep 9 13:01:45 2005 -0700 [PATCH] remove the inode_post_link and inode_post_rename LSM hooks This patch removes the inode_post_link and inode_post_rename LSM hooks as they are unused (and likely useless). Signed-off-by: Stephen Smalley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a74574aafea3a63add3251047601611111f44562 Author: Stephen Smalley Date: Fri Sep 9 13:01:44 2005 -0700 [PATCH] Remove security_inode_post_create/mkdir/symlink/mknod hooks This patch removes the inode_post_create/mkdir/mknod/symlink LSM hooks as they are obsoleted by the new inode_init_security hook that enables atomic inode security labeling. If anyone sees any reason to retain these hooks, please speak now. Also, is anyone using the post_rename/link hooks; if not, those could also be removed. Signed-off-by: Stephen Smalley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 570bc1c2e5ccdb408081e77507a385dc7ebed7fa Author: Stephen Smalley Date: Fri Sep 9 13:01:43 2005 -0700 [PATCH] tmpfs: Enable atomic inode security labeling This patch modifies tmpfs to call the inode_init_security LSM hook to set up the incore inode security state for new inodes before the inode becomes accessible via the dcache. As there is no underlying storage of security xattrs in this case, it is not necessary for the hook to return the (name, value, len) triple to the tmpfs code, so this patch also modifies the SELinux hook function to correctly handle the case where the (name, value, len) pointers are NULL. The hook call is needed in tmpfs in order to support proper security labeling of tmpfs inodes (e.g. for udev with tmpfs /dev in Fedora). With this change in place, we should then be able to remove the security_inode_post_create/mkdir/... hooks safely. Signed-off-by: Stephen Smalley Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac50960afa31877493add6d941d8402fa879c452 Author: Stephen Smalley Date: Fri Sep 9 13:01:41 2005 -0700 [PATCH] ext3: Enable atomic inode security labeling This patch modifies ext3 to call the inode_init_security LSM hook to obtain the security attribute for a newly created inode and to set the resulting attribute on the new inode as part of the same transaction. This parallels the existing processing for setting ACLs on newly created inodes. Signed-off-by: Stephen Smalley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 10f47e6a1b8b276323b652053945c87a63a5812d Author: Stephen Smalley Date: Fri Sep 9 13:01:39 2005 -0700 [PATCH] ext2: Enable atomic inode security labeling This patch modifies ext2 to call the inode_init_security LSM hook to obtain the security attribute for a newly created inode and to set the resulting attribute on the new inode. This parallels the existing processing for setting ACLs on newly created inodes. Signed-off-by: Stephen Smalley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e41ff9e0650f327a6c819841fa412da95d57319 Author: Stephen Smalley Date: Fri Sep 9 13:01:35 2005 -0700 [PATCH] security: enable atomic inode security labeling The following patch set enables atomic security labeling of newly created inodes by altering the fs code to invoke a new LSM hook to obtain the security attribute to apply to a newly created inode and to set up the incore inode security state during the inode creation transaction. This parallels the existing processing for setting ACLs on newly created inodes. Otherwise, it is possible for new inodes to be accessed by another thread via the dcache prior to complete security setup (presently handled by the post_create/mkdir/... LSM hooks in the VFS) and a newly created inode may be left unlabeled on the disk in the event of a crash. SELinux presently works around the issue by ensuring that the incore inode security label is initialized to a special SID that is inaccessible to unprivileged processes (in accordance with policy), thereby preventing inappropriate access but potentially causing false denials on legitimate accesses. A simple test program demonstrates such false denials on SELinux, and the patch solves the problem. Similar such false denials have been encountered in real applications. This patch defines a new inode_init_security LSM hook to obtain the security attribute to apply to a newly created inode and to set up the incore inode security state for it, and adds a corresponding hook function implementation to SELinux. Signed-off-by: Stephen Smalley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f5ee56cc184e0944ebc9ff1691985219959596f6 Author: Ralf Baechle Date: Fri Sep 9 13:01:32 2005 -0700 [PATCH] txx9 serial update Support for the new RBHMA4500 eval board for the TX4938. General update from the 8250 ancestor of this driver. Replace use of deprecated interfaces. Signed-off-by: Ralf Baechle Signed-off-by: Atsushi Nemoto Acked-by: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fef266580e5cf897a1b63528fc6b1185e2d6bb87 Author: Mark Fasheh Date: Fri Sep 9 13:01:31 2005 -0700 [PATCH] update filesystems for new delete_inode behavior Update the file systems in fs/ implementing a delete_inode() callback to call truncate_inode_pages(). One implementation note: In developing this patch I put the calls to truncate_inode_pages() at the very top of those filesystems delete_inode() callbacks in order to retain the previous behavior. I'm guessing that some of those could probably be optimized. Signed-off-by: Mark Fasheh Acked-by: Christoph Hellwig Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e85b565233236a2a833adea73fb2f0e0f8fa2a61 Author: Mark Fasheh Date: Fri Sep 9 13:01:29 2005 -0700 [PATCH] move truncate_inode_pages() into ->delete_inode() Allow file systems supporting ->delete_inode() to call truncate_inode_pages() on their own. OCFS2 wants this so it can query the cluster before making a final decision on whether to wipe an inode from disk or not. In some corner cases an inode marked on the local node via voting may not actually get orphaned. A good example is node death before the transaction moving the inode to the orphan dir commits to the journal. Without this patch, the truncate_inode_pages() call in generic_delete_inode() would discard valid data for such inodes. During earlier discussion in the 2.6.13 merge plan thread, Christoph Hellwig indicated that other file systems might also find this useful. IMHO, the best solution would be to just allow ->drop_inode() to do the cluster query but it seems that would require a substantial reworking of that section of the code. Assuming it is safe to call write_inode_now() in ocfs2_delete_inode() for those inodes which won't actually get wiped, this solution should get us by for now. Trivial testing of this patch (and a related OCFS2 update) has shown this to avoid the corruption I'm seeing. Signed-off-by: Mark Fasheh Acked-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f6fd5db2dbc28d475d67f9a6b041fefe1d6f7c8 Author: Kumar Gala Date: Fri Sep 9 13:01:26 2005 -0700 [PATCH] ppc32: Fix Kconfig mismerge Looks like the help comment for MPC834x got merged incorrectly. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit abda24528ac3045511fb59291a2d6ccbddf30eda Author: Magnus Damm Date: Fri Sep 9 13:01:23 2005 -0700 [PATCH] i386: CONFIG_ACPI_SRAT typo fix Fix a typo involving CONFIG_ACPI_SRAT. Signed-off-by: Magnus Damm Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b5d37ac02954572e80e09255bb5737277aaee8e Author: Giancarlo Formicuccia Date: Fri Sep 9 13:01:22 2005 -0700 [PATCH] Clear task_struct->fs_excl on fork() An oversight. We don't want to carry the IO scheduler's "we hold exclusive fs resources" hint over to the child across fork(). Acked-by: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1299232b5743da454c73853b90b3d2d83dce1737 Author: Andrew Morton Date: Fri Sep 9 13:01:21 2005 -0700 [PATCH] x86: MP_processor_info fix Remove the weird and apparently unnecessary logic in MP_processor_info() which assumes that the BSP is the first one to run MP_processor_info(). On one of my boxes that isn't true and cpu_possible_map gets the wrong value. Cc: Zwane Mwaikambo Cc: Alexander Nyberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0037c78a96bb391635bff103d401c24459c5092d Author: Sam Ravnborg Date: Fri Sep 9 22:47:53 2005 +0200 kbuild: frv,m32r,sparc64 introduce fake asm-offsets.h file Needed to get them to build. And a hint to avoid hardcoding to many constants in assembler. Signed-off-by: Sam Ravnborg commit 1325cc79163058739b70bed9860fccbecac6236b Author: Hal Rosenstock Date: Fri Sep 9 13:45:51 2005 -0700 [PATCH] IB: Define more SA methods ib_sa.h: Define more SA methods (initially for madeye decode) Signed-off-by: Hal Rosenstock Signed-off-by: Roland Dreier commit 5a0773698c51fdcec7eb361b6b819669ed1d249e Author: Sam Ravnborg Date: Fri Sep 9 22:44:31 2005 +0200 kbuild: cris use generic asm-offsets.h support Cris has a dedicated asm-offsets.c file per subarchitecture. So a symlink is created to put the desired asm-offsets.c file in $(ARCH)/kernel This is absolutely not good practice, but it was the trick used in the rest of the cris code. Signed-off-by: Sam Ravnborg commit cb7b593c2c808b32a1ea188599713c434b95f849 Author: Stephen Hemminger Date: Fri Sep 9 13:35:42 2005 -0700 [IPV4] fib_trie: fix proc interface Create one iterator for walking over FIB trie, and use it for all the /proc functions. Add a /proc/net/route output for backwards compatibility with old applications. Make initialization of fib_trie same as fib_hash so no #ifdef is needed in af_inet.c Fixes: http://bugzilla.kernel.org/show_bug.cgi?id=5209 Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 048eb582f3f89737d4a29668de9935e6feea7c36 Author: Sam Ravnborg Date: Fri Sep 9 22:32:31 2005 +0200 kbuild: mips use generic asm-offsets.h support Removed obsolete stuff from arch makefile. mips had a special rule for generating asm-offsets.h so preserved it using an architecture specific hook in top-level Kbuild file. Renamed .h file to asm-offsets.h Signed-off-by: Sam Ravnborg commit 39e01cb874cbf694bd0b0c44f54c4f270e2aa556 Author: Sam Ravnborg Date: Fri Sep 9 22:03:13 2005 +0200 kbuild: ia64 use generic asm-offsets.h support Delete obsolete stuff from arch Makefile Rename file to asm-offsets.h The trick used in the arch Makefile to circumvent the circular dependency is kept. Signed-off-by: Sam Ravnborg commit fb61a8615fce15f30b1bb1cf265ed05e251b9ed8 Author: Sam Ravnborg Date: Fri Sep 9 21:39:46 2005 +0200 kbuild: v850 use generic asm-offsets.h support Deleted obsolete stuff from arch makefile Renamed .c file to asm-offsets.h Fix include of asm-offsets.h to use new name Signed-off-by: Sam Ravnborg commit e2d5df935d8a82cb7a2c50726628fa928aa89b9b Author: Sam Ravnborg Date: Fri Sep 9 21:28:48 2005 +0200 kbuild: alpha,x86_64 use generic asm-offsets.h support Delete obsolete stuff from arch makefiles Rename .h file to asm-offsets.h Signed-off-by: Sam Ravnborg commit e6ae744dd2eae8e00af328b11b1fe77cb0931136 Author: Sam Ravnborg Date: Fri Sep 9 21:08:59 2005 +0200 kbuild: arm - use generic asm-offsets.h support Delete obsoleted stuff from arch Makefile and rename constants.h to asm-offsets.h Signed-off-by: Sam Ravnborg commit 0013a85454c281faaf064ccb576e373a2881aac8 Author: Sam Ravnborg Date: Fri Sep 9 20:57:26 2005 +0200 kbuild: m68k,parisc,ppc,ppc64,s390,xtensa use generic asm-offsets.h support Delete obsoleted parts form arch makefiles and rename to asm-offsets.h Signed-off-by: Sam Ravnborg commit 47003497dd819b10874a2291e54df7dc5cf8be57 Author: Sam Ravnborg Date: Fri Sep 9 20:35:55 2005 +0200 kbuild: arm26,sparc use generic asm-offset support Rename all includes to use asm-offsets.h to match generic name Signed-off-by: Sam Ravnborg commit cca6e6f5f473ec63e85c87dfc77279ce1ca114e6 Author: Sam Ravnborg Date: Fri Sep 9 20:28:49 2005 +0200 kbuild: h8300,m68knommu,sh,sh64 use generic asm-offsets.h support h8300, m68knommu, sh and sh64 all used the name asm-offsets.h so minimal changes required. Signed-off-by: Sam Ravnborg commit 144a50ea5e1487b8b8e722289b4177713354448a Author: Dave Jones Date: Tue Aug 9 00:20:10 2005 -0400 [PATCH] must_check attributes for PCI layer. Self explanatory really. Some newer gcc's print a warning if a function is used and we don't check its result. We do this for a bunch of things in the kernel already, this extends that to the PCI layer. Based on a patch originally from Arjan van de Ven. Signed-off-by: Dave Jones Signed-off-by: Arjan van de Ven Signed-off-by: Greg Kroah-Hartman commit 7bcf5c0e7fd9ab4ddb9e24d7e91bda2ac23e5678 Author: Greg Kroah-Hartman Date: Thu Aug 18 14:33:01 2005 +1000 [PATCH] PCI: move pci core to use add_hotplug_env_var() This fixes a bug in the environment variables for all PCI device hotplug calls. Thanks to Kay Sievers for pointing out the problem. Signed-off-by: Greg Kroah-Hartman commit daad56661d56cc382948fc95b74e17d3326b901b Author: Richard Purdie Date: Fri Sep 9 18:54:04 2005 +0100 [ARM] 2894/1: Sharp Scoop driver pm_message_t type fix Patch from Richard Purdie Fix a pm_message_t type warning in the Sharp scoop driver Signed-off-by: Richard Purdie Signed-off-by: Russell King commit aa6c2e794f7e1f54dc52c84471c750327fa21ccd Author: Richard Purdie Date: Fri Sep 9 18:54:03 2005 +0100 [ARM] 2893/1: [MMC] Update corgi to use the new mmc delayed detection function Patch from Richard Purdie We can remove this timer and its associated code from the corgi platform code now mmc_detect_change() and the pxamci code support an optional delay. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 5dce225bd9ea60e28e17076de63df0dee51b2883 Author: viro@ZenIV.linux.org.uk Date: Fri Sep 9 18:31:38 2005 +0100 [PATCH] Fix CONFIG_ACPI_BLACKLIST_YEAR This makes ACPI_BLACKLIST_YEAR be consistently defined when ACPI is enabled, regardless of whether we're on x86 or not, and thus avoids bogus -Wundef warnings on ia64. Signed-off-by: Linus Torvalds commit 0b968d23610d65a46299347b141a687e207bd294 Author: Karsten Wiese Date: Fri Sep 9 12:59:04 2005 +0200 [PATCH] Fix misspelled i8259 typo in io_apic.c The legacy PIC's name is "i8259". Signed-off-by: Karsten Wiese Signed-off-by: Vojtech Pavlik Signed-off-by: Linus Torvalds commit 9b9eb8c06177f07657ad35440b56cbf68e1d253b Author: Russell King Date: Fri Sep 9 18:35:12 2005 +0100 [ARM] sys_mbind needs wrapping sys_mbind is a 6-arg syscall, hence needs wrapping to save the sixth argument. Signed-off-by: Russell King commit fc0b1af2571cd56f8f2b218ef72b911135c0e37a Author: viro@ZenIV.linux.org.uk Date: Fri Sep 9 17:18:14 2005 +0100 [PATCH] __user annotations for pointers in i386 sigframe Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 85c39206ac556c9dd7345465ea5265c1f33e50d1 Author: viro@ZenIV.linux.org.uk Date: Fri Sep 9 17:15:13 2005 +0100 [PATCH] uaccess.h annotations (uml) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 2624f124b3b5d550ab2fbef7ee3bc0e1fed09722 Author: viro@ZenIV.linux.org.uk Date: Fri Sep 9 17:14:12 2005 +0100 [PATCH] sparse on uml (infrastructure bits) Passes -m64 to sparse on uml/amd64, tells sparse to stay out of USER_OBJS. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit f91f4d923f4039bf3460eca299ed5a3f7ecd7b96 Author: viro@ZenIV.linux.org.uk Date: Fri Sep 9 17:02:51 2005 +0100 [PATCH] gratuitous includes of asm/serial.h Removed gratuitous includes of asm/serial.h in synklinkmp and ip2main. Allows to remove the rest of "broken on sparc32" in drivers/char - this stuff doesn't break the build anymore. Since it got zero testing, it almost certainly won't work there, though... Signed-off-by: Al Viro Acked-by: Russell King Signed-off-by: Linus Torvalds commit d310a35a487388859432648daa2ea4fc5e51c049 Author: viro@ZenIV.linux.org.uk Date: Fri Sep 9 16:56:05 2005 +0100 [PATCH] missing CHECKFLAGS on s390 Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 3f70353ea91ad77c83500e70507a239b2ab0c980 Author: viro@ZenIV.linux.org.uk Date: Fri Sep 9 16:53:56 2005 +0100 [PATCH] bogus cast in bio.c void * is not the same as void *... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 6c9afc655d4df902211d00a437e893881cdef588 Author: viro@ZenIV.linux.org.uk Date: Fri Sep 9 16:50:43 2005 +0100 [PATCH] basic iomem annotations (ppc64) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 86feeaa8120bb1b0ab21efed49e9754039395ef1 Author: Sam Ravnborg Date: Fri Sep 9 19:28:28 2005 +0200 kbuild: full dependency check on asm-offsets.h Building asm-offsets.h has been moved to a seperate Kbuild file located in the top-level directory. This allow us to share the functionality across the architectures. The old rules in architecture specific Makefiles will die in subsequent patches. Furhtermore the usual kbuild dependency tracking is now used when deciding to rebuild asm-offsets.s. So we no longer risk to fail a rebuild caused by asm-offsets.c dependencies being touched. With this common rule-set we now force the same name across all architectures. Following patches will fix the rest. Signed-off-by: Sam Ravnborg commit 2fd9d74b35efa9823f1f7d34cb421e2b9eee9650 Author: Brett M Russ Date: Fri Sep 9 10:02:22 2005 -0700 [PATCH] PCI: PCI/libata INTx bug fix Previous INTx cleanup patch had a bug that was not caught. I found this last night during testing and can confirm that it is now 100% working. Signed-off-by: Brett Russ Signed-off-by: Greg Kroah-Hartman Acked-by: Jeff Garzik Signed-off-by: Linus Torvalds commit e91442b635be776ea205fba233bdd5bc74b62bc3 Author: James Bottomley Date: Fri Sep 9 10:44:16 2005 -0500 [SCSI] SCSI core: fix leakage of scsi_cmnd's From: Alan Stern This patch (as559b) adds a new routine, scsi_unprep_request, which gets called every place a request is requeued. (That includes scsi_queue_insert as well as scsi_requeue_command.) It also changes scsi_kill_requests to make it call __scsi_done with result equal to DID_NO_CONNECT << 16. (I'm not sure if it's necessary to call scsi_init_cmd_errh here; maybe you can check on that.) Finally, the patch changes the return value from scsi_end_request, to avoid returning a stale pointer in the case where the request was requeued. Fortunately the return value is used in only place, and the change actually simplified it. Signed-off-by: Alan Stern Rejections fixed up and Signed-off-by: James Bottomley commit 286f3e13a1dc7f32407629fbd7aabc8ea78c62b5 Author: Neil Brown Date: Fri Sep 2 13:13:54 2005 +1000 [SCSI] fix possible deadlock in scsi_lib.c If a filesystem, while writing out data, decides that it is good to issue a cache flush on a SCSI drive (or other 'sd' device), it will call blkdev_issue_flush which calls ->issue_flush_fn which is scsi_issue_flush_fn. This calls sd_issue_flush which calls sd_sync_cache, which calls scsi_execute_request. This will (as sshdr != NULL) call kmalloc(SCSI_SENSE_BUFFERSIZE, GFP_KERNEL) If memory is tight, the presence of GFP_KERNEL may cause write requests to be sent to some filesystem to free up memory, however if that filesystem is waiting for the issue_flush_fn to complete, you could get a deadlock. I wonder if it might be more appropriate to use GFP_NOIO as in the following patch. I wonder if it might be even more appropriate to cope better with a kmalloc failure, especially as in this use, sd_sync_cache only will use the sense information to print out a more informative error message. Signed-off-by: Neil Brown Signed-off-by: James Bottomley commit 903f4fed858a7b56b260cbd55d174fe54d188fb7 Author: Alan Stern Date: Tue Jul 26 10:20:53 2005 -0400 [SCSI] fix callers of scsi_remove_device() who already hold the scan muted This patch (as544) adds a private entry point to scsi_remove_device, for use when callers already own the scan_mutex. The appropriate callers are modified to use the new entry point. Signed-off-by: Alan Stern Signed-off-by: James Bottomley commit e517d3133f62c27b211f305a6dbd6f6ccac0db1b Author: Alan Stern Date: Tue Jul 26 10:18:45 2005 -0400 [SCSI] add missing scan mutex to scsi_scan_target() This patch (as543) adds a private entry point to scsi_scan_target, for use when the caller already owns the scan_mutex, and updates the kerneldoc for that routine (which was badly out-of-date). It converts scsi_scan_channel to use the new entry point. Lastly, it modifies scsi_get_host_dev to make it acquire the scan_mutex, necessary since the routine adds a new scsi_device even if it doesn't do any actual scanning. Signed-off-by: Alan Stern Signed-off-by: James Bottomley commit 6f0d618f0e9b8025d1c3531e82d7cc8455e79394 Author: Russell King Date: Fri Sep 9 16:17:58 2005 +0100 [SERIAL] Spelling fix in 8250.c Signed-off-by: Russell King commit 35efb606e544403835df48cd240441a8e089c80b Author: Russell King Date: Fri Sep 9 15:57:17 2005 +0100 [ARM] Fix typo in arch/arm/Kconfig.debug It's called printch, not printchar Signed-off-by: Russell King commit b2ad7b5e8115582cdf5bbda065aa516c24d62c21 Author: Paul Mackerras Date: Fri Sep 9 23:02:36 2005 +1000 Allow PCI config space syscalls to be used by 64-bit processes. The pciconfig_iobase, pciconfig_read and pciconfig_write system calls were only implemented for 32-bit processes; for 64-bit processes they returned an ENOSYS error. This allows them to be used by 64-bit processes as well. The X server uses pciconfig_iobase at least, and this change is necessary to allow a 64-bit X server to work on my G5. Signed-off-by: Paul Mackerras commit 766375362a1dcac63dc0c0fb61ce4143c8de63d9 Author: Arthur Othieno Date: Sat Aug 20 21:48:47 2005 -0400 [PATCH] ppc64: Big-endian I/O memory accessors. I/O memory accessors. Big-endian version. For those busses/devices that do export big-endian I/O memory. Of notable relevance/reference: http://lwn.net/Articles/132804/ http://ozlabs.org/pipermail/linuxppc-embedded/2005-August/019798.html http://ozlabs.org/pipermail/linuxppc-embedded/2005-August/019752.html Signed-Off-By: Arthur Othieno Signed-off-by: Paul Mackerras commit 1635317facea3094ddf34082cd86797efb1d9f7e Author: Paul Mackerras Date: Tue Sep 6 13:17:54 2005 +1000 [PATCH] Separate pci bits out of struct device_node This patch pulls the PCI-related junk out of struct device_node and puts it in a separate structure, struct pci_dn. The device_node now just has a void * pointer in it, which points to a struct pci_dn for nodes that represent PCI devices. It could potentially be used in future for device-specific data for other sorts of devices, such as virtual I/O devices. Signed-off-by: Paul Mackerras commit b28d2582ce8aafe531d909bb9c4dcf29189e786e Author: Kumar Gala Date: Wed Aug 24 11:56:56 2005 -0500 [PATCH] ppc64: remove use of asm/segment.h Remove asm-ppc64/segment.h now that all users are gone. Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras commit 3cc747e96480d4e26560e5bc59f2b9c9204ade0e Author: Mark Bellon Date: Tue Sep 6 15:50:02 2005 -0700 [PATCH] PPC64: large INITRD causes kernel not to boot In PPC64 there are number of problems in arch/ppc64/boot/main.c that prevent a kernel from making use of a large (greater than ~16MB) INITRD. This is 64 bit architecture and really large INITRD images should be possible. Simply put the existing code has a fixed reservation (claim) address and once the kernel plus initrd image are large enough to pass this address all sorts of bad things occur. The fix is the dynamically establish the first claim address above the loaded kernel plus initrd (plus some "padding" and rounding). If PROG_START is defined this will be used as the minimum safe address - currently known to be 0x01400000 for the firmwares tested so far. Signed-off-by: Mark Bellon Signed-off-by: Paul Mackerras commit f9526785d8a03fd0e21f9cfc951adc03bde1c395 Author: jdl@freescale.com Date: Thu Sep 8 14:05:49 2005 -0500 [PATCH] powerpc: Fix __power64__ typos that should be __powerpc64__ Fix __power64__ typo that should be __powerpc64__ instead. Signed-off-by: Jon Loeliger Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras commit e4df7671716f1fffb3437a7c1a14e3d2465fefef Author: Geoff Levand Date: Wed Aug 10 17:57:42 2005 -0700 [PATCH] ppc64: makefile cleanup This patch cleans up the output generated by ppc64 builds. Signed-off-by: Geoff Levand Signed-off-by: Paul Mackerras commit a24c8481b6439cb151a4750cc278ea2df4fb0e53 Author: Geoff Levand Date: Mon Aug 15 13:59:13 2005 -0700 [PATCH] ppc64: zimage build fix Signed-off-by: Geoff Levand Signed-off-by: Paul Mackerras commit dd56fdf23dfa0127d512b73d4238dbd2b5a7c1eb Author: jdl@freescale.com Date: Wed Sep 7 15:59:48 2005 -0500 [PATCH] powerpc: Merge a few more include files Merge a few asm-ppc and asm-ppc64 header files. Note: the merge of setup.h intentionally does not carry forward the m68k cruft. That means this patch continues to break the already broken amiga on the ppc32. Signed-off-by: Jon Loeliger Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras commit 64807081e38703617cf9a5d71db14ea2b3e1cb04 Author: jdl@freescale.com Date: Wed Sep 7 15:56:20 2005 -0500 [PATCH] powerpc: Make check_bugs() static inline Make check_bugs() static inline and remove it from syscalls.c. Signed-off-by: Jon Loeliger Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras commit a37c8875a764b4decf941859f4a2c63e1e86c8fa Author: jdl@freescale.com Date: Wed Sep 7 15:27:09 2005 -0500 [PATCH] powerpc: Standardize on _ASM_POWERPC header symbol prefix Standardize on _ASM_POWERPC_... prefix for all #include exclusion symbols. Fixup all the non-compilers. Signed-off-by: Jon Loeliger Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras commit 38c0ff06d5ba05b6fbf18652c49747ad320aaeb0 Author: Stephen Rothwell Date: Wed Sep 7 19:52:38 2005 +1000 [PATCH] ppc64: iSeries early printk breakage The earlier commit 8d9273918635f0301368c01b56c03a6f339e8d51 (Consolidate early console and PPCDBG code) broke iSeries because it caused unregister_console(&udbg_console) to be called unconditionally. iSeries never registers the udbg_console. This just reverts part of the change. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 34b5233f379847097a1925a02b62f129c407c1e4 Author: Michael Ellerman Date: Tue Sep 6 21:00:02 2005 +1000 [PATCH] ppc64: Fix oops for !CONFIG_NUMA The SPARSEMEM EXTREME code (802f192e4a600f7ef84ca25c8b818c8830acef5a) that went in yesterday broke PPC64 for !CONFIG_NUMA. The problem is that (free|reserve)_bootmem don't take a page number as their first argument, they take an address. Ruh roh. Booted on P5 LPAR, iSeries and G5. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit a84195f36e373001e6eed2e95a5dc1994cf30480 Author: Arnd Bergmann Date: Thu Aug 18 19:35:21 2005 +0200 [PATCH] ppc64: fix IPI on bpa_iic This fixes a severe bug in the bpa_iic driver that caused all sorts of problems. We had been using incorrect priority values for inter processor interrupts, which resulted in always doing CALL_FUNCTION instead of RESCHEDULE or DEBUGGER_BREAK. The symptoms cured by this patch include bad performance on SMP systems spurious kernel panics in the IPI code. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 9c2c389307c03a35672c80725ccf7968656d87ef Author: Russell King Date: Fri Sep 9 11:12:51 2005 +0100 [ARM] Add memory type based allocation syscalls Add syscall numbers and syscall table entries for mbind, set_mempolicy and get_mempolicy. Signed-off-by: Russell King commit 59725dc2a2e86a03bbf97976ede3bdc6f95bba92 Author: Arnaldo Carvalho de Melo Date: Fri Sep 9 02:40:58 2005 -0300 [CCID3] Introduce ccid3_hc_[rt]x_sk() for overal consistency Signed-off-by: Arnaldo Carvalho de Melo commit b0e567806d16586629468c824dfb2e71155df7da Author: Arnaldo Carvalho de Melo Date: Fri Sep 9 02:38:35 2005 -0300 [DCCP] Introduce dccp_timestamp To start the timestamps with 0.0ms, easing the integer maths in the CCIDs, this probably will be reworked to use the to be introduced struct timeval_offset infrastructure out of skb_get_timestamp, etc. Signed-off-by: Arnaldo Carvalho de Melo commit 954ee31f366fabe53fb450482789258fe552f40b Author: Arnaldo Carvalho de Melo Date: Fri Sep 9 02:37:05 2005 -0300 [CCID3] Initialize more fields in ccid3_hc_rx_init The initialization of ccid3hcrx_rtt to 5ms is just a bandaid, I'll continue auditing the CCID3 HC rx codebase to fix this properly, probably I'll add a feedback timer as suggested in the CCID3 draft. Signed-off-by: Arnaldo Carvalho de Melo commit b3a3077d963fc54a25be26e2e84fe9f4327c1e12 Author: Arnaldo Carvalho de Melo Date: Fri Sep 9 02:34:10 2005 -0300 [CCID3] Make the ccid3hcrx_rtt calc look more like the ccid3hctx_rtt one Signed-off-by: Arnaldo Carvalho de Melo commit 1a28599a2c2781dd6af72f4f84175e2db74d3bb1 Author: Arnaldo Carvalho de Melo Date: Fri Sep 9 02:32:56 2005 -0300 [CCID3] Use ELAPSED_TIME in the HC TX RTT estimation Signed-off-by: Arnaldo Carvalho de Melo commit 1c14ac0ae8eb62cbb40af1e31b156994c7d7d3d5 Author: Arnaldo Carvalho de Melo Date: Fri Sep 9 02:32:01 2005 -0300 [DCCP] Give precedence to the biggest ELAPSED_TIME We can get this value in an TIMESTAMP_ECHO and/or in an ELAPSED_TIME option, if receiving both give precendence to the biggest one. In my tests they are very close if not equal at all times, so we may well think about removing the code in CCID3 that inserts this option and leaving this to the core, and perhaps even use just TIMESTAMP_ECHO including the elapsed time. Signed-off-by: Arnaldo Carvalho de Melo commit 27ae543e6f116df66e2b19ff0a3aa1053e4784d8 Author: Arnaldo Carvalho de Melo Date: Fri Sep 9 02:31:07 2005 -0300 [CCID3] Calculate ccid3hcrx_x_recv using usecs_div Signed-off-by: Arnaldo Carvalho de Melo commit 507d37cf269ebbd1b32bcc435fe577e411f73151 Author: Arnaldo Carvalho de Melo Date: Fri Sep 9 02:30:07 2005 -0300 [CCID] Only call the HC insert_options methods when requested Signed-off-by: Arnaldo Carvalho de Melo commit 0ba7a3ba6608de6e0c0bfe3009a63d7e0b7ab0ce Author: Arnaldo Carvalho de Melo Date: Fri Sep 9 02:28:47 2005 -0300 [CCID3] Avoid unsigned integer overflows in usecs_div Signed-off-by: Arnaldo Carvalho de Melo commit 8add788574694c5aed04fcb281a5c999e40cd8f6 Author: Jeff Garzik Date: Thu Sep 8 23:07:29 2005 -0400 [libata] minor fixes * sata_mv: remove pci_intx(), now that the same function is in PCI core * sata_sis: fix variable initialization bug, trim trailing whitespace commit c9fc0d6a6901e7f06c6bbd0061e503d96464266d Author: Nathan Scott Date: Fri Sep 9 11:38:09 2005 +1000 [XFS] Revert recent quota Makefile change, not in a fit state for merging. Signed-off-by: Nathan Scott commit 03981f2427c767cfcd917cb51197c43fe68ba5db Author: Greg Ungerer Date: Fri Sep 9 09:32:14 2005 +1000 [PATCH] m68knommu: extract common timer code for 68EZ328 processor Rework the 68x328 configuration and setup code. All 68x328 varients share the same timer hardware. So extract that into its own file, instead of keeping copies in each processors setup code. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit d9b9d5ddb827dc36cc1f7214f5818640e1bc22d5 Author: Greg Ungerer Date: Fri Sep 9 09:32:14 2005 +1000 [PATCH] m68knommu: include ColdFire 523x processor register definitions Include the ColdFire 523x register definitions when compiling for that target processor. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 75003c4812ae23a8a99e9921bbe66ffb0e784c8e Author: Greg Ungerer Date: Fri Sep 9 09:32:14 2005 +1000 [PATCH] m68knommu: create common timer code for 68x328 processor varients Create common timer code for all 68x328 processor varients. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit a79626604bc044cec30bfc6cc3332007588e1a94 Author: Greg Ungerer Date: Fri Sep 9 09:32:14 2005 +1000 [PATCH] m68knommu: register map setup for MOD5272 board The boot loader on the MOD5272 board doesn't set the register maping, so set it in the 5272 init code. There was code in there to support this, but we had never needed to use it before. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit a052b7affc193a7937e6791d262addcb82654d5f Author: Greg Ungerer Date: Fri Sep 9 09:32:14 2005 +1000 [PATCH] m68knommu: add timer support for the 523x ColdFire processor family Add timer support for the ColdFire 523x processor family. (It uses the ColdFire PIT timer hardware, so we just build that in). Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 7dbdd91fe67e3cd28af36d3853df38b92deec711 Author: Greg Ungerer Date: Fri Sep 9 09:32:14 2005 +1000 [PATCH] m68knommu: include support for the ColdFire 523x processor UARTs Add support definitions for the integrated UARTs on the 523x ColdFire processor family. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit ee721126cae77e66efb470d38cf971ed7b0c506b Author: Greg Ungerer Date: Fri Sep 9 09:32:14 2005 +1000 [PATCH] m68knommu: extract common timer code for 68328 processor Rework the 68x328 configuration and setup code. All 68x328 varient share the same timer hardware, so extract that into its own file, instead of keeping copies in each processors setup code. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 8c2b58ce716112cbba167b0abcb9558c118b8c9a Author: Greg Ungerer Date: Fri Sep 9 09:32:14 2005 +1000 [PATCH] m68knommu: create common config code for all 68VZ328 platforms Create common 68VZ328 config code. It is essentially the same for all boards that use this, so no point having a version of it for each. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 55f37debf75f34e4fdd42ea1a81c1cea60c7ad9f Author: Greg Ungerer Date: Fri Sep 9 09:32:14 2005 +1000 [PATCH] m68knommu: remove DrangonEngine2 specific config code Remove DragonEngine2 specific config code. Use common 68VZ328 config code now. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 58201a2d03272b99bdbb5090c0aca517db0702a7 Author: Greg Ungerer Date: Fri Sep 9 09:32:14 2005 +1000 [PATCH] m68knommu: remove uCdimm specific config code Remove uCdimm specific config code. Use common 68VZ328 config code now. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 97591b2c76e3a11d6060b72aa53dc30d3d5478c5 Author: Greg Ungerer Date: Fri Sep 9 09:32:14 2005 +1000 [PATCH] m68knommu: 523x ColdFire processor init/config Makefile Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 1bdd89db117a55c77a854829ff507d6d68ab6485 Author: Greg Ungerer Date: Fri Sep 9 09:32:14 2005 +1000 [PATCH] m68knommu: defines to support the ColdFire 523x processor Add processor level and clock support defines for the ColdFire 523x processor. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 910ce396a88b84b99377f7c46888a1ff9a86ded3 Author: Greg Ungerer Date: Fri Sep 9 09:32:14 2005 +1000 [PATCH] m68knommu: ColdFire 523x processor register definitions ColdFire 523x processor hardware register definitions. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit b71e318cdb1dc301d734fdd4983dfc6dc167235a Author: Henk Date: Wed Aug 17 10:40:26 2005 +0200 [PATCH] USB: yealink: fix htons usage, documentation updates Signed-off-by: Henk Vergonet Signed-off-by: Greg Kroah-Hartman commit d5ae36dd439549305f00a755556f49c9fa7bb237 Author: Greg Kroah-Hartman Date: Tue Aug 16 12:33:30 2005 -0700 [PATCH] USB: fix endian issues in yealink driver. sparse still complains about the htons usage, but I'll leave that for others to fix. Signed-off-by: Greg Kroah-Hartman commit aca951a22a1d93ebe31b54052b3eb9a8196df2fc Author: Henk Date: Tue Aug 16 16:17:43 2005 +0200 [PATCH] input-driver-yealink-P1K-usb-phone This patch aggregates all modifications in the -mm tree and adds complete ringtone support. The following features are supported: - keyboard full support - LCD full support - LED full support - dialtone full support - ringtone full support - audio playback via generic usb audio diver - audio record via generic usb audio diver For driver documentation see: Documentation/input/yealink.txt For vendor documentation see: http://yealink.com Signed-off-by: Henk Signed-off-by: Greg Kroah-Hartman commit d6450e19329c85ac4888c185429094236a650928 Author: Nick Sillik Date: Wed Aug 17 13:37:34 2005 -0400 [PATCH] USB Storage: code cleanups for onetouch.c As sugested by Alan Stern here are a few code cleanups for onetouch.c: -Check number of endpoints before directly referencing intf->endpoint[2] -Use defined constants instead of magic numbers -Revmove the non-ascii characters from copyright notice -Make registration and deregistration messages more similar Signed-off-by: Nick Sillik Signed-off-by: Greg Kroah-Hartman commit 0256839619d9b1e933cafc83e7f0deaad4216465 Author: Pete Zaitcev Date: Mon Aug 15 16:53:57 2005 -0700 [PATCH] usbmon in 2.6.13: peeking into DMA areas This code looks at urb->transfer_dma, maps the page and takes the data. I am looking for volunteers to contribute architectures other than i386 or to develop an architecure-neutral API for it (or point me that it was done already). Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit d0384200f6b608e77fb5ddf7dfae1bf0e42c1c6e Author: david-b@pacbell.net Date: Sat Aug 13 18:44:58 2005 -0700 [PATCH] ehci: add tt_usecs This adds the field tt_usecs to ehci_qh and ehci_iso_stream, and sets it appropriately when setting them up as periodic endpoints. It records the transation translator's think_time (added in last patch) plus the downstream (i.e. low or full speed) bustime of the transfer associated with each interrupt or iso frame, as calculated by usb_calc_bus_time. Signed-off-by: Dan Streetman Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit e09711aef4180002241c7f2eab37390ddf40d6a0 Author: david-b@pacbell.net Date: Sat Aug 13 18:41:04 2005 -0700 [PATCH] ehci: add think_time This adds think_time to the usb_tt struct and sets it appropriately (measured in ns); this can help us implement better split transaction scheduling. Signed-off-by: Dan Streetman Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 090ffa9d0e904e1ed0f86c84dcf20684a8ac1a5a Author: David Brownell Date: Wed Aug 31 09:54:50 2005 -0700 [PATCH] USB: usbnet (9/9) module for pl2301/2302 cables This wraps up the conversion of the "usbnet" driver structure, by moving the Prolific PL-2201/2302 minidriver to a module of its own. It also includes some minor cleanups to the remaining "usbnet" file, notably removing that long changelog at the top. Minor historical note: Linux 2.2 first called the driver for this hardware "plusb". Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 64e049102d3de3e61409cb6019403a9e689dfda6 Author: David Brownell Date: Wed Aug 31 09:54:36 2005 -0700 [PATCH] USB: usbnet (8/9) module for RNDIS devices This adds host-side RNDIS support to the "usbnet" driver, so Linux can talk to various devices (often based on WinCE) that otherwise only Windows could talk to. Tested with little-endian Linux talking to a Linux-USB Ethernet/RNDIS based peripheral. This also includes updates from Eddie C. Dost for big-endian SPARC Linux talking to a Nokia 9500 Communicator. It's still marked as EXPERIMENTAL because this code is so young. This ought to let Linux to work with various cable modems that previously would have been "Windows Only". Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 4324fd493430c0ab99dd7e89d50540b5e70f8098 Author: David Brownell Date: Wed Aug 31 09:54:20 2005 -0700 [PATCH] USB: usbnet (7/9) module for CDC Ethernet Makes the CDC Ethernet support live in a separate driver module. This module is a bit special since it exports utility functions that are reused by the the Zaurus and RNDIS drivers, but it's not "core" like usbnet itself. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 0aa599c5644fddd3052433c5335260108a8a39a2 Author: David Brownell Date: Wed Aug 31 09:53:58 2005 -0700 [PATCH] USB: usbnet (6/9) module for Zaurii and compatibles This moves usbnet support for Zaurus and compatibles into its own module. Other than exporting a couple of helper functions, this just involved shuffling some code and updating the comments. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 47ee3051c856cc2aa95d35d577a8cb37279d540f Author: David Brownell Date: Wed Aug 31 09:53:42 2005 -0700 [PATCH] USB: usbnet (5/9) module for genesys gl620a cables This moves the GeneSys GL620USB-A support into its own driver file. It also fixes a "return wrong skb" glitch in the rx unbatching, as recently reported, and adds some missing byteswaps in the special "genelink" headers (so it might now work on big-endian Linux). Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 904813cd8a0b334189da285bb05af0b18b062502 Author: David Brownell Date: Wed Aug 31 09:53:26 2005 -0700 [PATCH] USB: usbnet (4/9) module for net1080 cables As with the "cdc_subset" and "asix" drivers, this just moves the net1080 support into its one driver module. In this case there's a small bit of extra cleanup involved, moving some funky framing logic into the tx_fixup() routine (resolving a long overdue FIXME). Minor historical note: "usbnet" started out as "net1080", then got generalized to make it easier for other network drivers to reuse the urb queueing and fault management code here. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 2e55cc7210fef90f88201e860d8767594974574e Author: David Brownell Date: Wed Aug 31 09:53:10 2005 -0700 [PATCH] USB: usbnet (3/9) module for ASIX Ethernet adapters This patch moves the ASIX AX8817x driver into its own file, just using the "usbnet" infrastructure as a utility library. - As with "cdc_subset" this involved minor Kconfig/kbuild tweaks, moving code from one file to another, and exporting a few functions. - This includes updates from Jamie Painter to add (and use) a new hook to handle the different maximum transfer sizes for rx and tx sides. - Also from Jamie, some bugfixes: * MDIO byteorder (to address some PPC media negotiation problems); * Force alignment at key spots when using ax88772 framing (on some embedded hardware, the network stack will break otherwise); * Address some link reset problems. It also makes this driver use the standard (5 seconds vs half second) control timeouts used elsewhere in USB; and wraps a few lines before the 80th column (which previously needed it). Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 38bde1d4699af45e6a4167a72e2e512e45c35ca8 Author: David Brownell Date: Wed Aug 31 09:52:45 2005 -0700 [PATCH] USB: usbnet (2/9) module for simple network links This patch creates the first of several separate "minidriver" modules for "usbnet". This one handles only the very simplest hardware, which can be handled almost entirely by the "usbnet" core. - Move device-specific bits into new "cdc_subset.c" driver, shrinking "usbnet" by a bunch; - Export the functions needed to support this minidriver (with EXPORT_SYMBOL_GPL); - Update Kconfig and kbuild accordingly. This one handles about a dozen different device types, with the most notable ones being Gumstix and most Linux-based PDAs (except Zaurus running that ancient code from Sharp). Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit f29fc259976e9f4dd1fe8ed59ccdd50e4ea61db0 Author: David Brownell Date: Wed Aug 31 09:52:31 2005 -0700 [PATCH] USB: usbnet (1/9) clean up framing This starts to prepare the core of "usbnet" to know less about various framing protocols that map Ethernet packets onto USB, so "minidrivers" can be modules that just plug into the core. - Remove some framing-specific code that cluttered the core: * net->hard_header_len records how much space to preallocate; now drivers that add their own framing (Net1080, GeneLink, Zaurus, and RNDIS) will have smoother TX paths. Even for the drivers (Zaurus, Net1080) that need trailers. * defines new dev->hard_mtu, using this "hardware" limit to check changes to the link's settable "software" mtu. * now net->hard_header_len and dev->hard_mtu are set up in the driver bind() routines, if needed. - Transaction ID is no longer specific to the Net1080 framing; RNDIS needs one too. - Creates a new "usbnet.h" header with declarations that are shared between the core and what will be separate modules. - Plus a couple other minor tweaks, like recognizing -ESHUTDOWN means the keventd work should just shut itself down asap. The core code is only about 1/3 of this large file. Splitting out the minidrivers into separate modules (e.g. ones for ASIX adapters, Zaurii and similar, CDC Ethernet, etc), in later patches, will improve maintainability and shrink typical runtime footprints. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit dd7d50081f5dafd9392bd79f1ec90d553a7303c9 Author: Alexey Dobriyan Date: Sun Aug 14 17:24:26 2005 +0400 [PATCH] USB ldusb: fmt warnings fixes for 64-bit platforms Fix drivers/usb/misc/ldusb.c: In function `ld_usb_read': drivers/usb/misc/ldusb.c:467: warning: int format, different type arg (arg 4) drivers/usb/misc/ldusb.c: In function `ld_usb_write': drivers/usb/misc/ldusb.c:531: warning: int format, different type arg (arg 4) drivers/usb/misc/ldusb.c:532: warning: int format, different type arg (arg 5) drivers/usb/misc/ldusb.c:532: warning: int format, different type arg (arg 6) Signed-off-by: Alexey Dobriyan Signed-off-by: Greg Kroah-Hartman commit 9bc45e0c01ae268ad5f9e6d35492bbd8197e32f2 Author: Adrian Bunk Date: Sun Aug 14 13:00:58 2005 +0200 [PATCH] USB: schedule OSS USB drivers for removal Deprecate the OSS USB drivers. This patch includes spelling fixes by Lee Revell. Signed-off-by: Adrian Bunk Signed-off-by: Greg Kroah-Hartman commit 4fbd55f03e294d18bd7a5c4c98974e157f6f84e7 Author: Dale Farnsworth Date: Wed Aug 10 17:25:25 2005 -0700 [PATCH] USB: remove include of asm/usb.h in ohci-ppc-soc.c ohci-ppc-soc.c provides for a platform-specific callback mechanism for when the HC is successfully probed or removed. It turned out that none of the 3 platforms using it need this facility. Also the required include/asm-ppc/usb.h has never been accepted. This patch removes the callback feature and the include of . Signed-off-by: Dale Farnsworth Signed-off-by: Greg Kroah-Hartman commit 8f34c2883b894b9a97f07b23b5b86fd65ecd2f85 Author: david-b@pacbell.net Date: Thu Aug 11 19:36:36 2005 -0700 [PATCH] USB: remove annoying message Avoid an annoying message that can appear if devices are disconnected in the middle of a USB scatterlist operation. Message noted in http://bugzilla.kernel.org/show_bug.cgi?id=4373 (but the real issue there seems to be a SCSI level hang). Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit f956e7cd9ac4618b98022020e638bbdc01d9d65a Author: david-b@pacbell.net Date: Thu Aug 11 19:37:01 2005 -0700 [PATCH] USB: tweak highspeed timing calculations Use a more correct calculation for highspeed bit times. http://bugzilla.kernel.org/show_bug.cgi?id=3604 This sort if thing might start to make a difference now that the high speed periodic scheduler is more complete -- and even getting used. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 3b4d7f79164853e10342d707e32307e0c8054982 Author: Alan Stern Date: Thu Aug 11 15:50:32 2005 -0400 [PATCH] USB: Support unbinding of the usb_generic driver This patch (as556) adds support for unbinding the usb_generic "driver". That driver only binds to USB devices, as opposed to interfaces, and it does nothing much besides marking which struct device's go with an overall USB device plus providing suspend/resume methods. Now that users can unbind drivers at will using the sysfs "unbind" attribute, we need a rational way of dealing with USB devices that are no longer under full control of the USB stack. The patch handles this by unconfiguring the device, thereby removing all the interfaces and their associated drivers and children. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 3ea15966ed59f2bc20928c7b0496b4585f6de206 Author: Alan Stern Date: Thu Aug 11 10:15:39 2005 -0400 [PATCH] USB: Add timeout to usb_lock_device_for_reset This patch (as555) modifies the already-awkward usb_lock_device_for_reset routine in usbcore by adding a timeout. The whole point of the routine is that the caller wants to acquire some semaphores in the wrong order; protecting against the possibility of deadlock by timing out seems only prudent. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit e52b1d3afe698cb77c080ecbe9e745257ff8c81b Author: Dale Farnsworth Date: Tue Aug 9 12:13:35 2005 -0700 [PATCH] USB: Fix typo in ohci-ppc-soc.c: usb_hcd_put => usb_put_hcd Signed-off-by: Dale Farnsworth Signed-off-by: Greg Kroah-Hartman commit ba44e7c407e248ed85d4f510728d0284373cf678 Author: Ben Dooks Date: Tue Aug 9 15:04:00 2005 +0100 [PATCH] USB: S3C24XX port numbering fix Fix the port numbering confusion for the S3C24XX platform device information as reported by Rudy This patch ensurs that the the ports are numbered 0 and 1. Signed-off-by: Ben Dooks Signed-off-by: Greg Kroah-Hartman commit bf193d3cd2a3b73f2df74f57106114867946c09c Author: Alan Stern Date: Wed Aug 10 17:12:31 2005 -0400 [PATCH] USB: Disconnect children when unbinding the hub driver This patch (as554) makes the hub driver disconnect any child USB devices when it is unbound from a hub. Normally this will never happen, but there are a few oddball ways to unbind the hub driver while leaving the children intact. For example, the new "unbind" sysfs attribute can be used for this purpose. Given that unbinding hubs with children is now safe, the patch also removes the code that prevented people from doing so using usbfs. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 8b28c7526a302bbfa618f7eab4ef961edd68c9a0 Author: Alan Stern Date: Wed Aug 10 17:04:13 2005 -0400 [PATCH] USB: Code motion in the hub driver This patch (as553) merely moves some code and deletes an unneeded test in the hub driver. This is in preparation for the patch that follows. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 68a6457edb8a64fdcc231a4fc5406f6e3f6c9b33 Author: Daniel Drake Date: Wed Aug 10 18:30:04 2005 +0100 [PATCH] USB: Fix HP8200 detection in shuttle_usbat Adding flash-device support to the shuttle_usbat driver in 2.6.11 introduced the need to detect which type of device we are dealing with: CDRW drive, or flash media reader. The detection routine used turned out to not work for HP8200 CDRW users, who saw their devices being detected as a flash disk. This patch (which has been tested on both flash and cdrom) removes some unnecessary code, moves device detection to much later during initialization, and introduces a new detection routine which appears to work. Signed-off-by: Daniel Drake Signed-off-by: Greg Kroah-Hartman commit 242cf670c09c05504ce53dfc27f8331a072f169d Author: Greg Kroah-Hartman Date: Fri Jul 29 16:11:07 2005 -0400 [PATCH] USB: fix up URB_ASYNC_UNLINK usages from the usb-serial drivers Signed-off-by: Greg Kroah-Hartman commit b375a0495fd622037560c73c05f23ae6f127bb0c Author: Alan Stern Date: Fri Jul 29 16:11:07 2005 -0400 [PATCH] USB: URB_ASYNC_UNLINK flag removed from the kernel 29 July 2005, Cambridge, MA: This afternoon Alan Stern submitted a patch to remove the URB_ASYNC_UNLINK flag from the Linux kernel. Mr. Stern explained, "This flag is a relic from an earlier, less-well-designed system. For over a year it hasn't been used for anything other than printing warning messages." An anonymous spokesman for the Linux kernel development community commented, "This is exactly the sort of thing we see happening all the time. As the kernel evolves, support for old techniques and old code can be jettisoned and replaced by newer, better approaches. Proprietary operating systems do not have the freedom or flexibility to change so quickly." Mr. Stern, a staff member at Harvard University's Rowland Institute who works on Linux only as a hobby, noted that the patch (labelled as548) did not update two files, keyspan.c and option.c, in the USB drivers' "serial" subdirectory. "Those files need more extensive changes," he remarked. "They examine the status field of several URBs at times when they're not supposed to. That will need to be fixed before the URB_ASYNC_UNLINK flag is removed." Greg Kroah-Hartman, the kernel maintainer responsible for overseeing all of Linux's USB drivers, did not respond to our inquiries or return our calls. His only comment was "Applied, thanks." Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit a4e628328ec60873fec9d506d682155391f589ce Author: Matthew Dharm Date: Thu Jul 28 14:50:29 2005 -0700 [PATCH] USB Storage: wedge SCSI revision at 2 for usb-storage devices This patch started life as as479b, and has been rediffed. Please note the order of submission of this latest patch series -- even tho this has an older original number, it is the last patch I'll be sending today. This patch changes the reported SCSI revision level to 2 for all disk-type devices. This is needed in a few cases because the device reports a level of 3 or higher but then crashes when given a REPORT LUNS command (for which support is supposed to be mandatory at those levels). This shouldn't harm us, since it only matters for sparse LUNs and we have separate ways of coping with that. Signed-off-by: Alan Stern Signed-off-by: Matthew Dharm Signed-off-by: Greg Kroah-Hartman commit 34008dbfe8c00eca67f97bad484eb5cb03bafe66 Author: Matthew Dharm Date: Thu Jul 28 14:49:01 2005 -0700 [PATCH] USB Storage: add support for Maxtor One-Touch button This patch is originally from Nick Sillik, and has been rediffed against the latest tree. This patch adds usability to the OneTouch Button on Maxtor External USB Hard Drives. Using an unusual device entry it declares an extra init function which claims the interrupt endpoint associated with this button. The button is connected to the input system. Signed-off-by: Nick Sillik Signed-off-by: Matthew Dharm Signed-off-by: Greg Kroah-Hartman commit 26186ba77b493204ae0fadc3c88a67b14f22168f Author: Matthew Dharm Date: Thu Jul 28 14:45:50 2005 -0700 [PATCH] USB Storage: close a race condition in disconnect near queuecommand This patch started life as as534, and has been re-diffed against the latest tree. usb-storage has a small loophole, a window between the time queuecommand accepts a new command and the time the control thread starts to execute it. If disconnect is called during that window, the driver won't cancel the pending command -- we've been relying on the SCSI core to cancel it for us during host removal. But it's better for usb-storage to cancel it; this avoids races and reduces reliance on the SCSI core. Fortunately cancelling these commands is easy to do; the key is to do it _before_ calling scsi_remove_host. Signed-off-by: Alan Stern Signed-off-by: Matthew Dharm Signed-off-by: Greg Kroah-Hartman commit 77f46328fb83b64befd889ebce6d7fb959932509 Author: Matthew Dharm Date: Thu Jul 28 14:44:29 2005 -0700 [PATCH] USB Storage: close a race condition in disconnect near probe This patch started life as as533, and has been re-diffed against the current tree. Disconnect processing in usb-storage naturally divides into two parts: one to quiesce the driver (make sure no commands are executing or queued) and remove the host, and the other to deallocate all the USB and non-USB resources. This patch creates two subroutines to handle those two parts. Mostly it's just code movement, but there is one significant change. If the scsi-scanning thread fails to initialize but the host has successfully been added, we need to quiesce the driver before removing the host. After all, it's possible that scanning could have been initiated from somewhere else, such as userspace -- very low probability, but it's easily handled by calling the new subroutine. Signed-off-by: Alan Stern Signed-off-by: Matthew Dharm Signed-off-by: Greg Kroah-Hartman commit 0f64e078139109d1902e5b1274c23cec9a9ad12e Author: Matthew Dharm Date: Thu Jul 28 14:43:08 2005 -0700 [PATCH] USB Storage: remove dependency on SCSI-provided serial/tag number This patch started life as as531 from Alan Stern. It has been rediffed against the latest tree. The SCSI people have deprecated the use of scsi_cmnd.serial_number for anything other than printk. Worse than that, the SCSI core doesn't always increment the number (when the error handler is running, for example). So this patch creates a locally-stored value for use in bulk-only tags. The net result is a simplification, since we no longer have to save & restore the serial_number value while autosensing. Signed-off-by: Alan Stern Signed-off-by: Matthew Dharm Signed-off-by: Greg Kroah-Hartman commit 9a57116bc9e36c9accc869f666e1d25c5e2cdcbf Author: Olav Kongas Date: Fri Aug 5 14:23:35 2005 +0300 [PATCH] USB: Switch isp116x-hcd over to root hub interrupt Switch isp116x-hcd over from root hub polling to interrupt. This change closes also a race that was present with the old polling scheme: status polling could happen in a time window, where root hub status bits were not stable. Signed-off-by: Olav Kongas Signed-off-by: Greg Kroah-Hartman commit f8d23d309809ae69c763520dababb7e845938272 Author: Olav Kongas Date: Thu Aug 4 17:02:54 2005 +0300 [PATCH] USB: isp116x-hcd: remove clock() and reset() This patch removes support for user-provided platform-specific hardware reset and clock starting/stopping functions. Hardware reset was needed earlier as getting the software reset working was tricky due to the lack of documentation. Recently, a number of people using isp116x have said the software reset is working for them. I haven't heard of anybody using the clock starting/stopping. Signed-off-by: Olav Kongas Signed-off-by: Greg Kroah-Hartman commit 9d233d9faedfd8a4ee22288c1fdc698a6f75db21 Author: Olav Kongas Date: Thu Aug 4 16:54:08 2005 +0300 [PATCH] USB: isp116x-hcd: per-port overcurrent reporting This patch sets the isp116x to report overcurrent always per-port. Signed-off-by: Olav Kongas Signed-off-by: Greg Kroah-Hartman commit 165c0f39390212d7a517b80c3bb61cb8f1782fef Author: Olav Kongas Date: Thu Aug 4 16:52:31 2005 +0300 [PATCH] USB: isp116x-hcd: support only per-port power switching The isp116x chip will now always be in per-port power switching mode. Remove conf options to set any other mode. Signed-off-by: Olav Kongas Signed-off-by: Greg Kroah-Hartman commit d4d62861b5cdb0ecfcae448e4281623284de5d05 Author: Olav Kongas Date: Thu Aug 4 16:48:19 2005 +0300 [PATCH] USB: isp116x-hcd: remove unnecessary ClockNotStop configuration option Signed-off-by: Olav Kongas Signed-off-by: Greg Kroah-Hartman commit dc5bed091a7a5fe378055c30a2da874f77228b71 Author: Olav Kongas Date: Thu Aug 4 16:46:28 2005 +0300 [PATCH] USB: isp116x-hcd: use fixed power-on-to-power-good-time This patch removes the power-on-to-power-good-time configuration option for isp116x-hcd. Signed-off-by: Olav Kongas Signed-off-by: Greg Kroah-Hartman commit 0d9899f8139b1e4ee84b97fb61615714fd40be5b Author: david-b@pacbell.net Date: Thu Jul 28 20:46:32 2005 -0700 [PATCH] USB: usbnet and unsigned gfp_flags This just fixes some gfp flags warnings that joined us recently. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 0bc8e009a2d5106183ea31a2b83035e790778cab Author: Randy Dunlap Date: Sun Jul 31 20:41:19 2005 -0700 [PATCH] USB usblp: rate-limit printer status error messages Rate-limit usblp printer error status messages. I unplugged my USB printer and almost instantly got several hundred of these in my kernel message log: drivers/usb/class/usblp.c: usblp0: error -19 reading printer status Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit a1cf96efbabac2f8af6f75286ffcefd40b0a466c Author: Pete Zaitcev Date: Sun Aug 14 21:16:03 2005 -0700 [PATCH] USB: ub 4: Zaitcev's quasi-S/G Back out Axboe-style quasi-S/G and replace it with one command and repeated URBs. This is similar to what usb-storage does, only instead of a few URBs allocated together, one URB is reused. Jens's idea was very nice, but it collapsed when I had to support packet commads for CD burning. I cannot issue two or more packet commands where application expected only one. However, burning does not work completely yet. The cdrecord starts, recognizes the device, then aborts without writing a TOC. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 6c1eb8c1c3ec2df00b629ab4fe7fe04a95129f08 Author: Pete Zaitcev Date: Sat Jul 30 22:51:52 2005 -0700 [PATCH] USB: ub 3/3: death to ub_bd_rq_fn_1 When Al Viro saw the ub.c, he observed that it was a proof positive of Linus not reading patches anymore: names like fo_ob_ar_ba_2 used to cause serious fireworks. In my defence, any good scheme can be pushed to the realm of absurd if pushed far enough. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 07d4fd2566ddbf2a91ff3cde80ddf449ab82c381 Author: Pete Zaitcev Date: Sat Jul 30 22:51:45 2005 -0700 [PATCH] USB: ub 2/3: Fold one line Evidently, Yani Ioannou's display is wider than mine. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit ba6abf1352dc83e500a71e3ad9b39de0337f0c6b Author: Pete Zaitcev Date: Sat Jul 30 22:38:30 2005 -0700 [PATCH] USB: ub 1/3: Axboe's quasi-S/G This the quasi-S/G patch for ub as suggested by Jens Axboe at OLS and implemented that night before 4 a.m. Surprisingly, it worked right away... Alas, I had to skip some OLS partying, but it was for the good cause. Now the speed of ub is quite acceptable even on partitions with small block size. The ub does not really support S/G. Instead, it just tells the block layer that it does. Then, most of the time, the block layer merges requests and passes single-segmnent requests down to ub; everything works as before. Very rarely ub gets an unmerged S/G request. In such case, it issues several commands to the device. I added a small array of counters to monitor the merging (sg_stat). This may be dropped later. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 64be07585893d207d23f8516948222faf746aa43 Author: Mihnea-Costin Grigore Date: Fri Jul 29 13:48:48 2005 +0300 [PATCH] usb-storage: Add IGNORE_RESIDUE flag for Mitsumi USB 2.0 card reader (VIA hardware) This patch adds an entry in the unusual_devs.h file for a Mitsumi card reader/floppy combo that uses a VIA chipset. The IGNORE_RESIDUE flag was needed for the second LUN to operate properly. Signed-off-by: Mihnea-Costin Grigore Signed-off-by: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman commit fad21bdf56a25e1cb3e92bba33349de368e8f0b0 Author: Alan Stern Date: Wed Aug 10 15:15:57 2005 -0400 [PATCH] USB: Fix regression in core/devio.c This patch (as551) fixes another little problem recently added to the USB core. Someone didn't fix the type of the first argument to unregister_chrdev_region. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit fbf82fd2e1f4e679c60516d772d1862c941ca845 Author: Kay Sievers Date: Sun Jul 31 01:05:53 2005 +0200 [PATCH] USB: real nodes instead of usbfs This patch introduces a /sys/class/usb_device/ class where every connected usb-device will show up: tree /sys/class/usb_device/ /sys/class/usb_device/ |-- usb1.1 | |-- dev | `-- device -> ../../../devices/pci0000:00/0000:00:1d.0/usb1 |-- usb2.1 | |-- dev | `-- device -> ../../../devices/pci0000:00/0000:00:1d.1/usb2 ... The presence of the "dev" file lets udev create real device nodes. kay@pim:~/src/linux-2.6> tree /dev/bus/usb/ /dev/bus/usb/ |-- 1 | `-- 1 |-- 2 | `-- 1 ... udev rule: SUBSYSTEM="usb_device", PROGRAM="/sbin/usb_device %k", NAME="%c" (echo $1 | /bin/sed 's/usb\([0-9]*\)\.\([0-9]*\)/bus\/usb\/\1\/\2/') This makes libusb pick up the real nodes instead of the mounted usbfs: export USB_DEVFS_PATH=/dev/bus/usb Background: All this makes it possible to manage usb devices with udev instead of the devfs solution. We are currently working on a pam_console/resmgr replacement driven by udev and a pam-helper. It applies ACL's to device nodes, which is required for modern desktop functionalty like "Fast User Switching" or multiple local login support. New patch with its own major. I've succesfully disabled usbfs and use real nodes only on my box. With: "export USB_DEVFS_PATH=/dev/bus/usb" libusb picks up the udev managed nodes instead of reading usbfs files. This makes udev to provide symlinks for libusb to pick up: SUBSYSTEM="usb_device", PROGRAM="/sbin/usbdevice %k", SYMLINK="%c" /sbin/usbdevice: #!/bin/sh echo $1 | /bin/sed 's/usbdev\([0-9]*\)\.\([0-9]*\)/bus\/usb\/\1\/\2/' Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 22af8878d2d641c6b15fe39fe4de3c05b2c477f0 Author: Andrew de Quincey Date: Thu Aug 4 23:16:12 2005 +0100 [PATCH] USB: Prevent hid-core claiming Apple Bluetooth device on new G4 powerbooks To recap: My new G4 powerbook has a bluetooth device that boots up in what apppears to be a compatability mode - it looks exactly like an HID keyboard/mouse device. A special command sequence is sent to switch it into full bluetooth mode. When this occurs the original HID device vanishes, and a new (bluetooth HID) USB device appears on the bus with a different product ID. The original thread is here: http://sourceforge.net/mailarchive/message.php?msg_id=12532263 The attached patch adds the device to the hid-core quirks so that hid-core ignores it. Signed-off-by: Andrew de Quincey Signed-off-by: Greg Kroah-Hartman commit e6ac4a40e5f5c58f6e1058f6b3fb98be921dc7f4 Author: Ian Abbott Date: Tue Aug 2 14:01:27 2005 +0100 [PATCH] USB ftdi_sio: New IDs for ELV, Xsens and Falcom products This patch for the ftdi_sio driver adds a bunch of new devices and fixes an incorrect PID: o Fix PID for ELV UO100 (the PID was in fact for ELV UR100). o Add PID ELV UR100 (see above) and ELV ALC 8500 Expert. o Add a whole bunch of other PIDs for ELV USB devices, commented out for now as they may be used by other drivers eventually. (Christian Abt of ELV.de submitted a full list of devices including an indication of which set of drivers are used by default in the MS Windows world. We decided to comment out the devices that use FTDI's D2XX Windows drivers by default.) o Add PIDs for eight devices from Xsens Technologies BV (submitted in a patch against 2.6.12.2 by Patrick Riphagen). o Add PID for Falcom Samba GPRS modem (submitted by Sebastian Schubert). Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit fdcb0a0f1b8b050cbb7ed0ea2e030741ce5bb517 Author: Ian Abbott Date: Thu Jul 28 18:40:32 2005 +0100 [PATCH] USB ftdi_sio: user specified VID/PID ftdi_sio: Support one user specified vendor and product ID via a couple of new module parameters. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit 1694899fd1af43636351aac97f415fd3c9cefb1d Author: Dariusz M Date: Thu Jul 28 18:06:13 2005 +0200 [PATCH] USB: pl2303 driver, makes pl2303HX chip work correctly This trivial patch makes pl2303 driver work correctly with pl2303HX chip. Apparently some bug in HX version of pl2303 makes the chip loose some transmitted bytes or stop working at all after reception of USB_REQ_CLEAR_FEATURE mesage. Logs generated by UsbSnoop application reveal that windows driver does not send this type of messages to the converter. From: "Dariusz M." Signed-off-by: Greg Kroah-Hartman commit ef0840286045fe7ce84cb77e7608f0844c81001c Author: Greg Kroah-Hartman Date: Wed Jul 27 01:06:19 2005 -0700 [PATCH] USB: fix keyspan_remote endian bug on probe Signed-off-by: Greg Kroah-Hartman commit 91e79c91fab10f5790159d8d0c1d16da2a9653f9 Author: David Brownell Date: Wed Jul 13 15:18:30 2005 -0700 [PATCH] USB: Gadget library: centralize gadget controller numbers This patch centralizes the assignment of bcdDevice numbers for different gadget controllers. This won't improve the object code at all, but it does save a lot of repetitive and error-prone source code ... and will simplify the work of supporting a new controller driver, since most new gadget drivers will no longer need patches (unless some hardware quirks limit USB protocol messaging). Added minor cleanups and identifer hooks for the UDC in the Freescale iMX series processors. Signed-off-by: Alan Stern Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 81671ddb7e24e9d1f84812dba8ed810935f77d40 Author: Tobias Klauser Date: Mon Jul 4 19:32:51 2005 +0200 [PATCH] USB: drivers/serial/usb-serial: Remove unneeded void * casts The following patch removes unneeded casts for the following (void *) pointers: - tty_struct->driver_data - void *private argument of usb_serial_port_softint() Signed-off-by: Tobias Klauser Signed-off-by: Greg Kroah-Hartman commit 7bb75aeeeec7417a961920b3f63a83007475260f Author: Andrew Morton Date: Wed Jul 27 01:08:30 2005 -0700 [PATCH] USB: option card driver coding style tweaks Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit b9db07fba7f113764d7379b0f68324a9a5450306 Author: Lonnie Mendez Date: Tue Jul 12 17:21:31 2005 -0500 [PATCH] USB: whitespace fixes for cypress_m8 driver Reading this driver I noticed some trailing whitespaces and tabs so I removed them with some 80th column fitting and a few more similar things. From: Carlo Perassi Signed-off-by: Lonnie Mendez Signed-off-by: Carlo Perassi Signed-off-by: Domen Puncer Signed-off-by: Greg Kroah-Hartman commit e104411b82f5c4d19752c335492036abdbf5880d Author: Patrick McHardy Date: Thu Sep 8 15:11:55 2005 -0700 [XFRM]: Always release dst_entry on error in xfrm_lookup Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit cf0b450cd5176b68ac7d5bbe68aeae6bb6a5a4b8 Author: Herbert Xu Date: Thu Sep 8 15:10:52 2005 -0700 [TCP]: Fix off by one in tcp_fragment() "already sent" test. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 61c8c158c828073cfebf11ca8e340727feafa038 Author: Nicolas Pitre Date: Thu Sep 8 23:07:40 2005 +0100 [ARM] 2892/1: remove gcc workaround for direct access to absolute memory addresses Patch from Nicolas Pitre It used to make a difference in the gcc-2.95 era. However these days modern gcc apparently got better at not being influenced by such constructs (which is good in general) and therefore such workaround is of no real advantage anymore. The good news is that gcc (from version 4.1.0) is now fixed with regards to the defficiency this workaround was trying to address. For those interested the patch can easily be backported to older gcc versions and can be found here: http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/config/arm/arm.c.diff?r1=1.476&r2=1.478 and also here: http://savannah.gnu.org/cgi-bin/viewcvs/gcc/gcc/gcc/config/arm/arm.c.diff?r1=text&tr1=1.476&r2=text&tr2=1.478&diff_format=u Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 0dffefbf1a26ee0661d47516420d86b485a08e9c Author: Ben Dooks Date: Thu Sep 8 23:07:39 2005 +0100 [ARM] 2891/1: S3C2410 - update s3c2410_defconfig for 2.6.13 Patch from Ben Dooks Updated the s3c2410_defconfig for the 2.6.13-git8 kernel release, as well as adding the Anubis board to the list of boards built. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 7c38cf021b42a4297bc8f860ab627734bdd6c8d1 Author: Tony Lindgren Date: Thu Sep 8 23:07:38 2005 +0100 [ARM] 2890/1: OMAP 1/4: Update omap1 specific files, take 2 Patch from Tony Lindgren This patch syncs the mainline kernel with linux-omap tree. The highlights of the patch are: - Convert more drivers to register resources in board-*.c to take advantage of the driver model by David Brownell and Ladislav Michl - Use set_irq_type() for GPIO interrupts instead of omap_set_gpio_edge_ctrl() by David Brownell - Add minimal support for handling optional add-on boards, such as OSK Mistral board with LCD and keypad, by David Brownell - Minimal support for loading functions to SRAM by Tony Lindgren - Wake up from serial port by muxing RX lines temporarily into GPIO interrupts by Tony Lindgren - 32KHz sched_clock by Tony Lindgren and Juha Yrjola Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit a04ce0ffcaf561994ecf382cd3caad75556dc499 Author: Brett M Russ Date: Mon Aug 15 15:23:41 2005 -0400 [PATCH] PCI/libata INTx cleanup Simple cleanup to eliminate X copies of the pci_enable_intx() function in libata. Moved ahci.c's pci_intx() to pci.c and use it throughout libata and msi.c. Signed-off-by: Brett Russ Signed-off-by: Greg Kroah-Hartman commit 3fe9d19f9e86a55679f5f2b38ec0a43a1a510cee Author: Daniel Ritz Date: Wed Aug 17 15:32:19 2005 -0700 [PATCH] PCI: Support PCM PM CAP version 3 - support PCI PM CAP version 3 (as defined in PCI PM Interface Spec v1.2) - pci/probe.c sets the PM state initially to 4 which is D3cold. add a PCI_UNKNOWN - minor cleanups Signed-off-by: Daniel Ritz Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit cecf4864cf52a4a243a62b2856a6a155edbb55e8 Author: Paul Mackerras Date: Thu Aug 18 14:33:01 2005 +1000 [PATCH] PCI: Add pci_walk_bus function to PCI core (nonrecursive) The PCI error recovery infrastructure needs to be able to contact all the drivers affected by a PCI error event, which may mean traversing all the devices under a given PCI-PCI bridge. This patch adds a function to the PCI core that traverses all the PCI devices on a PCI bus and under any PCI-PCI bridges on that bus (and so on), calling a given function for each device. This provides a way for the error recovery code to iterate through all devices that are affected by an error event. This version is not implemented as a recursive function. Instead, when we reach a PCI-PCI bridge, we set the pointers to start doing the devices on the bus under the bridge, and when we reach the end of a bus's devices, we use the bus->self pointer to go back up to the next higher bus and continue doing its devices. Signed-off-by: Paul Mackerras Signed-off-by: Greg Kroah-Hartman commit 7d333d6c739a5cd6d60102ea1a9940cbbb0546ec Author: Anton Altaparmakov Date: Thu Sep 8 23:01:16 2005 +0100 NTFS: 2.1.24 release and some minor final fixes. Signed-off-by: Anton Altaparmakov commit 1d2450a4a6eb656798c6282b5ffc8e5f9f52ac14 Author: Prarit Bhargava Date: Fri Aug 12 10:13:34 2005 -0400 [PATCH] PCI Hotplug: SGI hotplug driver fixes These fixes were suggested by pcihpd-discuss, but were dropped in the initial checkin of the code. These fixes include cleaning up the hotplug driver sysfs filename, and some minor code cleanups. The driver also requires at least PROM 4.30, not 4.20. Signed-off-by: Prarit Bhargava Signed-off-by: Greg Kroah-Hartman commit c9d8073fd2a0bcb5df973654e988282b523cf553 Author: Jiri Slaby Date: Wed Aug 10 02:09:39 2005 +0200 [PATCH] PCI: remove pci_find_device from parport_pc.c This patch changes pci_find_device to pci_get_device (encapsulated in for_each_pci_dev). Signed-off-by: Jiri Slaby Signed-off-by: Greg Kroah-Hartman commit 11f3859b1e85dd408756c72e228cfb5aa7230c87 Author: Alan Stern Date: Wed Aug 10 15:18:44 2005 -0400 [PATCH] PCI: Fix regression in pci_enable_device_bars This patch (as552) fixes yet another small problem recently added. If an attempt to put a PCI device back into D0 fails because the device doesn't support PCI PM, it shouldn't count as error. Without this patch the UHCI controllers on my Intel motherboard don't work. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 95a629657dbe28e44a312c47815b3dc3f1ce0970 Author: Greg Kroah-Hartman Date: Thu Jul 28 11:37:33 2005 -0700 [PATCH] PCI: start paying attention to a lot of pci function return values Signed-off-by: Greg Kroah-Hartman commit 085ae41f66657a9655ce832b0a61832a06f0e1dc Author: David S. Miller Date: Mon Aug 8 13:19:08 2005 -0700 [PATCH] Make sparc64 use setup-res.c There were three changes necessary in order to allow sparc64 to use setup-res.c: 1) Sparc64 roots the PCI I/O and MEM address space using parent resources contained in the PCI controller structure. I'm actually surprised no other platforms do this, especially ones like Alpha and PPC{,64}. These resources get linked into the iomem/ioport tree when PCI controllers are probed. So the hierarchy looks like this: iomem --| PCI controller 1 MEM space --| device 1 device 2 etc. PCI controller 2 MEM space --| ... ioport --| PCI controller 1 IO space --| ... PCI controller 2 IO space --| ... You get the idea. The drivers/pci/setup-res.c code allocates using plain iomem_space and ioport_space as the root, so that wouldn't work with the above setup. So I added a pcibios_select_root() that is used to handle this. It uses the PCI controller struct's io_space and mem_space on sparc64, and io{port,mem}_resource on every other platform to keep current behavior. 2) quirk_io_region() is buggy. It takes in raw BUS view addresses and tries to use them as a PCI resource. pci_claim_resource() expects the resource to be fully formed when it gets called. The sparc64 implementation would do the translation but that's absolutely wrong, because if the same resource gets released then re-claimed we'll adjust things twice. So I fixed up quirk_io_region() to do the proper pcibios_bus_to_resource() conversion before passing it on to pci_claim_resource(). 3) I was mistakedly __init'ing the function methods the PCI controller drivers provide on sparc64 to implement some parts of these routines. This was, of course, easy to fix. So we end up with the following, and that nasty SPARC64 makefile ifdef in drivers/pci/Makefile is finally zapped. Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 064b53dbcc977dbf2753a67c2b8fc1c061d74f21 Author: John W. Linville Date: Wed Jul 27 10:19:44 2005 -0400 [PATCH] PCI: restore BAR values after D3hot->D0 for devices that need it Some PCI devices (e.g. 3c905B, 3c556B) lose all configuration (including BARs) when transitioning from D3hot->D0. This leaves such a device in an inaccessible state. The patch below causes the BARs to be restored when enabling such a device, so that its driver will be able to access it. The patch also adds pci_restore_bars as a new global symbol, and adds a correpsonding EXPORT_SYMBOL_GPL for that. Some firmware (e.g. Thinkpad T21) leaves devices in D3hot after a (re)boot. Most drivers call pci_enable_device very early, so devices left in D3hot that lose configuration during the D3hot->D0 transition will be inaccessible to their drivers. Drivers could be modified to account for this, but it would be difficult to know which drivers need modification. This is especially true since often many devices are covered by the same driver. It likely would be necessary to replicate code across dozens of drivers. The patch below should trigger only when transitioning from D3hot->D0 (or at boot), and only for devices that have the "no soft reset" bit cleared in the PM control register. I believe it is safe to include this patch as part of the PCI infrastructure. The cleanest implementation of pci_restore_bars was to call pci_update_resource. Unfortunately, that does not currently exist for the sparc64 architecture. The patch below includes a null implemenation of pci_update_resource for sparc64. Some have expressed interest in making general use of the the pci_restore_bars function, so that has been exported to GPL licensed modules. Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 1248d636122e4ec9d7802b850904e3bb48a0da23 Author: Kristen Accardi Date: Fri Aug 5 12:16:06 2005 -0700 [PATCH] PCI Hotplug: use bus_slot number for name For systems with multiple hotplug controllers, you need to use more than just the slot number to uniquely name the slot. Without a unique slot name, the pci_hp_register() will fail. This patch adds the bus number to the name. Signed-off-by: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman commit 346d38823b59d65c3c1365971776b52e0661b7e5 Author: Michael S. Tsirkin Date: Sun Jul 31 11:51:45 2005 +0300 [PATCH] arch/386/pci: remap_pfn_range -> io_remap_pfn_range Convert i386/pci to use io_remap_pfn_range instead of remap_pfn_range. This is good for Xen which reuses i386/pci/i386.c for domain 0 code. Signed-off-by: Michael S. Tsirkin Signed-off-by: Greg Kroah-Hartman commit 4352dfd5cd9172f1ee425924a463b43e6157b840 Author: Greg Kroah-Hartman Date: Thu Jul 28 11:37:33 2005 -0700 [PATCH] PCI: clean up pci.h and split pci register info to separate header file. This cleans up some of the #ifdef CONFIG_PCI stuff up, and moves the pci register info out to a separate file, where it belongs. Eventually we can stop including this file from within pci.h, but lots of code needs to be audited first. Signed-off-by: Greg Kroah-Hartman commit 8fdc23ee1ab7c1f8f1dd40602f62b9cc84072531 Author: Andrew Morton Date: Wed Jul 27 00:07:11 2005 -0700 [PATCH] PCI: fix up pretty-names removal patch Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 982245f01734e9d5a3ab98b2b2e9761ae7719094 Author: Adrian Bunk Date: Sun Jul 17 04:22:20 2005 +0200 [PATCH] PCI: remove CONFIG_PCI_NAMES This patch removes CONFIG_PCI_NAMES. Signed-off-by: Adrian Bunk Signed-off-by: Greg Kroah-Hartman commit 74d863ee8a9da2b0f31e0f977daf127807b2e9d2 Author: akpm@osdl.org Date: Mon Jul 25 23:28:14 2005 -0700 [PATCH] PCI: Move PCI fixup data into r/o section Make PCI fixup data const, so it'll end up in a r/o section. This also fixes the conversion into ECOFF which gets broken by too many changes between r/w and r/o sections. Call it a hack but it's a change that's correct by itself. Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit d42c69972b853fd33a26c8c7405624be41a22136 Author: Andi Kleen Date: Wed Jul 6 19:56:03 2005 +0200 [PATCH] PCI: Run PCI driver initialization on local node Run PCI driver initialization on local node Instead of adding messy kmalloc_node()s everywhere run the PCI driver probe on the node local to the device. This would not have helped for IDE, but should for other more clean drivers that do more initialization in probe(). It won't help for drivers that do most of the work on first open (like many network drivers) Signed-off-by: Andi Kleen Signed-off-by: Greg Kroah-Hartman commit 56d8456b06ad1316bff3c75caed5e06e786f20d8 Author: John Rose Date: Mon Jul 25 10:17:03 2005 -0500 [PATCH] PCI Hotplug: rpaphp: Purify hotplug Currently rpaphp registers the following bus types as hotplug slots: 1) Actual PCI Hotplug slots 2) Embedded/Internal PCI slots 3) PCI Host Bridges The second and third bus types are not actually direct parents of removable adapters. As such, the rpaphp has special case code to fake results for attributes like power, adapter status, etc. This patch removes types 2 and 3 from the rpaphp module. This patch also changes the DLPAR module so that slots can be DLPAR-added/removed without having been designated as hotplug-capable. Signed-off-by: John Rose Signed-off-by: Greg Kroah-Hartman commit 940903c5a5a906c622a79b3101586deb1a1b3480 Author: John Rose Date: Mon Jul 25 10:16:58 2005 -0500 [PATCH] PCI Hotplug: rpaphp: Export slot enable This patch exports rpaphp_config_pci_adapter() for use by the rpadlpar module. It also changes this function by removing any dependencies on struct slot. The patch also changes the RPA DLPAR-add path to enable newly-added slots in a separate step from that which registers them as hotplug slots. Signed-off-by: John Rose Signed-off-by: Greg Kroah-Hartman commit 0945cd5f908a09ad99bf42d7ded16f26f24f317d Author: John Rose Date: Mon Jul 25 10:16:53 2005 -0500 [PATCH] PCI Hotplug: rpaphp: Remove rpaphp_find_pci The rpaphp module currently uses a fragile method to find a pci device by its device node. This function is unnecessary, so this patch scraps it. Signed-off-by: John Rose Signed-off-by: Greg Kroah-Hartman commit 9c209c919df95f83aa042b3352c43841ad15a02b Author: John Rose Date: Mon Jul 25 11:13:38 2005 -0500 [PATCH] PCI Hotplug: rpaphp: Change slot pci reference The slot structure in the rpaphp module currently references the PCI contents of the slot using the PCI device of the parent bridge. This is unnecessary, since the module is actually interested in the subordinate bus of the bridge. The dependency on a PCI bridge device also prohibits the module from registering hotplug slots that have a root bridge as a parent, since root bridges on PPC64 don't have PCI devices. This patch changes struct slot to reference the PCI subsystem using a pci_bus rather than a pci_dev. Signed-off-by: John Rose Signed-off-by: Greg Kroah-Hartman commit 5eeb8c63a38ff20285f3bbe7bcfe5e7c33c8ba14 Author: John Rose Date: Mon Jul 25 10:16:42 2005 -0500 [PATCH] PCI Hotplug: rpaphp: Move VIO registration Currently, rpaphp registers Virtual I/O slots as hotplug slots. The only purpose of this registration is to ensure that the VIO subsystem is notified of new VIO buses during DLPAR adds. Similarly, rpaphp notifies the VIO subsystem when a VIO bus is DLPAR-removed. The rpaphp module has special case code to fake results for attributes like power, adapter status, etc. The VIO register/unregister functions could just as easily be made from the DLPAR module. This patch moves the VIO registration calls to the DLPAR module, and removes the VIO fluff from rpaphp altogether. Signed-off-by: John Rose Signed-off-by: Greg Kroah-Hartman commit bde168412440084e649e7e04938bd1ab6e7bf978 Author: John Rose Date: Mon Jul 25 10:16:37 2005 -0500 [PATCH] PCI Hotplug: rpaphp: Remove unused stuff Subject line says it all :) Signed-off-by: John Rose Signed-off-by: Greg Kroah-Hartman commit c26971cbb39727b0b692c6236f890ba13046a663 Author: Richard Purdie Date: Thu Sep 8 22:48:16 2005 +0100 [MMC] Add mmc_detect_change() delay support for PXAMCI driver Allow PXA platforms to pass an appropriate delay value to the PXA MCI driver for delaying detection changes. Signed-Off-By: Richard Purdie Signed-off-by: Russell King commit 4e1491847ef5ca1c5a661601d5f96dcb7d90d2f0 Author: Linus Torvalds Date: Thu Sep 8 14:47:12 2005 -0700 Fix up ARM serial driver compile failure Proud member of Uglyhacks'R'US. Acked-by: David S. Miller Acked-by: Russell King Signed-off-by: Linus Torvalds commit 01357dcac62ac028de65a1c315eb75c530c8a5d6 Author: Russell King Date: Thu Sep 8 22:46:00 2005 +0100 [MMC] Ensure correct mmc_priv() behaviour mmc_priv() has some nasty effects if the wrong pointer type is passed to it. Introduce type checking, which also means we get the right type. Also add an additional member to mmc_host which is used to align host-private data appropriately. Signed-off-by: Russell King commit 0a25e4d5647003a32ba5496f9d0f40ba9c1e3863 Author: Evgeniy Polyakov Date: Wed Aug 17 15:24:37 2005 +0400 [PATCH] w1_ds2433: Added crc16 protection and read caching. The changes to ds2433 to add CRC16 protection and read caching. Signed-off-by: Ben Gardner Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit a45f105ad4b456f99f622642056ae533f70710b7 Author: Evgeniy Polyakov Date: Wed Aug 17 15:19:08 2005 +0400 [PATCH] w1: added private family data into w1_slave strucutre. Add family_data to struct w1_slave. Signed-off-by: Ben Gardner Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 7657ec1fcb69e266ab876af56332d0c484ca6d00 Author: Evgeniy Polyakov Date: Wed Aug 17 15:17:26 2005 +0400 [PATCH] lib/crc16: added crc16 algorithm. Add the crc16 routines, as used by w1 devices. Signed-off-by: Ben Gardner Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit a3d65f254274567daa89d8b99ab3d481d60fcaef Author: Evgeniy Polyakov Date: Thu Aug 11 17:27:50 2005 +0400 [PATCH] w1: Added DS2433 driver - family id update. Work by Ben Gardner . Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 80895392c83e54653540e72e7d40573aac7ee690 Author: Evgeniy Polyakov Date: Thu Aug 11 17:27:50 2005 +0400 [PATCH] w1: Added DS2433 driver. Work by Ben Gardner . Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 7c8f5703de91ade517d4fd6c3cc8e08dbba2b739 Author: Evgeniy Polyakov Date: Thu Aug 11 17:27:50 2005 +0400 [PATCH] w1: Decreased debug level. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 3aca692d3ec7cf89da4575f598e41f74502b22d7 Author: Evgeniy Polyakov Date: Thu Aug 11 17:27:50 2005 +0400 [PATCH] w1: Detouching bug fixed. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit d2a4ef6a0ce4d841293b49bf2cdc17a0ebfaaf9d Author: Evgeniy Polyakov Date: Thu Aug 11 17:27:50 2005 +0400 [PATCH] w1: Added add/remove slave callbacks. Patch is based on work from Ben Gardner Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit ea7d8f65c865ebfa1d7cd67c360a87333ff013c1 Author: Evgeniy Polyakov Date: Thu Aug 11 17:27:49 2005 +0400 [PATCH] w1: Added w1_reset_select_slave() - Resets the bus and then selects the slave by sending either a skip rom or a rom match. Patch from Ben Gardner Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit db2d0008de519c5db6baec45f7831e08790301cf Author: Evgeniy Polyakov Date: Thu Aug 11 17:27:49 2005 +0400 [PATCH] w1: Added inline functions on top of container_of(). Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 5e8eb8501212eb92826ccf191f9ca8c186f531c3 Author: Evgeniy Polyakov Date: Thu Aug 11 13:45:54 2005 +0400 [PATCH] w1: Fixed 64bit compilation warning. Fixed 64bit compilation warning. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 7f772ed8df27c6941952452330c618512389c4c7 Author: Evgeniy Polyakov Date: Thu Aug 11 13:20:07 2005 +0400 [PATCH] w1: hotplug support. Here is W1 hotplug in addition to netlink notifications. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 8949d2aa05ddf5e9a31d738568a79915970cb38e Author: Evgeniy Polyakov Date: Wed Aug 3 15:14:50 2005 +0400 [PATCH] W1: Sync with w1/ds9490 tree. Whitespace, static/nonstatic cleanups. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 2d8331792ea3f5ccfd147288afba148537337019 Author: Evgeniy Polyakov Date: Wed Jul 27 13:10:11 2005 +0400 [PATCH] W1: w1_netlink: New init/fini netlink callbacks. They are guarded with NETLINK_DISABLE compile time options, so if CONFIG_NET is disabled, no linking errors occur. Bug noticed by Adrian Bunk . Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 4d803fcdcd97dd346d4b39c3b76e5879cead8a31 Author: David S. Miller Date: Thu Sep 8 14:37:53 2005 -0700 [SPARC64]: Inline membar()'s again. Since GCC has to emit a call and a delay slot to the out-of-line "membar" routines in arch/sparc64/lib/mb.S it is much better to just do the necessary predicted branch inline instead as: ba,pt %xcc, 1f membar #whatever 1: instead of the current: call membar_foo dslot because this way GCC is not required to allocate a stack frame if the function can be a leaf function. This also makes this bug fix easier to backport to 2.4.x Signed-off-by: David S. Miller commit a57ebc90f1350296edded12d33d7c278831bc3bf Author: Patrick McHardy Date: Thu Sep 8 14:27:47 2005 -0700 [IPV6]: Don't redo xfrm_lookup for cached dst entries The xfrm lookup is already done when the dst entry is looked up first and stored in the cache. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit e604635c8bea16f6177e6133eb3efbfb4a029ef6 Author: Anton Altaparmakov Date: Thu Sep 8 22:13:02 2005 +0100 NTFS: Improve scalability by changing the driver global spin lock in fs/ntfs/aops.c::ntfs_end_buffer_async_read() to a bit spin lock in the first buffer head of a page. Signed-off-by: Anton Altaparmakov commit a01ac532b519dc0e0b4d8bc4e12373e4e4cd1b1a Author: Anton Altaparmakov Date: Thu Sep 8 22:08:11 2005 +0100 NTFS: Fix page_has_buffers()/page_buffers() handling in fs/ntfs/aops.c. Signed-off-by: Anton Altaparmakov commit 311120eca0013083f5eb0aff13ffb8aa9fdd050c Author: Anton Altaparmakov Date: Thu Sep 8 22:04:20 2005 +0100 NTFS: Fixup handling of sparse, compressed, and encrypted attributes in fs/ntfs/aops.c::ntfs_readpage(). Signed-off-by: Anton Altaparmakov commit 8273d5d4c28a9fde68f830cc6ff61e37e8ae1dca Author: Anton Altaparmakov Date: Thu Sep 8 22:00:33 2005 +0100 NTFS: Fix fs/ntfs/aops.c::ntfs_{read,write}_block() to handle the case where a concurrent truncate has truncated the runlist under our feet. Signed-off-by: Anton Altaparmakov commit 9b17e7e74e767d8a494a74c3c459aeecd1e08c5f Author: Jack Steiner Date: Thu Sep 8 15:28:28 2005 -0500 [IA64] Increase max physical address for SN platforms Increase the value for the maximum physical address on SN systems. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 408865ce4829376120489ac8011b72125453dcff Author: Dean Nelson Date: Thu Sep 8 10:46:58 2005 -0500 [IA64] ensure XPC and XPNET are loaded on sn2 platforms only These are SN2 only drivers. They should have platform checks to prevent them from doing evil stuff in GENERIC kernels. Signed-off-by: Martin Hicks Acked-by: Dean Nelson Signed-off-by: Tony Luck commit 087f902686beb6c02157c271e3fc95606dbdfdbf Author: Martin Hicks Date: Thu Sep 8 11:28:11 2005 -0400 [IA64] defconfig: turn off QLOGIC_FC Turn off the QLOGIC_FC driver. Supposedly qla2xxx should support these devices. Do any ia64 machines have one of these devices as the boot device? Signed-off-by: Martin Hicks Signed-off-by: Tony Luck commit 45ac56ca6403b83ad880083be164c425f4b50882 Author: Jeff Garzik Date: Thu Sep 8 16:44:33 2005 -0400 Kconfig: IEEE80211 should not depend on NET_RADIO We should not restrict use of ieee80211 to only when wireless drivers are enabled. In-development and out-of-tree drivers may wish to use it, and by removing this restriction we eliminate a circular dependency. commit 54b02eb01c0172294e43e2b54d6815f65637c111 Author: Anton Altaparmakov Date: Thu Sep 8 21:43:47 2005 +0100 NTFS: Optimize fs/ntfs/aops.c::ntfs_write_block() by extending the page lock protection over the buffer submission for i/o which allows the removal of the get_bh()/put_bh() pairs for each buffer. Signed-off-by: Anton Altaparmakov commit baed16a7ff5194487764db300c2753ac7409c4c5 Author: Ralf Baechle Date: Thu Sep 8 13:40:41 2005 -0700 [AX.25]: Make asc2ax() thread-proof Asc2ax was still using a static buffer for all invocations which isn't exactly SMP-safe. Change asc2ax to take an additional result buffer as the argument. Change all callers to provide such a buffer. This one only really is a fix for ROSE and as per recent discussions there's still much more to fix in ROSE ... Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller commit bd45fdd209ca49c5010ac9af469c41ae6dd3f145 Author: Anton Altaparmakov Date: Thu Sep 8 21:38:05 2005 +0100 NTFS: Fixup handling of sparse, compressed, and encrypted attributes in fs/ntfs/aops.c::ntfs_writepage(). Signed-off-by: Anton Altaparmakov commit 3a93481589dc80d9ff9082731f35031b0345442e Author: Andrew Morton Date: Thu Sep 8 13:36:34 2005 -0700 [NETFILTER]: ip_conntrack_netbios_ns.c gcc-2.95.x build fix gcc-2.95.x can't do this sort of initialisation Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit ce723d8e048ef98ea64d12379e3921c933f5b3e0 Author: Julian Anastasov Date: Thu Sep 8 13:34:47 2005 -0700 [IPV4]: Fix refcount damaging in net/ipv4/route.c One such place that can damage the dst refcnts is route.c with CONFIG_IP_ROUTE_MULTIPATH_CACHED enabled, i don't see the user's .config. In this new code i see that rt_intern_hash is called before dst->refcnt is set to 1, dst is the 2nd arg to rt_intern_hash. Arg 2 of rt_intern_hash must come with refcnt 1 as it is added to table or dropped depending on error/add/update. One such example is ip_mkroute_input where __mkroute_input return rth with refcnt 0 which is provided to rt_intern_hash. ip_mkroute_output looks like a 2nd such place. Appending untested patch for comments and review. The idea is to put previous reference as we are going to return next result/error. Signed-off-by: Julian Anastasov Signed-off-by: David S. Miller commit 8dcdebafb848415eae25924b00c4f0b9ec907da0 Author: Anton Altaparmakov Date: Thu Sep 8 21:25:48 2005 +0100 NTFS: Make ntfs_write_block() not instantiate sparse blocks if they are zero. Signed-off-by: Anton Altaparmakov commit 67bb103725e4cde322cb4ddb160a12933c5c7072 Author: Anton Altaparmakov Date: Thu Sep 8 21:19:45 2005 +0100 NTFS: Fixup handling of sparse, compressed, and encrypted attributes in fs/ntfs/inode.c::ntfs_read_locked_{,attr_,index_}inode(). Signed-off-by: Anton Altaparmakov commit c921e4c4dbb043f9435414c4e661e7f0a783053d Author: Michael Chan Date: Thu Sep 8 13:15:32 2005 -0700 [BNX2]: Fix bug in irq handler and add prefetch Fix bug in bnx2_interrupt() that caused an unnecessary register read. The BNX2_PCICFG_MISC_STATUS should only be read when the status tag has not changed. Add prefetch of the status block in bnx2_msi() similar to tg3_msi(). The status block is not touched in bnx2_msi() and prefetching it will speed up bnx2_poll() that will run on the same CPU that received the MSI. Update version. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 1c7d469d47668f4664b892a6cd1c452a0c02d710 Author: Anton Altaparmakov Date: Thu Sep 8 21:15:09 2005 +0100 NTFS: Truncate {a,c,m}time to the ntfs supported time granularity when updating the times in the inode in ntfs_setattr(). Signed-off-by: Anton Altaparmakov commit bbf1813fb8ff9d21171bf22e6d1f0e0393601e86 Author: Anton Altaparmakov Date: Thu Sep 8 21:09:06 2005 +0100 NTFS: Fix cluster (de)allocators to work when the runlist is NULL and more importantly to take a locked runlist rather than them locking it which leads to lock reversal. Signed-off-by: Anton Altaparmakov commit 6fd60fa97b706e52abba7c9f810b148aa230817f Author: Russell King Date: Thu Sep 8 21:04:58 2005 +0100 [I2C] Clean up i2c-pxa debugging/printks Fix up comments made by review by gregkh. Signed-off-by: Russell King commit 807c453de7c5487d2e5eece76bafdea8f39d249e Author: Anton Altaparmakov Date: Thu Sep 8 21:01:17 2005 +0100 NTFS: Fix handling of sparse attributes in ntfs_attr_make_non_resident(). Also, add BUG() checks to ntfs_attr_make_non_resident() and ntfs_attr_set() to ensure that these functions are never called for compressed or encrypted attributes. Signed-off-by: Anton Altaparmakov commit 42ca89c18b75e1c4c3b02aa5589ad3aa916909a8 Author: Stephen Hemminger Date: Thu Sep 8 12:57:43 2005 -0700 [IPV6]: Need to use pskb_trim_rcsum(). Fix pskb_trim usage in ipv6. Only the udp one is really a bug, other places are just doing equivalent code. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 2983d1bd1a596e88cdddc0c2d45b9e97728f3f41 Author: Anton Altaparmakov Date: Thu Sep 8 20:56:09 2005 +0100 NTFS: Fix several bugs in fs/ntfs/attrib.c. - Fix a bug in ntfs_map_runlist_nolock() where we forgot to protect access to the allocated size in the ntfs inode with the size lock. - Fix ntfs_attr_vcn_to_lcn_nolock() and ntfs_attr_find_vcn_nolock() to return LCN_ENOENT when there is no runlist and the allocated size is zero. - Fix load_attribute_list() to handle the case of a NULL runlist. Signed-off-by: Anton Altaparmakov commit 0aacceacf35451ffb771ec825555e98c5dce8b01 Author: Anton Altaparmakov Date: Thu Sep 8 20:40:32 2005 +0100 NTFS: Add fs/ntfs/attrib.[hc]::ntfs_resident_attr_value_resize(). Signed-off-by: Anton Altaparmakov commit f25dfb5e44fa8641961780d681bc1871abcfb861 Author: Anton Altaparmakov Date: Thu Sep 8 20:35:33 2005 +0100 NTFS: Remove bogus setting of PageError in ntfs_read_compressed_block(). Signed-off-by: Anton Altaparmakov commit e50ef933e649a2b43aa10c8a60c491543b8b4c02 Author: David S. Miller Date: Thu Sep 8 12:32:46 2005 -0700 [NET]: Need struct sock forward decl in net/compat.h Else we get build failures like: CC arch/sparc64/kernel/sparc64_ksyms.o In file included from arch/sparc64/kernel/sparc64_ksyms.c:28: include/net/compat.h:37: warning: "struct sock" declared inside parameter list include/net/compat.h:37: warning: its scope is only this definition or declaration, which is probably not what you want Signed-off-by: David S. Miller commit e308e25c97f06cf704e65eeb773412f5460a3b93 Author: Stephen Hemminger Date: Thu Sep 8 12:32:21 2005 -0700 [IPV4] udp: trim forgets about CHECKSUM_HW A UDP packet may contain extra data that needs to be trimmed off. But when doing so, UDP forgets to fixup the skb checksum if CHECKSUM_HW is being used. I think this explains the case of a NFS receive using skge driver causing 'udp hw checksum failures' when interacting with a crufty settop box. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 0e4e4220f10bf8f58a8606f0cb28538088c64b1a Author: Stephen Hemminger Date: Thu Sep 8 12:32:03 2005 -0700 [NET]: Optimize pskb_trim_rcsum() Since packets almost never contain extra garbage at the end, it is worthwhile to optimize for that case. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 8e08ceaeacd5d300aaad166f2eef8bfc37e09831 Author: Anton Altaparmakov Date: Thu Sep 8 20:29:50 2005 +0100 NTFS: Fix a bug in fs/ntfs/index.c::ntfs_index_lookup(). When the returned index entry is in the index root, we forgot to set the @ir pointer in the index context. Thanks for Yura Pakhuchiy for finding this bug. Signed-off-by: Anton Altaparmakov commit 6e48321a40610f7213e3ac75ba234f6f8b3ed5f5 Author: Anton Altaparmakov Date: Thu Sep 8 20:26:34 2005 +0100 NTFS: Add ntfs_rl_punch_nolock() which punches a caller specified hole into a runlist. Signed-off-by: Anton Altaparmakov commit 3ffc5a443824fcf426d8d35dc632acc4dd9fb6d1 Author: Anton Altaparmakov Date: Thu Sep 8 20:23:06 2005 +0100 NTFS: Change ntfs_rl_truncate_nolock() to throw away the runlist if the new length is zero. Signed-off-by: Anton Altaparmakov commit 8dc003359cc3996abad9e53a7b2280b272610283 Author: Richard Purdie Date: Thu Sep 8 17:53:01 2005 +0100 [MMC] Allow detection/removal to be delayed Change mmc_detect_change() to take a delay argument such that the detection of card insertions and removals can be delayed according to the requirements of the host driver or platform. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit f94ad38e68e1623660fdbb063d0c580ba6661c29 Author: Anton Altaparmakov Date: Thu Sep 8 17:04:11 2005 +0100 NTFS: Report unrepresentable inodes during ntfs_readdir() as KERN_WARNING messages and include the inode number. Thanks to Yura Pakhuchiy for pointing this out. Signed-off-by: Anton Altaparmakov commit 2b0ada2b8e086c267dd116a39ad41ff0a717b665 Author: Anton Altaparmakov Date: Thu Sep 8 16:52:31 2005 +0100 NTFS: Fix handling of valid but empty mapping pairs array in fs/ntfs/runlist.c::ntfs_mapping_pairs_decompress(). Signed-off-by: Anton Altaparmakov commit 8bb735216a0675e247bbe8b8b92c09d6884d1a17 Author: Anton Altaparmakov Date: Thu Sep 8 16:48:28 2005 +0100 NTFS: Remove two bogus BUG_ON()s from fs/ntfs/mft.c. Signed-off-by: Anton Altaparmakov commit 84d6ebe63f50b6efd8be252b58a207132157c60f Author: Anton Altaparmakov Date: Thu Sep 8 16:46:55 2005 +0100 NTFS: Fix two nasty runlist merging bugs that had gone unnoticed so far. Thanks to Stefano Picerno for the bug report. Signed-off-by: Anton Altaparmakov commit 9529d461d0992959026264b8fc002ac01d226708 Author: Anton Altaparmakov Date: Thu Sep 8 16:33:12 2005 +0100 NTFS: Use ntfs_malloc_nofs_nofail() in runlist.c::ntfs_runlists_merge() in the two critical regions. This means we no longer need to panic() when the allocation fails as it now cannot fail. Signed-off-by: Anton Altaparmakov commit 06d0e3cf3d527f927681773c6ffbe697ccc5db7f Author: Anton Altaparmakov Date: Thu Sep 8 16:28:25 2005 +0100 NTFS: Allow highmem kmalloc() in ntfs_malloc_nofs() and add _nofail() version. - Modify fs/ntfs/malloc.h::ntfs_malloc_nofs() to do the kmalloc() based allocations with __GFP_HIGHMEM, analogous to how the vmalloc() based allocations are done. - Add fs/ntfs/malloc.h::ntfs_malloc_nofs_nofail() which is analogous to ntfs_malloc_nofs() but it performs allocations with __GFP_NOFAIL and hence cannot fail. Signed-off-by: Anton Altaparmakov commit 8920e8f94c44e31a73bdf923b04721e26e88cadd Author: Al Viro Date: Wed Sep 7 18:28:51 2005 -0700 [PATCH] Fix 32bit sendmsg() flaw When we copy 32bit ->msg_control contents to kernel, we walk the same userland data twice without sanity checks on the second pass. Second version of this patch: the original broke with 64-bit arches running 32-bit-compat-mode executables doing sendmsg() syscalls with unaligned CMSG data areas Another thing is that we use kmalloc() to allocate and sock_kfree_s() to free afterwards; less serious, but also needs fixing. Signed-off-by: Al Viro Signed-off-by: David Woodhouse Signed-off-by: Chris Wright Signed-off-by: Linus Torvalds commit e7a1033b946f4f2622f2b338ab107f559aad542c Author: Anton Altaparmakov Date: Thu Sep 8 16:12:28 2005 +0100 NTFS: Support more clean journal ($LogFile) states. - Support journals ($LogFile) which have been modified by chkdsk. This means users can boot into Windows after we marked the volume dirty. The Windows boot will run chkdsk and then reboot. The user can then immediately boot into Linux rather than having to do a full Windows boot first before rebooting into Linux and we will recognize such a journal and empty it as it is clean by definition. - Support journals ($LogFile) with only one restart page as well as journals with two different restart pages. We sanity check both and either use the only sane one or the more recent one of the two in the case that both are valid. Signed-off-by: Anton Altaparmakov commit 6df29debb7fc04ac3f92038c57437f40bab4e72d Author: Russell King Date: Thu Sep 8 16:04:41 2005 +0100 [SERIAL] Use an enum for serial8250 platform device IDs Rather than hard-coding the platform device IDs, enumerate them. We don't particularly care about the actual ID we get, just as long as they're unique. Signed-off-by: Russell King commit 5aa3b610a7330c3cd6f0cb264d2189a3a1dcf534 Author: Kumar Gala Date: Thu Sep 8 09:20:55 2005 -0500 [PATCH] ppc32: Fix head_4xx.S compile error head_4xx.S wasn't compiling due to a missing #endif Signed-off-by: Kumar Gala Signed-off-by: Linus Torvalds commit d7b6b3589471c3856f1e6dc9c77abc4af962ffdb Author: Russell King Date: Thu Sep 8 15:32:23 2005 +0100 [ARM] Fix ARMv6 VIPT cache >= 32K This adds the necessary changes to ensure that we flush the caches correctly with aliasing VIPT caches. Signed-off-by: Russell King commit b38d950d3aedf90c8b15b3c7c799b5eb53c47c45 Author: John Lenz Date: Thu Sep 8 14:41:54 2005 +0100 [ARM] Add suspend/resume support to locomo.c This adds low-level suspend/resume support to locomo.c. Signed-off-by: Pavel Machek Signed-off-by: Russell King commit 6a690df5c8b37d4a1c41df40770d42d44fac0e97 Author: Hannes Reinecke Date: Tue Jun 28 17:30:38 2005 -0700 [PATCH] scan all enabled ports on ata_piix ICH6 spec defines the PORT_ bits as: PORT_ENABLED (R/W): 0 = Disabled. The port is in the off state and cannot detect any devices. 1 = Enabled. The port can transition between the on, partial, and slumber states and can detect devices. PORT_PRESENT (R/O) The status of this bit may change at any time. This bit is cleared when the port is disabled via PORT_ENABLED. This bit is not cleared upon surprise removal of a device. So from a textual view it is not necessary that PORT_PRESENT _must_ be set, especially if a device detection has to be done anyway. And, in fact, this is the view that ACER has been taken with its new Laptops (e.g. Travelmate 4150). And the definition of PORT_ENABLED / PORT_PRESENT is mixed up, btw. Signed-off-by: Hannes Reinecke Signed-off-by: Jens Axboe Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit eccdfcd6f8265300380fa14a83aeb14e69830323 Author: Nathan Scott Date: Thu Sep 8 15:38:52 2005 +1000 [XFS] Fix modular XFS builds (Makefile botch). Signed-off-by: Nathan Scott commit 20ba02879bc78cdf1ed89a1c6a92ee55d31ee103 Author: Nathan Scott Date: Thu Sep 8 15:34:58 2005 +1000 [XFS] Remove special Kconfig XFS menu, make XFS options "inline". Signed-off-by: Eric Sandeen Signed-off-by: Nathan Scott commit f016bad6be720496b5582a59738bca00a26f876c Author: Nathan Scott Date: Thu Sep 8 15:30:05 2005 +1000 [XFS] Cleanup some -Wundef flag warnings in the endian macros (thanks Christoph). SGI-PV: 942400 SGI-Modid: xfs-linux-melb:xfs-kern:23771a Signed-off-by: Nathan Scott commit caf39e87cc1182f7dae84eefc43ca14d54c78ef9 Author: Linus Torvalds Date: Wed Sep 7 18:44:33 2005 -0700 [SCSI] Re-do "final klist fixes" With the previous commit that introduces the klist enhancements, we can now re-do 2b7d6a8cb9718fc1d9e826201b64909c44a915f4 again. commit 34bb61f9ddabd7a7f909cbfb05592eb775f6662a Author: James Bottomley Date: Tue Sep 6 16:56:51 2005 -0700 [PATCH] fix klist semantics for lists which have elements removed on traversal The problem is that klists claim to provide semantics for safe traversal of lists which are being modified. The failure case is when traversal of a list causes element removal (a fairly common case). The issue is that although the list node is refcounted, if it is embedded in an object (which is universally the case), then the object will be freed regardless of the klist refcount leading to slab corruption because the klist iterator refers to the prior element to get the next. The solution is to make the klist take and release references to the embedding object meaning that the embedding object won't be released until the list relinquishes the reference to it. (akpm: fast-track this because it's needed for the 2.6.13 scsi merge) Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 41a1f8ea4fbfcdc4232f023732584aae2220de31 Author: YOSHIFUJI Hideaki Date: Thu Sep 8 10:19:03 2005 +0900 [IPV6]: Support IPV6_{RECV,}TCLASS socket options / ancillary data. Based on patch from David L Stevens Signed-off-by: David L Stevens Signed-off-by: YOSHIFUJI Hideaki commit 333fad5364d6b457c8d837f7d05802d2aaf8a961 Author: YOSHIFUJI Hideaki Date: Thu Sep 8 09:59:17 2005 +0900 [IPV6]: Support several new sockopt / ancillary data in Advanced API (RFC3542). Support several new socket options / ancillary data: IPV6_RECVPKTINFO, IPV6_PKTINFO, IPV6_RECVHOPOPTS, IPV6_HOPOPTS, IPV6_RECVDSTOPTS, IPV6_DSTOPTS, IPV6_RTHDRDSTOPTS, IPV6_RECVRTHDR, IPV6_RTHDR, IPV6_RECVHOPOPTS, IPV6_HOPOPTS Old semantics are preserved as IPV6_2292xxxx so that we can maintain backward compatibility. Signed-off-by: YOSHIFUJI Hideaki commit df4edad1787bbfa3c9c10824e4f11e9f4a7ec5c6 Author: Linus Torvalds Date: Wed Sep 7 17:50:58 2005 -0700 [SCSI] Revert "final klist fixes" Revert commit 2b7d6a8cb9718fc1d9e826201b64909c44a915f4. The "fix" was known to not even compile. Duh. That's not a fix. That's just stupid. Signed-off-by: Linus Torvalds commit f2c853bca542f5ac0b036377637192a74f2091c2 Author: Arnaud Patard Date: Wed Sep 7 22:44:48 2005 +0200 [PATCH] sata_sis: Add support for SiS182 chipset This patch adds support for the SiS182 sata chipset. This is a minimalistic version of the patch from http://bugme.osdl.org/show_bug.cgi?id=4192. Basically, it add the PCI IDs and handles the change of the 2nd port adress register. Signed-Off-By: Arnaud Patard Signed-off-by: Jeff Garzik commit e72225d160a2529d6ce6d5898a267f7dae02aa6e Author: viro@ZenIV.linux.org.uk Date: Wed Sep 7 23:23:50 2005 +0100 [PATCH] bogus #if (simserial) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 3352ae5de4945242040d23e16b674d17ddc7ce15 Author: viro@ZenIV.linux.org.uk Date: Wed Sep 7 23:28:32 2005 +0100 [PATCH] CHECKFLAGS on ppc64 got broken Now that asm-powerpc/* is using ifdefs on __powerpc64__ we need to add it to CHECKFLAGS on ppc64. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 147a67f0107effad2b454b786228c97e429f654e Author: viro@ZenIV.linux.org.uk Date: Wed Sep 7 23:26:35 2005 +0100 [PATCH] bogus #if (ncr53c406) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 4c86b114a45361aa3b321fd24c53023c300566fc Author: viro@ZenIV.linux.org.uk Date: Wed Sep 7 23:25:15 2005 +0100 [PATCH] bogus #if (smc91x.h) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 9a0b3869bbf7cc66ee668515d4852c729158c0ca Author: viro@ZenIV.linux.org.uk Date: Wed Sep 7 23:21:11 2005 +0100 [PATCH] bogus #if (arch/um/kernel/mem.c) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit f718404aa939d2ae19efda8e71f7fa79cbdf1646 Author: viro@ZenIV.linux.org.uk Date: Wed Sep 7 23:19:41 2005 +0100 [PATCH] -Wundef fixes (hisax) CARD_... in hisax are all used with #if; CARD_FN_ENTERNOW_PCI lacks define to 0 if corresponding config option is not set. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 185a7a1cd79b9891e3c17abdb103ba1c98d6ca7a Author: viro@ZenIV.linux.org.uk Date: Wed Sep 7 23:18:24 2005 +0100 [PATCH] -Wundef fixes (ncr5380) NDEBUG and NDEBUG_ABORT are almost always used as integers in NCR5380; added define to 0 if they are not defined, switched lone ifdef NDEBUG into if. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit f20badbe1207bb10a8ad5fdadc2131c94344b5d9 Author: viro@ZenIV.linux.org.uk Date: Wed Sep 7 23:16:59 2005 +0100 [PATCH] -Wundef fixes (hamachi) All uses of ADDRLEN are comparisons with 64 (it's an address width). added define to 32 (again, we only care about comparisons with 64) if not defined. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 95608261dae863bc43292e6fbd946a3abd3aa49f Author: viro@ZenIV.linux.org.uk Date: Tue Sep 6 22:33:51 2005 +0100 [PATCH] bogus symbol used in arch/um/os-Linux/elf_aux.c elf_aux is userland code; it uses symbol (ELF_CLASS) that doesn't exist in userland headers; pulled into kernel-offsets.h, switched elf_aux to using it. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 8412205838ae92489ab2f029687659b056dd96ff Author: viro@ZenIV.linux.org.uk Date: Tue Sep 6 19:35:49 2005 +0100 [PATCH] updated mail address parcelfarce is dead... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit e12ba644eefa9b8df4f961be91f1a0c5ea5038fa Author: viro@ZenIV.linux.org.uk Date: Tue Sep 6 02:06:57 2005 +0100 [PATCH] iomem annotations (sound/arm/aaci) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 90dffc03ca8caa0ea047f11c81fe61cd86d80568 Author: viro@ZenIV.linux.org.uk Date: Tue Sep 6 02:02:22 2005 +0100 [PATCH] lost chunk of "uml: build cleanups" A piece of the UML stubs patch got lost - it has Killed STUBS_CFLAGS - it's not needed and the only remaining use had been gratitious - it only polluted CFLAGS in description and does remove it in arch/um/Makefile-x86_64, but forgets to do the same in i386 counterpart. Lost chunk follows: Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a08b6b7968e7a6afc75e365ac31830867275abdc Author: viro@ZenIV.linux.org.uk Date: Tue Sep 6 01:48:42 2005 +0100 [PATCH] Kconfig fix (BLK_DEV_FD dependencies) Sanitized and fixed floppy dependencies: split the messy dependencies for BLK_DEV_FD by introducing a new symbol (ARCH_MAY_HAVE_PC_FDC), making BLK_DEV_FD depend on that one and taking declarations of ARCH_MAY_HAVE_PC_FDC to arch/*/Kconfig. While we are at it, fixed several obvious cases when BLK_DEV_FD should have been excluded (architectures lacking asm/floppy.h are *not* going to have floppy.c compile, let alone work). If you can come up with better name for that ("this architecture might have working PC-compatible floppy disk controller"), you are more than welcome - just s/ARCH_MAY_HAVE_PC_FDC/your_prefered_name/g in the patch below... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 8ae418cf85b92cae7bce3d810b6aaf354e77be84 Author: viro@zenIV.linux.org.uk Date: Fri Sep 2 20:15:29 2005 +0100 [PATCH] s2io u64 use for uintptr_t u64 is not uintptr_t; unsigned long is... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit dc9ca2af4917ce4e545fa3eb1d845c555128cabc Author: Michael Krufky Date: Tue Sep 6 15:19:40 2005 -0700 [PATCH] DVB: lgdt330x check callback fix Most of the patch is whitespace cleanup, but more importantly, this patch checks to see whether a callback is set before calling it. On cx88 boards (currently the only boards using lgdt330x in 2.6.13) every callback is set. However, newer drivers currently in development leave a callback undefined, and lgdt330x must not call it if it isn't defined. Signed-off-by: Patrick Boettcher Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2684f5c74d5c2d3eb6ddbb599a8c89a06c5fa420 Author: Michael Krufky Date: Tue Sep 6 15:19:38 2005 -0700 [PATCH] DVB: Clarify description text for dvb-bt8xx in Kconfig Patrick Keene wrote to the linux-dvb list, asking where in menuconfig he can enable dvb-bt8xx for his AVerMedia DVB card. I pointed the following out to him: config DVB_BT8XX tristate "Nebula/Pinnacle PCTV/Twinhan PCI cards" It has been agreed upon that this description is extremely misleading. This patch changes the one-liner description text of dvb-bt8xx to something more meaningful, and adds AVerMedia to the detailed description. Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d203a7eca85101f0a8ce1dc139ee91196142da36 Author: Ralf Baechle Date: Tue Sep 6 15:19:37 2005 -0700 [PATCH] Indycam / VINO drivers Rewrite of the Indycam / VINO video v4l2 drivers for the SGI Indy. Signed-off-by: Ralf Baechle Signed-off-by: Mikael Nousiainen Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0bb6fcc13ae4fad98e0d610458975e47be0d2203 Author: Miklos Szeredi Date: Tue Sep 6 15:19:36 2005 -0700 [PATCH] pivot_root() circular reference fix Fix http://bugzilla.kernel.org/show_bug.cgi?id=4857 When pivot_root is called from an init script in an initramfs environment, it causes a circular reference in the mount tree. The cause of this is that pivot_root() is not prepared to handle pivoting an unattached mount. In an initramfs environment, rootfs is the root of the namespace, and so it is not attached. This patch fixes this and related problems, by returning -EINVAL if either the current root or the new root is detached. Signed-off-by: Miklos Szeredi Acked-by: Al Viro Cc: Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit deac66ae454cacf942c051b86d9232af546fb187 Author: Keshavamurthy Anil S Date: Tue Sep 6 15:19:35 2005 -0700 [PATCH] kprobes: fix bug when probed on task and isr functions This patch fixes a race condition where in system used to hang or sometime crash within minutes when kprobes are inserted on ISR routine and a task routine. The fix has been stress tested on i386, ia64, pp64 and on x86_64. To reproduce the problem insert kprobes on schedule() and do_IRQ() functions and you should see hang or system crash. Signed-off-by: Anil S Keshavamurthy Signed-off-by: Ananth N Mavinakayanahalli Acked-by: Prasanna S Panchamukhi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bce0649417d6e71f6df8ab7b11103d247913b142 Author: Jim Keniston Date: Tue Sep 6 15:19:34 2005 -0700 [PATCH] kprobes: fix handling of simultaneous probe hit/unregister This patch fixes a bug in kprobes's handling of a corner case on i386 and x86_64. On an SMP system, if one CPU unregisters a kprobe just after another CPU hits that probepoint, kprobe_handler() on the latter CPU sees that the kprobe has been unregistered, and attempts to let the CPU continue as if the probepoint hadn't been hit. The bug is that on i386 and x86_64, we were neglecting to set the IP back to the beginning of the probed instruction. This could cause an oops or crash. This bug doesn't exist on ppc64 and ia64, where a breakpoint instruction leaves the IP pointing to the beginning of the instruction. I don't know about sparc64. (Dave, could you please advise?) This fix has been tested on i386 and x86_64 SMP systems. To reproduce the problem, set one CPU to work registering and unregistering a kprobe repeatedly, and another CPU pounding the probepoint in a tight loop. Acked-by: Prasanna S Panchamukhi Signed-off-by: Jim Keniston Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 661e5a3d9958dc83d610992da85625c0ada9bb06 Author: Keshavamurthy Anil S Date: Tue Sep 6 15:19:32 2005 -0700 [PATCH] Kprobes/IA64: fix race when break hits and kprobe not found This patch addresses a potential race condition for a case where Kprobe has been removed right after another CPU has taken a break hit. The way this is addressed here is when the CPU that has taken a break hit does not find its corresponding kprobe, then we check to see if the original instruction got replaced with other than break. If it got replaced with other than break instruction, then we continue to execute from the replaced instruction, else if we find that it is still a break, then we let the kernel handle this, as this might be the break instruction inserted by other than kprobe(may be kernel debugger). Signed-off-by: Anil S Keshavamurthy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 83005161c84efa70f3d4dc193eb1024a40b650dc Author: Prasanna S Panchamukhi Date: Tue Sep 6 15:19:31 2005 -0700 [PATCH] kprobes-prevent-possible-race-conditions-sparc64-changes fix This patch adds flags "ax" to .kprobe.text section. Signed-off-by: Prasanna S Panchamukhi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 05e14cb3bafabbf08216ab5566f3cd687eba9723 Author: Prasanna S Panchamukhi Date: Tue Sep 6 15:19:30 2005 -0700 [PATCH] Kprobes: prevent possible race conditions sparc64 changes This patch contains the sparc64 architecture specific changes to prevent the possible race conditions. Signed-off-by: Prasanna S Panchamukhi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1f7ad57b75ab0fba27455c7344a6ab7aa6bd90c5 Author: Prasanna S Panchamukhi Date: Tue Sep 6 15:19:30 2005 -0700 [PATCH] Kprobes: prevent possible race conditions ia64 changes This patch contains the ia64 architecture specific changes to prevent the possible race conditions. Signed-off-by: Prasanna S Panchamukhi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bb144a85c70a65730424ad1a9dc50fef66e5cafe Author: Prasanna S Panchamukhi Date: Tue Sep 6 15:19:29 2005 -0700 [PATCH] Kprobes: prevent possible race conditions ppc64 changes This patch contains the ppc64 architecture specific changes to prevent the possible race conditions. Signed-off-by: Prasanna S Panchamukhi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f2fbdcbb041f9087da42f8ac2e81f2817098d2a Author: Prasanna S Panchamukhi Date: Tue Sep 6 15:19:28 2005 -0700 [PATCH] kprobes: prevent possible race conditions x86_64 changes This patch contains the x86_64 architecture specific changes to prevent the possible race conditions. Signed-off-by: Prasanna S Panchamukhi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3d97ae5b958855ac007b6f56a0f94ab8ade09e9e Author: Prasanna S Panchamukhi Date: Tue Sep 6 15:19:27 2005 -0700 [PATCH] kprobes: prevent possible race conditions i386 changes This patch contains the i386 architecture specific changes to prevent the possible race conditions. Signed-off-by: Prasanna S Panchamukhi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d0aaff9796c3310326d10da44fc0faed352a1d29 Author: Prasanna S Panchamukhi Date: Tue Sep 6 15:19:26 2005 -0700 [PATCH] Kprobes: prevent possible race conditions generic There are possible race conditions if probes are placed on routines within the kprobes files and routines used by the kprobes. For example if you put probe on get_kprobe() routines, the system can hang while inserting probes on any routine such as do_fork(). Because while inserting probes on do_fork(), register_kprobes() routine grabs the kprobes spin lock and executes get_kprobe() routine and to handle probe of get_kprobe(), kprobes_handler() gets executed and tries to grab kprobes spin lock, and spins forever. This patch avoids such possible race conditions by preventing probes on routines within the kprobes file and routines used by kprobes. I have modified the patches as per Andi Kleen's suggestion to move kprobes routines and other routines used by kprobes to a seperate section .kprobes.text. Also moved page fault and exception handlers, general protection fault to .kprobes.text section. These patches have been tested on i386, x86_64 and ppc64 architectures, also compiled on ia64 and sparc64 architectures. Signed-off-by: Prasanna S Panchamukhi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 505db03639db34ca2c64fe7ee27190d324281f2c Author: Brice Goglin Date: Tue Sep 6 15:19:25 2005 -0700 [PATCH] Fix smsc_ircc_init return value I noticed a strange return value in smsc_ircc_init in drivers/net/irda/smsc_ircc2.c in rc4-mm1. When reaching the line "if (ircc_fir > 0 && ircc_sir > 0)", ret is 0. So I don't see the point of setting it to 0 in the "else" case. >From what I see in 2.6.12 it should probably be set to -ENODEV at the begining of the "else" case. The attached patch does this. Note that I didn't actually see any breakage caused by this. Signed-off-by: Brice Goglin Cc: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0fa2f491f0547ddb87fa3069afee3eda43b51057 Author: Dmitry Torokhov Date: Tue Sep 6 15:19:24 2005 -0700 [PATCH] smsc-ircc2: dont use void * where specific type will do IRDA: smsc-ircc2 - do not over-use void * pointers, use specific types wherever possible. Signed-off-by: Dmitry Torokhov Cc: Jean Tourrilhes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da0841a09531818000f816b76374abaef7e4b9b9 Author: Dmitry Torokhov Date: Tue Sep 6 15:19:23 2005 -0700 [PATCH] smsc-ircc2: use netdev_priv() IRDA: smsc-ircc2 - use netdev_priv() instead of accessing pointer directly. Signed-off-by: Dmitry Torokhov Cc: Jean Tourrilhes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6bb3b2cd40973ca67c9c6ab26c34df61680f5f84 Author: Dmitry Torokhov Date: Tue Sep 6 15:19:22 2005 -0700 [PATCH] smsc-ircc2: add to sysfs as platform device, new PM IRDA: smsc-ircc2 - add sysfs support (platform device and driver) and switch power management to the new scheme. Signed-off-by: Dmitry Torokhov Cc: Jean Tourrilhes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 80a9058924d66643b645dbf5ad92acdac6d1d134 Author: Dmitry Torokhov Date: Tue Sep 6 15:19:21 2005 -0700 [PATCH] smsc-ircc2: dont pass iobase around IRDA: smsc-ircc2 - cleanup - do not pass around iobase, it can be retrieved from smsc_ircc_cb structure. Signed-off-by: Dmitry Torokhov Cc: Jean Tourrilhes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6158d23a60ac32fc08316703266b6ab14d9dc00 Author: Dmitry Torokhov Date: Tue Sep 6 15:19:20 2005 -0700 [PATCH] smsc-ircc2: remove typedefs IRDA: smsc-ircc2 - remove excessive typedefs. Signed-off-by: Dmitry Torokhov Cc: Jean Tourrilhes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a956f4ca3ede0a77e307f504e4a98554047b44ff Author: Dmitry Torokhov Date: Tue Sep 6 15:19:20 2005 -0700 [PATCH] smsc-ircc2: drop DIM macro in favor of ARRAY_SIZE IRDA: smsc-ircc2 - remove home-grown DIM macro, use ARRAY_SIZE intead. Also fix out-of-bound array access. Signed-off-by: Dmitry Torokhov Cc: Jean Tourrilhes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 98b7777331d4344821e900040da5d1d3016d9e67 Author: Dmitry Torokhov Date: Tue Sep 6 15:19:19 2005 -0700 [PATCH] smsc-ircc2: formatting fixes IRDA: smsc-ircc2 - some formatting changes for better readability. Signed-off-by: Dmitry Torokhov Cc: Jean Tourrilhes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 527b6af4133f433542a875dea7a24d58f8871d4b Author: Dmitry Torokhov Date: Tue Sep 6 15:19:17 2005 -0700 [PATCH] smsc-ircc2: whitespace fixes IRDA: smsc-ircc2 - whitespace fixes. Signed-off-by: Dmitry Torokhov Cc: Jean Tourrilhes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4407c2b6b297339e296facf62e020cf66e55053d Author: Jan Kara Date: Tue Sep 6 15:19:17 2005 -0700 [PATCH] Fix race in do_get_write_access() attached patch should fix the following race: Proc 1 Proc 2 __flush_batch() ll_rw_block() do_get_write_access() lock_buffer jh is only waiting for checkpoint -> b_transaction == NULL -> do nothing unlock_buffer test_set_buffer_locked() test_clear_buffer_dirty() __journal_file_buffer() change the data submit_bh() and we have sent wrong data to disk... We now clean the dirty buffer flag under buffer lock in all cases and hence we know that whenever a buffer is starting to be journaled we either finish the pending write-out before attaching a buffer to a transaction or we won't write the buffer until the transaction is going to be committed. The test in jbd_unexpected_dirty_buffer() is redundant - remove it. Furthermore we have to clear the buffer dirty bit under the buffer lock to prevent races with buffer write-out (and hence prevent returning a buffer with IO happening). Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e39f07c83bac96850265b87a69dfc5c90ed4f1f5 Author: Jan Kara Date: Tue Sep 6 15:19:16 2005 -0700 [PATCH] Change HFS+ to not use ll_rw_block() Use block layer predefined function. Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 096125f31ae3aa2c7271463b9986dd228e0da089 Author: Jan Kara Date: Tue Sep 6 15:19:15 2005 -0700 [PATCH] Change ll_rw_block() calls in UFS We need to be sure that current data are sent to disk. Hence we call ll_rw_block() with SWRITE. Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53778ffde601c962ad9250c4998df7de6f428246 Author: Jan Kara Date: Tue Sep 6 15:19:14 2005 -0700 [PATCH] Change ll_rw_block() calls in Reiser We need to be sure that current data in buffer are sent to disk. Hence we need to call ll_rw_block() with SWRITE. Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 26707699b5337ea471ba1774447e8a1170c99e52 Author: Jan Kara Date: Tue Sep 6 15:19:12 2005 -0700 [PATCH] Change ll_rw_block() calls in JBD We must be sure that the current data in buffer are sent to disk. Hence we have to call ll_rw_block() with SWRITE. Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a7662236253374012d364106b6dc9161bd929e2e Author: Jan Kara Date: Tue Sep 6 15:19:10 2005 -0700 [PATCH] Make ll_rw_block() wait for buffer lock Introduce new ll_rw_block() operation SWRITE meaning that block layer should wait for the buffer lock and write-out afterwards. Hence data in buffers at the time of call are guaranteed to be submitted to the disk. Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e6c9f5c1888097c936334bf9740024520ca47b8e Author: Jan Kara Date: Tue Sep 6 15:19:09 2005 -0700 [PATCH] Fix JBD race in t_forget list handling Fix race between journal_commit_transaction() and other places as journal_unmap_buffer() that are adding buffers to transaction's t_forget list. We have to protect against such places by holding j_list_lock even when traversing the t_forget list. The fact that other places can only add buffers to the list makes the locking easier. OTOH the lock ranking complicates the stuff... Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cbf0d27a131639f4f3e4faa94373c5c6f89f8f07 Author: Mark Fasheh Date: Tue Sep 6 15:19:08 2005 -0700 [PATCH] kjournald: missing JFS_UNMOUNT check It seems that kjournald() may be missing a check of the JFS_UNMOUNT flag before calling schedule(). This showed up in testing of OCFS2 recovery where our recovery thread would hang in journal_kill_thread() called from journal_destroy() because kjournald never got a chance to read the flag to shut down before the schedule(). Zach pointed out the missing check which led me to hack up this trivial patch. It's been tested many times now and I have yet to reproduce the hang, which was happening very regularly before. I'm guessing that we could really use some wait_event() calls with helper functions in, well, most of jbd these days which would make a ton of the wait code there vastly cleaner. As for why this doesn't happen in ext3 (or OCFS2 during normal mount/unmount of the local nodes journal), I think it may that the specific timing of events in the ocfs2 recovery thread exposes a race there. Because ocfs2_replay_journal() is only interested in playing back the journal, initialization and shutdown happen very quicky with no other metadata put into that specific journal. Acked-by: "Stephen C. Tweedie" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3870ee8c63d5e55aea990654dfeb231264e13134 Author: Richard Purdie Date: Tue Sep 6 15:19:07 2005 -0700 [PATCH] Corgi: Add MMC/SD write protection switch handling Add MMC/SD write protection switch handling for the Corgi platform Signed-off-by: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f7ceff348bbd2ef35b5bc2ab47541dcac4b0b8ea Author: Richard Purdie Date: Tue Sep 6 15:19:07 2005 -0700 [PATCH] Corgi: Add keyboard and touchscreen device definitions Add keyboard and touchscreen device definitions for corgi. Signed-off-by: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3158106685acac8f8d4e74a17b974f160fe77c0b Author: Richard Purdie Date: Tue Sep 6 15:19:06 2005 -0700 [PATCH] Input: Add a new switch event type The corgi keyboard has need of a switch event type with slightly type to the input system as recommended by the input maintainer. Signed-off-by: Richard Purdie Cc: Vojtech Pavlik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 41b1bce80b43f7c6a6c64006b2abe3a8d52ab120 Author: Richard Purdie Date: Tue Sep 6 15:19:05 2005 -0700 [PATCH] w100fb: Update corgi platform code to match new driver This patch moves the platform specific Sharp SL-C7x0 LCD code from the w100fb driver into a more appropriate place and updates the Corgi code to match the new w100fb driver. It also updates the corgi touchscreen code to match the new simplified interface available from w100fb. Signed-off-by: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aac51f09d96a0acfb73c1d1c0796358bb47ea07b Author: Richard Purdie Date: Tue Sep 6 15:19:03 2005 -0700 [PATCH] w100fb: Rewrite for platform independence The code w100fb was based on was horribly Sharp SL-C7x0 specific and there was little else that could be done as I had no access to anything else with a w100 in it. There is no real documentation about this chipset available. Ian Molton has access to other platforms with the w100 (Toshiba e-series) and so between us, we've improved w100fb and made it platform independent. Ian Molton also added support for the very similar w3220 and w3200 chipsets. There are a lot of changes here and it nearly amounts to a rewrite of the driver but it has been extensively tested and is being used in preference to the original driver in the Zaurus community. I'd therefore like to update the mainline code to reflect this. Signed-off-by: Richard Purdie Acked-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8cc3c7af42aa826d413e3134628d85f3920457d8 Author: Richard Purdie Date: Tue Sep 6 15:19:02 2005 -0700 [PATCH] Corgi touchscreen: Fix a pmu bug Corgi Touchscreen bugfix. If the PMU isn't running, the register needs to be set to a sane value rather than reusing some random value. Signed-off-by: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74b74890bc23b8c6f5b0c0d99f6e1b3d39cb3dae Author: Richard Purdie Date: Tue Sep 6 15:19:02 2005 -0700 [PATCH] Corgi Touchscreen: Code cleanup / fixes Clean up some Corgi Touchscreen logic and merge the repeat calls to w100fb_blanking() in anticipation of the w100fb patch. Fix a pm_message_t reference. Signed-off-by: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 347e4843fa1fc21bf542c6f086fcf5ef1ab5f58e Author: Richard Purdie Date: Tue Sep 6 15:19:01 2005 -0700 [PATCH] Corgi Touchscreen: Allow the driver to share the PMU The Corgi Touchscreen driver uses the PMU as an accurate timing source which conflicts with its usage for performance monitoring. This patch allows it to be shared with other users such as oprofile. Signed-off-by: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 948e12f0bd51db439659fed857971e22fbdd7527 Author: Richard Purdie Date: Tue Sep 6 15:19:00 2005 -0700 [PATCH] Corgi Keyboard: Code tidying The input system handles key state tracking so there's no need for the driver to do so as well. Also tidy up some comment formatting and remove a now unneeded function. Signed-off-by: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8240a4a4bc95814502da522d5ee929fe0f0dc679 Author: Richard Purdie Date: Tue Sep 6 15:18:59 2005 -0700 [PATCH] Corgi Keyboard: Add some power management code Add some power management code to the corgi keyboard driver so that only one power event gets reported within any reasonable time frame and the driver doesn't enter an infinte loop due to key repeat. Signed-off-by: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aba5a4c055dde13a3cece53e1b4b060294d631ed Author: Richard Purdie Date: Tue Sep 6 15:18:59 2005 -0700 [PATCH] Corgi Keyboard: Fix a couple of compile errors Fix a couple of compile errors in the corgi keyboard driver. Signed-off-by: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4bc20a8d497e137c0a9ee9a3bacce3dd4a2b6993 Author: Pierre Ossman Date: Tue Sep 6 15:18:58 2005 -0700 [PATCH] mmc: conditional scr sysfs entry Only show the scr file in sysfs for SD cards. Previously this was present for all cards but had a contents of 0 for MMC cards. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 65ae2118e84616680dce37b951ffc366dcce7cf0 Author: Pierre Ossman Date: Tue Sep 6 15:18:57 2005 -0700 [PATCH] mmc: wbsd Secure Digital support Add support for Secure Digital specific features in the wbsd driver. Adds support for read-only switch and wide bus transfers. Signed-off-by: Pierre Ossman Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e619524fe5f5b0c13db34ed0f6320d2dcccf6e8d Author: Richard Purdie Date: Tue Sep 6 15:18:56 2005 -0700 [PATCH] Add write protection switch handling to the PXA MMC driver Add a write protection switch handling code to the PXA MMC driver so that platform specific code can provide it if available. Signed-off-by: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5b4fd9aef778e223968dfab1b90f905b3f2bd23d Author: Pierre Ossman Date: Tue Sep 6 15:18:56 2005 -0700 [PATCH] sd: SD copyright notice Credit where credit is due. Signed-off-by: Pierre Ossman Cc: Russell King Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f218278a456b3c272b480443c89004c3d2a49f18 Author: Pierre Ossman Date: Tue Sep 6 15:18:55 2005 -0700 [PATCH] sd: SD 4-bit bus Infrastructure for 4-bit bus transfers with SD cards. Signed-off-by: Pierre Ossman Cc: Russell King Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a9c4342beb4cd28b3a05c3401195e2536c37c150 Author: Pierre Ossman Date: Tue Sep 6 15:18:54 2005 -0700 [PATCH] sd: SCR in sysfs Export the SCR register through sysfs. Signed-off-by: Pierre Ossman Cc: Russell King Cc: David Brownell Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b57c43ad81602589afca3948a5a7121e40026e17 Author: Pierre Ossman Date: Tue Sep 6 15:18:53 2005 -0700 [PATCH] sd: SCR register Read the SD specific SCR register from the card. Signed-off-by: Pierre Ossman Cc: Russell King Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a00fc09029f02ca833cf90e5d5625f08c4ac4f51 Author: Pierre Ossman Date: Tue Sep 6 15:18:52 2005 -0700 [PATCH] sd: read-only switch Support for the read-only switch on SD cards which must be enforced by the host. Signed-off-by: Pierre Ossman Cc: Russell King Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 335eadf2ef6a1122a720aea98e758e5d431da87d Author: Pierre Ossman Date: Tue Sep 6 15:18:50 2005 -0700 [PATCH] sd: initialize SD cards Support for the Secure Digital protocol in the MMC layer. A summary of the legal issues surrounding SD cards, as understood by yours truly: Members of the Secure Digital Association, hereafter SDA, are required to sign a NDA[1] before given access to any specifications. It has been speculated that including an SD implementation would forbid these members to redistribute Linux. This is the basic problem with SD support so it is unclear if it even is a problem since it has no effect on those of us that aren't members. The SDA doesn't seem to enforce these rules though since the patches included here are based on documentation made public by some of the members. The most complete specs[2] are actually released by Sandisk, one of the founding companies of the SDA. Because of this the NDA is considered a non-issue by most involved in the discussions concerning these patches. It might be that the SDA is only interested in protecting the so called "secure" bits of SD, which so far hasn't been found in any public spec. (The card is split into two sections, one "normal" and one "secure" which has an access scheme similar to TPM:s). (As a side note, Microsoft is working to make things easier for us since they want to be able to include the source code for a SD driver in one of their development kits. HP is making sure that the new NDA will allow a Linux implementation. So far only the SDIO specs have been opened up[3]. More will hopefully follow.) [1] http://www.sdcard.org/membership/images/ippolicy.pdf [2] http://www.sandisk.com/pdf/oem/ProdManualSDCardv1.9.pdf [3] http://www.sdcard.org/sdio/Simplified%20SDIO%20Card%20Specification.pdf This patch contains the central parts of the SD support. If no MMC cards are found on a bus then the MMC layer proceeds looking for SD cards. Helper functions are extended to handle the special needs of SD cards. Signed-off-by: Pierre Ossman Cc: Russell King Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 328b9227865026268261a24a97a578907b280415 Author: Roman Zippel Date: Tue Sep 6 15:18:49 2005 -0700 [PATCH] hfs: NLS support This adds NLS support to HFS. Using the kernel options iocharset and codepage it's possible to map the disk encoding to a local mapping. If these options are not used, it falls back to the old direct mapping. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 717dd80e999cdc84fb611decec5c5054d37c40d2 Author: Roman Zippel Date: Tue Sep 6 15:18:48 2005 -0700 [PATCH] hfs: show_options support This adds support for show_options. It also fixes some namespace polution in the hfsplus driver. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a5e3985fa014029eb6795664c704953720cc7f7d Author: Roman Zippel Date: Tue Sep 6 15:18:47 2005 -0700 [PATCH] hfs: remove debug code This removes some old debug code, which is no longer needed. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c702e16207c70119d03df924de35f8c3629a5c4 Author: Corey Minyard Date: Tue Sep 6 15:18:46 2005 -0700 [PATCH] ipmi poweroff: fix chassis control The IPMI power control function proc_write_chassctrl was badly written, it directly used userspace pointers, it assumed that strings were NULL terminated, and it used the evil sscanf function. This converts over to using the sysctl interface for this data and changes the semantics to be a little more logical. Signed-off-by: Corey Minyard Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 877197ef89aa486c8eea369a9357af34381d11e0 Author: Corey Minyard Date: Tue Sep 6 15:18:45 2005 -0700 [PATCH] ipmi: remove unused fields This removes the unused "all_cmd_rcvr" variable from the IPMI driver. Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e8b336173b86c5db5dd5ae5ad33f3f8605878d0d Author: Corey Minyard Date: Tue Sep 6 15:18:45 2005 -0700 [PATCH] ipmi: style cleanups Clean up various style issues in the IPMI driver. Should be no functional changes. Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 168524d673f99550d75af49eb3f5d2850420eb66 Author: Corey Minyard Date: Tue Sep 6 15:18:43 2005 -0700 [PATCH] ipmi: add hacks for IPMI chassis poweroff for certain Dell servers This patch allows Dell servers with IPMI controllers that predate IPMI 1.5 to use the standard poweroff or powercycle commands. These systems firmware don't set the chassis capability bit in the Get Device ID, but they do implement the standard poweroff and powercycle commands. Tested on RHEL3 kernel 2.4.21-20.ELsmp on a PowerEdge 2600. The standard ipmi_poweroff driver cannot drive these systems. With this patch, they power off or powercycle as expected. Signed-off-by: Matt Domsch Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 56a55ec64806fb56e0cd43b0f726020b74c6689b Author: Corey Minyard Date: Tue Sep 6 15:18:42 2005 -0700 [PATCH] ipmi: fix panic ipmb response The "null message handler" in the IPMI driver is used in startup and panic situations to handle messages. It was only designed to work with messages from the local management controller, but in some cases it was used to get messages from remote managmenet controllers, and the system would then panic. This patch makes the "null message handler" in the IPMI driver more general so it works with any kind of message. Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1fdd75bd6cfa60a54b6db91d9256a711ab52fef3 Author: Corey Minyard Date: Tue Sep 6 15:18:42 2005 -0700 [PATCH] ipmi: clean up versioning of the IPMI driver This adds MODULE_VERSION, MODULE_DESCRIPTION, and MODULE_AUTHOR tags to the IPMI driver modules. Also changes the MODULE_VERSION to remove the prepended 'v' on each value, consistent with the module versioning policy. This patch also removes all the version information from everything except the ipmi_msghandler module. Signed-off-by: Matt Domsch Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3ae0e0f9b15b95a2c3e64088d2a85e3f4a707681 Author: Corey Minyard Date: Tue Sep 6 15:18:41 2005 -0700 [PATCH] ipmi: OEM flag handling and hacks for some Dell machines The ipmi driver does not have a way to handle firmware-generated events which have the OEM[012] Data Available flags set. In such a case, the SMS_ATN bit may never get cleared by firmware, leaving the driver looping infinitely but never able to make any progress. This patch first simplifies storage and use of the data returned from an IPMI Get Device ID command. It then creates a new per-OEM handler hook, which should know how to handle events with the OEM[012] Data Available flags set. It then uses this to implement a workaround for IPMI 1.5-capable Dell PowerEdge servers which are susceptable to setting the OEM[012] Data Available flags when the driver can't handle it. Signed-off-by: Matt Domsch Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 07766f241b54d67999907d529b99ffaa61d8b7d9 Author: Corey Minyard Date: Tue Sep 6 15:18:40 2005 -0700 [PATCH] ipmi: allow userland to include ipmi.h The IPMI driver include file needs to include compiler.h so it has definitions for __user and such. Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f05ee9a63b414da4fd036a9dab2d27727301188 Author: Corey Minyard Date: Tue Sep 6 15:18:39 2005 -0700 [PATCH] ipmi: watchdog/NMI interaction fixes There are some interactions between IPMI NMI timeouts and the other operations of the IPMI driver. This make sure those interactions are handled properly. Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 75b0768a396f2a25901b7b1edc87b95cdb3af4ef Author: Corey Minyard Date: Tue Sep 6 15:18:38 2005 -0700 [PATCH] ipmi: high-res timer support fixes Fix some problems with the high-res timer support. Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c14979b993021377228958498937bcdd9539cbce Author: Corey Minyard Date: Tue Sep 6 15:18:38 2005 -0700 [PATCH] ipmi: add per-channel IPMB addresses IPMI allows multiple IPMB channels on a single interface, and each channel might have a different IPMB address. However, the driver has only one IPMB address that it uses for everything. This patch adds new IOCTLS and a new internal interface for setting per-channel IPMB addresses and LUNs. New systems are coming out with support for multiple IPMB channels, and they are broken without this patch. Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b224cd3a0ca376dd52f382905c1aaf5a83a54692 Author: Andrey Panin Date: Tue Sep 6 15:18:37 2005 -0700 [PATCH] IPMI: use dmi_find_device() This patch replaces homebrew DMI scanning code in IPMI System Interface driver with dmi_find_device() call. Signed-off-by: Andrey Panin Cc: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8db08ea7e6527eff82d8e45507468003e3cefba3 Author: Pekka Enberg Date: Tue Sep 6 15:18:36 2005 -0700 [PATCH] ALSA: convert kcalloc to kzalloc This patch introduces a memory-leak tracking version of kzalloc for ALSA. Signed-off-by: Pekka Enberg Cc: Jaroslav Kysela Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e915fc497a8da551f32b7e5fda687eb4a10bc23b Author: Pekka Enberg Date: Tue Sep 6 15:18:35 2005 -0700 [PATCH] fs: convert kcalloc to kzalloc This patch converts kcalloc(1, ...) calls to use the new kzalloc() function. Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 82ca76b6b160b6fce46f78c069f87fe1a4dc0778 Author: Pekka Enberg Date: Tue Sep 6 15:18:35 2005 -0700 [PATCH] drivers: convert kcalloc to kzalloc This patch converts kcalloc(1, ...) calls to use the new kzalloc() function. Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7b842b6e3704f4b9606ff8a4ffe03579d9addf5e Author: Pekka Enberg Date: Tue Sep 6 15:18:34 2005 -0700 [PATCH] USB: convert kcalloc to kzalloc This patch converts kcalloc(1, ...) calls to use the new kzalloc() function. Signed-off-by: Pekka Enberg Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a97e148a8b8da8b04bc3e18ceb824a8f5f56d567 Author: Pekka Enberg Date: Tue Sep 6 15:18:33 2005 -0700 [PATCH] input: convert kcalloc to kzalloc This patch converts kcalloc(1, ...) calls to use the new kzalloc() function. Signed-off-by: Pekka Enberg Cc: Vojtech Pavlik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 874ca6cd3fb454f4dfafd2bbb6c6893303227c3f Author: Pekka Enberg Date: Tue Sep 6 15:18:32 2005 -0700 [PATCH] PPC64: convert kcalloc to kzalloc This patch converts kcalloc(1, ...) calls to use the new kzalloc() function. Signed-off-by: Pekka Enberg Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f96cb1f0580324b95b7219466312a376a59a796f Author: Pekka Enberg Date: Tue Sep 6 15:18:31 2005 -0700 [PATCH] IA64: convert kcalloc to kzalloc This patch converts kcalloc(1, ...) calls to use the new kzalloc() function. Signed-off-by: Pekka Enberg Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd3927105b6f65afb7dac17682172cdfb86d3f00 Author: Pekka J Enberg Date: Tue Sep 6 15:18:31 2005 -0700 [PATCH] introduce and use kzalloc This patch introduces a kzalloc wrapper and converts kernel/ to use it. It saves a little program text. Signed-off-by: Pekka Enberg Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 640e803376b9c4072f69fec42e304c974a631298 Author: Robert Love Date: Tue Sep 6 15:18:30 2005 -0700 [PATCH] fix: dmi_check_system Background: 1) dmi_check_system() returns the count of the number of matches. Zero thus means no matches. 2) A match callback can return nonzero to stop the match checking. Bug: The count is incremented after we check for the nonzero return value, so it does not reflect the actual count. We could say this is intended, for some dumb reason, except that it means that a match on the first check returns zero--no matches--if the callback returns nonzero. Attached patch implements the count before calling the callback and thus before potentially short-circuiting. Signed-off-by: Robert Love Cc: Andrey Panin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ebad6a4230bdb5927495e28bc7837f515bf667a7 Author: Andrey Panin Date: Tue Sep 6 15:18:29 2005 -0700 [PATCH] dmi: add onboard devices discovery This patch adds onboard devices and IPMI BMC discovery into DMI scan code. Drivers can use dmi_find_device() function to search for devices by type and name. Signed-off-by: Andrey Panin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c3c7120d552989be94c9137989be5abb6da8954f Author: Andrey Panin Date: Tue Sep 6 15:18:28 2005 -0700 [PATCH] dmi: make dmi_string() behave like strdup() This patch changes dmi_string() function to allocate string copy by itself, to avoid code duplication in the next patch. Signed-off-by: Andrey Panin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4e70b9a3d68909ad7e79bf6e1b0dcec6de922a7c Author: Andrey Panin Date: Tue Sep 6 15:18:28 2005 -0700 [PATCH] dmi: remove old debugging code DMI debugging code is unused for ages. This patch removes it. Signed-off-by: Andrey Panin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 61e032fa2f659fada02ede5087b46963a1c7de34 Author: Andrey Panin Date: Tue Sep 6 15:18:26 2005 -0700 [PATCH] dmi: remove uneeded function After elimination of central DMI blacklist dmi_scan_machine() function became a wrapper for dmi_iterate(). This patch moves some code around to kill unneeded function. Signed-off-by: Andrey Panin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e08fc0457af28f2ebec36296ea7ada6024fde81b Author: Miklos Szeredi Date: Tue Sep 6 15:18:26 2005 -0700 [PATCH] cifs_create() fix cifs_create() did totally the wrong thing with nd->intent.open.flags: it interpreted nd->intent.open.flags as the original open flags, not the one transformed for open_namei(). Also it used the intent data even if it was not filled in (if called from sys_mknod()). Signed-off-by: Miklos Szeredi Cc: Cc: Christoph Hellwig Cc: Steven French Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e922efc342d565a38eed3af377ff403f52148864 Author: Miklos Szeredi Date: Tue Sep 6 15:18:25 2005 -0700 [PATCH] remove duplicated sys_open32() code from 64bit archs 64 bit architectures all implement their own compatibility sys_open(), when in fact the difference is simply not forcing the O_LARGEFILE flag. So use the a common function instead. Signed-off-by: Miklos Szeredi Cc: Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab8d11beb46f0bd0617e04205c01f5c1fe845b61 Author: Miklos Szeredi Date: Tue Sep 6 15:18:24 2005 -0700 [PATCH] remove duplicated code from proc and ptrace Extract common code used by ptrace_attach() and may_ptrace_attach() into a separate function. Signed-off-by: Miklos Szeredi Cc: Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e21ccb136047e556acf0fdf227cab5db05c1c25 Author: Miklos Szeredi Date: Tue Sep 6 15:18:23 2005 -0700 [PATCH] fix enum pid_directory_inos in proc/base.c This patch fixes wrongly placed elements in the pid_directory_inos enum. Also add comment so this mistake is not repeated. Signed-off-by: Miklos Szeredi Cc: Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0494f6ec5d3a015d53b57e37280b93c19446676a Author: Miklos Szeredi Date: Tue Sep 6 15:18:22 2005 -0700 [PATCH] use get_fs_struct() in proc This patch cleans up proc_cwd_link() and proc_root_link() by factoring out common code into get_fs_struct(). Signed-off-by: Miklos Szeredi Cc: Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 09dd17d3e5e43ea6d3f3a12829108c4ca13ff810 Author: Miklos Szeredi Date: Tue Sep 6 15:18:21 2005 -0700 [PATCH] namei cleanup Extract common code into inline functions to make reading easier. Signed-off-by: Miklos Szeredi Cc: Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e89bbd3a0b3c054d9a94feb0db7bbae1cdb99e54 Author: Miklos Szeredi Date: Tue Sep 6 15:18:21 2005 -0700 [PATCH] remove iattr.ia_attr_flags Remove unused ia_attr_flags from struct iattr, and related defines. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c320aa545bc3921fc2b192ab0443218d27a2738c Author: Jiri Slaby Date: Tue Sep 6 15:18:19 2005 -0700 [PATCH] Remove maintainer's bad e-mails addresses This patch removes 1 whole entry, which is no longer maintained and 1 e-mail, which is not right. [comtrol was posted by Rolf Eike Beer] Signed-off-by: Rolf Eike Beer Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b19d85acca488b63af96f59c8bad2dfd75506b0 Author: Olaf Hering Date: Tue Sep 6 15:18:18 2005 -0700 [PATCH] provide MODALIAS= enviroment variable to autoload ieee1394 modules via udev https://bugzilla.novell.com/show_bug.cgi?id=103746 Old 2.6.13 hotplug enviroment for 'plug in firewire disk' event: ==> debug.01139.ieee1394.add.8211 <== set -- ieee1394 UDEV_LOG='7' ACTION='add' DEVPATH='/class/ieee1394/00010410100036e0-0' SUBSYSTEM='ieee1394' SEQNUM='1139' PHYSDEVPATH='/devices/pci0001:10/0001:10:0d.0/0001:11:0a.0/fw-host0/00010410100036e0/00010410100036e0-0' PHYSDEVBUS='ieee1394' VENDOR_ID='000000' MODEL_ID='001010' GUID='00010410100036e0' SPECIFIER_ID='00609e' VERSION='010483' UDEVD_EVENT='1' Module spb2 is not loaded. grep sbp2 /lib/modules/2.6.13-20050901172817-default/modules.alias alias ieee1394:ven*mo*sp0000609Ever00010483* sbp2 printf 'ieee1394:ven%08Xmo%08Xsp%08Xver%08X\n' '0x000000' '0x001010' '0x00609e' '0x010483' ieee1394:ven00000000mo00001010sp0000609Ever00010483 modprobe -v ieee1394:ven00000000mo00001010sp0000609Ever00010483 insmod /lib/modules/2.6.13-20050901172817-default/kernel/drivers/ieee1394/sbp2.ko Providing a MODALIAS= enviroment variable with the content above will fix it. Signed-off-by: Olaf Hering Cc: Ben Collins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 736c7b808f38f3bb72941345e11e236ec65dec3d Author: Coywolf Qi Hunt Date: Tue Sep 6 15:18:17 2005 -0700 [PATCH] alloc_buffer_head() and free_buffer_head() cleanup Signed-off-by: Coywolf Qi Hunt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3f4bb1f4199b7dc0c958447b1e4898980013b884 Author: Eric Dumazet Date: Tue Sep 6 15:18:16 2005 -0700 [PATCH] struct dentry: place d_hash close to d_parent and d_name to speedup lookups dentry cache uses sophisticated RCU technology (and prefetching if available) but touches 2 cache lines per dentry during hlist lookup. This patch moves d_hash in the same cache line than d_parent and d_name fields so that : 1) One cache line is needed instead of two. 2) the hlist_for_each_rcu() prefetching has a chance to bring all the needed data in advance, not only the part that includes d_hash.next. I also changed one old comment that was wrong for 64bits. A further optimisation would be to separate dentry in two parts, one that is mostly read, and one writen (d_count/d_lock) to avoid false sharing on SMP/NUMA but this would need different field placement depending on 32bits or 64bits platform. Signed-off-by: Eric Dumazet Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0811bab24ff1eecab38110eda7ea7847db95c64e Author: John Hawkes Date: Tue Sep 6 15:18:15 2005 -0700 [PATCH] cpusets: re-enable "dynamic sched domains" Revert the hack introduced last week. Signed-off-by: John Hawkes Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d1b551386a5f3f50a5003b691f819b07f8e6f034 Author: John Hawkes Date: Tue Sep 6 15:18:14 2005 -0700 [PATCH] cpusets: fix the "dynamic sched domains" bug For a NUMA system with multiple CPUs per node, declaring a cpu-exclusive cpuset that includes only some, but not all, of the CPUs in a node will mangle the sched domain structures. Signed-off-by: John Hawkes Cc; Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9c1cfda20a508b181bdda8c0045f7c0c333880a5 Author: John Hawkes Date: Tue Sep 6 15:18:14 2005 -0700 [PATCH] cpusets: Move the ia64 domain setup code to the generic code Signed-off-by: John Hawkes Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ef08e3b4981aebf2ba9bd7025ef7210e8eec07ce Author: Paul Jackson Date: Tue Sep 6 15:18:13 2005 -0700 [PATCH] cpusets: confine oom_killer to mem_exclusive cpuset Now the real motivation for this cpuset mem_exclusive patch series seems trivial. This patch keeps a task in or under one mem_exclusive cpuset from provoking an oom kill of a task under a non-overlapping mem_exclusive cpuset. Since only interrupt and GFP_ATOMIC allocations are allowed to escape mem_exclusive containment, there is little to gain from oom killing a task under a non-overlapping mem_exclusive cpuset, as almost all kernel and user memory allocation must come from disjoint memory nodes. This patch enables configuring a system so that a runaway job under one mem_exclusive cpuset cannot cause the killing of a job in another such cpuset that might be using very high compute and memory resources for a prolonged time. Signed-off-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9bf2229f8817677127a60c177aefce1badd22d7b Author: Paul Jackson Date: Tue Sep 6 15:18:12 2005 -0700 [PATCH] cpusets: formalize intermediate GFP_KERNEL containment This patch makes use of the previously underutilized cpuset flag 'mem_exclusive' to provide what amounts to another layer of memory placement resolution. With this patch, there are now the following four layers of memory placement available: 1) The whole system (interrupt and GFP_ATOMIC allocations can use this), 2) The nearest enclosing mem_exclusive cpuset (GFP_KERNEL allocations can use), 3) The current tasks cpuset (GFP_USER allocations constrained to here), and 4) Specific node placement, using mbind and set_mempolicy. These nest - each layer is a subset (same or within) of the previous. Layer (2) above is new, with this patch. The call used to check whether a zone (its node, actually) is in a cpuset (in its mems_allowed, actually) is extended to take a gfp_mask argument, and its logic is extended, in the case that __GFP_HARDWALL is not set in the flag bits, to look up the cpuset hierarchy for the nearest enclosing mem_exclusive cpuset, to determine if placement is allowed. The definition of GFP_USER, which used to be identical to GFP_KERNEL, is changed to also set the __GFP_HARDWALL bit, in the previous cpuset_gfp_hardwall_flag patch. GFP_ATOMIC and GFP_KERNEL allocations will stay within the current tasks cpuset, so long as any node therein is not too tight on memory, but will escape to the larger layer, if need be. The intended use is to allow something like a batch manager to handle several jobs, each job in its own cpuset, but using common kernel memory for caches and such. Swapper and oom_kill activity is also constrained to Layer (2). A task in or below one mem_exclusive cpuset should not cause swapping on nodes in another non-overlapping mem_exclusive cpuset, nor provoke oom_killing of a task in another such cpuset. Heavy use of kernel memory for i/o caching and such by one job should not impact the memory available to jobs in other non-overlapping mem_exclusive cpusets. This patch enables providing hardwall, inescapable cpusets for memory allocations of each job, while sharing kernel memory allocations between several jobs, in an enclosing mem_exclusive cpuset. Like Dinakar's patch earlier to enable administering sched domains using the cpu_exclusive flag, this patch also provides a useful meaning to a cpuset flag that had previously done nothing much useful other than restrict what cpuset configurations were allowed. Signed-off-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f90b1d2f1aaaa40c6519a32e69615edc25bb97d5 Author: Paul Jackson Date: Tue Sep 6 15:18:10 2005 -0700 [PATCH] cpusets: new __GFP_HARDWALL flag Add another GFP flag: __GFP_HARDWALL. A subsequent "cpuset_zone_allowed" patch will use this flag to mark GFP_USER allocations, and distinguish them from GFP_KERNEL allocations. Allocations (such as GFP_USER) marked GFP_HARDWALL are constrainted to the current tasks cpuset. Other allocations (such as GFP_KERNEL) can steal from the possibly larger nearest mem_exclusive cpuset ancestor, if memory is tight on every node in the current cpuset. This patch collides with Mel Gorman's patch to reduce fragmentation in the standard buddy allocator, which adds two GFP flags. This was discussed on linux-mm in July. Most likely, one of his flags for user reclaimable memory can be the same as my __GFP_HARDWALL flag, under some generic name meaning its user address space memory. Signed-off-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a49335cceab8afb6603152fcc3f7d3b6677366ca Author: Paul Jackson Date: Tue Sep 6 15:18:09 2005 -0700 [PATCH] cpusets: oom_kill tweaks This patch series extends the use of the cpuset attribute 'mem_exclusive' to support cpuset configurations that: 1) allow GFP_KERNEL allocations to come from a potentially larger set of memory nodes than GFP_USER allocations, and 2) can constrain the oom killer to tasks running in cpusets in a specified subtree of the cpuset hierarchy. Here's an example usage scenario. For a few hours or more, a large NUMA system at a University is to be divided in two halves, with a bunch of student jobs running in half the system under some form of batch manager, and with a big research project running in the other half. Each of the student jobs is placed in a small cpuset, but should share the classic Unix time share facilities, such as buffered pages of files in /bin and /usr/lib. The big research project wants no interference whatsoever from the student jobs, and has highly tuned, unusual memory and i/o patterns that intend to make full use of all the main memory on the nodes available to it. In this example, we have two big sibling cpusets, one of which is further divided into a more dynamic set of child cpusets. We want kernel memory allocations constrained by the two big cpusets, and user allocations constrained by the smaller child cpusets where present. And we require that the oom killer not operate across the two halves of this system, or else the first time a student job runs amuck, the big research project will likely be first inline to get shot. Tweaking /proc//oom_adj is not ideal -- if the big research project really does run amuck allocating memory, it should be shot, not some other task outside the research projects mem_exclusive cpuset. I propose to extend the use of the 'mem_exclusive' flag of cpusets to manage such scenarios. Let memory allocations for user space (GFP_USER) be constrained by a tasks current cpuset, but memory allocations for kernel space (GFP_KERNEL) by constrained by the nearest mem_exclusive ancestor of the current cpuset, even though kernel space allocations will still _prefer_ to remain within the current tasks cpuset, if memory is easily available. Let the oom killer be constrained to consider only tasks that are in overlapping mem_exclusive cpusets (it won't help much to kill a task that normally cannot allocate memory on any of the same nodes as the ones on which the current task can allocate.) The current constraints imposed on setting mem_exclusive are unchanged. A cpuset may only be mem_exclusive if its parent is also mem_exclusive, and a mem_exclusive cpuset may not overlap any of its siblings memory nodes. This patch was presented on linux-mm in early July 2005, though did not generate much feedback at that time. It has been built for a variety of arch's using cross tools, and built, booted and tested for function on SN2 (ia64). There are 4 patches in this set: 1) Some minor cleanup, and some improvements to the code layout of one routine to make subsequent patches cleaner. 2) Add another GFP flag - __GFP_HARDWALL. It marks memory requests for USER space, which are tightly confined by the current tasks cpuset. 3) Now memory requests (such as KERNEL) that not marked HARDWALL can if short on memory, look in the potentially larger pool of memory defined by the nearest mem_exclusive ancestor cpuset of the current tasks cpuset. 4) Finally, modify the oom killer to skip any task whose mem_exclusive cpuset doesn't overlap ours. Patch (1), the one time I looked on an SN2 (ia64) build, actually saved 32 bytes of kernel text space. Patch (2) has no affect on the size of kernel text space (it just adds a preprocessor flag). Patches (3) and (4) added about 600 bytes each of kernel text space, mostly in kernel/cpuset.c, which matters only if CONFIG_CPUSET is enabled. This patch: This patch applies a few comment and code cleanups to mm/oom_kill.c prior to applying a few small patches to improve cpuset management of memory placement. The comment changed in oom_kill.c was seriously misleading. The code layout change in select_bad_process() makes room for adding another condition on which a process can be spared the oom killer (see the subsequent cpuset_nodes_overlap patch for this addition). Also a couple typos and spellos that bugged me, while I was here. This patch should have no material affect. Signed-off-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f68f447e8389de9a62e3e80c3c5823cce484c2e5 Author: John Hawkes Date: Tue Sep 6 15:18:06 2005 -0700 [PATCH] ia64 cpuset + build_sched_domains() mangles structures I've already sent this to the maintainers, and this is now being sent to a larger community audience. I have fixed a problem with the ia64 version of build_sched_domains(), but a similar fix still needs to be made to the generic build_sched_domains() in kernel/sched.c. The "dynamic sched domains" functionality has recently been merged into 2.6.13-rcN that sees the dynamic declaration of a cpu-exclusive (a.k.a. "isolated") cpuset and rebuilds the CPU Scheduler sched domains and sched groups to separate away the CPUs in this cpu-exclusive cpuset from the remainder of the non-isolated CPUs. This allows the non-isolated CPUs to completely ignore the isolated CPUs when doing load-balancing. Unfortunately, build_sched_domains() expects that a sched domain will include all the CPUs of each node in the domain, i.e., that no node will belong in both an isolated cpuset and a non-isolated cpuset. Declaring a cpuset that violates this presumption will produce flawed data structures and will oops the kernel. To trigger the problem (on a NUMA system with >1 CPUs per node): cd /dev/cpuset mkdir newcpuset cd newcpuset echo 0 >cpus echo 0 >mems echo 1 >cpu_exclusive I have fixed this shortcoming for ia64 NUMA (with multiple CPUs per node). A similar shortcoming exists in the generic build_sched_domains() (in kernel/sched.c) for NUMA, and that needs to be fixed also. The fix involves dynamically allocating sched_group_nodes[] and sched_group_allnodes[] for each invocation of build_sched_domains(), rather than using global arrays for these structures. Care must be taken to remember kmalloc() addresses so that arch_destroy_sched_domains() can properly kfree() the new dynamic structures. Signed-off-by: John Hawkes Cc: Nick Piggin Cc: Ingo Molnar Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 38f18527592756d24a12e84c0713e8c902ba7f15 Author: Brian King Date: Tue Sep 6 15:18:04 2005 -0700 [PATCH] block: CFQ refcounting fix I ran across a memory leak related to the cfq scheduler. The cfq init function increments the refcnt of the associated request_queue. This refcount gets decremented in cfq's exit function. Since blk_cleanup_queue only calls the elevator exit function when its refcnt goes to zero, the request_q never gets cleaned up. It didn't look like other io schedulers were incrementing this refcnt, so I removed the refcnt increment and it fixed the memory leak for me. To reproduce the problem, simply use cfq and use the scsi_host scan sysfs attribute to scan "- - -" repeatedly on a scsi host and watch the memory vanish. Signed-off-by: Brian King Acked-by: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 49e31cbac5be2202f351626fd4fb33ad4d4819b8 Author: Max Kellermann Date: Tue Sep 6 15:18:03 2005 -0700 [PATCH] sunrpc: print unsigned integers in stats The sunrpc stats are collected in unsigned integers, but they are printed with '%d'. That can result in negative numbers in /proc/net/rpc when the highest bit of a counter is set. The following patch changes '%d' to '%u' where appropriate. Cc: "David S. Miller" Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ea6040b0eff07d3a9a4e2d248ac137c6ad02d42 Author: John McCutchan Date: Tue Sep 6 15:18:02 2005 -0700 [PATCH] inotify: fix event loss on hardlinked files People have run into a problem when they do this: watch (file1, all_events); watch (file2, some_events); if file2 is a hard link to file1, some events will be missed because by default we replace the mask. The patch below adds a flag IN_MASK_ADD which will cause inotify to add to the existing mask if present. Signed-off-by: John McCutchan Signed-off-by: Robert Love Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8191151d0933d65fb6b659ffbd765479f0f200e1 Author: Stephen Rothwell Date: Tue Sep 6 15:18:01 2005 -0700 [PATCH] Consolidate the asm-ppc*/fcntl.h files into asm-powerpc This makes sense now that we have asm-powerpc. Signed-off-by: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d286aa5eaf951bf53d4a0f64576d4b377c435ba Author: Stephen Rothwell Date: Tue Sep 6 15:18:01 2005 -0700 [PATCH] Clean up struct flock64 definitions This patch gathers all the struct flock64 definitions (and the operations), puts them under !CONFIG_64BIT and cleans up the arch files. Signed-off-by: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ac353f9baf7169298ebb7de86b2d697b25bca44 Author: Stephen Rothwell Date: Tue Sep 6 15:18:00 2005 -0700 [PATCH] Clean up struct flock definitions This patch just gathers together all the struct flock definitions except xtensa into asm-generic/fcntl.h. Signed-off-by: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1abf62afb6e9cdc1b2618b69067a186b94281587 Author: Stephen Rothwell Date: Tue Sep 6 15:17:59 2005 -0700 [PATCH] Clean up the fcntl operations This patch puts the most popular of each fcntl operation/flag into asm-generic/fcntl.h and cleans up the arch files. Signed-off-by: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e64ca97fd80a129e538ca42d0b12c379746b83db Author: Stephen Rothwell Date: Tue Sep 6 15:17:58 2005 -0700 [PATCH] Clean up the open flags This patch puts the most popular of each open flag into asm-generic/fcntl.h and cleans up the arch files. Signed-off-by: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2b2fa38e5f3f17a5e1ef3fe29a9869d93197ebfd Author: Stephen Rothwell Date: Tue Sep 6 15:17:58 2005 -0700 [PATCH] Consolidate asm-ppc*/fcntl.h These two files are basically identical, so make one just include the other (protecting the 32-bit-only parts with __powerpc64__). Also remove some completely unused defines. Signed-off-by: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9317259ead88fe6c05120ae1e3ace99738e2c698 Author: Stephen Rothwell Date: Tue Sep 6 15:17:57 2005 -0700 [PATCH] Create asm-generic/fcntl.h This set of patches creates asm-generic/fcntl.h and consolidates as much as possible from the asm-*/fcntl.h files into it. This patch just gathers all the identical bits of the asm-*/fcntl.h files into asm-generic/fcntl.h. Signed-off-by: Stephen Rothwell Signed-off-by: Yoichi Yuasa Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ba4d46dc44c5399bc4e7a39239de5a1690848a4 Author: Philipp Matthias Hahn Date: Tue Sep 6 15:17:56 2005 -0700 [PATCH] tpm: fix tpm_atmel.c on ICH6 While installing Debian on our new IBM X41 Tablet, I tried briefly to use the built-in Atmel TPM. The Athmel TPM is also located on the LPC-bus of the ICH6. To make it work I had to apply the following patch: Signed-off-by: Philipp Matthias Hahn Acked-by: Kylene Jo Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e1a5cc77ec019e0d67c2abcbd486e4f3ac947a4 Author: Jesper Juhl Date: Tue Sep 6 15:17:55 2005 -0700 [PATCH] isdn_v110 warning fix Here's a small warning fix for drivers/isdn/i4l/isdn_v110.c drivers/isdn/i4l/isdn_v110.c:523: warning: `ret' might be used uninitialized in this function In addition to Karsten Keil signing off on the patch, Thomas Pfeiffer also commented on the patch, saying "initializing ret with the value zero is correct and should be done." Please apply. Signed-off-by: Jesper Juhl Signed-off-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 96803820b3d9830518083c02681fd3f72987ae4d Author: Alex Williamson Date: Tue Sep 6 15:17:54 2005 -0700 [PATCH] hpet: fix drift and url The HPET driver is using a parts per second drift factor instead of the standard parts per million drift the time interpolator code expects. This patch fixes that problem and updates the URL for the HPET spec. Signed-off-by: Alex Williamson Cc: "Robert W. Picco" Acked-by: "Pallipadi, Venkatesh" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 414edcd32aa54bad8827e7c74cace168006c5fab Author: Antonino A. Daplas Date: Tue Sep 6 15:17:52 2005 -0700 [PATCH] vt: fix possible memory corruption in complement_pos Based on a patch from Andr Pereira de Almeida It might be possible for the saved pointer (*p) to become invalid in between vc_resizes, so saving the screen offset instead of the screen pointer is saner. This bug is very hard to trigger though, but Andre probably did, if he's submitting this patch. Anyway, with Andre's patch, it's still possible for the offsets to be still illegal, if the new screen size is smaller than the old one. So I've also added checks if the offsets are still within the screenbuffer size. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eed74dfcd48101d259012ac08d29061eea500249 Author: Ralf Baechle Date: Tue Sep 6 15:17:51 2005 -0700 [PATCH] optimise 64bit unaligned access on 32bit kernel I've rewriten Atushi's fix for the 64-bit put_unaligned on 32-bit systems bug to generate more efficient code. This case has buzilla URL http://bugzilla.kernel.org/show_bug.cgi?id=5138. Signed-off-by: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 82a25b5670eef736a20613f8b93fe55ecb5ca4bc Author: Jesper Juhl Date: Tue Sep 6 15:17:51 2005 -0700 [PATCH] remove verify_area(): remove fs/umsdos/notes as it only contain a verify_area related note The file `fs/umsdos/notes' contains only a small note about a possible bug involving verify_area(). Since umsdos is no longer in the kernel and verify_area() is also gone, it seems to make sense that this file goes the way of the Dodo. After applying this patch the `fs/umsdos/' directory will be empty and can be removed entirely. Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 720a845911097cea1394fe7abb2c9efa76e32715 Author: Jesper Juhl Date: Tue Sep 6 15:17:50 2005 -0700 [PATCH] remove verify_area(): remove or edit references to verify_area in Documentation/ Remove (or edit) remaining references to the now dead verify_area() function from files in Documentation/. Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 97de50c0add1e8f3b4e764c66a13c07235fee631 Author: Jesper Juhl Date: Tue Sep 6 15:17:49 2005 -0700 [PATCH] remove verify_area(): remove verify_area() from various uaccess.h headers Remove the deprecated (and unused) verify_area() from various uaccess.h headers. Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e5d7a22292613e55da8e91d75bcc062fd861f41 Author: Pekka Enberg Date: Tue Sep 6 15:17:48 2005 -0700 [PATCH] pipe: remove redundant fifo_poll abstraction Remove a redundant fifo_poll() abstraction from fs/pipe.c and adds a big fat comment stating we set POLLERR for FIFOs too on Linux unlike most Unices. Signed-off-by: Pekka Enberg Cc: Manfred Spraul Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9c45817f41af987277353e463c78a1c6beb37da2 Author: Kumar Gala Date: Tue Sep 6 15:17:47 2005 -0700 [PATCH] Remove non-arch consumers of asm/segment.h asm/segment.h varies greatly on different architectures but is clearly deprecated. Removing all non-architecture consumers will make it easier for us to get ride of asm/segment.h all together. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 309c0a1d5d1dae2e543bfc5a0e762d0424696e0d Author: Stuart McLaren Date: Tue Sep 6 15:17:47 2005 -0700 [PATCH] blk: Use blk_queue_xxx functions to set parameters Per-queue parameters should be updated using the appropriate blk_queue_xxx functions. Signed-off-by: Stuart McLaren Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b149ee2233edf08fb59b11e879a2c5941929bcb8 Author: john stultz Date: Tue Sep 6 15:17:46 2005 -0700 [PATCH] NTP: ntp-helper functions This patch cleans up a commonly repeated set of changes to the NTP state variables by adding two helper inline functions: ntp_clear(): Clears the ntp state variables ntp_synced(): Returns 1 if the system is synced with a time server. This was compile tested for alpha, arm, i386, x86-64, ppc64, s390, sparc, sparc64. Signed-off-by: John Stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c231b7bab0aa6860cd9da2de8a064eddc34c146 Author: Ravikiran G Thirumalai Date: Tue Sep 6 15:17:45 2005 -0700 [PATCH] Additions to .data.read_mostly section Mark variables which are usually accessed for reads with __readmostly. Signed-off-by: Alok N Kataria Signed-off-by: Shai Fultheim Signed-off-by: Ravikiran Thirumalai Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39ed3fdeec1290dd246dcf1da6b278566987a084 Author: Pekka Enberg Date: Tue Sep 6 15:17:44 2005 -0700 [PATCH] futex: remove duplicate code This patch cleans up the error path of futex_fd() by removing duplicate code. Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 580b2e3c0183818adf6151e60270405b02ea8504 Author: Alexey Dobriyan Date: Tue Sep 6 15:17:43 2005 -0700 [PATCH] Adapt scripts/ver_linux to new util-linux version strings Tested with 2.12i and 2.13-pre2. Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e752dd6cc66a3e6a11396928998baf390cc00420 Author: Oleg Nesterov Date: Tue Sep 6 15:17:42 2005 -0700 [PATCH] fix send_sigqueue() vs thread exit race posix_timer_event() first checks that the thread (SIGEV_THREAD_ID case) does not have PF_EXITING flag, then it calls send_sigqueue() which locks task list. But if the thread exits in between the kernel will oops (->sighand == NULL after __exit_sighand). This patch moves the PF_EXITING check into the send_sigqueue(), it must be done atomically under tasklist_lock. When send_sigqueue() detects exiting thread it returns -1. In that case posix_timer_event will send the signal to thread group. Also, this patch fixes task_struct use-after-free in posix_timer_event. Signed-off-by: Oleg Nesterov Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a97c9bf33f4612e2aed6f000f6b1d268b6814f3c Author: Dave Johnson Date: Tue Sep 6 15:17:40 2005 -0700 [PATCH] fix cramfs making duplicate entries in inode cache Every time cramfs_lookup() is called to lookup and inode for a dentry, get_cramfs_inode() will allocate a new inode without checking to see if that inode already exists in the inode cache. This is fine the first time, but if the dentry cache entry(ies) associated with that inode are aged out, but the inode entry is not aged out (which can be quite common if the inode has buffer cache linked to it), cramfs_lookup() will be called again and another inode will be allocated and added to the inode cache creating a duplicate in the inode cache. The big issue here is that the buffers associated with each inode cache entry are not shared between the duplicates! The older inode entries are now orphaned as no dentry points to it and won't be freed until the buffer cache assoicated with them are first freed. The newest entry will have to create all new buffer cache for each part of its file as the old buffer cache is now orphaned as well. Patch below fixes this by making get_cramfs_inode() use the inode cache before blindly creating a new entry every time. This eliminates the duplicate inodes and duplicate buffer cache. Cc: Phillip Lougher Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f4bde9a3486cd7e70bedd2aff35b38667d50173 Author: Adrian Bunk Date: Tue Sep 6 15:17:39 2005 -0700 [PATCH] remove the second arg of do_timer_interrupt() The second arg of do_timer_interrupt() is not used in the functions, and all callers pass NULL. Signed-off-by: Adrian Bunk Cc: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2832e9366a1fcd6f76957a42157be041240f994e Author: Eric Dumazet Date: Tue Sep 6 15:17:38 2005 -0700 [PATCH] remove file.f_maxcount struct file cleanup: f_maxcount has an unique value (INT_MAX). Just use the hard-wired value. Signed-off-by: Eric Dumazet Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0730ded5be28653675ed314fdd878b8db5f88aa4 Author: Jesper Juhl Date: Tue Sep 6 15:17:37 2005 -0700 [PATCH] remove a redundant variable in sys_prctl() The patch removes a redundant variable `sig' from sys_prctl(). For some reason, when sys_prctl is called with option == PR_SET_PDEATHSIG then the value of arg2 is assigned to an int variable named sig. Then sig is tested with valid_signal() and later used to set the value of current->pdeath_signal . There is no reason to use this intermediate variable since valid_signal() takes a unsigned long argument, so it can handle being passed arg2 directly, and if the call to valid_signal is OK, then we know the value of arg2 is in the range zero to _NSIG and thus it'll easily fit in a plain int and thus there's no problem assigning it later to current->pdeath_signal (which is an int). The patch gets rid of the pointless variable `sig'. This reduces the size of kernel/sys.o in 2.6.13-rc6-mm1 by 32 bytes on my system. Patch has been compile tested, boot tested, and just to make damn sure I didn't break anything I wrote a quick test app that calls prctl(PR_SET_PDEATHSIG ...) with the entire range of values for a unsigned long, and it behaves as expected with and without the patch. Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5acd57936c3224fd86e838201e528e0169373e9b Author: Tejun Heo Date: Tue Sep 6 15:17:36 2005 -0700 [PATCH] fs: remove redundant timespec_equal test in update_atime() In update_atime(), timespec_equal() test is done twice in succession and the second is always false. This patch removes the second test. Signed-off-by: Tejun Heo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c9c0b52b8c6b68b05bb06efd7079a8fc5e9ba60 Author: Peter Staubach Date: Tue Sep 6 15:17:35 2005 -0700 [PATCH] largefile support for accounting There is a problem in the accounting subsystem in the kernel can not correctly handle files larger than 2GB. The output file containing the process accounting data can grow very large if the system is large enough and active enough. If the 2GB limit is reached, then the system simply stops storing process accounting data. Another annoying problem is that once the system reaches this 2GB limit, then every process which exits will receive a signal, SIGXFSZ. This signal is generated because an attempt was made to write beyond the limit for the file descriptor. This signal makes it look like every process has exited due to a signal, when in fact, they have not. The solution is to add the O_LARGEFILE flag to the list of flags used to open the accounting file. The rest of the accounting support is already largefile safe. The changes were tested by constructing a large file (just short of 2GB), enabling accounting, and then running enough commands to cause the accounting data generated to increase the size of the file to 2GB. Without the changes, the file grows to 2GB and the last command run in the test script appears to exit due a signal when it has not. With the changes, things work as expected and quietly. There are some user level changes required so that it can deal with largefiles, but those are being handled separately. Signed-off-by: Peter Staubach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 439c430e3d448b16112de3f3d92bef6ee2639d89 Author: Adrian Bunk Date: Tue Sep 6 15:17:34 2005 -0700 [PATCH] arm26: one -g is enough for everyone The main Makefile is already adding -g to the CFLAGS if CONFIG_DEBUG_INFO=y. Not that two -g would do harm, but one works as well. Signed-off-by: Adrian Bunk Acked-by: Ian Molton Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bc505a478d3fffcfb269b72f64df4510305cfe81 Author: Oleg Nesterov Date: Tue Sep 6 15:17:32 2005 -0700 [PATCH] do_notify_parent_cldstop() cleanup This patch simplifies the usage of do_notify_parent_cldstop(), it lessens the source and .text size slightly, and makes the code (in my opinion) a bit more readable. I am sending this patch now because I'm afraid Paul will touch do_notify_parent_cldstop() really soon, It's better to cleanup first. Signed-off-by: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d237c63659c098a662b1b09d43460f04c498436 Author: Stephane Doyon Date: Tue Sep 6 15:17:31 2005 -0700 [PATCH] Console blanking locking fix I've had WARN_CONSOLE_UNLOCKED warnings when calling TIOCLINUX TIOCL_BLANKSCREEN and TIOCL_UNBLANKSCREEN. (I'm blind and I use a braille display. I use those functions to blank my laptop's screen so people don't read it, and hopefully to conserve power.) The warnings are from these places: do_blank_screen at drivers/char/vt.c:2754 (Not tainted) save_screen at drivers/char/vt.c:575 (Not tainted) do_unblank_screen at drivers/char/vt.c:2822 (Not tainted) set_palette at drivers/char/vt.c:2908 (Not tainted) At a glance I would think the following patch ought to fix that. Tested on one machine. Could you please tell me if this is correct and/or forward the patch where appropriate... Signed-off-by: Stephane Doyon Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f62c6d0a2607b2d1fdf280d4d1467a7a6e24c67d Author: Neil Horman Date: Tue Sep 6 15:17:30 2005 -0700 [PATCH] Add missing overflow check in get_blkdev_list Patch to clean up missing overflow check in get_blkdev_list. The printf which adds the "Block Devices" string in /proc/devices can overflow the presented page if get_chrdev_list eats up the entire 4k space. Signed-off-by: Neil Horman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f23ef184b486ac021b6a471b4e94cfa04860d3b0 Author: Ralf Baechle Date: Tue Sep 6 15:17:29 2005 -0700 [PATCH] Delete unused do_nanosleep declaration There is no do_nanosleep function so kill it's declaration in . Signed-off-by: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2de93fbf3c427df010b5a923c302e20c143d60cf Author: Tommy S. Christensen Date: Tue Sep 6 15:17:28 2005 -0700 [PATCH] 3c59x: read current link status from phy The phy status register must be read twice in order to get the actual link state. Signed-off-by: Tommy S. Christensen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c8d127418d78aaeeb1a417ef7453dc09c9118146 Author: Christoph Hellwig Date: Tue Sep 6 15:17:27 2005 -0700 [PATCH] remove asm-*/hdreg.h unused and useless.. Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 96d0821cacd095e25a39dfff5232a45b63ed18dd Author: David Gibson Date: Tue Sep 6 15:17:26 2005 -0700 [PATCH] Fix function/macro name collision on i386 oprofile The i386 OProfile code has a function named nmi_exit(), which collides with the nmi_exit() macro in linux/hardirq.h. At the moment, we get away with it, because hardirq.h isn't included in the oprofile code. I hit this as a bug when working with a patch which (indirectly) adds a #include of hardirq.h to oprofile. Regardless, the name collision is probably not a good idea, so this patch fixes it, renaming the oprofile function to op_nmi_exit(). It also renames the nmi_init() and nmi_timer_init() functions similarly, for consistency. Signed-off-by: David Gibson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f26fdd59929e1144c6caf72adcaf4561d6e682a4 Author: Karsten Wiese Date: Tue Sep 6 15:17:25 2005 -0700 [PATCH] CHECK_IRQ_PER_CPU() to avoid dead code in __do_IRQ() IRQ_PER_CPU is not used by all architectures. This patch introduces the macros ARCH_HAS_IRQ_PER_CPU and CHECK_IRQ_PER_CPU() to avoid the generation of dead code in __do_IRQ(). ARCH_HAS_IRQ_PER_CPU is defined by architectures using IRQ_PER_CPU in their include/asm_ARCH/irq.h file. Through grepping the tree I found the following architectures currently use IRQ_PER_CPU: cris, ia64, ppc, ppc64 and parisc. Signed-off-by: Karsten Wiese Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f8eeaaf4180334a8e5c3582fe62a5f8176a8c124 Author: H. Peter Anvin Date: Tue Sep 6 15:17:24 2005 -0700 [PATCH] Make the bzImage format self-terminating Signed-off-by: H. Peter Anvin Cc: Frank Sorenson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e1efe4931bf7d95b2f3d48ca0b79ea0e8341cc2 Author: Adrian Bunk Date: Tue Sep 6 15:17:23 2005 -0700 [PATCH] jffs/jffs2: remove wrong function prototypes This patch removes prototypes for the generic_file_open and generic_file_llseek functions. Besides being superfluous because they are already present in fs.h, they were also wrong because the actual functions aren't weak functions. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 919532a54518c3a4a8258319e2bba0e07f69a925 Author: Adrian Bunk Date: Tue Sep 6 15:17:22 2005 -0700 [PATCH] fs/Kconfig: quota help text updates This patch contains the following updates to the help texts: - QUOTA: most people will get the quota utilities from their distribution, and if not the mini-HOWTO will tell them - QFMT_V2: quota utilities 3.01 are no longer recent, they are now ancient and 3.01 is lower than the minimal version documented in Documentation/Changes Signed-off-by: Adrian Bunk Acked-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 85747f0325406f3393f48e50c7e31437e2915141 Author: Maximilian Attems Date: Tue Sep 6 15:17:21 2005 -0700 [PATCH] parport: add NetMOS 9805 support This interface is said to be commonly used in germany: "The patch has been proven to work fine in a beige G3 Mac." http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=262324 Signed-off-by: maximilian attems Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b0dc07e66ade18e0209331afbd16b3de8384f5c Author: Nikita Danilov Date: Tue Sep 6 15:17:20 2005 -0700 [PATCH] cleanup of deadline_dispatch_requests() cleanup of deadline_dispatch_requests(): - replace drq selection with hopefully clearer while semantically the same construct: take write request, if there is any, otherwise take read one, or NULL if none exist. - kill unused other_dir. Signed-off-by: Nikita Danilov Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ffdfc40976dda18d923cd001d44bf0ee55da1af4 Author: Olof Johansson Date: Tue Sep 6 15:17:19 2005 -0700 [PATCH] Add rdinit parameter to pick early userspace init Since early userspace was added, there's no way to override which init to run from it. Some people tack on an extra cpio archive with a link from /init depending on what they want to run, but that's sometimes impractical. Changing the "init=" to also override the early userspace isn't feasible, since it is still used to indicate what init to run from disk when early userspace has completed doing whatever it's doing (i.e. load filesystem modules and drivers). Instead, introduce "rdinit=" and make it override the default "/init" if specified. Signed-off-by: Olof Johansson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2b579beec255d6589fabe51b60933d723630bcd4 Author: Miklos Szeredi Date: Tue Sep 6 15:17:18 2005 -0700 [PATCH] proc: link count fix This patch fixes bug titled "sunrpc as module and bad proc/sys link count" reported by Jiri Slaby. The problem was, that only proc_dir_entry->nlink was updated and the corresponding inode->i_nlink was not. The fix is to implement the inode->getattr() method, and update i_nlink (if necessary). A quick audit of proc code shows that no other attribute changes after creation. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 230649da7cb73914b8b2a1ffc802a2951e970454 Author: Mika Kukkonen Date: Tue Sep 6 15:17:17 2005 -0700 [PATCH] create_workqueue_thread() signedness fix With "-W -Wno-unused -Wno-sign-compare" I get the following compile warning: CC kernel/workqueue.o kernel/workqueue.c: In function `workqueue_cpu_callback': kernel/workqueue.c:504: warning: ordered comparison of pointer with integer zero On error create_workqueue_thread() returns NULL, not negative pointer, so following trivial patch suggests itself. Signed-off-by: Mika Kukkonen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b80068543794864f533163c586be2a1a9880a65d Author: Robert Love Date: Tue Sep 6 15:17:16 2005 -0700 [PATCH] fsnotify: hook on removexattr, too Add fsnotify_xattr() hook to removexattr(). Signed-off-by: Robert Love Signed-off-by: John McCtuchan Cc: Andreas Gruenbacher Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 90563ec4129f14d19f018240d1d3ff5c0e5e6392 Author: Doug Warzecha Date: Tue Sep 6 15:17:15 2005 -0700 [PATCH] dcdbas: add Dell Systems Management Base Driver with sysfs support This patch adds the Dell Systems Management Base Driver with sysfs support. This driver has been tested with Dell OpenManage. Signed-off-by: Doug Warzecha Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c54c28e69f2a374ad708fba37cbe1c5bb94e283 Author: Abhay Salunke Date: Tue Sep 6 15:17:14 2005 -0700 [PATCH] dell_rbu: new Dell BIOS update driver Remote BIOS Update driver for updating BIOS images on Dell servers and desktops. See dell_rbu.txt for details. Signed-off-by: Abhay Salunke Cc: Greg KH Signed-off-by: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e3eaab02028c4087a92711b20abb9e72cc803a7 Author: Abhay Salunke Date: Tue Sep 6 15:17:13 2005 -0700 [PATCH] modified firmware_class.c to support no hotplug Upgrade the request_firmware_nowait function to not start the hotplug action on a firmware update. This patch is tested along with dell_rbu driver on i386 and x86-64 systems. Signed-off-by: Abhay Salunke Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f3ef6f63e5c575c136b39bb423a6e9a002932da7 Author: Karsten Wiese Date: Tue Sep 6 15:17:12 2005 -0700 [PATCH] Speedup FAT filesystem directory reads OGAWA Hirofumi This speeds up directory reads for large FAT partitions, if the buffercache has to be filled from the drive. Following values were taken from: $ time find path_to_freshly_mounted_fat > /dev/null on an otherwise idle system. FAT with 16KB Clusters on IDE attached drive: Factor 2 FAT with 32KB Clusters on USB2 attached drive: Factor 10 (!) Its less than 1/10 slower, if the buffercache is uptodate. The patch introduces the new function fat_dir_readahead(). fat_dir_readahead() calls sb_breadahead() to readahead a whole cluster, if the requested sector is the first one in a cluster. It is usefull to do this, because on FAT directories occupy whole clusters, with the exception of FAT12/FAT16 root dirs. Readahead is only done, if the cluster's first sector is not uptodate to avoid overhead, when the buffer cache is already uptodate. Note that under memory pressure, the maximal byte count wasted (read: has to be red from disk twice) is 1 cluster's size. Thats 64KB. fat_dir_readahead() is called from fat__get_entry(). There is also an unrelated cleanup at one spot: if (bh) brelse(bh); is replaced with: brelse(bh); brelse() can handle NULL pointer arguments by itself. Signed-off-by: Karsten Wiese Signed-off-by: OGAWA Hirofumi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 378bac820be6a0ec95df8151524de73ad2b2d2ac Author: Thomas Koeller Date: Tue Sep 6 15:17:11 2005 -0700 [PATCH] flush icache early when loading module Change the sequence of operations performed during module loading to flush the instruction cache before module parameters are processed. If a module has parameters of an unusual type that cannot be handled using the standard accessor functions param_set_xxx and param_get_xxx, it has to to provide a set of accessor functions for this type. This requires module code to be executed during parameter processing, which is of course only possible after the icache has been flushed. Signed-off-by: Thomas Koeller Cc: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 19b4946ca9d1e35d4c641dcebe27378de34f3ddd Author: Mike Waychison Date: Tue Sep 6 15:17:10 2005 -0700 [PATCH] ipc: convert /proc/sysvipc/* to generic seq_file interface Change the /proc/sysvipc/shm|sem|msg files to use the generic seq_file implementation for struct ipc_ids. Signed-off-by: Mike Waychison Cc: Manfred Spraul Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae7817745eef3b4ed3c2e36cb403e0c50f17d4e4 Author: Mike Waychison Date: Tue Sep 6 15:17:09 2005 -0700 [PATCH] ipc: add generic struct ipc_ids seq_file iteration The following two patches convert /proc/sysvipc/* to use seq_file. This gives us the following: - Self-consistent IPC records in proc. - O(n) reading of the files themselves. This patch: Add a generic method for ipc types to be displayed using seq_file. This patch abstracts out seq_file iterating over struct ipc_ids into ipc/util.c Signed-off-by: Mike Waychison Cc: Manfred Spraul Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f35279d3f713e5c97b98cbdbf47d98f79942c11f Author: Bruce Allan Date: Tue Sep 6 15:17:08 2005 -0700 [PATCH] sunrpc: cache_register can use wrong module reference When registering an RPC cache, cache_register() always sets the owner as the sunrpc module. However, there are RPC caches owned by other modules. With the incorrect owner setting, the real owning module can be removed potentially with an open reference to the cache from userspace. For example, if one were to stop the nfs server and unmount the nfsd filesystem, the nfsd module could be removed eventhough rpc.idmapd had references to the idtoname and nametoid caches (i.e. /proc/net/rpc/nfs4./channel is still open). This resulted in a system panic on one of our machines when attempting to restart the nfs services after reloading the nfsd module. The following patch adds a 'struct module *owner' field in struct cache_detail. The owner is further assigned to the struct proc_dir_entry in cache_register() so that the module cannot be unloaded while user-space daemons have an open reference on the associated file under /proc. Signed-off-by: Bruce Allan Cc: Trond Myklebust Cc: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d013a068a5675ecd8e71f585a44e7af0798a4307 Author: Tobias Klauser Date: Tue Sep 6 15:17:07 2005 -0700 [PATCH] meye: use dma-mapping constants Use the DMA_32BIT_MASK constant from dma-mapping.h when calling pci_set_dma_mask() or pci_set_consistent_dma_mask() This patch includes dma-mapping.h explicitly because it caused errors on some architectures otherwise. See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details Signed-off-by: Tobias Klauser Signed-off-by: Stelian Pop Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b30bbd963ac2606b0377b39c9d148d6eeef7dce Author: Steven Pratt Date: Tue Sep 6 15:17:06 2005 -0700 [PATCH] readahead: reset cache_hit earlier We don't reset the cache hit count until after readahead does a successful readahead. This seems to leave a corner case open where we miss in cache, but don't restart the readhead right away. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e139aa595c5d3bd01699530cbe017dec75fdb07f Author: Bjorn Helgaas Date: Tue Sep 6 15:17:05 2005 -0700 [PATCH] PNP: make pnp_dbg conditional directly on CONFIG_PNP_DEBUG Seems pointless to require .c files to test CONFIG_PNP_DEBUG and conditionally define DEBUG before including . Just test CONFIG_PNP_DEBUG directly in pnp.h. Signed-off-by: Bjorn Helgaas Cc: Adam Belay Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 486d46aefe7ded0d343e306be740edd972aff740 Author: Alex Williamson Date: Tue Sep 6 15:17:04 2005 -0700 [PATCH] optimize writer path in time_interpolator_get_counter() Christoph Lameter When using a time interpolator that is susceptible to jitter there's potentially contention over a cmpxchg used to prevent time from going backwards. This is unnecessary when the caller holds the xtime write seqlock as all readers will be blocked from returning until the write is complete. We can therefore allow writers to insert a new value and exit rather than fight with CPUs who only hold a reader lock. Signed-off-by: Alex Williamson Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9f4a6dce10941380ad7365cc9b0ef038ed56cbf9 Author: Stelian Pop Date: Tue Sep 6 15:17:03 2005 -0700 [PATCH] sonypi: remove obsolete event Remove old obsolete event. Signed-off-by: Stelian Pop Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d2052c1676a39cae101a81f3da8a4ade8b668c88 Author: Erik Waling Date: Tue Sep 6 15:17:02 2005 -0700 [PATCH] sonypi SPIC initialisation fix Newer Sony VAIO models (VGN-S480, VGN-S460, VGN-S3XP etc) use a new method to initialize the SPIC device. The new way to initialize (and disable) the device comes directly from the AML code in the _CRS, _SRS and _DIS methods from the DSDT table. This patch adds support for the new models. Signed-off-by: Erik Waling Signed-off-by: Stelian Pop Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2865cf001878d22d5fd12e5215621dffbcad76dc Author: Zhigang Huo Date: Tue Sep 6 15:17:00 2005 -0700 [PATCH] remove pipe definitions These no longer have any users. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a10077708233becfbae7b0104e1e8c0569359aa7 Author: Christoph Hellwig Date: Tue Sep 6 15:16:59 2005 -0700 [PATCH] move 68360serial.c over use initcalls this is the last serial driver not using initcalls. Signed-off-by: Christoph Hellwig Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 573fc113133e0b0984d2c0090e706c6506661f91 Author: Christoph Hellwig Date: Tue Sep 6 15:16:58 2005 -0700 [PATCH] move m68k rtc drivers over to initcalls this gets rid of the last two explicit initializations in misc.c Signed-off-by: Christoph Hellwig Acked-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cdb3826b9958c204bc8ffda2cf9bbe2d899ef90c Author: Christoph Hellwig Date: Tue Sep 6 15:16:57 2005 -0700 [PATCH] remove misleading comment above sys_brk Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit edf83015fcbff8976b75b42b565a77e9d450c567 Author: Christoph Hellwig Date: Tue Sep 6 15:16:56 2005 -0700 [PATCH] remove a dead extern in mem.c Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c1d7ef70a71eb54fb389a9a411d331661be73056 Author: Avery, Brian Date: Tue Sep 6 15:16:56 2005 -0700 [PATCH] Add warning `init=' to init/main.c I passed init=/mylinuxrc to the kernel on the command line. The kernel silently dropped down to exec /sbin/init. It turned out that /mylinuxrc had improper permissions. Without any warning message from the kernel that something was wrong it took awhile to find the issue. The patch below adds a warning. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8fc2751beb0941966d3a97b26544e8585e428c08 Author: Mark Bellon Date: Tue Sep 6 15:16:54 2005 -0700 [PATCH] disk quotas fail when /etc/mtab is symlinked to /proc/mounts If /etc/mtab is a regular file all of the mount options (of a file system) are written to /etc/mtab by the mount command. The quota tools look there for the quota strings for their operation. If, however, /etc/mtab is a symlink to /proc/mounts (a "good thing" in some environments) the tools don't write anything - they assume the kernel will take care of things. While the quota options are sent down to the kernel via the mount system call and the file system codes handle them properly unfortunately there is no code to echo the quota strings into /proc/mounts and the quota tools fail in the symlink case. The attached patchs modify the EXT[2|3] and JFS codes to add the necessary hooks. The show_options function of each file system in these patches currently deal with only those things that seemed related to quotas; especially in the EXT3 case more can be done (later?). Jan Kara also noted the difficulty in moving these changes above the FS codes responding similarly to myself to Andrew's comment about possible VFS migration. Issue summary: - FS codes have to process the entire string of options anyway. - Only FS codes that use quotas must have a show_options function (for quotas to work properly) however quotas are only used in a small number of FS. - Since most of the quota using FS support other options these FS codes should have the a show_options function to show those options - and the quota echoing becomes virtually negligible. Based on feedback I have modified my patches from the original: JFS a missing patch has been restored to the posting EXT[2|3] and JFS always use the show_options function - Each FS has at least one FS specific option displayed - QUOTA output is under a CONFIG_QUOTA ifdef - a follow-on patch will add a multitude of options for each FS EXT[2|3] and JFS "quota" is treated as "usrquota" EXT3 journalled data check for journalled quota removed EXT[2|3] mount when quota specified but not compiled in - no changes from my original patch. I tested the patch and the codes warn but - still mount. With all due respection I believe the comments otherwise were a - misread of the patch. Please reread/test and comment. XFS patch removed - the XFS team already made the necessary changes EXT3 mixing old and new quotas are handled differently (not purely exclusive) - if old and new quotas for the same type are used together the old type is silently depricated for compatability (e.g. usrquota and usrjquota) - mixing of old and new quotas is an error (e.g. usrjquota and grpquota) Signed-off-by: Mark Bellon Acked-by: Dave Kleikamp Cc: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c92371566ea505cf455c208cdfb89046b3db87de Author: Russell King Date: Tue Sep 6 15:16:52 2005 -0700 [PATCH] Fix sound/arm/Makefile for locality of reference Ensure that sound/arm/Makefile is sanely organised so that additions to it don't break all other patches out there. This means I only have to adjust the line numbers in my patch queue rather than having to re-generate by hand those which touch this file. Signed-off-by: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a2822e7f00cdccbff8e507b5ebbddce1aa95eb5d Author: Bjorn Helgaas Date: Tue Sep 6 15:16:51 2005 -0700 [PATCH] pnp: consolidate kmalloc wrappers ISAPNP, PNPBIOS, and PNPACPI all had their own kmalloc wrappers that reimplemented kcalloc(). Remove the wrappers and just use kcalloc() directly. Note that this also removes the PNPBIOS error message when the kmalloc fails. Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ea2f1590aaffbd02f1850c19c3895ff4d092c6e0 Author: Daniel Ritz Date: Tue Sep 6 15:16:50 2005 -0700 [PATCH] yenta: make ToPIC95 bridges work with 16bit cards ToPIC95 brides (and maybe some other too) require to use the ExCA registers to power up the socket if a 16bit card is pluged. allow socket drivers to set a flag so that yenta does just that. also clean up yenta_get_status() a bit to use the new yenta_get_power() function. Side note: ToPIC97 bridges (at least in Rev.5 i have) don't require this. Ryan Underwood said: According to the mail that David Hinds received from a Toshiba engineer, ToPIC95 and 97 do require this, and ToPIC100 does not. Maybe you have a later revision. For all chips, 16-bit cards can be enabled through ExCA. So doesn't it make sense just to make this the default behavior for all Toshiba chips, to avoid corner cases showing up later? Daniel responded: I disagree with ryan to change anything for topic97 bridges. they work. and I couldn't find (read google) any report of a topic97 breaking on applying power with the CB registers. I'm having several toshba notebooks at work (and home) with topic95,97,100 bridges. Only the ones with a topic95 didn't work. Signed-off-by: Daniel Ritz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 36d57ac4a818cb4aa3edbdf63ad2ebc31106f925 Author: H. J. Lu Date: Tue Sep 6 15:16:49 2005 -0700 [PATCH] auxiliary vector cleanups The size of auxiliary vector is fixed at 42 in linux/sched.h. But it isn't very obvious when looking at linux/elf.h. This patch adds AT_VECTOR_SIZE so that we can change it if necessary when a new vector is added. Because of include file ordering problems, doing this necessitated the extraction of the AT_* symbols into a standalone header file. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32605a18152b246df483fadc1c23854addde8755 Author: Marcelo Tosatti Date: Tue Sep 6 15:16:48 2005 -0700 [PATCH] radix_tag_get(): differentiate between no present node and tag unset cases Simple patch to radix_tree_tag_get() to return different values for non present node and tag unset. The function is not used by any in-kernel callers (yet), but this information is definitely useful. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 201b6264ff3865090747f58f48e087c3a35e0dbc Author: Christoph Lameter Date: Tue Sep 6 15:16:46 2005 -0700 [PATCH] radix-tree: Remove unnecessary indirections and clean up code - There is frequent use of indirections in the radix code. This patch removes those indirections, makes the code more readable and allows the compilers to generate better code. - Removing indirections allows the removal of several casts. - Removing indirections allows the reduction of the radix_tree_path size from 3 to 2 words. - Use pathp-> consistently. - Remove unnecessary tmp variable in radix_tree_insert - Separate the upper layer processing from the lowest layer in __lookup() in order to make it easier to understand what is going on and allow compilers to generate better code for the loop. Signed-off-by: Christoph Lameter Cc: Nick Piggin Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 987132bb0b136c93cef5f195e7371bb98df64709 Author: Pavel Machek Date: Tue Sep 6 15:16:45 2005 -0700 [PATCH] Support powering sharp zaurus sl-5500 LCD up and down This adds support for powering Zaurus's video up and down. PDA without screen is kind of useless, so it is quite important... I'll have to figure out how to really control the frontlight, because LCD without that is quite hard to read. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2cf8e25ba4cf4e0881e612125858b4eed563ee4 Author: Alan Cox Date: Tue Sep 6 15:16:44 2005 -0700 [PATCH] Clean up the old digi support and rescue it Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5dd42c262bd742fa3602180bbe5550b4828de8f3 Author: Adrian Bunk Date: Tue Sep 6 15:16:43 2005 -0700 [PATCH] remove register_ioctl32_conversion and unregister_ioctl32_conversion All users have been converted. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3676347a5e216a7fec7f8eedbbcf8bed6b9c4e40 Author: Peter Osterlund Date: Tue Sep 6 15:16:42 2005 -0700 [PATCH] kill bio->bi_set Jens: ->bi_set is totally unnecessary bloat of struct bio. Just define a proper destructor for the bio and it already knows what bio_set it belongs too. Peter: Fixed the bugs. Signed-off-by: Jens Axboe Signed-off-by: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6f00df24ee394f345a8789d3a2f98fc1d9195b9f Author: Ralf Baechle Date: Tue Sep 6 15:16:41 2005 -0700 [PATCH] Strip local symbols from kallsyms Local symbols generated by gcc start with a `$'; no point in including them in the kernel. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 022a4a7bbdefdedc2706a13c81c832d8c3173c6d Author: Adrian Bunk Date: Tue Sep 6 15:16:41 2005 -0700 [PATCH] fs/jbd/: cleanups This patch contains the following cleanups: - make needlessly global functions static - journal.c: remove the unused global function __journal_internal_check and move the check to journal_init - remove the following write-only global variable: - journal.c: current_journal - remove the following unneeded EXPORT_SYMBOL: - journal.c: journal_recover Signed-off-by: Adrian Bunk Acked-by: Andreas Dilger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 202e5979af4d91c7ca05892641131dee22653259 Author: Stephen Rothwell Date: Tue Sep 6 15:16:40 2005 -0700 [PATCH] compat: be more consistent about [ug]id_t When I first wrote the compat layer patches, I was somewhat cavalier about the definition of compat_uid_t and compat_gid_t (or maybe I just misunderstood :-)). This patch makes the compat types much more consistent with the types we are being compatible with and hopefully will fix a few bugs along the way. compat type type in compat arch __compat_[ug]id_t __kernel_[ug]id_t __compat_[ug]id32_t __kernel_[ug]id32_t compat_[ug]id_t [ug]id_t The difference is that compat_uid_t is always 32 bits (for the archs we care about) but __compat_uid_t may be 16 bits on some. Signed-off-by: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8dbfc5cfdcac04d656f6f6789eb8fcdcc3d2dfda Author: Bodo Eggert <7eggert@gmx.de> Date: Tue Sep 6 15:16:39 2005 -0700 [PATCH] use select in sound/isa/Kconfig In sound/isa/Kconfig, select ISAPNP and depend on ISAPNP are intermixed, resulting in funny behaviour. (Soundcarts get selectable if other soundcards are selected). This patch changes the "depend on ISAPNP"s to select. Signed-Off-By: Bodo Eggert <7eggert@gmx.de> Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 820249bafe441dce5336ad544a5e709df42fceb5 Author: John McCutchan Date: Tue Sep 6 15:16:38 2005 -0700 [PATCH] inotify speedup Bypass an inotify-related fastpath spinlock and several function calls on systems which have no inotify watches registered. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 19306059cd7fedaf96b4b0260a9a8a45e513c857 Author: Paul E. McKenney Date: Tue Sep 6 15:16:35 2005 -0700 [PATCH] NMI: Update NMI users of RCU to use new API Uses of RCU for dynamically changeable NMI handlers need to use the new rcu_dereference() and rcu_assign_pointer() facilities. This change makes it clear that these uses are safe from a memory-barrier viewpoint, but the main purpose is to document exactly what operations are being protected by RCU. This has been tested on x86 and x86-64, which are the only architectures affected by this change. Signed-off-by: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fe21773d655c2c64641ec2cef499289ea175c817 Author: David Howells Date: Tue Sep 6 15:16:34 2005 -0700 [PATCH] Provide better printk() support for SMP machines The attached patch prevents oopses interleaving with characters from other printks on other CPUs by only breaking the lock if the oops is happening on the machine holding the lock. It might be better if the oops generator got the lock and then called an inner vprintk routine that assumed the caller holds the lock, thus making oops reports "atomic". Signed-Off-By: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c3d8c1414573be8cf7c8fdc1e076935697c7f6af Author: Christoph Lameter Date: Tue Sep 6 15:16:33 2005 -0700 [PATCH] More __read_mostly variables Move some more frequently read variables that showed up during some of our performance tests as sometimes ending up in hot cachelines to the read_mostly section. Fix: Move the __read_mostly from before hpet_usec_quotient to follow the variable like the other uses of __read_mostly. Signed-off-by: Alok N Kataria Signed-off-by: Christoph Lameter Signed-off-by: Shai Fultheim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b3dbb4ecd46767b621df3dedd28788da93ee0cac Author: Paulo Marques Date: Tue Sep 6 15:16:31 2005 -0700 [PATCH] kallsyms: change compression algorithm This patch changes the way the compression algorithm works. The base algorithm is similiar to the previous but we force the compressed token size to 2. Having a fixed size compressed token allows for a lot of optimizations, and that in turn allows this code to run over *all* the symbols faster than it did before over just a subset. Having it work over all the symbols will make it behave better when symbols change positions between passes, and the "inconsistent kallsyms" messages should become less frequent. In my tests the compression ratio was degraded by about 0.5%, but the results will depend greatly on the number of symbols to compress. Signed-off-by: Paulo Marques Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e82894f84dbba130ab46c97748c03647f8204f92 Author: Tom Zanussi Date: Tue Sep 6 15:16:30 2005 -0700 [PATCH] relayfs Here's the latest version of relayfs, against linux-2.6.11-mm2. I'm hoping you'll consider putting this version back into your tree - the previous rounds of comment seem to have shaken out all the API issues and the number of comments on the code itself have also steadily dwindled. This patch is essentially the same as the relayfs redux part 5 patch, with some minor changes based on reviewer comments. Thanks again to Pekka Enberg for those. The patch size without documentation is now a little smaller at just over 40k. Here's a detailed list of the changes: - removed the attribute_flags in relay open and changed it to a boolean specifying either overwrite or no-overwrite mode, and removed everything referencing the attribute flags. - added a check for NULL names in relayfs_create_entry() - got rid of the unnecessary multiple labels in relay_create_buf() - some minor simplification of relay_alloc_buf() which got rid of a couple params - updated the Documentation In addition, this version (through code contained in the relay-apps tarball linked to below, not as part of the relayfs patch) tries to make it as easy as possible to create the cooperating kernel/user pieces of a typical and common type of logging application, one where kernel logging is kicked off when a user space data collection app starts and stops when the collection app exits, with the data being automatically logged to disk in between. To create this type of application, you basically just include a header file (relay-app.h, included in the relay-apps tarball) in your kernel module, define a couple of callbacks and call an initialization function, and on the user side call a single function that sets up and continuously monitors the buffers, and writes data to files as it becomes available. Channels are created when the collection app is started and destroyed when it exits, not when the kernel module is inserted, so different channel buffer sizes can be specified for each separate run via command-line options. See the README in the relay-apps tarball for details. Also included in the relay-apps tarball are a couple examples demonstrating how you can use this to create quick and dirty kernel logging/debugging applications. They are: - tprintk, short for 'tee printk', which temporarily puts a kprobe on printk() and writes a duplicate stream of printk output to a relayfs channel. This could be used anywhere there's printk() debugging code in the kernel which you'd like to exercise, but would rather not have your system logs cluttered with debugging junk. You'd probably want to kill klogd while you do this, otherwise there wouldn't be much point (since putting a kprobe on printk() doesn't change the output of printk()). I've used this method to temporarily divert the packet logging output of the iptables LOG target from the system logs to relayfs files instead, for instance. - klog, which just provides a printk-like formatted logging function on top of relayfs. Again, you can use this to keep stuff out of your system logs if used in place of printk. The example applications can be found here: http://prdownloads.sourceforge.net/dprobes/relay-apps.tar.gz?download From: Christoph Hellwig avoid lookup_hash usage in relayfs Signed-off-by: Tom Zanussi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8446f1d391f3d27e6bf9c43d4cbcdac0ca720417 Author: Ingo Molnar Date: Tue Sep 6 15:16:27 2005 -0700 [PATCH] detect soft lockups This patch adds a new kernel debug feature: CONFIG_DETECT_SOFTLOCKUP. When enabled then per-CPU watchdog threads are started, which try to run once per second. If they get delayed for more than 10 seconds then a callback from the timer interrupt detects this condition and prints out a warning message and a stack dump (once per lockup incident). The feature is otherwise non-intrusive, it doesnt try to unlock the box in any way, it only gets the debug info out, automatically, and on all CPUs affected by the lockup. Signed-off-by: Ingo Molnar Signed-off-by: Nishanth Aravamudan Signed-Off-By: Matthias Urlichs Signed-off-by: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4732efbeb997189d9f9b04708dc26bf8613ed721 Author: Jakub Jelinek Date: Tue Sep 6 15:16:25 2005 -0700 [PATCH] FUTEX_WAKE_OP: pthread_cond_signal() speedup ATM pthread_cond_signal is unnecessarily slow, because it wakes one waiter (which at least on UP usually means an immediate context switch to one of the waiter threads). This waiter wakes up and after a few instructions it attempts to acquire the cv internal lock, but that lock is still held by the thread calling pthread_cond_signal. So it goes to sleep and eventually the signalling thread is scheduled in, unlocks the internal lock and wakes the waiter again. Now, before 2003-09-21 NPTL was using FUTEX_REQUEUE in pthread_cond_signal to avoid this performance issue, but it was removed when locks were redesigned to the 3 state scheme (unlocked, locked uncontended, locked contended). Following scenario shows why simply using FUTEX_REQUEUE in pthread_cond_signal together with using lll_mutex_unlock_force in place of lll_mutex_unlock is not enough and probably why it has been disabled at that time: The number is value in cv->__data.__lock. thr1 thr2 thr3 0 pthread_cond_wait 1 lll_mutex_lock (cv->__data.__lock) 0 lll_mutex_unlock (cv->__data.__lock) 0 lll_futex_wait (&cv->__data.__futex, futexval) 0 pthread_cond_signal 1 lll_mutex_lock (cv->__data.__lock) 1 pthread_cond_signal 2 lll_mutex_lock (cv->__data.__lock) 2 lll_futex_wait (&cv->__data.__lock, 2) 2 lll_futex_requeue (&cv->__data.__futex, 0, 1, &cv->__data.__lock) # FUTEX_REQUEUE, not FUTEX_CMP_REQUEUE 2 lll_mutex_unlock_force (cv->__data.__lock) 0 cv->__data.__lock = 0 0 lll_futex_wake (&cv->__data.__lock, 1) 1 lll_mutex_lock (cv->__data.__lock) 0 lll_mutex_unlock (cv->__data.__lock) # Here, lll_mutex_unlock doesn't know there are threads waiting # on the internal cv's lock Now, I believe it is possible to use FUTEX_REQUEUE in pthread_cond_signal, but it will cost us not one, but 2 extra syscalls and, what's worse, one of these extra syscalls will be done for every single waiting loop in pthread_cond_*wait. We would need to use lll_mutex_unlock_force in pthread_cond_signal after requeue and lll_mutex_cond_lock in pthread_cond_*wait after lll_futex_wait. Another alternative is to do the unlocking pthread_cond_signal needs to do (the lock can't be unlocked before lll_futex_wake, as that is racy) in the kernel. I have implemented both variants, futex-requeue-glibc.patch is the first one and futex-wake_op{,-glibc}.patch is the unlocking inside of the kernel. The kernel interface allows userland to specify how exactly an unlocking operation should look like (some atomic arithmetic operation with optional constant argument and comparison of the previous futex value with another constant). It has been implemented just for ppc*, x86_64 and i?86, for other architectures I'm including just a stub header which can be used as a starting point by maintainers to write support for their arches and ATM will just return -ENOSYS for FUTEX_WAKE_OP. The requeue patch has been (lightly) tested just on x86_64, the wake_op patch on ppc64 kernel running 32-bit and 64-bit NPTL and x86_64 kernel running 32-bit and 64-bit NPTL. With the following benchmark on UP x86-64 I get: for i in nptl-orig nptl-requeue nptl-wake_op; do echo time elf/ld.so --library-path .:$i /tmp/bench; \ for j in 1 2; do echo ( time elf/ld.so --library-path .:$i /tmp/bench ) 2>&1; done; done time elf/ld.so --library-path .:nptl-orig /tmp/bench real 0m0.655s user 0m0.253s sys 0m0.403s real 0m0.657s user 0m0.269s sys 0m0.388s time elf/ld.so --library-path .:nptl-requeue /tmp/bench real 0m0.496s user 0m0.225s sys 0m0.271s real 0m0.531s user 0m0.242s sys 0m0.288s time elf/ld.so --library-path .:nptl-wake_op /tmp/bench real 0m0.380s user 0m0.176s sys 0m0.204s real 0m0.382s user 0m0.175s sys 0m0.207s The benchmark is at: http://sourceware.org/ml/libc-alpha/2005-03/txt00001.txt Older futex-requeue-glibc.patch version is at: http://sourceware.org/ml/libc-alpha/2005-03/txt00002.txt Older futex-wake_op-glibc.patch version is at: http://sourceware.org/ml/libc-alpha/2005-03/txt00003.txt Will post a new version (just x86-64 fixes so that the patch applies against pthread_cond_signal.S) to libc-hacker ml soon. Attached is the kernel FUTEX_WAKE_OP patch as well as a simple-minded testcase that will not test the atomicity of the operation, but at least check if the threads that should have been woken up are woken up and whether the arithmetic operation in the kernel gave the expected results. Acked-by: Ingo Molnar Cc: Ulrich Drepper Cc: Jamie Lokier Cc: Rusty Russell Signed-off-by: Yoichi Yuasa Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5b039e681b8c5f30aac9cc04385cc94be45d0823 Author: Rafael J. Wysocki Date: Tue Sep 6 15:16:22 2005 -0700 [PATCH] 3c59x PM fixes This patch adds some missing pci-related calls to the suspend and resume routines of the 3c59x driver. It also makes the driver free/request IRQ on suspend/resume, in accordance with the proposal at: http://lists.osdl.org/pipermail/linux-pm/2005-May/000955.html Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d7ae79c72d072e3208c18ff2dc402a69229b7b1b Author: Pavel Machek Date: Tue Sep 6 15:16:21 2005 -0700 [PATCH] swsusp: update documentation This updates documentation a bit (mostly removing obsolete stuff), and marks swsusp as no longer experimental in config. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 48c8b1134249432318c8e5d19adc37c45242c4b1 Author: Eric W. Biederman Date: Tue Sep 6 15:16:20 2005 -0700 [PATCH] x86_64: Fix off by one in e820_mapped This allows a valid iommu placed immediately after memory to work, to be recognized as after the last byte of memory and not overlapping it. Signed-off-by: Eric W. Biederman Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a888cebe17e39476e5ca18c3a4bd96c6775070db Author: Ashok Raj Date: Tue Sep 6 15:16:19 2005 -0700 [PATCH] x86_64: create sysfs entries for cpu only for present cpus Need to create sysfs only for cpus that are present. Without which we see NR_CPUS entries created when we have CONFIG_HOTPLUG and CONFIG_HOTPLUG_CPU enabled. Signed-off-by: Ashok Raj Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0c2b9d5c035f5a82c9c4ba717984d04838a0701e Author: Ashok Raj Date: Tue Sep 6 15:16:18 2005 -0700 [PATCH] x86_64: Fix cluster mode send_IPI_allbutself to use get_cpu()/put_cpu() Need to ensure we dont get prempted when we clear ourself from mask when using clustered mode genapic code. Signed-off-by: Ashok Raj Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 19aaabb5841439988fc357f90d5c59d28fa84658 Author: Eric Dumazet Date: Tue Sep 6 15:16:17 2005 -0700 [PATCH] x86_64: prefetchw() can fall back to prefetch() if !3DNOW This is a multi-part message in MIME format. If the cpu lacks 3DNOW feature, we can use a normal prefetcht0 instruction instead of NOP5. "prefetchw (%rxx)" and "prefetcht0 (%rxx)" have the same length, ranging from 3 to 5 bytes depending on the register. So this patch even helps AMD64, shortening the length of the code. Signed-off-by: Eric Dumazet Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c078d3266e58a3edd698b9f143f78fc585679031 Author: Zwane Mwaikambo Date: Tue Sep 6 15:16:16 2005 -0700 [PATCH] x86_64: print processor number in show_regs Up to date I've been using the GS value to determine the processor number in dumps from show_regs, however this can be cumbersome to do if you don't have the vmlinux to verify with the address of cpu_pda, how about the following? I considered using hard_smp_processor_id for robustness but we already dereference current so we're already relying on MSR_GS_BASE being sane. Signed-off-by: Zwane Mwaikambo Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 54d5d42404e7705cf3804593189e963350d470e5 Author: Ashok Raj Date: Tue Sep 6 15:16:15 2005 -0700 [PATCH] x86/x86_64: deferred handling of writes to /proc/irqxx/smp_affinity When handling writes to /proc/irq, current code is re-programming rte entries directly. This is not recommended and could potentially cause chipset's to lockup, or cause missing interrupts. CONFIG_IRQ_BALANCE does this correctly, where it re-programs only when the interrupt is pending. The same needs to be done for /proc/irq handling as well. Otherwise user space irq balancers are really not doing the right thing. - Changed pending_irq_balance_cpumask to pending_irq_migrate_cpumask for lack of a generic name. - added move_irq out of IRQ_BALANCE, and added this same to X86_64 - Added new proc handler for write, so we can do deferred write at irq handling time. - Display of /proc/irq/XX/smp_affinity used to display CPU_MASKALL, instead it now shows only active cpu masks, or exactly what was set. - Provided a common move_irq implementation, instead of duplicating when using generic irq framework. Tested on i386/x86_64 and ia64 with CONFIG_PCI_MSI turned on and off. Tested UP builds as well. MSI testing: tbd: I have cards, need to look for a x-over cable, although I did test an earlier version of this patch. Will test in a couple days. Signed-off-by: Ashok Raj Acked-by: Zwane Mwaikambo Grudgingly-acked-by: Andi Kleen Signed-off-by: Coywolf Qi Hunt Signed-off-by: Ashok Raj Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f63ed39c578a2a2d067356a85ce7c28a7c795d8a Author: Eugene Surovegin Date: Tue Sep 6 15:16:14 2005 -0700 [PATCH] ppc32: add missing sysfs node for ocp_func_emac_data.phy_feat_exc Add sysfs node for ocp_func_emac_data.phy_feat_exc field. Signed-off-by: Eugene Surovegin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 842363ff5fd79ce75c311175ea832901e2b2d40e Author: Eugene Surovegin Date: Tue Sep 6 15:16:13 2005 -0700 [PATCH] ppc32: fix ocp_device_suspend to use pm_message_t instead of u32 Recent "u32 -> pm_message_t" change triggered hidden bug in ocp_device_suspend. Fix it to correctly use pm_message_t instead of u32. Signed-off-by: Eugene Surovegin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9799e4d39a7e2763a614084f6ae6cc936047de70 Author: Kenji Kaneshige Date: Wed Sep 7 14:08:18 2005 +0900 [IA64] Minor cleanups - remove unnecessary function prototype in iosapic.h The function prototypes for iosapic_enable_intr() and iosapic_pci_fixup() in include/asm-ia64/iosapic.h are no longer needed. This patch removes them. The original patch has been posted by Satoru Takeuchi. Signed-off-by: Satoru Takeuchi Signed-off-by: Kenji Kaneshige Signed-off-by: Tony Luck commit 697eaad417f9f2e40f62282e8b396208b72990cf Author: Kenji Kaneshige Date: Wed Sep 7 14:06:25 2005 +0900 [IA64] Minor cleanups - remove CONFIG_ACPI_DEALLOCATE_IRQ The config option 'CONFIG_ACPI_DEALLOCATE_IRQ' is no longer needed. This patch removes it. Signed-off-by: Kenji Kaneshige Signed-off-by: Tony Luck commit a52ac87eb249f5e87f43e1a0adeb1a737f4a2b43 Author: Kenji Kaneshige Date: Wed Sep 7 14:04:14 2005 +0900 [IA64] Minor cleanups - remove unnecessary function prototype in irq.h The function prototype for handl_IRQ_event() in include/asm-ia64/irq.h is no longer needed. This patch removes it. Signed-off-by: Kenji Kaneshige Signed-off-by: Tony Luck commit 02326223247c773bc007629d54622d750c0371c1 Author: Chen, Kenneth W Date: Wed Sep 7 01:00:37 2005 -0700 [IA64] minor performance tune-up in ia64_switch_to The reenabling of psr.ic should really belong to dtr mapping code block. It make the fall through code fast since it doesn't need to execute the predicated-off instruction. Logically make more sense as well since psr.ic was turned off in .map code block. Signed-off-by: Ken Chen Signed-off-by: Tony Luck commit 66172d259b816cbb65878a05d30771935a6928e8 Author: Max Asbock Date: Wed Sep 7 21:37:00 2005 +0100 [SERIAL] Update ibmasm driver for death of register_serial&co Signed-off-by: Max Asbock Signed-off-by: Russell King commit 17781cd6186cb3472ff34b2d9a15e647bd311e8b Author: James Lentini Date: Wed Sep 7 12:43:08 2005 -0700 [PATCH] IB: clean up user access config options Add a new config option INFINIBAND_USER_MAD to control whether we build ib_umad. Change INFINIBAND_USER_VERBS to INFINIBAND_USER_ACCESS, and have it control ib_ucm and ib_uat as well as ib_uverbs. Signed-off-by: James Lentini Signed-off-by: Roland Dreier commit b5dcbf47e10e568273213a4410daa27c11cdba3a Author: Hal Rosenstock Date: Wed Sep 7 11:03:41 2005 -0700 [PATCH] IB: RMPP fixes - Fix payload length of middle RMPP sent segments. Middle payload lengths should be 0 on the send side. (This is perhaps a compliance and should not be an interop issue as middle payload lengths are supposed to be ignored on receive). - Fix length in first segment of multipacket sends (This is a compliance issue but does not affect at least OpenIB to OpenIB RMPP transfers). Signed-off-by: Hal Rosenstock Signed-off-by: Roland Dreier commit 30a7e8ef13b2ff0db7b15af9afdd12b93783f01e Author: Michael S. Tsirkin Date: Wed Sep 7 09:45:00 2005 -0700 [PATCH] IB: Initialize qp->wait Add missing call to init_waitqueue_head(). Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit c9fe2b3287498b80781284306064104ef9c8a31a Author: Roland Dreier Date: Wed Sep 7 09:43:23 2005 -0700 [PATCH] IB: really reset QPs When we modify a QP to the RESET state, completely clean up the QP so that it is really and truly reset. Signed-off-by: Roland Dreier commit 0b2b35f68140ceeb1b78ef85680198e63ebc8649 Author: Sean Hefty Date: Thu Sep 1 09:28:03 2005 -0700 [PATCH] IB: Add user-supplied context to userspace CM ABI - Add user specified context to all uCM events. Users will not retrieve any events associated with the context after destroying the corresponding cm_id. - Provide the ib_cm_init_qp_attr() call to userspace clients of the CM. This call may be used to set QP attributes properly before modifying the QP. - Fixes some error handling synchonization and cleanup issues. - Performs some minor code cleanup. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 1d6801f9dd3ebb054ae685153a01b1a4ec817f46 Author: Michael S. Tsirkin Date: Thu Sep 1 09:19:44 2005 -0700 [PATCH] IB/sa_query: avoid unnecessary list scan Using ib_get_client_data in SA event handler performs a list scan. It's better to use container_of to get the sa device directly. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 06c56e44f3e32a859420ecac97996cc6f12827bb Author: Michael S. Tsirkin Date: Thu Sep 1 09:19:02 2005 -0700 [PATCH] IPoIB: fix memory leak Fix IPoIB memory leak on device removal. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit bafa49cc1b800df4748b29e2b038ff029d7c8747 Author: Ben Dooks Date: Wed Sep 7 17:24:48 2005 +0100 [ARM] 2884/1: BAST - fix PC104 IRQ routing Patch from Ben Dooks This has been broken for a while now, so fix the problems with the code, test and bring up to date. This also makes the code conditional on an Kconfig option Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 7691d931aa55409ae3339d541ec0b87ab0a2adae Author: Adam Brooks Date: Wed Sep 7 17:24:36 2005 +0100 [ARM] 2871/1: Fixes an issue with gettimeofday not working correctly on Intel IOP3xx processors Patch from Adam Brooks The current gettimeofday implementation for the IOP3xx processors reads the contents of the timer interrupt register and does math on the value to figure out exactly what time it is. To do this it multiplies the contents of the timer register with a large constant. The result is then divided by a large constant. Unfortunately the result of the first multiplication is often too large for the register to hold. The solution is to combine the two large constants to a single smaller constant at compile time. Then the timer value can be divided by single smaller constant without any overflow issues. Signed-off-by: Adam Brooks Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit fd6480f27e38f86ddea78eb5b46db249dfd09f17 Author: Richard Purdie Date: Wed Sep 7 17:24:35 2005 +0100 [ARM] 2883/1: PXA Sharpsl: Add detection of new PXA based Zaurii machine types Patch from Richard Purdie Add machine detection routines for several new models of PXA based Zaurii (SL-C3000 - Spitz, SL-C1000 - Akita, SL-C3100 - Borzoi, SL-C6000 - Tosa). Sharp continue to use broken bootloaders in ROM. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 7dfe508a821adf180beafa29761b4a303536d67b Author: Tony Lindgren Date: Wed Sep 7 17:20:28 2005 +0100 [ARM] 2880/1: OMAP 4/4: Update H2 defconfig Patch from Tony Lindgren This patch updates H2 defconfig Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 9839c6b8dd414612be0b6a70c4aa06eaca5b7652 Author: Tony Lindgren Date: Wed Sep 7 17:20:27 2005 +0100 [ARM] 2888/1: OMAP 3/4: Update omap include files, take 2 Patch from Tony Lindgren This patch syncs the mainline kernel with linux-omap tree. The highlights of the patch are: - Start adding 24xx support by Paul Mundt - Clean-up of cpu detection by Dirk Behme and Tony Lindgren - Add DSP header by Toshihiro Kobayashi - Add support for mtd-xip by Vladimir Barinov - Add various new mux registers - Move OMAP specific serial defines back to serial.h Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 92105bb70634abacc08bbe12bf6f888fbd7dad38 Author: Tony Lindgren Date: Wed Sep 7 17:20:26 2005 +0100 [ARM] 2887/1: OMAP 2/4: Update files common to omap1 and omap2, take 2 Patch from Tony Lindgren This patch syncs the mainline kernel with linux-omap tree. The highlights of the patch are: - Clock updates by Tuukka Tikkanen, Juha Yrjola, Daniel Petrini and Tony Lindgren - DMA fixes by Imre Deak, Juha Yrjola and Daniel Petrini - Add support to dual-mode hardware timers by Lauri Leukkunen - GPIO support for 24xx by Paul Mundt - GPIO wake-up support by Tony Lindgren - Better GPIO interrupt handler to not lose interrupts by Ralph Walden and Ladislav Michl - Power Management updates by Tuukka Tikkanen - Make Power Management code use new SRAM functions by Tony Lindgren Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 295bd89279aad6959f0d363ee8e946d4766f9ad8 Author: Chen, Kenneth W Date: Tue Sep 6 16:05:23 2005 -0700 [IA64] make exception handler in copy_user more robust The exception handler in copy user always expects fault occurs only on user space address and the fall back recovery code is written with that very assumption in mind. Recent source code inspection revealed that while it worked splendid and to the expectation under normal circumstances, It broke down under unexpected condition where some address calculation might go outside the legal address range the original copy_user was called for. This patch is to make copy_user exception handler more robust and to prevent potential memory corruption. Signed-off-by: Ken Chen Signed-off-by: Tony Luck commit 7efb833d645d10258e32664404354d26cf6070e3 Author: Ben Dooks Date: Wed Sep 7 11:49:23 2005 +0100 [ARM] 2889/1: S3C2410 - Add machine Anubis Patch from Ben Dooks Add the Simtec Anubis to the list of supported machines in the arch/arm/mach-s3c2410 directory. This ensures the core peripherals are registered, the timer source is configured and the correct power-management is enabled. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit ca20aa6954bcb4537064a1bf5e8f74af57da2a03 Author: Jeff Garzik Date: Wed Sep 7 02:05:59 2005 -0400 [libata sata_mv] fix build This function will go away when pci_intx() finally makes it into the core PCI layer. commit 20f733e7d75a16bffc34842b7682c9247dd5f954 Author: Brett Russ Date: Thu Sep 1 18:26:17 2005 -0400 [PATCH] libata: Marvell SATA support (PIO mode) This is my libata compatible low level driver for the Marvell SATA family. Currently it successfully runs in PIO mode on a 6081 chip. EDMA support is in the works and should be done shortly. Review, testing (especially on other flavors of Marvell), comments welcome. Signed-off-by: Brett Russ Signed-off-by: Jeff Garzik commit 7da79312830e6d9b3f6ee06b86c3a35caba2f6e7 Author: Brett Russ Date: Thu Sep 1 21:53:34 2005 -0400 [PATCH] libata: fix pio_mask values (take 2) ata_get_mode_mask() uses bits 3 and 4 in the pio_mask to represent PIO modes 3 and 4. The value read from the drive, which reports support for PIO3 and PIO4 in bits 0 and 1, is shifted left by 3 bits and OR'd with 0x7 (which then corresponds to PIO 2-0 in libata). Thus, the drivers below need adjustments to comply with the way pio_mask is used. I changed the masks from the commented values to all support PIO4-0, since the spec mandates that PIO0-2 are supported and there's no reason not to support PIO3 IMO. Signed-off-by: Brett Russ Signed-off-by: Jeff Garzik commit 344babaa9d39b10b85cadec4e5335d43b52b4ec0 Author: Jeff Garzik Date: Wed Sep 7 01:15:17 2005 -0400 [kernel-doc] fix various DocBook build problems/warnings Most serious is fixing include/sound/pcm.h, which breaks the DocBook build. The other stuff is just filling in things that cause warnings. commit 0edd5b44913cd0aba6f23b626b407f70bb3fb018 Author: Jeff Garzik Date: Wed Sep 7 00:48:31 2005 -0400 [wireless ieee80211,ipw2200] Lindent source code No code changes, just Lindent + manual fixups. This prepares us for updating to the latest Intel driver code, plus gives the source code a nice facelift. commit bbeec90b98a3066f6f2b8d41c80561f5665e4631 Author: Jeff Garzik Date: Wed Sep 7 00:27:54 2005 -0400 [wireless] build fixes after merging WE-19 commit 09bbe1043a65903c93f6b6df123e36e3584bfac7 Author: David S. Miller Date: Tue Sep 6 20:12:15 2005 -0700 [SPARC64]: Fix set/get MTU cases in sunos_ioctl() Need to use compat struct sizes and compat_sys_ioctl(). Reported by Adrian Bunk via kernel bugzilla #2683 Signed-off-by: David S. Miller commit 832079d29a781ddf89467662ab4b540f0c1e668a Author: Max Kellermann Date: Tue Sep 6 20:04:59 2005 -0700 [SUNRPC]: print unsigned integers in stats From: Max Kellermann The sunrpc stats are collected in unsigned integers, but they are printed with '%d'. That can result in negative numbers in /proc/net/rpc when the highest bit of a counter is set. The following patch changes '%d' to '%u' where appropriate. Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit c6bb15a0c485fbdd3d161da54fd29f4f15e1b070 Author: Pieter Dejaeghere Date: Tue Sep 6 19:54:48 2005 -0700 [ARCNET]: Fix return value from arcnet_send_packet(). From: Pieter Dejaeghere Signed-off-by: David S. Miller commit 0a3f4358ac6283fe3a565183eaf9716de28b6fd0 Author: Patrick McHardy Date: Tue Sep 6 19:47:50 2005 -0700 [NET]: proto_unregister: fix sleeping while atomic proto_unregister holds a lock while calling kmem_cache_destroy, which can sleep. Noticed by Daniele Orlandi . Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit e345d5ef6d476cc236f64d90d9528143a70745c8 Author: Al Viro Date: Thu Aug 25 06:24:21 2005 +0100 [PATCH] lvalues abuse in lance result of comma operator is not an lvalue Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit ce6623c3d8f932a15306355a7c9a0cdfdd6a26ec Author: Jean Tourrilhes Date: Fri Sep 2 11:45:10 2005 -0700 [PATCH] airo : WE-19 support Dan Williams already included most parts of my WE-19 patch for the airo driver in the kernel. There was just a few bits he could not do because WE-19 itself was not in the kernel. Those are the missing bits. Tested with 2.6.13 (with real HW). Signed-off-by: Jean Tourrilhes Signed-off-by: Jeff Garzik commit 61bd49631474c8763676a6ac72461cb523ddb78a Author: Jean Tourrilhes Date: Fri Sep 2 11:42:56 2005 -0700 [PATCH] prism54 : WE-17 support My patch that adds WE-17 support to the Prism54 driver went already in the kernel, except for a tiny bit that was dropped on the way. This is the missing bit.... Tested with 2.6.13 (with real HW). Signed-off-by: Jean Tourrilhes Signed-off-by: Jeff Garzik commit 00b309f561e9746fd6ac9598c4203c6610fcb26c Author: Jean Tourrilhes Date: Fri Sep 2 11:37:38 2005 -0700 [PATCH] wl3501_cs : WE-17 support wl3501_cs won't compile with WE-19. This patches fixes it. Signed-off-by: Jean Tourrilhes Acked-by: Arnaldo Carvalho de Melo Signed-off-by: Jeff Garzik commit 72f98d38a890822cf547f94c8fbdef591b082ec2 Author: Jean Tourrilhes Date: Fri Sep 2 11:36:00 2005 -0700 [PATCH] atmel_cs : WE-17 support This adds support for WE-17 to the atmel_cs driver. Not tested, I don't have the HW. Signed-off-by: Jean Tourrilhes Signed-off-by: Jeff Garzik commit 62337dd54bad660258d44c89754721f60283ea84 Author: Jean Tourrilhes Date: Fri Sep 2 11:39:02 2005 -0700 [PATCH] iw263_netwave_we17.diff This adds support for WE-17 to the netwave_cs driver. Tested with 2.6.13 (with real HW). Signed-off-by: Jean Tourrilhes Signed-off-by: Jeff Garzik commit 3d5d5ac085c467f05cce85d32985e78912db4a7e Author: Jean Tourrilhes Date: Fri Sep 2 11:40:39 2005 -0700 [PATCH] ray_cs : WE-17 support This adds support for WE-17 to the ray_cs driver. Tested with 2.6.13 (with real HW). Signed-off-by: Jean Tourrilhes Signed-off-by: Jeff Garzik commit 6582c164f2b3b6e58d1f13c1c031b19ee691eb14 Author: Jean Tourrilhes Date: Fri Sep 2 11:32:28 2005 -0700 [PATCH] WE-19 for kernel 2.6.13 Hi Jeff, This is version 19 of the Wireless Extensions. It was supposed to be the fallback of the WPA API changes, but people seem quite happy about it (especially Jouni), so the patch is rather small. The patch has been fully tested with 2.6.13 and various wireless drivers, and is in its final version. Would you mind pushing that into Linus's kernel so that the driver and the apps can take advantage ot it ? It includes : o iwstat improvement (explicit dBm). This is the result of long discussions with Dan Williams, the authors of NetworkManager. Thanks to him for all the fruitful feedback. o remove pointer from event stream. I was not totally sure if this pointer was 32-64 bits clean, so I'd rather remove it and be at peace with it. o remove linux header from wireless.h. This has long been requested by people writting user space apps, now it's done, and it was not even painful. o final deprecation of spy_offset. You did not like it, it's now gone for good. o Start deprecating dev->get_wireless_stats -> debloat netdev o Add "check" version of event macros for ieee802.11 stack. Jiri Benc doesn't like the current macros, we aim to please ;-) All those changes, except the last one, have been bit-roting on my web pages for a while... Patches for most kernel drivers will follow. Patches for the Orinoco and the HostAP drivers have been sent to their respective maintainers. Have fun... Jean Signed-off-by: Jeff Garzik commit 054034dbf5b1a6aef800af4eb22d421d1c7d4b6d Author: Jens Osterkamp Date: Tue Sep 6 19:30:55 2005 -0700 [PATCH] net: fix bonding with spider_net Another small update for the spidernet driver to fix a bug encountered during testing our latest hardware with dual-ethernet support. Signed-off-by: Arnd Bergmann Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 543cec517dbc07c7c801ccacd02141d99f09f756 Author: Jens Osterkamp Date: Tue Sep 6 19:30:54 2005 -0700 [PATCH] net: update the spider_net driver - Prevent PCI posting problems by using synchronous register access in critical places - Check return value from firmware device tree functions - fix device cleanup Signed-off-by: Arnd Bergmann Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit aaec0fab5f8809fe1509fdc204e769bb35ebe41a Author: Jens Osterkamp Date: Mon Sep 5 15:19:29 2005 -0700 [PATCH] net: add driver for the NIC on Cell Blades This patch adds a driver for a new 1000 Mbit ethernet NIC. It is integrated on the south bridge that is used for our Cell Blades. The code gets the MAC address from the Open Firmware device tree, so it won't compile on platforms other than ppc64. This is the first public release, so I don't expect the first version to get merged, but I'd aim for integration within the 2.6.13 time frame. Cc: Utz Bacher Signed-off-by: Arnd Bergmann Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 25097d4bda4a554d8b4a9989c7d8bcb67ef53f48 Author: viro@ftp.linux.org.uk Date: Tue Sep 6 01:36:58 2005 +0100 [PATCH] __user annotations (forcedeth.c) Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit 269cd3819cf1cc20f9567c4920b59c15751076d3 Author: Michael Ellerman Date: Tue Sep 6 10:39:38 2005 +1000 [PATCH] iseries_veth: Update copyright notice My overlords have asked me to update the copyright notice for iseries_veth. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit 43fece7b8ba005b7d6a98186c48c577156a25623 Author: viro@ftp.linux.org.uk Date: Tue Sep 6 01:36:58 2005 +0100 [PATCH] missed s/u32/pm_message_t/ (dm9000) Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit 5ac90037c8ea428bbf7c5ce383a63a05d05ec763 Author: viro@ftp.linux.org.uk Date: Tue Sep 6 01:36:58 2005 +0100 [PATCH] iomem annotations (ac3200.c) no need to mess with (wrong) casts for ->mem_start, when we have the original iomem pointer used to set ->mem_start in the first place... Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit 8e84c801bad50d2e0e9f802610d2c13f8d342230 Author: Frank Pavlic Date: Tue Sep 6 15:03:09 2005 +0200 [PATCH] s390: claw driver fixes [patch 1/4] s390: claw driver fixes From: Andy Richter - change memory allocation and move dbf from proc to debugfs - use dev_kfree_skb_any instead of dev_kfree_skb_irq Signed-off-by: Frank Pavlic diffstat: claw.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) Signed-off-by: Jeff Garzik commit 776bd20fa25fd8fc71fd4a2f213c106d6868db39 Author: ravinandan.arakali@neterion.com Date: Tue Sep 6 21:36:56 2005 -0700 [PATCH] S2io: Hardware and miscellaneous fixes Hi, This patch contains the following hardware related fixes and other miscellaneous bug fixes. 1. Updated the definition of single and double-bit ECC errors 2. Earlier we were allocating Transmit descriptors equal to MAX_SKB_FRAGS. This was causing a boundary condition failure. Need to allocate MAX_SKB_FRAGS+1 descriptors. 3. On some platforms(like PPC), pci_alloc_consistent() can return a zero DMA address. Since the NIC cannot handle zero-addresses, a workaround has been provided. Basically, we don't use such that page. We reallocate. 4. If list_info allocation failed during driver load, check for it during driver exit and return instead of trying to dereference NULL pointer. 5. Increase the debug level of few non-critical debug messages. 6. Reset the card on critical ECC double errors only in case of XframeI since XframeII can recover from such errors. 7. Print copyright message on driver load. 8. Bumped up the driver version no. to 2.0.8.1 Signed-off-by: Ravinandan Arakali Signed-off-by: Jeff Garzik commit 63028aa7f581d9d4e6889f9dc06ded2534250a76 Author: Kiyoshi Ueda Date: Wed Aug 24 18:03:43 2005 -0400 [IA64] page_not_present fault in region 5 is normal When copying data from user-space to kernel-space by __copy_user(), a page_not_present fault sometimes occurs at vmalloced kernel address because of VHPT pre-fetching. Ignore the page_not_present fault in ia64_do_page_fault() before jumping into exception handlers. Signed-off-by: Kiyoshi Ueda Signed-off-by: Jun'ichi Nomura Signed-off-by: Tony Luck commit 48bc41a49c4f3aa760dff84e7f71437f5ed520fe Author: Stephen Hemminger Date: Tue Sep 6 15:51:48 2005 -0700 [IPV4]: Reassembly trim not clearing CHECKSUM_HW This was found by inspection while looking for checksum problems with the skge driver that sets CHECKSUM_HW. It did not fix the problem, but it looks like it is needed. If IP reassembly is trimming an overlapping fragment, it should reset (or adjust) the hardware checksum flag on the skb. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit f75268cd6cbd24e6c70ff1390f4de5d0bb618539 Author: Ralf Baechle Date: Tue Sep 6 15:49:39 2005 -0700 [AX25]: Make ax2asc thread-proof Ax2asc was still using a static buffer for all invocations which isn't exactly SMP-safe. Change ax2asc to take an additional result buffer as the argument. Change all callers to provide such a buffer. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller commit f2c383988d68c91a7d474b7cf26c0a2df49bbafe Author: Stephen Hemminger Date: Tue Sep 6 15:48:03 2005 -0700 [NET]: skb_get/set_timestamp use const The new timestamp get/set routines should have const attribute on parameters (helps to indicate direction). Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 513c25000005257e5474f261bf27d4a3c1dff1e3 Author: Patrick McHardy Date: Tue Sep 6 15:43:59 2005 -0700 [NETLINK]: Don't prevent creating sockets when no kernel socket is registered This broke the pam audit module which includes an incorrect check for -ENOENT instead of -EPROTONOTSUPP. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 3173d8c342971a03857d8af749a3f57da7d06b57 Author: James Bottomley Date: Sun Sep 4 11:32:05 2005 -0500 [SCSI] quieten messages on scsi_execute commands scsi_io_completion() can be a bit noisy about certain conditions. Previously this wasn't a problem for internally generated commands, since they never hit it. However, since we do all SCSI commands via bios, now they do. user CD testers like magicdev are now getting not ready messages every time they touch the CD to see if there's anything in it. Fix this by making all scsi_execute commands REQ_QUIET and making scsi_finish_io() not say anything for REQ_QUIET. Signed-off-by: James Bottomley commit fe1b2d544d71300f8e2d151c3c77a130d13a58be Author: Christoph Hellwig Date: Tue Sep 6 14:15:37 2005 +0200 [SCSI] unexport scsi_add_timer/scsi_delete_timer Signed-off-by: James Bottomley commit c5478def7a3a2dba9ceda452c2aa3539514d30a9 Author: Christoph Hellwig Date: Tue Sep 6 14:04:26 2005 +0200 [SCSI] switch EH thread startup to the kthread API Signed-off-by: James Bottomley commit 32993523dc59759ae6cb349e4d231d4cd2165329 Author: Christoph Hellwig Date: Tue Sep 6 14:03:44 2005 +0200 [SCSI] fix SCSI_IOCTL_PROBE_HOST This returns always false with new-style drivers right now. Make it return always true instead, as a host must be present if we are able to call the ioctl (without a host attached there would be no device node to call on..) Signed-off-by: James Bottomley commit 4869040512082b761de2d7c35975d01044f8bfea Author: Anton Blanchard Date: Tue Sep 6 18:08:14 2005 +1000 [SCSI] Universal Xport no attach blacklist On Fri, Dec 13, 2002 at 12:24:39AM +1100, Anton Blanchard wrote: > We tested 2.5.51 on a ppc64 box, qlogic 2312 and a fastt700 array. I > had CONFIG_SCSI_REPORT_LUNS and unfortunately it thought the management > LUN was a disk: > > Vendor: IBM Model: Universal Xport Rev: 0520 > Type: Direct-Access ANSI SCSI revision: 03 > > ... > > SCSI device sdaj: drive cache: write through > SCSI device sdaj: 40960 512-byte hdwr sectors (21 MB) > sdaj: unknown partition table > Attached scsi disk sdaj at scsi2, channel 0, id 0, lun 31 > > ... > > end_request: I/O error, dev sdaj, sector 0 Three years later... It looks like SGI use the same FC vendor and they already have a workaround for this issue. The following patch adds the IBM version of it. Signed-off-by: Anton Blanchard Signed-off-by: James Bottomley commit 4451e472627881e3e2240b224f127c99be500f91 Author: Alan Stern Date: Tue Jul 12 10:45:17 2005 -0400 [SCSI] sd: pause in sd_spinup_disk for slow USB devices This patch adds a delay tailored for USB flash devices that are slow to initialize their firmware. The symptom is a repeated Unit Attention with ASC=0x28 (Not Ready to Ready transition). The patch will wait for up to 5 seconds for such devices to become ready. Normal devices won't send the repeated Unit Attention sense key and hence won't trigger the patch. This fixes a problem with James Roberts-Thomson's USB device, and I've seen several reports of other devices exhibiting the same symptoms -- presumably they will be helped as well. Signed-off-by: Alan Stern Signed-off-by: James Bottomley commit e47373ec1c9aab9ee134f4e2b8249957e9f4c7ef Author: Alan Stern Date: Wed Mar 30 15:05:45 2005 -0500 [SCSI] return success after retries in scsi_eh_tur The problem lies in the way the error handler uses TEST UNIT READY to tell whether error recovery has succeeded. The scsi_eh_tur function gives up after one round of retrying; after that it decides that more error recovery is needed. However TUR is liable to report sense data indicating a retry is needed when in fact error recovery has succeeded. A typical example might be SK=2, ASC=4, ASCQ=1 (Logical unit in process of becoming ready). The mere fact that we were able to get a sensible reply to the TUR should indicate that the device is working well enough to stop error recovery. I ran across a case back in January where this happened. A CD-ROM drive timed out the INQUIRY command, and a device reset fixed the blockage. But then the drive kept responding with 2/4/1 -- because it was spinning up I suppose -- until the error handler gave up and placed it offline. If the initial INQUIRY had received the 2/4/1 instead, everything would have worked okay. It doesn't seem reasonable for things to fail just because the error handler had started running. Signed-off-by: Alan Stern Signed-off-by: James Bottomley commit 1cd9855c1ba60b3e615e09d3ddf557f7bc371533 Author: Russell King Date: Tue Sep 6 23:14:59 2005 +0100 [SERIAL] Fix lh7a40x serial driver Missed updating two lh7a40xuart_stop_tx calls. Signed-off-by: Russell King commit 2be863c959ea22ac9eb83e30f6cd92a8ae78bfdc Author: Russell King Date: Tue Sep 6 23:13:17 2005 +0100 [ARM] Fix missed initialisers/missing comma Fix the broken initialisers missed by the recent IRQ patch. Signed-off-by: Russell King commit 4dddbc26c3895ecdab1f4b16435685b47f96f599 Author: James Bottomley Date: Tue Sep 6 17:11:54 2005 -0500 [SCSI] ibmvscsi: handle large scatter/gather lists The maximum size of a scatter-gather list that the current IBM VSCSI Client can handle is 10. This patch adds large scatter-gather support to the client so that it is capable of handling up to SG_ALL(255) number of requests in the scatter-gather list. Signed-off-by: Linda Xie Acked by: Dave C Boutcher Rejections fixed up and Signed-off-by: James Bottomley commit e4466399398a2ec854776e9eca2b4415b40bd1ff Author: Patrick McHardy Date: Tue Sep 6 15:11:10 2005 -0700 [NETFILTER]: Missing unlock in TCP connection tracking error path Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 49719eb355d32fa07793017b4b46b1c02e88b275 Author: Pablo Neira Ayuso Date: Tue Sep 6 15:10:46 2005 -0700 [NETFILTER]: kill __ip_ct_expect_unlink_destroy The following patch kills __ip_ct_expect_unlink_destroy and export unlink_expect as ip_ct_unlink_expect. As it was discussed [1], the function __ip_ct_expect_unlink_destroy is a bit confusing so better do the following sequence: ip_ct_destroy_expect and ip_conntrack_expect_put. [1] https://lists.netfilter.org/pipermail/netfilter-devel/2005-August/020794.html Signed-off-by: Pablo Neira Ayuso Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 91c46e2e60da0b43a1e8740729737318862f64eb Author: Pablo Neira Ayuso Date: Tue Sep 6 15:10:23 2005 -0700 [NETFILTER]: Don't increase master refcount on expectations As it's been discussed [1][2]. We shouldn't increase the master conntrack refcount for non-fulfilled conntracks. During the conntrack destruction, the expectations are always killed before the conntrack itself, this guarantees that there won't be any orphan expectation. [1]https://lists.netfilter.org/pipermail/netfilter-devel/2005-August/020783.html [2]https://lists.netfilter.org/pipermail/netfilter-devel/2005-August/020904.html Signed-off-by: Pablo Neira Ayuso Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit e7dfb09a3624a32df2dd00683875d0e56406a603 Author: Patrick McHardy Date: Tue Sep 6 15:10:00 2005 -0700 [NETFILTER]: Fix HW checksum handling in nfnetlink_queue Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 03486a4f838c55481317fca5ac2e7d12550a4fb7 Author: Patrick McHardy Date: Tue Sep 6 15:09:43 2005 -0700 [NETFILTER]: Handle NAT module load race When the NAT module is loaded when connections are already confirmed it must not change their tuples anymore. This is especially important with CONFIG_NETFILTER_DEBUG, the netfilter listhelp functions will refuse to remove an entry from a list when it can not be found on the list, so when a changed tuple hashes to a new bucket the entry is kept in the list until and after the conntrack is freed. Allocate the exact conntrack tuple for NAT for already confirmed connections or drop them if that fails. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 31c913e7fd48000163a88cfe10383fd3be20910e Author: Yasuyuki Kozakai Date: Tue Sep 6 15:09:20 2005 -0700 [NETFILTER]: Fix CONNMARK Kconfig dependency Connection mark tracking support is one of the feature in connection tracking, so IP_NF_CONNTRACK_MARK depends on IP_NF_CONNTRACK. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit a2978aea393b5e00b55b219786a5b8a47f838a7f Author: Patrick McHardy Date: Tue Sep 6 15:08:51 2005 -0700 [NETFILTER]: Add NetBIOS name service helper Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 2248bcfcd8fb622ec88b8587d0c1f139635ffd2e Author: Patrick McHardy Date: Tue Sep 6 15:06:42 2005 -0700 [NETFILTER]: Add support for permanent expectations A permanent expectation exists until timeing out and can expect multiple related connections. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 9261c9b042547d01eeb206cf0e21ce72832245ec Author: Eric Dumazet Date: Tue Sep 6 14:51:39 2005 -0700 [NET]: Make sure l_linger is unsigned to avoid negative timeouts One of my x86_64 (linux 2.6.13) server log is filled with : schedule_timeout: wrong timeout value ffffffffffffff06 from ffffffff802e63ca schedule_timeout: wrong timeout value ffffffffffffff06 from ffffffff802e63ca schedule_timeout: wrong timeout value ffffffffffffff06 from ffffffff802e63ca schedule_timeout: wrong timeout value ffffffffffffff06 from ffffffff802e63ca schedule_timeout: wrong timeout value ffffffffffffff06 from ffffffff802e63ca This is because some application does a struct linger li; li.l_onoff = 1; li.l_linger = -1; setsockopt(sock, SOL_SOCKET, SO_LINGER, &li, sizeof(li)); And unfortunatly l_linger is defined as a 'signed int' in include/linux/socket.h: struct linger { int l_onoff; /* Linger active */ int l_linger; /* How long to linger for */ }; I dont know if it's safe to change l_linger to 'unsigned int' in the include file (It might be defined as int in ABI specs) Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit fe2d5295a11e2ab2d6f4e7ea074816000b32eba3 Author: Herbert Xu Date: Tue Sep 6 14:49:44 2005 -0700 [CRYPTO] Fix boundary check in standard multi-block cipher processors The boundary check in the standard multi-block cipher processors are broken when nbytes is not a multiple of bsize. In those cases it will always process an extra block. This patch corrects the check so that it processes at most nbytes of data. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit b69aee04fbfc027fc4ddaddc809ea8711cef9511 Author: Eric Dumazet Date: Tue Sep 6 14:42:45 2005 -0700 [NET]: Use file->private_data to get socket pointer. Avoid touching file->f_dentry on sockets, since file->private_data directly gives us the socket pointer. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 93c37f292110a37dd77e4cc0aaf1c341d79bf6aa Author: David S. Miller Date: Tue Sep 6 13:57:08 2005 -0700 [SERIAL]: Avoid 'statement with no effect' warnings. When SUPPORT_SYSRQ is false, gcc can emit warnings for the uart_handle_sysrq_char() that results. Using an empty inline returning zero kills the warning. Signed-off-by: David S. Miller commit cebb2b156319990fc2fba615bbfeac81be62a86a Author: Olaf Hering Date: Sun Jul 10 19:35:15 2005 +0000 [PATCH] remove linux/version.h include from arch/ppc64 Changing CONFIG_LOCALVERSION rebuilds too much, for no apparent reason. Use system_utsname for progress and debug header. Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit 14b34661615ec036ab4c91637913706e4caccc93 Author: David Gibson Date: Tue Sep 6 14:59:47 2005 +1000 [PATCH] Invert sense of SLB class bit Currently, we set the class bit in kernel SLB entries, and clear it on user SLB entries. On POWER5, ERAT entries created in real mode have the class bit clear. So to avoid flushing kernel ERAT entries on each context switch, this patch inverts our usage of the class bit, setting it on user SLB entries and clearing it on kernel SLB entries. Booted on POWER5 and G5. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit c0f2f761e1ea3923952e31cce2cdb7d65f450fbd Author: Al Viro Date: Mon Sep 5 23:35:41 2005 -0700 [SPARC64]: Kconfig fix (GEN_RTC dependencies) Yet another architecture not coverd by GEN_RTC - sparc64 never picked it until now and it doesn't have asm/rtc.h to go with it, so it wouldn't compile anyway (or have these ioctls in the user-visible headers, for that matter). FWIW, I'm very tempted to introduce ARCH_HAS_GEN_RTC and have it set in arch/*/Kconfig for architectures that know what to do with this stuff - for something supposedly generic the list of architectures where it doesn't work is getting too long... Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 3d9c994840f0e217c391871ddbb84a506d275658 Author: Al Viro Date: Mon Sep 5 23:35:05 2005 -0700 [SUNSU]: Compile fixes. sunsu had been broken by ->stop_tx/->start_tx API changes. Signed-off-by: Al Viro Signed-off-by: David S. Miller commit e5e259466f2fe68251b1e1092949ef3d4dabb254 Author: David S. Miller Date: Mon Sep 5 23:34:13 2005 -0700 [SPARC64]: Don't include drivers/firmware/Kconfig It's really not relevant for this platform in any way, after all. Signed-off-by: David S. Miller commit 53d0fc27af3a3ab22c0ffb67857adfa18977e681 Author: David S. Miller Date: Mon Sep 5 23:33:05 2005 -0700 [RTC]: Use SA_SHIRQ in sparc specific code. Based upon a report from Jason Wever. Signed-off-by: David S. Miller commit 1d25240fcfce0e55540a273b1e1b07d304065a31 Author: Al Viro Date: Mon Sep 5 23:30:15 2005 -0700 [MOXA]: Fix this driver properly. Actually, proper fix of that breakage is embarrassingly simple - it's yet another gratitious leftover include of asm/segment.h, so incremental to the previos would be removal of that BROKEN and removal of bogus include from mxser.c itself. Signed-off-by: David S. Miller commit 4c2cac8908ded8436191bd058e52d2737fd7fd31 Author: David S. Miller Date: Mon Sep 5 23:19:49 2005 -0700 [IEEE80211]: Use correct size_t printf format string in ieee80211_rx.c Signed-off-by: David S. Miller commit 0fdf0b8634055b016f7b93cfcdea2eb9091f0271 Author: Anton Blanchard Date: Tue Sep 6 14:59:16 2005 +1000 [PATCH] ppc64: Fix build with oprofile disabled Fix build with oprofile disabled. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 8fef0306f9164d4bfd0befb62e63e4d1167681b5 Author: Anton Blanchard Date: Tue Sep 6 14:57:52 2005 +1000 [PATCH] ppc64: Move oprofile_model into cpu feature struct Move oprofile_model into cpu feature struct. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit dca859329cee9b4cf02c8b7cb805b49973292ed2 Author: Anton Blanchard Date: Tue Sep 6 14:55:35 2005 +1000 [PATCH] ppc64: Move oprofile_impl.h into include/asm-ppc64 Move oprofile_impl.h into include/asm-ppc64 in preparation for moving oprofile_model into cpu feature struct. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 1a410d883023da70806a0190c4bde104545cb9c6 Author: Anton Blanchard Date: Tue Sep 6 14:53:57 2005 +1000 [PATCH] ppc64: Add oprofile cpu_type to cpu feature struct Add oprofile cpu_type to cpu feature struct. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit a6908cd00036080fbea14ff67335e5f2a1ab5489 Author: Anton Blanchard Date: Tue Sep 6 14:52:12 2005 +1000 [PATCH] ppc64: Use num_pmcs in oprofile code Change oprofile to use num_pmcs from the cpu feature struct. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 8530935d384bef1467ba76e1f4382f0f8b3c899d Author: Anton Blanchard Date: Tue Sep 6 14:50:48 2005 +1000 [PATCH] ppc64: remove CPU_FTR_PMC8 Remove the CPU_FTR_PMC8 feature now we encode the number of PMCs directly. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit fd5b4377eacac42293b1a349dbb0f9892bf7f74a Author: Anton Blanchard Date: Tue Sep 6 14:47:49 2005 +1000 [PATCH] ppc64: add number of PMCs to cputable Add a field in the cputable struct to store the number of PMCs. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 3da54c5b253549153ee6521db21d541a06abaa65 Author: David S. Miller Date: Mon Sep 5 23:08:01 2005 -0700 [IPW2200]: ipw2200.h needs linux/dma-mapping.h Signed-off-by: David S. Miller commit 71839267f2554d76bb0862cdd0181a60bd0f4970 Author: Wim Coekaerts Date: Mon Sep 5 20:22:47 2005 -0700 [PATCH] ppc64: Allow world readable /proc/ppc64/lparcfg I would like to be able to read the lparcfg data from any user so we can make "intelligent" decisions based on underlying attributes when running in lpars. Yes there's software that likes to do this :) and runs as non-root. It's very similar to say VM where you can get CP to provide feedback of the real hardware inside a VM guest. Signed-off-by: Wim Coekaerts Signed-off-by: Paul Mackerras commit fa2259b06c38a7c392966c66cd1cdd710d487463 Author: Kumar Gala Date: Wed Aug 24 11:56:56 2005 -0500 [PATCH] ppc64: remove use of asm/segment.h Removed PPC64 architecture specific users of asm/segment.h. Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras commit 6b9269abd64c54f11dc4aaf162d2915fccae6c77 Author: Jon Loeliger Date: Thu Sep 1 15:51:52 2005 -0500 [PATCH] ppc/ppc64: Merge more include files This patch merges several include files from asm-ppc and asm-ppc64 into the new asm-powerpc. Signed-off-by: Jon Loeliger Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras commit ad6571a78ac74e9fa27e581834709067dba459af Author: Becky Bruce Date: Sat Sep 3 19:01:57 2005 -0500 [PATCH] Move 3 more headers to asm-powerpc Merged several nearly-identical header files from asm-ppc and asm-ppc64 into asm-powerpc. Signed-off-by: Kumar Gala Signed-off-by: Becky Bruce Signed-off-by: Paul Mackerras commit b2c0ab17ba751abe13a28508b1ac7e9ca074cd87 Author: Anton Blanchard Date: Tue Sep 6 13:05:58 2005 +1000 [PATCH] ppc64: speedup cmpxchg cmpxchg has the following code: __typeof__(*(ptr)) _o_ = (o); __typeof__(*(ptr)) _n_ = (n); Unfortunately it makes gcc 4.0 store and load the variables to the stack. Eg in atomic_dec_and_test we get: stw r10,112(r1) stw r9,116(r1) lwz r9,112(r1) lwz r0,116(r1) x86 is just casting the values so do that instead. Also change __xchg* and __cmpxchg* to take unsigned values, removing a few sign extensions. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 4721e2214b5fd6eca48caea76afb1bad3148930f Author: Anton Blanchard Date: Tue Sep 6 12:05:26 2005 +1000 [PATCH] ppc64: poison initmem Poison initmem after we free it so we catch use after free issues. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 2f4cf721eb2ff23b60af2932fd9fa4026f2a1164 Author: Jimi Xenidis Date: Thu Sep 1 11:57:10 2005 -0400 [PATCH] ppc64: systemcfg is now a pointer The following patch fixes 2 issues: 1) use PLATFORM_LPAR bit to test if running in LPAR mode 2) systemcfg pointer is assigned from static data in arch/ppc64/kernel/pacaData.c. The file arch/ppc64/kernel/head.S now refers to is using the GOT binding to the pointer and hence must deref it. Signed-off-by: Jimi Xenidis Signed-off-by: Paul Mackerras commit 8d9273918635f0301368c01b56c03a6f339e8d51 Author: Milton Miller Date: Tue Sep 6 11:57:27 2005 +1000 [PATCH] ppc64: Consolidate early console and PPCDBG code Consolidate the early console and PPCDBG code in udbg.c Signed-off-by: Milton Miller Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 188d2ce78feac67e41e41808acda7951810f677b Author: Milton Miller Date: Tue Sep 6 11:57:00 2005 +1000 [PATCH] ppc64: Remove old includes Trim some no longer needed includes from udbg.c and friends. Signed-off-by: Milton Miller Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit c8f1c8be629ee34991fdba8bfe46a5c455393209 Author: Milton Miller Date: Tue Sep 6 11:56:42 2005 +1000 [PATCH] ppc64: Take udbg out of ppc_md Take udbg out of ppc_md. Allows us to not overwrite early udbg inits when assigning ppc_md. Signed-off-by: Milton Miller Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 7f853352e79bf57c4ee279b7458ed0c072e2be76 Author: Milton Miller Date: Tue Sep 6 11:56:02 2005 +1000 [PATCH] ppc64: Split SCC and 15550 udbg code Split scc and 15550 functions from udbg each into their own file. This makes them more symetric with the lpar and btext code. Signed-off-by: Milton Miller Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 37548d58e5ce53dda609c5b35c0eb62d50d59675 Author: Milton Miller Date: Tue Sep 6 11:55:38 2005 +1000 [PATCH] ppc64: Make udbg_init_uart set the ppc_md udbg methods. make udbg_init_uart set the ppc_md udbg methods. Signed-off-by: Milton Miller Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit cb14c4d641b4e083fae7ce4a0e8a3973cecb7554 Author: Milton Miller Date: Tue Sep 6 11:55:00 2005 +1000 [PATCH] ppc64: Clean up CR handling Make the 16550 and real mode 16550 use tail recursion like the scc code instead of repeating the routine except for the character sent. Gcc recoginizes the tail recursion and handles it efficently without stack allocations. The maple real putc shrinks from 188 to 104 bytes of instructions. udbg_putc drops from 188 to 140 bytes. Signed-off-by: Milton Miller Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 5fdabaab01ee8928597aae8a0178a3a4f7b66365 Author: Milton Miller Date: Tue Sep 6 11:54:42 2005 +1000 [PATCH] ppc64: Remove dummy getc routines Now that xmon is fixed we should not need the dummy getc routines. Signed-off-by: Milton Miller Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 41be31b7d61c661a63bb1d5c8be3c39f124beabd Author: Milton Miller Date: Tue Sep 6 11:54:13 2005 +1000 [PATCH] ppc64: dont bypass ppc_md.udbg* functions udbg_getc_poll is a ppc_md function. don't call directly into udbg.c Signed-off-by: Milton Miller Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit cdcd318fefab8c8655fdc3b085ccc23848a93001 Author: Milton Miller Date: Tue Sep 6 11:50:55 2005 +1000 [PATCH] ppc64: Add missing include inline pmac_call_feature references ppc_md so include asm/machdep.h in asm/pmac_feature.h Signed-off-by: Milton Miller Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit fb5f5e6e0cebd574be737334671d1aa8f170d5f3 Author: Herbert Xu Date: Mon Sep 5 18:55:48 2005 -0700 [TCP]: Fix TCP_OFF() bug check introduced by previous change. The TCP_OFF assignment at the bottom of that if block can indeed set TCP_OFF without setting TCP_PAGE. Since there is not much to be gained from avoiding this situation, we might as well just zap the offset. The following patch should fix it. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 1198ad002ad36291817c7bf0308ab9c50ee2571d Author: Herbert Xu Date: Mon Sep 5 18:44:37 2005 -0700 [NET]: 2.6.13 breaks libpcap (and tcpdump) Patrick McHardy says: Never mind, I got it, we never fall through to the second switch statement anymore. I think we could simply break when load_pointer returns NULL. The switch statement will fall through to the default case and return 0 for all cases but 0 > k >= SKF_AD_OFF. Here's a patch to do just that. I left BPF_MSH alone because it's really a hack to calculate the IP header length, which makes no sense when applied to the special data. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 6baf1f417d092bd2de7c8892cecad456024c993f Author: David S. Miller Date: Mon Sep 5 18:14:11 2005 -0700 [NET]: Do not protect sysctl_optmem_max with CONFIG_SYSCTL The ipv4 and ipv6 protocols need to access it unconditionally. SYSCTL=n build failure reported by Russell King. Signed-off-by: David S. Miller commit aa07ca5793414ce257ad98809147bd1dbb7a3837 Author: Harald Welte Date: Mon Sep 5 18:09:08 2005 -0700 [NETFILTER] remove bogus hand-coded htonll() from nenetlink_queue htonll() is nothing else than cpu_to_be64(), so we'd rather call the latter. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 506e7beb7468c7cf56370d0a7a6afbec56653473 Author: Adrian Bunk Date: Mon Sep 5 18:08:11 2005 -0700 [IRDA]: IrDA prototype fixes Every file should #include the header files containing the prototypes of it's global functions. In this case this showed that the prototype of irlan_print_filter() was wrong which is also corrected in this patch. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 8c5955d83ed26455a49d12e783cc2258d11279a9 Author: Adrian Bunk Date: Mon Sep 5 18:07:42 2005 -0700 [SCTP]: net/sctp/sysctl.c should #include Every file should #include the header files containing the prototypes of it's global functions. sctp.h contains the prototypes of sctp_sysctl_{,un}register(). Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 395dde20fb06153feb65d79d7fe83eda41bf50e7 Author: Adrian Bunk Date: Mon Sep 5 18:06:45 2005 -0700 [NETFILTER]: net/netfilter/nfnetlink*: make functions static This patch makes needlessly global functions static. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 43d60661ac67c28b358f012d07587762074017fc Author: Adrian Bunk Date: Mon Sep 5 18:05:52 2005 -0700 [IPV4]: net/ipv4/ipconfig.c should #include Every file should #include the header files containing the prototypes of it's global functions. nfs_fs.h contains the prototype of root_nfs_parse_addr(). Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 295098e9f4822aecdddd4cab05705f1ee63bc3f4 Author: Adrian Bunk Date: Mon Sep 5 18:04:28 2005 -0700 [ATM]: net/atm/ioctl.c should #include "common.h" Every file should #include the header files containing the prototypes of it's global functions. common.h contains the prototype for vcc_ioctl(). Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 74da1edf264c5982b465041a5706caff25d7e1ed Author: David S. Miller Date: Mon Sep 5 17:56:11 2005 -0700 [TG3]: Update driver version and release date. Signed-off-by: David S. Miller commit 38f3843ed6bdbcff9465386c3539523466880320 Author: Michael Chan Date: Mon Sep 5 17:53:32 2005 -0700 [TG3]: Use status tag to check for new events Use the status tag to determine if there are new events in tg3_interrupt_tagged(). We discussed about this a while ago with Grant Grundler and DaveM. This scheme makes it unnecessary to clear the updated bit in the status block when using tagged mode, and only a simple comparison is needed to determine if there are new events. The tp->lock around netif_rx_complete() and tg3_restart_ints() is also removed. It is unnecessary with DaveM's new locking scheme. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 61487480dd79acc5e82b08cd29cbcbd3301645fa Author: Michael Chan Date: Mon Sep 5 17:53:19 2005 -0700 [TG3]: Remove status block access in tg3_msi() and add prefetches Remove unnecessary status block accesses in tg3_msi(). Since MSI is not shared, it is unnecessary to read the status block to determine if there are any new events in the MSI handler. It is also unnecessary to clear the updated bit in the status block. Since the poll list is per-cpu, tg3_poll() will be scheduled to run on the same CPU that received the MSI. Prefetches for the status block and the next rx descriptors are added in tg3_msi() to improve their access times when tg3_poll() runs. In the non-MSI irq handlers, we need to check the status block because interrupts may be shared. Only prefetches for the next rx descriptors are added. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 9f40dead25957434937f2b1872e9f4b43605f0ad Author: Michael Chan Date: Mon Sep 5 17:53:06 2005 -0700 [TG3]: Add PHY loopback test Improve ethtool loopback self test by adding PHY loopback to the existing MAC loopback test. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 4009a93d8e85f685b02794aee28e3272be862e2b Author: Michael Chan Date: Mon Sep 5 17:52:54 2005 -0700 [TG3]: Add ethtool -p support Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 4c98748763ce25c5394a7edd686d92c70b4fac38 Author: Michael Chan Date: Mon Sep 5 17:52:38 2005 -0700 [TG3]: Minor 5780 and 5752 fixes Minor SerDes bug fixes for 5780S and nvram bug fixes for 5780 and 5752. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit d856f1e337782326c638c70c0b4df2b909350dec Author: James Bottomley Date: Fri Aug 19 09:14:01 2005 -0400 [PATCH] klist: fix klist to have the same klist_add semantics as list_head at the moment, the list_head semantics are list_add(node, head) whereas current klist semantics are klist_add(head, node) This is bound to cause confusion, and since klist is the newcomer, it should follow the list_head semantics. I also added missing include guards to klist.h Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman commit fef6ec8dd96205fb22e3cfe2e4abd69d89413631 Author: Jesper Juhl Date: Wed Aug 17 22:06:34 2005 +0200 [PATCH] Driver core: small cleanup; remove check for NULL before kfree() in driver core Remove needless checking of variable for NULL before calling kfree() on it. Applies to 2.6.13-rc6-git9 Signed-off-by: Jesper Juhl Signed-off-by: Greg Kroah-Hartman commit ceaeade1f94c0a1c0163906ceeaede6493a9715e Author: Shaohua Li Date: Thu Aug 11 10:37:39 2005 +0800 [PATCH] Driver core: hande sysdev suspend failure This patch adds the return value check for sysdev suspend and does restore in failure case. Send the patch to pm-list, but seems lost, so I resend it. Signed-off-by: Shaohua Li Signed-off-by: Greg Kroah-Hartman commit 91e49001b9a7fe5dc2fa5b56039fbca9aa638ccc Author: Jan Veldeman Date: Sun Jul 31 13:12:10 2005 +0200 [PATCH] Driver core: Documentation: use S_IRUSR | ... in stead of 0644 Change filemode to use defines in stead of 0644, based on suggestions by Walter Harms and Domen Puncer. Signed-off-by: Jan Veldeman Signed-off-by: Domen Puncer Signed-off-by: Greg Kroah-Hartman commit f8d825bfb8d2a7546eeb57569d0eedf8c5565d28 Author: Jan Veldeman Date: Sun Jul 31 13:12:09 2005 +0200 [PATCH] Driver core: Documentation: fix whitespace between parameters Fix whitespace after comma between parameters. Signed-off-by: Jan Veldeman Signed-off-by: Domen Puncer Signed-off-by: Greg Kroah-Hartman commit 9a8af6b3b64ee97a1aeecde017ffd02e6796913a Author: Andrew Morton Date: Wed Jul 27 17:37:34 2005 -0700 [PATCH] Floppy: add cmos attribute to floppy driver tidy Fiddle with coding style a bit. Cc: Hannes Reinecke Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 94fd0db7bfb4a03da202fd426d4e8e7eab42ab86 Author: Hannes Reinecke Date: Fri Jul 15 10:09:25 2005 +0200 [PATCH] Floppy: Add cmos attribute to floppy driver Currently only a device 'fdX' shows up in sysfs; the other possible device for this drive (like fd0h1440 etc) must be guessed from there. This patch corrects the floppy driver to create a platform device for each floppy found; each platform device also has an attribute 'cmos' which represents the cmos type for this drive. From this attribute the other possible device types can be computed. From: Hannes Reinecke Signed-off-by: Greg Kroah-Hartman commit 76d1ce00bdd76c2987fbfb763cd40447413a55b3 Author: Dmitry Torokhov Date: Sun Jul 10 01:21:24 2005 -0500 [PATCH] Driver core: link device and all class devices derived from it. Driver core: link device and all class devices derived from it. To ease the task of locating class devices derived from a certain device create symlinks from parent device to its class devices. Change USB host class device name from usbX to usb_hostX to avoid conflict when creating aforementioned links. Tweaked by Greg to have the symlink be "class_name:class_device_name" in order to prevent duplicate links. Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman commit d65da6eae10cc77f93ead0188cde0b45f124d912 Author: Greg Kroah-Hartman Date: Wed Aug 17 17:33:11 2005 -0700 [PATCH] Fix manual binding infinite loop Fix for manual binding of drivers to devices. Problem is if you pass in a valid device id, but the driver refuses to bind. Infinite loop as write() tries to resubmit the data it just sent. Thanks to Michal Ostrowski for pointing the problem out. Signed-off-by: Greg Kroah-Hartman commit 3a48c4c2d52a08e12319ab7caacad0a9b88e6cb4 Author: Pavel Roskin Date: Thu Sep 1 20:10:06 2005 -0400 [PATCH] orinoco: New driver - spectrum_cs. Signed-off-by: Pavel Roskin diff-tree dee4f325520d4ea29397dd67ca657b7235bb1790 (from c88faac230cc9775445e5c644991c352e35c72a1) Author: Pavel Roskin Date: Thu Sep 1 17:46:39 2005 -0400 New driver - spectrum_cs. Driver for 802.11b cards using RAM-loadable Symbol firmware, such as Symbol Wireless Networker LA4100, CompactFlash cards by Socket Communications and Intel PRO/Wireless 2011B. The driver implements Symbol firmware download. The rest is handled in hermes.c and orinoco.c. Utilities for downloading the Symbol firmware are available at http://sourceforge.net/projects/orinoco/ Signed-off-by: Jeff Garzik commit ec82905177a22b0fe0abaf4ecb76813d3d45d16e Author: Pavel Roskin Date: Thu Sep 1 20:08:56 2005 -0400 [PATCH] orinoco: New driver - orinoco_nortel. Signed-off-by: Pavel Roskin diff-tree dce61aef99ceb57370b70222dc34d788666c0ac3 (from ceb6695092be8dcdfe2dec6ee5097d613011489d) Author: Pavel Roskin Date: Thu Sep 1 15:50:55 2005 -0400 New driver - orinoco_nortel. This is a driver for Nortel emobility PCI adaptors, which consist of an Orinoco compatible PCMCIA card and a simple PCI-to-PCMCIA bridge. The driver initializes the device and uses Orinoco core driver for actual wireless networking. Signed-off-by: Jeff Garzik commit 8c09e16bd8f816f19cea0920430a1ac26478fcf6 Author: Pavel Roskin Date: Thu Sep 1 20:07:52 2005 -0400 [PATCH] orinoco: Remove EXPERIMENTAL mark from PLX_HERMES, TMD_HERMES and PCI_HERMES. Signed-off-by: Pavel Roskin diff-tree ceb6695092be8dcdfe2dec6ee5097d613011489d (from 6b39374a27eb4be7e9d82145ae270ba02ea90dc8) Author: Pavel Roskin Date: Thu Sep 1 14:50:10 2005 -0400 Remove EXPERIMENTAL mark from PLX_HERMES, TMD_HERMES and PCI_HERMES. Those drivers have been used for a long time, and there have been very few problem reports. Signed-off-by: Jeff Garzik commit c89cc225f72ec240196733872fa1a9eb9d8335ac Author: Pavel Roskin Date: Thu Sep 1 20:06:06 2005 -0400 [PATCH] orinoco: Optimize orinoco_join_ap() Signed-off-by: Pavel Roskin diff-tree cb289b9f9b2a0f3ae7070a008f22e383b37526ee (from 56bfcdb38b3d04c1f8c1fd705e411f4be53b663c) Author: Pavel Roskin Date: Thu Sep 1 19:05:16 2005 -0400 Optimize orinoco_join_ap() - break from loop once the requested BSSID is found. Signed-off-by: Jeff Garzik commit 708218b064e3ad3d55ac0f9d19b3c8c0fb7af3a4 Author: Pavel Roskin Date: Thu Sep 1 20:05:19 2005 -0400 [PATCH] orinoco: Fix memory leak on error in processing hostscan frames. Signed-off-by: Pavel Roskin diff-tree ca955293cdfd3139e150d3b4fed3922a7eb651fb (from cb289b9f9b2a0f3ae7070a008f22e383b37526ee) Author: Pavel Roskin Date: Thu Sep 1 19:08:00 2005 -0400 Fix memory leak on error in processing hostscan frames. Signed-off-by: Jeff Garzik commit acf73a8563ff7540a54345c23f6cfe5a49b9d682 Author: Pavel Roskin Date: Thu Sep 1 20:04:20 2005 -0400 [PATCH] orinoco: Remove entry for Intel PRO/Wireless 2011B. Signed-off-by: Pavel Roskin diff-tree c88faac230cc9775445e5c644991c352e35c72a1 (from dce61aef99ceb57370b70222dc34d788666c0ac3) Author: Pavel Roskin Date: Thu Sep 1 17:09:45 2005 -0400 Remove entry for Intel PRO/Wireless 2011B. It is not supported by this driver because it has no firmware in flash. spectrum_cs is needed for this device. Signed-off-by: Jeff Garzik commit 70817c40b94eef047f1bfdd46f8c56cc16075a78 Author: Pavel Roskin Date: Thu Sep 1 20:02:50 2005 -0400 [PATCH] orinoco: Change orinoco_translate_scan() to return error code on error. Signed-off-by: Pavel Roskin diff-tree 8fc038ec51acf5f777fade80c5e38112b766aeee (from ca955293cdfd3139e150d3b4fed3922a7eb651fb) Author: Pavel Roskin Date: Thu Sep 1 19:10:12 2005 -0400 Change orinoco_translate_scan() to return error code on error. Adjust the caller to check for errors and clean up if needed. Signed-off-by: Jeff Garzik commit 7cda62455c800cf46bb86487d4f32ac6e4e8c519 Author: viro@ZenIV.linux.org.uk Date: Fri Sep 2 20:13:40 2005 +0100 [PATCH] Kconfig fix (PHYLIB vs. s390) drivers/net/phy/phy.c is broken on s390; it uses enable_irq() and friends and these do not exist on s390. Marked as broken for now. Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit 9a4822063e4865d07e902edbd0f31baf4857c2ce Author: Al Viro Date: Thu Aug 25 06:24:56 2005 +0100 [PATCH] (15/22) Kconfig fix (82596) driver is non-modular Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit 63c9e549148fb95c11befb4f255c84ded9277f89 Author: Dale Farnsworth Date: Fri Sep 2 13:49:10 2005 -0700 [PATCH] mv643xx: add netpoll api support Add support for the netpoll api for use by netconsole, kgdb, etc. Signed-off-by: Dale Farnsworth Signed-off-by: Jeff Garzik commit 7342cd810cfd73120687d5323846e5c114cb23bb Author: Dale Farnsworth Date: Fri Sep 2 12:36:48 2005 -0700 [PATCH] mv643xx: Fix promiscuous mode handling mv643xx_eth_get_config_reg() was reading the wrong register. mv643xx_eth_set_config_reg() was or'ing instead of setting the register. These functions are trivial and both are called only from mv643xx_eth_set_rx_mode() when changing to/from promiscuous mode. Remove both functions and do the operations directly in mv643xx_eth_set_rx_mode(). Also, maintain promiscuous mode setting across port resets. Signed-off-by: Dale Farnsworth Signed-off-by: Jeff Garzik commit 8f543718ea1c20795853bf065f1dcb510f210465 Author: Dale Farnsworth Date: Fri Sep 2 12:34:35 2005 -0700 [PATCH] mv643xx: Disable per port bandwidth limits The mv643xx chips support per port bandwith limits. This patch disables the bandwidth limits by clearing the MTU register. Signed-off-by: Dale Farnsworth Signed-off-by: Jeff Garzik commit b111ceb68ac4c44d1a6fa697c55f267fa09b1058 Author: Dale Farnsworth Date: Fri Sep 2 10:25:24 2005 -0700 [PATCH] mv643xx: fix outstanding tx skb counter This patch corrects the accounting of outstanding tx skbs. It fixes a bug that causes "Error on Queue Full" messages seen since scatter-gather was enabled by using the hardware tcp/udp checksum generator. Signed-off-by: Dale Farnsworth Signed-off-by: Jeff Garzik commit b1dd9ca177bd2ff5260376dd024dd43eb4631dc7 Author: Dale Farnsworth Date: Thu Sep 1 09:59:23 2005 -0700 [PATCH] mv643xx: fix skb memory leak This patch fixes an skb memory leak under heavy receive load (whenever the more packets have been received than the NAPI budget allows to be processed). Signed-off-by: Dale Farnsworth Signed-off-by: Jeff Garzik commit e797637f4c1cbcecb2d8f5cfa05b161da1f0b802 Author: Francois Romieu Date: Sat Sep 3 00:57:51 2005 +0200 [PATCH] sis190: basic sis191 support The sis191 is the gigabit brother of the sis190. SiS's driver suggests that the register set is backward compatible: this should hopefully give a basic driver. The device should allow the usual features from a modern ethernet adapter (802.1q, SG, Jumbo frames, TSO, checksum offload). So far the relevant register layout is not documented. SiS's driver does not provide these features either (at least not for Linux). Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit c3d6f1f24cf3fdfdad3bff631349dc2aef06c8df Author: Francois Romieu Date: Sat Sep 3 00:56:57 2005 +0200 [PATCH] sis190: RGMII Tx internal delay fiddling Don't ask. The patch is based on SiS's GPLed driver. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 6614a6dc6ebba4d3ca0ba5ea023b61a7d22ab00b Author: Francois Romieu Date: Sat Sep 3 00:56:16 2005 +0200 [PATCH] sis190: make 10Mbps the default when handling the StationControl register This patch does three things: - widen the access to the StationControl register (note the SIS_W16 versus SIS_W32 change); - default to 10Mbps half duplex when the LPA can not be evaluated (reg31->ctl is identical for both). It can be argued that it makes sense as the lowest common denominator when everything else failed. Btw it works better than the current code. :o) - remove some enums: they do not document anymore. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 900eb9d69252cf91d42f6a87fc80b1c5518dbff1 Author: Francois Romieu Date: Sat Sep 3 00:55:27 2005 +0200 [PATCH] sis190: recent chipsets from SiS include a RGMII Extracted from SiS's GPLed driver. From the few pdf available at SiS's, it seems that the 965 and the 966 south bridge include this interface whereas the 965L (and anything below) does not. It is expected to be a sis191 related feature and should not hurt the existing sis190 driver. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 21461380d30fb52b0bbf96dbcccd0b5096a7b346 Author: Francois Romieu Date: Sat Sep 3 00:54:25 2005 +0200 [PATCH] sis190: unmask the link change events link changes reporting does not work when the driver masks its irq event Signed-off-by: Arnaud Patard Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit dc85dec68880176c8ba05f68218a161964cada46 Author: Peter Chubb Date: Sat Sep 3 14:05:06 2005 -0700 [PATCH] 'mdio_bus_exit' in discarded section .text.exit When building with CONFIG_PHYLIB=y on Itanium, I see: `mdio_bus_exit' referenced in section `.init.text' of drivers/built-in.o: defined in discarded section `.exit.text' of drivers/built-in.o I believe that mdio_bus_exit should not be declared __exit, because it is referencesd from __init sections in, say, phy_init(). Signed-off-by: Peter Chubb Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 9d8cc1b6c3cba2be61c0884e3a04dd6baea70654 Author: Adrian Bunk Date: Sat Sep 3 14:04:55 2005 -0700 [PATCH] drivers/net/ne3210.c: cleanups - make two needlessly global functions static - kill an ancient version variable Signed-off-by: Adrian Bunk Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 0bf0519d2b531459009caab718b94fdf94d63d17 Author: viro@ftp.linux.org.uk Date: Mon Sep 5 03:26:18 2005 +0100 [PATCH] (7/7) __user annotations (ethtool) Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit 843684a24eb7b261461d8bc1aa723c23732ecb94 Author: viro@ftp.linux.org.uk Date: Mon Sep 5 03:26:13 2005 +0100 [PATCH] (6/7) missing include (ipw2200) added missing include of dma-mapping.h Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit 2be041a79bbdbb3c830f4cc3bc3387ba6fff7566 Author: viro@ftp.linux.org.uk Date: Mon Sep 5 03:26:08 2005 +0100 [PATCH] (5/7) iomem annotations, NULL noise removal (ipw2100) Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit 6cafa99f01ee355bf2590a45f0f7d236fe6bdca8 Author: viro@ftp.linux.org.uk Date: Mon Sep 5 03:26:03 2005 +0100 [PATCH] (4/7) missing include (uli526x) added missing include of dma-mapping.h, removed bogus ptrace.h (what the hell was it doing there, in the first place?) Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit 509a2671a445345d917d8828b2cb3f5743af6093 Author: viro@ftp.linux.org.uk Date: Mon Sep 5 03:25:58 2005 +0100 [PATCH] (3/7) iomem annotations (s2io) Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit 1bea9add7391be9d83886530a610fd0694f93130 Author: viro@ftp.linux.org.uk Date: Mon Sep 5 03:25:53 2005 +0100 [PATCH] (2/7) iomem annotations (e1000) Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit 91fb4c964c606e63ce0d0d31814728d62a5de9bc Author: viro@ftp.linux.org.uk Date: Mon Sep 5 03:25:48 2005 +0100 [PATCH] (1/7) chelsio sparse annotations NULL noise removal, __iomem annotations, use of if_mii() instead of open-coding it. Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit 0ce7625f3c1e3f921f6b83f7e944e00031a39dfa Author: Richard Purdie Date: Mon Sep 5 20:49:54 2005 +0100 [ARM] 2882/1: pxa2xx_sharpsl: Update PCMCIA driver to support variety of new hardware Patch from Richard Purdie This patch updates the PCMCIA pxa2xx_sharpsl driver to support multiple scoop devices by adding a scoop to pcmcia slot mapping structure. It adds platform support for poodle, is known to work on spitz (which is dual slot) and should also support collie with a minor amount of further work. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 027da01d734db0ca9dd1a084339dab07ab576935 Author: Ben Dooks Date: Mon Sep 5 20:47:53 2005 +0100 [ARM] 2876/1: N30 - remove task to toggle USB D+ line Patch from Ben Dooks The n30 machine file is using a kernel thread to change the state of the USB D+ pull-up resistor, which is not the proper way to do this. Once the usb-gadget support for the 24xx is merge, the proper access method will be added. This patch also removes the problem of using HZ for the msleep calls, from Nishanth Aravamudan. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 77ae84554cc0178e03862391599a0cedf96fa4c4 Author: Jean Delvare Date: Sat Sep 3 10:52:11 2005 +0200 [PATCH] I2C: Drop the I2C_ACK_TEST ioctl Drop the I2C_ACK_TEST ioctl, which was commented out. It never really existed (not after 1999 anyway), and there is no such thing as a ack test on I2C/SMBus anyway. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 11be27ea9bfd0ea7bca797ba6937285d18d426c2 Author: Jim Cromie Date: Fri Sep 2 23:05:07 2005 +0200 [PATCH] hwmon: (3/3) pc87360 driver update pc87360: consolidate fan helper This patch consolidates the _set_fan_min() helper routine into the 2 line sysfs-callback wrapper that uses it. Signed-off-by: Jim Cromie Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 694fa056a60828ef54a5db958468cc600c3b3622 Author: Jim Cromie Date: Fri Sep 2 22:57:52 2005 +0200 [PATCH] hwmon: (2/3) pc87360 driver update pc87360: number-skew to init The temp, therm, fan, pwm callbacks all have an offset skew in the code which accommodates attribute numbering conventions under /sys/bus/i2c/devices/9191-6620/ (ie they start at 1) This patch moves that skew into the declaration, and out of the functions (except for therm, where we simplify from 2 skews to 1). The declarative skew is clearer, less error-prone, and more efficient. The use of 11+offset-4 below reflects the fact that the sysfs numbering of these units is 4, 5, 6, but they use internal VLM units 11, 12, 13 to measure the thermistor voltages. There's one remaining skew factor, in *_crit callbacks below, because there are no critical thresholds for voltages 0-10, only for those supporting the thermistors. Signed-off-by: Jim Cromie Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit f0986bd8f390392948db85dac526fb238752372b Author: Jim Cromie Date: Fri Sep 2 22:52:43 2005 +0200 [PATCH] hwmon: (1/3) pc87360 driver update Use the new "dynamic sysfs callbacks", as introduced recently by Yani Ioannou, in pc87360. Note that this change isn't indiscriminate. Only those attributes that would benefit from having an index (i.e., those which are macro-repeated) have been converted. This significantly shrinks the size of the module: before: 49235 drivers/hwmon/pc87360.ko after: 32532 drivers/hwmon/pc87360.ko Signed-off-by: Jim Cromie Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit a89923fff79f8eeed0ccdf51e13453754e48a71e Author: Jean Delvare Date: Fri Sep 2 21:28:00 2005 +0200 [PATCH] I2C: Fix sgi_xfer return value The sgi_xfer function returns 0 on success instead of the number of transfered messages as it is supposed to. This patch fixes that. Let's just hope that no client chip driver was relying on this misbehavior. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit d1b2f0a9754d3087ee29b3e88b8f20f2d30090d3 Author: Jean Delvare Date: Fri Sep 2 21:25:47 2005 +0200 [PATCH] i2c: bug fix for busses/i2c-mv64xxx.c When an i2c transfer is successful, an incorrect value is returned. This patch fixes that. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 8e14d6c173f8fff05a94e62669c87c26141766af Author: Mark A. Greer Date: Thu Sep 1 18:12:04 2005 -0700 [PATCH] i2c: chips/ds1374.c fixup The 'new_time' variable should be static. Signed-off-by: Mark A. Greer Signed-off-by: Greg Kroah-Hartman commit a44e40b4d8c2c6faa2158caf7114e1065fed3b34 Author: Mark A. Greer Date: Thu Sep 1 18:09:54 2005 -0700 [PATCH] i2c: chips/m41t00.c fixup The 'new_time' variable should be static. Signed-off-by: Mark A. Greer Signed-off-by: Greg Kroah-Hartman commit b280dab6d62c8d0434cbc0aaeebf56d1fa4fcc19 Author: Jean Delvare Date: Mon Aug 29 21:10:31 2005 +0200 [PATCH] I2C: Drop probe parameter of i2c-keywest The i2c-keywest driver has a "probe" module parameter which enables bus scanning at load time. This can be done in userspace with the i2cdetect tool (part of the lm_sensors package) instead. What's more, i2cdetect gives more control on the way the bus is scanned, and is safer (i2c-keywest currently scans reserved addresses and doesn't properly handle the famous 24RF08 corruption case.) Thus, I would propose that this module parameter be simply dropped. Signed-off-by: Jean Delvare Acked-by: Benjamin Herrenschmidt Signed-off-by: Greg Kroah-Hartman commit 386625f9f5cd94d10a21241b555b130dcec484fb Author: Jean Delvare Date: Thu Aug 25 16:43:29 2005 +0200 [PATCH] I2C: Drop debug eeprom dump code in pcilynx The pcilynx driver includes code to dump the contents of an i2c eeprom for debugging purposes. The same can be done from userspace using the i2cdump tool (part of the lm_sensors project) instead, in a more efficient and flexible way. Thus I would suggest that this functionality be simply dropped from the pcilynx driver. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit fae91e72b79ba9a21f0ce7551a1fd7e8984c85a6 Author: Jean Delvare Date: Mon Aug 15 19:57:04 2005 +0200 [PATCH] I2C: Drop I2C_DEVNAME and i2c_clientname I2C_DEVNAME and i2c_clientname were introduced in 2.5.68 [1] to help media/video driver authors who wanted their code to be compatible with both Linux 2.4 and 2.6. The cause of the incompatibility has gone since [2], so I think we can get rid of them, as they tend to make the code harder to read and longer to preprocess/compile for no more benefit. I'd hope nobody seriously attempts to keep media/video driver compatible across Linux trees anymore, BTW. [1] http://marc.theaimsgroup.com/?l=linux-kernel&m=104930186524598&w=2 [2] http://www.linuxhq.com/kernel/v2.6/0-test3/include/linux/i2c.h Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 5b5439652af79106b792faf79b2c1e787e143ba0 Author: Jean Delvare Date: Mon Aug 15 19:51:02 2005 +0200 [PATCH] hwmon: separate maintainer Now that the hardware monitoring drivers are no more part of the i2c subsystem, they probably deserve their own entry in MAINTAINERS. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 020789e9cb688ac8b15a9950d25fe45492b23398 Author: Jean Delvare Date: Sat Aug 13 13:04:32 2005 +0200 [PATCH] I2C: Outdated i2c_adapter comment Delete an outdated comment about i2c_algorithm.id being computed from algo->id. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit c2459cf257106cea5adbc83f084b76d0030eb700 Author: Jean Delvare Date: Thu Aug 11 23:52:35 2005 +0200 [PATCH] I2C: Kill i2c_algorithm.id (7/7) The I2C_ALGO_* constants have no more users, delete them. Also update the comments in i2c-id.h so that they reflect the current state of the file. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 1684a984303abbfc39aa8b59b0fe825c717811a9 Author: Jean Delvare Date: Thu Aug 11 23:51:10 2005 +0200 [PATCH] I2C: Kill i2c_algorithm.id (6/7) In theory, there should be no more users of I2C_ALGO_* at this point. However, it happens that several drivers were using I2C_ALGO_* for adapter ids, so we need to correct these before we can get rid of all the I2C_ALGO_* definitions. Note that this also fixes a bug in media/video/tvaudio.c: /* don't attach on saa7146 based cards, because dedicated drivers are used */ if ((adap->id & I2C_ALGO_SAA7146)) return 0; This test was plain broken, as it would succeed for many more adapters than just the saa7146: any those id would share at least one bit with the saa7146 id. We are really lucky that the few other adapters we want this driver to work with did not fulfill that condition. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit c7a46533ff7ef9e1c51bae6e54208527c5275b24 Author: Jean Delvare Date: Thu Aug 11 23:41:56 2005 +0200 [PATCH] I2C: Kill i2c_algorithm.id (5/7) Merge the algorithm id part (16 upper bits) of the i2c adapters ids into the definition of the adapters ids directly. After that, we don't need to OR both ids together for each i2c_adapter structure. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 1d8b9e1bad35fa3ea829990b9056c2a257d8fe79 Author: Jean Delvare Date: Thu Aug 11 23:40:19 2005 +0200 [PATCH] I2C: Kill i2c_algorithm.id (4/7) There are no more users of i2c_algorithm.id, so we can finally drop this structure member. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 87c3d7a8bc0ff5c8d4481e509b407b6be1859925 Author: Jean Delvare Date: Thu Aug 11 23:38:52 2005 +0200 [PATCH] I2C: Kill i2c_algorithm.id (3/7) Don't rely on i2c_algorithm.id to alter the i2c adapter's id, use the I2C_ALGO_* value directly instead, because i2c_algorithm will soon have no id member no more. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit e51cc6b3a365e170d3ebe51c2308fdd42e027a46 Author: Jean Delvare Date: Thu Aug 11 23:36:49 2005 +0200 [PATCH] I2C: Kill i2c_algorithm.id (2/7) Use the adapter id rather than the algorithm id to detect the i2c-isa pseudo-adapter. This saves one level of dereferencing, and the algorithm ids will soon be gone anyway. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 975185880d55676b1352047e82a0cb84173c6c28 Author: Jean Delvare Date: Thu Aug 11 23:33:24 2005 +0200 [PATCH] I2C: Kill i2c_algorithm.name (1/7) The name member of the i2c_algorithm is never used, although all drivers conscientiously fill it. We can drop it completely, this structure doesn't need to have a name. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 4c9337da37c877e53a64696fc8524f642d446cba Author: Jean Delvare Date: Tue Aug 9 20:28:10 2005 +0200 [PATCH] I2C: Centralize 24RF08 corruption prevention The 24RF08 corruption would better be prevented at i2c-core level than at chip driver level, for several reasons: * The second quick write should happen as soon as possible after the first one, so as to limit the risk that another command is issued on the bus inbetween, causing the corruption. * As a matter of fact, the protection code at driver level was reworked at least three times already, which proves how hard it is to get it right there, while it's straightforward at i2c-core level. * It's easy to add a new driver that would need the protection, and forget to add it. This did happen already. * As additional probing addresses can be passed to most i2c chip drivers as module parameters, virtually every i2c chip driver would need the protection if we want to be really safe. * Why duplicate code when we can easily avoid it? Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit a89ba0bc02e82920a0f4137aa5d655ac0366cc28 Author: Jean Delvare Date: Tue Aug 9 20:17:55 2005 +0200 [PATCH] I2C: Rewrite i2c_probe i2c_probe was quite complex and slow, so I rewrote it in a more efficient and hopefully clearer way. Note that this slightly changes the way the module parameters are handled. This shouldn't change anything for the most common cases though. For one thing, the function now respects the order of the parameters for address probing. It used to always do lower addresses first. The new approach gives the user more control. For another, ignore addresses don't overrule probe addresses anymore. This could have been restored the way it was at the cost of a few more lines of code, but I don't think it's worth it. Both lists are given as module parameters, so a user would be quite silly to specify the same addresses in both lists. The normal addresses list is the only one that isn't controlled by a module parameter, thus is the only one the user may reasonably want to remove an address from. Another significant change is the fact that i2c_probe() will no more stop when a detection function returns -ENODEV. Just because a driver found a chip it doesn't support isn't a valid reason to stop all probings for this one driver. This closes the long standing lm_sensors ticket #1807. http://www2.lm-sensors.nu/~lm78/readticket.cgi?ticket=1807 I updated the documentation accordingly. In terms of algorithmic complexity, the new code is way better. If I is the ignore address count, P the probe address count, N the normal address count and F the force address count, the old code was doing 128 * (F + I + P + N) iterations max, while the new code does F + P + ((I+1) * N) iterations max. For the most common case where F, I and P are empty, this is down from 128 * N to N. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 3b6c0634cc989f0735a1541ccf9288947685cab5 Author: R.Marek@sh.cvut.cz Date: Fri Aug 5 15:40:11 2005 +0000 [PATCH] hwmon: VID table update This patch updates the VID entries, so any future Intel CPU will be detected as unknown rather than 9.0 Signed-off-by: Rudolf Marek Signed-off-by: Greg Kroah-Hartman commit 19f673eddb5a406be72989fb57b7f286772b8cf4 Author: Jean Delvare Date: Sun Jul 31 22:12:09 2005 +0200 [PATCH] hwmon: hwmon vs i2c, second round (11/11) Use the common vid_from_reg function in lm78 rather than reimplementing it. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit d0f282706df877f8fd8869419e308d24eedb523b Author: Jean Delvare Date: Mon Aug 1 22:50:08 2005 +0200 [PATCH] hwmon: hwmon vs i2c, second round (10/11) I see very little reason why vid_from_reg is inlined. It is not exactly short, its parameters are seldom known in advance, and it is never called in speed critical areas. Uninlining it should cause little performance loss if any, and saves a signficant space as well as compilation time. As suggested by Alexey Dobriyan, I am leaving vid_to_reg inline for now, as it is short and has a single user so far. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit ee70d3a33368038d41985474d9e70ac07f19651c Author: Jean Delvare Date: Sun Jul 31 21:57:33 2005 +0200 [PATCH] hwmon: hwmon vs i2c, second round (09/11) Delete DEFAULT_VRM from hwmon-vid.h, it has no more users. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit da97a5a3279340462e8be6612feabc4b28883f87 Author: Jean Delvare Date: Sun Jul 31 21:54:28 2005 +0200 [PATCH] hwmon: hwmon vs i2c, second round (08/11) Cleanup hwmon-vid a bit, fixing typos, rewording some comments and reindenting properly at places. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 303760b44a7a142cb9f4c9df4609fb63bbda98db Author: Jean Delvare Date: Sun Jul 31 21:52:01 2005 +0200 [PATCH] hwmon: hwmon vs i2c, second round (07/11) The only part left in i2c-sensor is the VRM/VRD/VID handling code. This is in no way related to i2c, so it doesn't belong there. Move the code to hwmon, where it belongs. Note that not all hardware monitoring drivers do VRM/VRD/VID operations, so less drivers depend on hwmon-vid than there were depending on i2c-sensor. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit f4b50261207c987913f076d867c2e154d71fd012 Author: Jean Delvare Date: Sun Jul 31 21:49:03 2005 +0200 [PATCH] hwmon: hwmon vs i2c, second round (06/11) The only thing left in i2c-sensor.h are module parameter definition macros. It's only an extension of what i2c.h offers, and this extension is not sensors-specific. As a matter of fact, a few non-sensors drivers use them. So we better merge them in i2c.h, and get rid of i2c-sensor.h altogether. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 96478ef3f3f71fa929cc905cc794993e312d9a5d Author: Jean Delvare Date: Sun Jul 31 21:45:27 2005 +0200 [PATCH] hwmon: hwmon vs i2c, second round (05/11) The i2c_detect function has no more user, delete it. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 2ed2dc3c116d26fc6a9384e83d136b15cc203b6c Author: Jean Delvare Date: Sun Jul 31 21:42:02 2005 +0200 [PATCH] hwmon: hwmon vs i2c, second round (04/11) i2c_probe and i2c_detect now do the exact same thing and operate on the same data structure, so we can have everyone call i2c_probe. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit b78ec31582c60578ee1d3bb470791d6dde96ccf7 Author: Jean Delvare Date: Sun Jul 31 21:36:24 2005 +0200 [PATCH] hwmon: hwmon vs i2c, second round (03/11) We now have two identical structures, i2c_address_data in i2c-sensor.h and i2c_client_address_data in i2c.h. We can kill one of them, I choose to keep the one in i2c.h as it makes more sense (this structure is not specific to sensors.) Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit ef8dec5d8b3e96e359f377f35cd8caff42fe6d58 Author: Jean Delvare Date: Sun Jul 31 21:33:23 2005 +0200 [PATCH] hwmon: hwmon vs i2c, second round (02/11) The way i2c-sensor handles forced addresses could be optimized. It defines a structure (i2c_force_data) to associate a module parameter with a given kind value, but in fact this kind value is always the index of the structure in each array it is used in. So this additional value can be omitted, and still be deduced in the code handling these arrays. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 9fc6adfa9adf2be84119a3c2592287f33bd1dff2 Author: Jean Delvare Date: Sun Jul 31 21:20:43 2005 +0200 [PATCH] hwmon: hwmon vs i2c, second round (01/11) Add support for kind-forced addresses to i2c_probe, like i2c_detect has for (essentially) hardware monitoring drivers. Note that this change will slightly increase the size of the drivers using I2C_CLIENT_INSMOD, with no immediate benefit. This is a requirement if we want to merge i2c_probe and i2c_detect though, and seems a reasonable price to pay in comparison with the previous cleanups which saved much more than that (such as the i2c-isa cleanup or the i2c address ranges removal.) Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 5cb802293e87035920d47979107af8cf42a2f62a Author: Jean Delvare Date: Fri Jul 29 20:51:54 2005 +0200 [PATCH] hwmon: lm85: trivial cleanups Remove an unused macro and an outdated comment from the lm85 driver. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 53ae11b08353268c4012ef107bf205a0724d71aa Author: Jean Delvare Date: Thu Jul 28 23:14:59 2005 +0200 [PATCH] hwmon: move SENSORS_LIMIT to hwmon.h Move SENSORS_LIMIT from i2c-sensor.h to hwmon.h, as it is in no way related to i2c. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit b6d7b3d1b5a388b7e9af2629a9ecccedee064078 Author: Jean Delvare Date: Sun Jul 31 19:02:53 2005 +0200 [PATCH] I2C: Improve core debugging messages The debugging messages in i2c-core are more confusing than helpful. Some lack their trailing newline, some lack a prefix, some are redundant, some lack precious information. Here is my attempt to introduce some standardization in there. I also changed two messages in i2c-dev to make it clear they come from i2c-dev. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 014e45380a3b96f2ebd8ff0d115b7a33c06d06d1 Author: Jean Delvare Date: Thu Jul 28 23:08:43 2005 +0200 [PATCH] I2C: fix typo in documentation Fix a typo in the i2c documentation: the i2c bus scanning tool found in lm_sensors is called i2cdetect, not i2c_detect. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 48edcb65ddcd93b6421831ad133599aacea9724a Author: Ian Campbell Date: Wed Aug 10 08:51:16 2005 +0100 [PATCH] I2C: i2c-algo-pca -- gracefully handle a busy bus I've been running with this patch for a while now, and while I've never seen it trigger except with buggy hardware I think it is a cleaner way to handle a busy bus. I had -EBUSY until about 10 minutes ago but -EIO seems to be what most of the existing algo drivers will return in the same circumstances. Signed-off-by: Ian Campbell Signed-off-by: Greg Kroah-Hartman commit cdcb19219714c796ddef1202e952566c5f86354d Author: Jean Delvare Date: Thu Jul 28 23:09:40 2005 +0200 [PATCH] I2C: inline i2c_adapter_id We could inline i2c_adapter_id, as it is really, really short. Doing so saves a few bytes both in i2c-core and in the drivers using this function. before after diff drivers/hwmon/adm1026.ko 41344 41305 -39 drivers/hwmon/asb100.ko 27325 27246 -79 drivers/hwmon/gl518sm.ko 20824 20785 -39 drivers/hwmon/it87.ko 26419 26380 -39 drivers/hwmon/lm78.ko 21424 21385 -39 drivers/hwmon/lm85.ko 41034 40939 -95 drivers/hwmon/w83781d.ko 39561 39514 -47 drivers/hwmon/w83792d.ko 32979 32932 -47 drivers/i2c/i2c-core.ko 24708 24531 -177 Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit e6cfb3ad7209e4f4dcdc14f5fc437db55667041f Author: Jean Delvare Date: Wed Jul 27 21:32:02 2005 +0200 [PATCH] hwmon: tag super-i/o find functions __init Super-I/O find functions in hardware monitoring drivers can be tagged __init as they are only called from functions themselves tagged __init. Two of them (smsc47b397 and w83627ehf) already do, but the other four of them (it87, pc87360, smsc47m1 and w83627hf) did not. This saves a few bytes of memory after the drivers are loaded, 192 in the case of the it87 driver. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 7bef559455fc71f66f8573cc1aafe1dd33966c1c Author: Jean Delvare Date: Wed Jul 27 22:14:49 2005 +0200 [PATCH] I2C: refactor message in i2c_detach_client We could refactor the error message 34 different i2c drivers print if i2c_detach_client() fails in this function itself. Saves quite a few lines of code. Documentation is updated to reflect that change. Note that this patch should be applied after Rudolf Marek's w83792d patches. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 1ff4e3065b41847b6fe5908b1214cb508dd49e61 Author: R.Marek@sh.cvut.cz Date: Wed Jul 27 09:25:28 2005 +0000 [PATCH] I2C: W83792D documentation 3/3 This patch adds documentation entry for W83792D chip. Signed-off-by: Rudolf Marek Signed-off-by: Greg Kroah-Hartman commit ce785ab460ce8728a9daf337ba8fab3ba692b6aa Author: R.Marek@sh.cvut.cz Date: Wed Jul 27 11:50:18 2005 +0000 [PATCH] I2C: W83792D add hwmon class register 2/3 This patch adds registration of hwmon class. Tested with help of i2c-stub. Signed-off-by: Rudolf Marek Signed-off-by: Greg Kroah-Hartman commit 5563e27d3a42667734e81c1cb8ad72bff76321f6 Author: R.Marek@sh.cvut.cz Date: Wed Jul 27 11:43:47 2005 +0000 [PATCH] I2C: W83792D driver 1/3 I would like to announce support for W83792D chip. This driver was developed by Winbond Electronics Corp. I added sysfs attributes callbacks infrastructure plus various code fixes and codingstyle cleanups. I would like to thank Winbond for supporting free software. This patch is against 2.6.13rc3 plus hwmon-class and hwmon-split. Separate patch for documantation and hwmon class register will follow. Signed-off-by: Rudolf Marek Signed-off-by: Chunhao Huang Signed-off-by: Greg Kroah-Hartman commit 570aefc361d3315ec6749f573009286106b0b2d8 Author: Jean Delvare Date: Wed Jul 20 00:09:03 2005 +0200 [PATCH] I2C: Separate non-i2c hwmon drivers from i2c-core (9/9) Move the definitions of i2c_is_isa_client and i2c_is_isa_adapter from i2c.h to i2c-isa.h. Only hybrid drivers still need them. Signed-off-by: Greg Kroah-Hartman commit 02ff982c6911de1484e13a1d765d7bd31a0f8fee Author: Jean Delvare Date: Wed Jul 20 00:05:33 2005 +0200 [PATCH] I2C: Separate non-i2c hwmon drivers from i2c-core (8/9) Kill all uses of i2c_is_isa_adapter except for the hybrid drivers (it87, lm78, w83781d). The i2c-isa adapter not being registered with the i2c core anymore, drivers don't have to fear being erroneously attached to it. Signed-off-by: Greg Kroah-Hartman commit 5071860aba7fc69279ab822638ed2c2e4549f9fd Author: Jean Delvare Date: Wed Jul 20 00:02:32 2005 +0200 [PATCH] I2C: Separate non-i2c hwmon drivers from i2c-core (7/9) Kill normal_isa in header files, documentation and all chip drivers, as it is no more used. normal_i2c could be renamed to normal, but I decided not to do so at the moment, so as to limit the number of changes. This might be done later as part of the i2c_probe/i2c_detect merge. Signed-off-by: Greg Kroah-Hartman commit 4926c0d4de77c5396a274ee7941ed7fc02afed26 Author: Jean Delvare Date: Tue Jul 19 23:57:54 2005 +0200 [PATCH] I2C: Separate non-i2c hwmon drivers from i2c-core (6/9) Kill all isa-related stuff from i2c_detect, it's not used anymore. This is one major step in the directiom of merging i2c_probe and i2c_detect. The last obstacle I can think of is the different way forced addresses work between sensors and non-sensors i2c drivers. I'll deal with that in a later patchset. Signed-off-by: Greg Kroah-Hartman commit 2d8672c5a6ba0d3f1d8d3ad61ef67868941364f0 Author: Jean Delvare Date: Tue Jul 19 23:56:35 2005 +0200 [PATCH] I2C: Separate non-i2c hwmon drivers from i2c-core (5/9) Call the ISA chip drivers detection function directly instead of relying on i2c_detect. The net effect is that address lists won't be handled anymore, but they were mostly useless in the ISA case anyway (pc87360, smsc47m1, smsc47b397 had already dropped them). We don't need to handle multiple devices, all we may need is a way to force a given address instead of the original one (some drivers already do: sis5595, via686a, w83627hf), and, for drivers supporting multiple chips, a way to force one given kind. All this may be added later on demand, but I actually don't think there will be much demand. Signed-off-by: Greg Kroah-Hartman commit 5042c7d752fe72c6924037058367f63902e68c5c Author: Jean Delvare Date: Tue Jul 19 23:53:07 2005 +0200 [PATCH] I2C: Separate non-i2c hwmon drivers from i2c-core (4/9) All ISA hardware monitoring drivers (including hybrid drivers) now have a hard dependency on i2c-isa, so they must select I2C_ISA. As a result, CONFIG_I2C_ISA doesn't need to be left visible to the user. The good thing here is that users will stop complaining that some driver doesn't work just because they forgot to compile or load i2c-isa. At this point, all drivers are working again and the cleanup phase can begin. Signed-off-by: Greg Kroah-Hartman commit fde0950903ce8cc38a91dd095280decceda2ff82 Author: Jean Delvare Date: Tue Jul 19 23:51:07 2005 +0200 [PATCH] I2C: Separate non-i2c hwmon drivers from i2c-core (3/9) Convert the 10 ISA hardware monitoring drivers (it87, lm78, pc87360, sis5595, smsc47b397, smsc47m1, via686a, w83627hf, w83627ehf, w83781d) to explicitely register with i2c-isa. For hybrid drivers (it87, lm78, w83781d), we now have two separate instances of i2c_driver, one for the I2C interface of the chip, and one for ISA interface. In the long run, the one for ISA will be replaced with a different driver type. At this point, all drivers are working again, except for missing dependencies in Kconfig. Signed-off-by: Greg Kroah-Hartman commit 400c455eaa0d0819d18cd42a74070e0e238a73dc Author: Jean Delvare Date: Tue Jul 19 23:48:43 2005 +0200 [PATCH] I2C: Separate non-i2c hwmon drivers from i2c-core (2/9) Convert i2c-isa from a dumb i2c_adapter into a pseudo i2c-core for ISA hardware monitoring drivers. The isa i2c_adapter is no more registered with i2c-core, drivers have to explicitely connect to it using the new i2c_isa_{add,del}_driver interface. At this point, all ISA chip drivers are useless, because they still register with i2c-core in the hope i2c-isa is registered there as well, but it isn't anymore. The fake bus will be named i2c-9191 in sysfs. This is the number it already had internally in various places, so it's not exactly new, except that now the number is seen in userspace as well. This shouldn't be a problem until someone really has 9192 I2C busses in a given system ;) The fake bus will no more show in "i2cdetect -l", as it won't be seen by i2c-dev anymore (not being registered with i2c-core), which is a good thing, as i2cdetect/i2cdump/i2cset cannot operate on this fake bus anyway. Signed-off-by: Greg Kroah-Hartman commit efde723fdac02111872bff606ef362074fc1efa8 Author: Jean Delvare Date: Wed Jul 20 23:03:50 2005 +0200 [PATCH] I2C: Separate non-i2c hwmon drivers from i2c-core (1/9) Temporarily export a few structures and functions from i2c-core, because we will soon need them in i2c-isa. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 943b0830cebe4711354945ed3cb44e84152aaca0 Author: Mark M. Hoffman Date: Fri Jul 15 21:39:18 2005 -0400 [PATCH] I2C hwmon: add hwmon sysfs class to drivers This patch modifies sensors chip drivers to make use of the new sysfs class "hwmon". Signed-off-by: Mark M. Hoffman Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 1236441f38b6a98caf4c7983e7efdecc2d1527b5 Author: Mark M. Hoffman Date: Fri Jul 15 21:38:08 2005 -0400 [PATCH] I2C hwmon: hwmon sysfs class This patch adds the sysfs class "hwmon" for use by hardware monitoring (sensors) chip drivers. It also fixes up the related Kconfig/Makefile bits. Signed-off-by: Mark M. Hoffman Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 8dd2d2ca7fafdedaebd1862e954fccaef212f1e1 Author: Jean Delvare Date: Wed Jul 27 21:33:15 2005 +0200 [PATCH] hwmon: Document on the W83627EHG chip Document the fact that the W83627EHG is compatible with the W83627EHF. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 27fe048eb3787d29bf9cf9d6d12077bb8af869a6 Author: Jean Delvare Date: Wed Jul 27 21:30:16 2005 +0200 [PATCH] hwmon: kill client name lm78-j Drop the separate client name for the LM78-J chip. This is really only a later revision of the LM78, with almost no difference and no difference the driver handles in any case. This was the only client name that had a dash in it, and special care had to be taken in libsensors because of it. As we plan to write a new library soon, I'd like to get rid of this exception before we do. As a nice side effect, it saves 876 bytes in lm78.ko. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit e647ecf15e365679f0528d7815ab4db0d4802918 Author: Jean Delvare Date: Wed Jul 27 21:28:28 2005 +0200 [PATCH] hwmon: soften lm75 initialization The LM75 initialization is a bit agressive, it arbitrarily reconfigures the chip. Make it only change the bit it needs. This is a port from the 2.4 kernel version of the driver (lm_sensors). Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 17f990c87a1e5addc49b99a53b3d2a2fac9680e9 Author: bgardner@wabtec.com Date: Wed Jul 27 12:43:14 2005 -0500 [PATCH] I2C: max6875 code cleanup Remove an unused local variable and change the subclient name. Signed-off-by: Ben Gardner Signed-off-by: Greg Kroah-Hartman commit 0283fe6c3bdbe9ca9aefa28b24883ec1dee3ccbd Author: bgardner@wabtec.com Date: Wed Jul 27 12:43:21 2005 -0500 [PATCH] I2C: max6875 documentation cleanup Fix a spelling error and change a sysfs name. Signed-off-by: Ben Gardner Signed-off-by: Greg Kroah-Hartman commit a61fc683ae1b7871d8d81ac5025af1a923731547 Author: bgardner@wabtec.com Date: Wed Jul 27 12:43:03 2005 -0500 [PATCH] I2C: add kobj_to_i2c_client Move the inline function kobj_to_i2c_client() from max6875.c to i2c.h. Signed-off-by: Ben Gardner Signed-off-by: Greg Kroah-Hartman commit 5033017c2678df9dc75be0139f19701ff224a498 Author: Hans-Frieder Vogt Date: Sat Jul 23 15:33:39 2005 +0200 [PATCH] I2C: cleanup of i2c-nforce2 attached is a small patch that removes unused code from i2c-nforce2 and adds a single debug message. The patch is against 2.6.13-rc3-mm1. I have tested the patch with 2.6.13-rc3: compiles cleanly and works as without the patch (as expected). Signed-off-by: Hans-Frieder Vogt Signed-off-by: Greg Kroah-Hartman commit a8decc658a8800e61f13b9240125f2a34d7fd3f5 Author: Greg Kroah-Hartman Date: Wed Jul 27 12:43:03 2005 -0500 [PATCH] I2C: fix max6875 build error Signed-off-by: Greg Kroah-Hartman commit 93ffa435147abd47ebd7d7d24176b3c653aef940 Author: bgardner@wabtec.com Date: Tue Jul 12 13:21:50 2005 -0500 [PATCH] I2C: update max6875 documentation Updates to the max6875 driver documentation. This brings the documentation in sync with the code, which was recently simplified. This patch is based off 2.6.13-rc2-mm2. Signed-off-by: Ben Gardner Signed-off-by: Greg Kroah-Hartman commit bc769ff8f5f6e3d249bfde082653e5bf1c2b5698 Author: bgardner@wabtec.com Date: Tue Jul 12 13:21:11 2005 -0500 [PATCH] I2C: simplify max6875 driver This is an update to the max6875 driver. It no longer does any detection, so the address must be forced on module load. It only makes available the user EEPROM (read-only). This patch is based off 2.6.13-rc2-mm2. Signed-off-by: Ben Gardner Signed-off-by: Greg Kroah-Hartman commit 908f9c485042e516bb3749f4361129a94772fe26 Author: Dave Airlie Date: Mon Sep 5 21:51:30 2005 +1000 drm: fix MGA on non AGP systems Al Viro noticed that MGA wouldn't build on non AGP systems. Signed-off-by: Dave Airlie commit f210973bb6d17aa220c797e8ea23d127d96859b7 Author: Dave Airlie Date: Mon Sep 5 21:33:44 2005 +1000 drm: small cleanups This patch contains the following small cleanups: - make two needlessly global functions static - drm_sysfs.c: every file should #include the header with the prototypes of the global functions it is offering Signed-off-by: Adrian Bunk Signed-off-by: Dave Airlie commit 89625eb186b9b0b9454d44126f8b1bcc72ad93b7 Author: Dave Airlie Date: Mon Sep 5 21:23:23 2005 +1000 drm: fix issue with handle lookup for a 0 handle On 32-bit PPC a 0 handle is valid for AGP space, the 32/64 lookup doesn't handle 0 correctly. From: Ben Herrenschmidt and Paul Mackerras Signed-off-by: Dave Airlie commit 9d88347758c58ee5b4ac9cd594b96eaafa5e08bb Author: Russell King Date: Mon Sep 5 10:21:04 2005 +0100 [ARM] Remove unused DYN_TICK_* macros Neither DYN_TICK_SKIPPING nor DYN_TICK_SUITABLE are used on ARM. Remove them. Signed-off-by: Russell King commit 3863e72414fa2ebf5f3b615d1bf99de32e59980a Author: Martin Schwidefsky Date: Sat Sep 3 15:58:06 2005 -0700 [PATCH] s390: disconnected 3270 console Fix reboot with a disconnected 3270 console. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9513e5e3f5a6b429da8a9fd4330f71f1e547c8e0 Author: Heiko Carstens Date: Sat Sep 3 15:58:05 2005 -0700 [PATCH] s390: spinlock corner case On s390 the lock value used for spinlocks consists of the lower 32 bits of the PSW that holds the lock. If this address happens to be on a four gigabyte boundary the lock is left unlocked. This allows other cpus to grab the same lock and enter a lock protected code path concurrently. In theory this can happen if the vmalloc area for the code of a module crosses a 4 GB boundary. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c563077e526d130b8c9aab4e75116551eb5fdc2d Author: Heiko Carstens Date: Sat Sep 3 15:58:04 2005 -0700 [PATCH] s390: compat system calls Use TIF bit to tell if a process is running in 31 bit mode instead of checking the addressing mode bits of the PSW. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2dee702fcb197d80c1a94650fb611539dd8135ce Author: Eric Rossman Date: Sat Sep 3 15:58:03 2005 -0700 [PATCH] s390: crypto driver update crypto device driver update: - Suppress syslog messages for some return codes. - Fix incorrect bounds checking in /proc interface. - Remove hotplug calls. - Remove linux version checks. - Remove device workqueue on module unload. Signed-off-by: Eric Rossman Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6d09449d53f5aa7c67b1be3e90d7b7ab2aad09c Author: Martin Schwidefsky Date: Sat Sep 3 15:58:02 2005 -0700 [PATCH] s390: pfault interrupt race There is a race in pfault_interrupt. That function gets called two times for each pfault notification. Once with a subcode of 0 to indicate that a real page is not available and once with a subcode of 0x80 to indicate that the page is present again. Since the two external interrupts can be delivered on two different cpus the order in which the two calls are made is unpredictable. It is possible that the subcode 0x80 interrupt is completed before the subcode 0x00 interrupt has done the wake_up() call. To avoid calling wake_up() on an already removed task structure proper task structure reference counting is needed. Increase the reference counter in the subcode 0x00 interrupt before setting pfault_wait to zero and return the reference after the wake_up call. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c24da79e29537f0e240a331220a1c46cb9bc085 Author: Cornelia Huck Date: Sat Sep 3 15:58:01 2005 -0700 [PATCH] s390: reIPL fix and extern/static inline Common i/o layer changes: - Collect the irb at the correct subchannel when waiting for the clear interrupt during subchannel cleaning befor reIPL - don't stop at the first interrupt that comes in. - Change "extern __inline__" to "static inline". - Remove unneeded qdio includes. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fd49f41aa0c125ec649c56a45337b3024d6b1736 Author: Horst Hummel Date: Sat Sep 3 15:58:00 2005 -0700 [PATCH] s390: 64 bit diag250 support Add support for diag 250 access to dasd devices for 64 bit kernels. In addition fix detach/attach for diag disks. The VM control block needs to get recreated by a call to mdsk_init_io. Signed-off-by: Horst Hummel Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c6eb7b7703ac4b3401b74f411c8c51ded214bf19 Author: Horst Hummel Date: Sat Sep 3 15:57:58 2005 -0700 [PATCH] s390: deadlock in dasd_devmap Reintroduce a read-only copy of the devmap features in the device struct. This is necessary to solve a deadlock on the dasd_devmap_lock which is acquired by dasd_get_features called from the dasd tasklet. The current implementation of devmap doesn't allow to call any devmap function from interrupt or softirq context. Signed-off-by: Horst Hummel Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 942eaabd5d77522223a311ed9bddaaa3cefde27d Author: Michael Holzheu Date: Sat Sep 3 15:57:58 2005 -0700 [PATCH] s390: debug feature changes debug feature changes/bug fixes: - Use get_clock() function instead of private inline assembly. - Use 'struct timeval' instead of 'struct timespec' for call to tod_to_timeval(). Now the microsecond part of the timestamp is correct again. - Fix a locking problem: when creating a snapshot of the current content of the debug areas, lock the entire debug_info object. Signed-off-by: Michael Holzheu Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae6aa2ea8973e200cb3d0564a64a1b441d233428 Author: Martin Schwidefsky Date: Sat Sep 3 15:57:56 2005 -0700 [PATCH] s390: machine check handler bugs The new machine check handler still has a few bugs. 1) The system entry time has to be stored in the machine check handler, 2) the machine check return psw may not be stored at the usual place because it might overwrite the return psw of the interrupted context, 3) the return address for the call to s390_handle_mcck in the i/o interrupt handler is not correct, 4) the system call cleanup has to take the different save area of the machine check handler into account, 5) the machine check handler may not call UPDATE_VTIME before CREATE_STACK_FRAME, and 6) the io leave path needs a critical section cleanup to make sure that the TIF_MCCK_PENDING bit is really checked before switching back to user space. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c139862b8831261d57de02716b92f82e5fb463b Author: Adrian Bunk Date: Sat Sep 3 15:57:55 2005 -0700 [PATCH] xtensa: delete accidental file This file seems to be an accident. Signed-off-by: Adrian Bunk Signed-off-by: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d99cf715a0751b0c819cdd8616c8870c1dd51910 Author: Adrian Bunk Date: Sat Sep 3 15:57:53 2005 -0700 [PATCH] xtensa: replace 'extern inline' with 'static inline' "extern inline" doesn't make sense. Signed-off-by: Adrian Bunk Signed-off-by: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ef939054139ef857cebbec07cbd12d7cf7beedd Author: Jeff Dike Date: Sat Sep 3 15:57:52 2005 -0700 [PATCH] uml: fix x86_64 page leak We were leaking pmd pages when 3_LEVEL_PGTABLES was enabled. This fixes that. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f9dfefe423a7633d81310c7b06c5566c74f9167b Author: Bodo Stroesser Date: Sat Sep 3 15:57:51 2005 -0700 [PATCH] uml: fix advanced sysemu check cleanup and fix the check for advanced sysemu (PTRACE_SYSEMU_SINGLESTEP option) Signed-off-by: Bodo Stroesser Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d9838d86536fe17e76d19bf3e737100fae618396 Author: Bodo Stroesser Date: Sat Sep 3 15:57:51 2005 -0700 [PATCH] uml: allow host capability usage to be disabled Add new cmdline setups: - noprocmm - noptracefaultinfo In case of testing, they can be used to switch off usage of /proc/mm and PTRACE_FAULTINFO independently. Signed-off-by: Bodo Stroesser Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 07bf731e4b95d7c9ea9dbacd1fc4a041120dfffb Author: Bodo Stroesser Date: Sat Sep 3 15:57:50 2005 -0700 [PATCH] uml: skas0 stubs now check system call return values Change syscall-stub's data to include a "expected retval". Stub now checks syscalls retval and aborts execution of syscall list, if retval != expected retval. run_syscall_stub prints the data of the failed syscall, using the data pointer and retval written by the stub to the beginning of the stack. one_syscall_stub is removed, to simplify code, because only some instructions are saved by one_syscall_stub, no host-syscall. Using the stub with additional data (modify_ldt via stub) is prepared also. Signed-off-by: Bodo Stroesser Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b51304ed3184826fb262c1e9d3e58b0b00fd083 Author: Bodo Stroesser Date: Sat Sep 3 15:57:49 2005 -0700 [PATCH] uml: increase granularity of host capability checking This change enables SKAS0/SKAS3 to work with all combinations of /proc/mm and PTRACE_FAULTINFO being available or not. Also it changes the initialization of proc_mm and ptrace_faultinfo slightly, to ease forcing SKAS0 on a patched host. Forcing UML to run without /proc/mm or PTRACE_FAULTINFO by cmdline parameter can be implemented with a setup resetting the related variable. Signed-off-by: Bodo Stroesser Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 60d339f6fe0831060600c62418b71a62ad26c281 Author: Gennady Sharapov Date: Sat Sep 3 15:57:47 2005 -0700 [PATCH] uml: move libc-dependent startup and signal code The serial UML OS-abstraction layer patch (um/kernel dir). This moves all systemcalls from process.c file under os-Linux dir and join process.c and process_kern.c files. Signed-off-by: Gennady Sharapov Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 09ace81c1d737bcbb2423db235ac980cac4d5de9 Author: Jeff Dike Date: Sat Sep 3 15:57:46 2005 -0700 [PATCH] uml: add host AIO support to block driver This adds AIO support to the ubd driver. The driver breaks a struct request into IO requests to the host, based on the hardware segments in the request and on any COW blocks covered by the request. The ubd IO thread is gone, since there is now an equivalent thread in the AIO module. There is provision for multiple outstanding requests now. Requests aren't retired until all pieces of it have been completed. The AIO requests have a shared count, which is decremented as IO operations come in until it reaches 0. This can be possibly moved to the request struct - haven't looked at this yet. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 75e5584c89d213d6089f64f22cd899fb172e4c95 Author: Jeff Dike Date: Sat Sep 3 15:57:45 2005 -0700 [PATCH] uml: use host AIO support This patch makes UML use host AIO support when it (and /usr/include/linux/aio_abi.h) are present. This is only the support, with no consumers - a consumer is coming in the next patch. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 30f7dabb083f8ff4ce541b5ac4e5d70cc173051a Author: Al Viro Date: Sat Sep 3 15:57:43 2005 -0700 [PATCH] uml: build cleanups Added missing include list to uml AFLAGS Killed magic for stubs. [So] - it was needed only because of messed AFLAGS Switched segv_stubs.c to kernel CFLAGS sans profile, instead of user ones Killed STUBS_CFLAGS - it's not needed and the only remaining use had been gratitious - it only polluted CFLAGS Signed-off-by: Al Viro Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e32dacb9f481fd6decb41adb28e720c923d34f54 Author: Jeff Dike Date: Sat Sep 3 15:57:42 2005 -0700 [PATCH] uml: system call path cleanup This merges two sets of files which had no business being split apart in the first place. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 08964c565b2fe49e338ffbe4907adcc19647ef16 Author: Jeff Dike Date: Sat Sep 3 15:57:41 2005 -0700 [PATCH] uml: merge duplicated page table code There is a lot of code which is duplicated between the 2 and 3 level implementation, with the only difference that the 3-level implementation is a bit more generalized (instead of accessing directly pte_t.pte, it uses the appropriate access macros). So this code is joined together. As obvious, a "core code nice cleanup" is not a "stability-friendly patch" so usual care applies. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Jeff Dike Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c56004901fa5dcf55f92318f192ab3c0e87db2d1 Author: Jeff Dike Date: Sat Sep 3 15:57:36 2005 -0700 [PATCH] uml: TLB operation batching This adds VM op batching to skas0. Rather than having a context switch to and from the userspace stub for each address space change, we write a number of operations to the stub data page and invoke a different stub which loops over them and executes them all in one go. The operations are stored as [ system call number, arg1, arg2, ... ] tuples. The set is terminated by a system call number of 0. Single operations, i.e. page faults, are handled in the old way, since that is slightly more efficient. For a kernel build, a minority (~1/4) of the operations are part of a set. These sets averaged ~100 in length, so for this quarter, the context switching overhead is greatly reduced. Signed-off-by: Jeff Dike Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 77fa5adcda6d686d2f45a2b55dcb9a03e7d33fa1 Author: Jeff Dike Date: Sat Sep 3 15:57:34 2005 -0700 [PATCH] uml: remove duplicated exports Al Viro spotted a bunch of duplicated exports - this removes them. Signed-off-by: Jeff Dike Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 02edeb586ae4cdd17778923674700edb732a4741 Author: Jeff Dike Date: Sat Sep 3 15:57:33 2005 -0700 [PATCH] uml: mark SMP on UML/x86_64 as broken Noticed by Al Viro - SMP on x86_64 is fundamentally broken due to UML's reuse of the host arch's percpu stuff. This is OK on x86, but the x86_64 pda stuff just won't work for UML. Signed-off-by: Jeff Dike Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 13abf8130139c2ccd4962a7e5a8902be5e6cb5a7 Author: Al Viro Date: Sat Sep 3 15:57:31 2005 -0700 [PATCH] uml: remove libc reference in build Remove an unneeded reference to libc. Signed-off-by: Jeff Dike Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 93ea5a5b5c71ddbefd4082627d8f33e4bc038a6f Author: Al Viro Date: Sat Sep 3 15:57:30 2005 -0700 [PATCH] uml: build cleanup Build cleanups Signed-off-by: Jeff Dike Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ec7cf783dd6cf5c8fb6b6767560686ed28d1cd6d Author: Jeff Dike Date: Sat Sep 3 15:57:29 2005 -0700 [PATCH] uml: error path cleanup This cleans up the error path in ubd_open, causing it now to call ubd_close appropriately when something fails. Signed-off-by: Jeff Dike Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7efd08c85523f9468a6a8748d6f02b3e73967569 Author: Al Viro Date: Sat Sep 3 15:57:28 2005 -0700 [PATCH] uml: fix a macro typo Fix a macro typo which could break if the macro is passed arguments with side-effects. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e54a5dfb960053437f464a7ce372a8acc293fdcb Author: Al Viro Date: Sat Sep 3 15:57:27 2005 -0700 [PATCH] uml: fix signal frame copy_user The copy_user stuff in the signal frame code was broke. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b52166cf72f0826c6d8fa0541c7d4ae39c5a146 Author: Paolo 'Blaisorblade' Giarrusso Date: Sat Sep 3 15:57:26 2005 -0700 [PATCH] uml: fault handler micro-cleanups Avoid chomping low bits of address for functions doing it by themselves, fix whitespace, add a correctness checking. I did this for remap-file-pages protection support, it was useful on its own too. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e40cd383ccc7c9f8b338c56ce28c326e25eb2fe Author: Paolo 'Blaisorblade' Giarrusso Date: Sat Sep 3 15:57:25 2005 -0700 [PATCH] uml: fixes performance regression in activate_mm and thus exec() Normally, activate_mm() is called from exec(), and thus it used to be a no-op because we use a completely new "MM context" on the host (for instance, a new process), and so we didn't need to flush any "TLB entries" (which for us are the set of memory mappings for the host process from the virtual "RAM" file). Kernel threads, instead, are usually handled in a different way. So, when for AIO we call use_mm(), things used to break and so Benjamin implemented activate_mm(). However, that is only needed for AIO, and could slow down exec() inside UML, so be smart: detect being called for AIO (via PF_BORROWED_MM) and do the full flush only in that situation. Comment also the caller so that people won't go breaking UML without noticing. I also rely on the caller's locks for testing current->flags. Signed-off-by: Paolo 'Blaisorblade' Giarrusso CC: Benjamin LaHaise Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ed1b58d8b53519e10a35c6a2bb49cac35f439621 Author: Bodo Stroesser Date: Sat Sep 3 15:57:24 2005 -0700 [PATCH] uml: fix SIGWINCH handler race while waiting for signals. If a SIGWINCH comes in, while winch_thread() isn't waiting in wait(), winch_thread could miss signals. It isn't very probable, that anyone will see this causing trouble, as it would need a very special timing, that a missed SIGWINCH results in a wrong window size. So, this is a minor problem. But why not fix, as it can be done so easy? Signed-off-by: Bodo Stroesser Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0221575903ad68debea57679b5b46575bf57afb1 Author: Paolo 'Blaisorblade' Giarrusso Date: Sat Sep 3 15:57:23 2005 -0700 [PATCH] uml: workaround GDB problems on debugging Apparently, GDB gets confused when we do an execvp() on ourselves. Since it's simply done to allocate further space for command line arguments (which we'll use to allow gathering the startup command line for guest processes through the host), allow the user to disable that to get a debuggable UML binary. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 640aa46e25922a00b805e6b0d0b5181ad9cf736a Author: Paolo 'Blaisorblade' Giarrusso Date: Sat Sep 3 15:57:22 2005 -0700 [PATCH] uml: SYSEMU: slight cleanup and speedup As a follow-up to "UML Support - Ptrace: adds the host SYSEMU support, for UML and general usage" (i.e. uml-support-* in current mm). Avoid unconditionally jumping to work_pending and code copying, just reuse the already existing resume_userspace path. One interesting note, from Charles P. Wright, suggested that the API is improvable with no downsides for UML (except that it will have to support yet another host API, since dropping support for the current API, for UML, is not reasonable from users' point of view). Signed-off-by: Paolo 'Blaisorblade' Giarrusso CC: Charles P. Wright Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab1c23c24471c760c573f4fb0dd78e166ddfd844 Author: Bodo Stroesser Date: Sat Sep 3 15:57:21 2005 -0700 [PATCH] SYSEMU: fix sysaudit / singlestep interaction Paolo 'Blaisorblade' Giarrusso This is simply an adjustment for "Ptrace - i386: fix Syscall Audit interaction with singlestep" to work on top of SYSEMU patches, too. On this patch, I have some doubts: I wonder why we need to alter that way ptrace_disable(). I left the patch this way because it has been extensively tested, but I don't understand the reason. The current PTRACE_DETACH handling simply clears child->ptrace; actually this is not enough because entry.S just looks at the thread_flags; actually, do_syscall_trace checks current->ptrace but I don't think depending on that is good, at least for performance, so I think the clearing is done elsewhere. For instance, on PTRACE_CONT it's done, but doing PTRACE_DETACH without PTRACE_CONT is possible (and happens when gdb crashes and one kills it manually). Signed-off-by: Paolo 'Blaisorblade' Giarrusso CC: Roland McGrath Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1b38f0064e4e0b9ec626e39f0740b1cf2e295743 Author: Bodo Stroesser Date: Sat Sep 3 15:57:20 2005 -0700 [PATCH] Uml support: add PTRACE_SYSEMU_SINGLESTEP option to i386 This patch implements the new ptrace option PTRACE_SYSEMU_SINGLESTEP, which can be used by UML to singlestep a process: it will receive SINGLESTEP interceptions for normal instructions and syscalls, but syscall execution will be skipped just like with PTRACE_SYSEMU. Signed-off-by: Bodo Stroesser Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c8c86cecd1d1a2722acb28a01d1babf7b6993697 Author: Bodo Stroesser Date: Sat Sep 3 15:57:19 2005 -0700 [PATCH] Uml support: reorganize PTRACE_SYSEMU support With this patch, we change the way we handle switching from PTRACE_SYSEMU to PTRACE_{SINGLESTEP,SYSCALL}, to free TIF_SYSCALL_EMU from double use as a preparation for PTRACE_SYSEMU_SINGLESTEP extension, without changing the behavior of the host kernel. Signed-off-by: Bodo Stroesser Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ed75e8d58010fdc06e2c3a81bfbebae92314c7e3 Author: Laurent Vivier Date: Sat Sep 3 15:57:18 2005 -0700 [PATCH] UML Support - Ptrace: adds the host SYSEMU support, for UML and general usage Jeff Dike , Paolo 'Blaisorblade' Giarrusso , Bodo Stroesser Adds a new ptrace(2) mode, called PTRACE_SYSEMU, resembling PTRACE_SYSCALL except that the kernel does not execute the requested syscall; this is useful to improve performance for virtual environments, like UML, which want to run the syscall on their own. In fact, using PTRACE_SYSCALL means stopping child execution twice, on entry and on exit, and each time you also have two context switches; with SYSEMU you avoid the 2nd stop and so save two context switches per syscall. Also, some architectures don't have support in the host for changing the syscall number via ptrace(), which is currently needed to skip syscall execution (UML turns any syscall into getpid() to avoid it being executed on the host). Fixing that is hard, while SYSEMU is easier to implement. * This version of the patch includes some suggestions of Jeff Dike to avoid adding any instructions to the syscall fast path, plus some other little changes, by myself, to make it work even when the syscall is executed with SYSENTER (but I'm unsure about them). It has been widely tested for quite a lot of time. * Various fixed were included to handle the various switches between various states, i.e. when for instance a syscall entry is traced with one of PT_SYSCALL / _SYSEMU / _SINGLESTEP and another one is used on exit. Basically, this is done by remembering which one of them was used even after the call to ptrace_notify(). * We're combining TIF_SYSCALL_EMU with TIF_SYSCALL_TRACE or TIF_SINGLESTEP to make do_syscall_trace() notice that the current syscall was started with SYSEMU on entry, so that no notification ought to be done in the exit path; this is a bit of a hack, so this problem is solved in another way in next patches. * Also, the effects of the patch: "Ptrace - i386: fix Syscall Audit interaction with singlestep" are cancelled; they are restored back in the last patch of this series. Detailed descriptions of the patches doing this kind of processing follow (but I've already summed everything up). * Fix behaviour when changing interception kind #1. In do_syscall_trace(), we check the status of the TIF_SYSCALL_EMU flag only after doing the debugger notification; but the debugger might have changed the status of this flag because he continued execution with PTRACE_SYSCALL, so this is wrong. This patch fixes it by saving the flag status before calling ptrace_notify(). * Fix behaviour when changing interception kind #2: avoid intercepting syscall on return when using SYSCALL again. A guest process switching from using PTRACE_SYSEMU to PTRACE_SYSCALL crashes. The problem is in arch/i386/kernel/entry.S. The current SYSEMU patch inhibits the syscall-handler to be called, but does not prevent do_syscall_trace() to be called after this for syscall completion interception. The appended patch fixes this. It reuses the flag TIF_SYSCALL_EMU to remember "we come from PTRACE_SYSEMU and now are in PTRACE_SYSCALL", since the flag is unused in the depicted situation. * Fix behaviour when changing interception kind #3: avoid intercepting syscall on return when using SINGLESTEP. When testing 2.6.9 and the skas3.v6 patch, with my latest patch and had problems with singlestepping on UML in SKAS with SYSEMU. It looped receiving SIGTRAPs without moving forward. EIP of the traced process was the same for all SIGTRAPs. What's missing is to handle switching from PTRACE_SYSCALL_EMU to PTRACE_SINGLESTEP in a way very similar to what is done for the change from PTRACE_SYSCALL_EMU to PTRACE_SYSCALL_TRACE. I.e., after calling ptrace(PTRACE_SYSEMU), on the return path, the debugger is notified and then wake ups the process; the syscall is executed (or skipped, when do_syscall_trace() returns 0, i.e. when using PTRACE_SYSEMU), and do_syscall_trace() is called again. Since we are on the return path of a SYSEMU'd syscall, if the wake up is performed through ptrace(PTRACE_SYSCALL), we must still avoid notifying the parent of the syscall exit. Now, this behaviour is extended even to resuming with PTRACE_SINGLESTEP. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94c80b2598dbd2b8a6fe5f5c2c3af1beb37f66c7 Author: Bodo Stroesser Date: Sat Sep 3 15:57:13 2005 -0700 [PATCH] Ptrace/i386: fix "syscall audit" interaction with singlestep Paolo 'Blaisorblade' Giarrusso Avoid giving two traps for singlestep instead of one, when syscall auditing is enabled. In fact no singlestep trap is sent on syscall entry, only on syscall exit, as can be seen in entry.S: # Note that in this mask _TIF_SINGLESTEP is not tested !!! <<<<<<<<<<<<<< testb $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP),TI_flags(%ebp) jnz syscall_trace_entry ... syscall_trace_entry: ... call do_syscall_trace But auditing a SINGLESTEP'ed process causes do_syscall_trace to be called, so the tracer will get one more trap on the syscall entry path, which it shouldn't. Signed-off-by: Paolo 'Blaisorblade' Giarrusso CC: Roland McGrath Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 08b178ebf37bbfb78329e0ae6ea688b103d205bf Author: Jeff Dike Date: Sat Sep 3 15:57:12 2005 -0700 [PATCH] uml: Rename Kconfig files to be like the other arches To the extent that sub-Kconfig files exist elsewhere in the tree, they are named Kconfig.foo, rather than the Kconfig_foo that UML has. This patch brings the names in line with the rest of the tree. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 96e59245e1abf3ea2e98c4b9ee2ebd975db653db Author: Jeff Dike Date: Sat Sep 3 15:57:12 2005 -0700 [PATCH] uml: remove debugging code from page fault path This eliminates the segfault info ring buffer, which added a system call to each page fault, and which hadn't been useful for debugging in ages. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 49f9ebc894ecdb985475060d051a571dc231cce7 Author: Adrian Bunk Date: Sat Sep 3 15:57:10 2005 -0700 [PATCH] arch/cris/Kconfig.debug: use lib/Kconfig.debug This patch converts arch/cris/Kconfig.debug to using lib/Kconfig.debug. This should fix a compile error in 2.6.13-rc4 caused by a missing CONFIG_LOG_BUF_SHIFT definition. While I was editing this file, I also converted some spaces to tabs. Signed-off-by: Adrian Bunk Acked-by: Mikael Starvik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 072dffda1d35c391fe893ec9b1d098145e668fef Author: Roman Zippel Date: Sat Sep 3 15:57:10 2005 -0700 [PATCH] m68k: cleanup inline mem functions Use the builtin functions for memset/memclr/memcpy, special optimizations for page operations have dedicated functions now. Uninline memmove/memchr and move all functions into a single file and clean it up a little. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2855b97020f6d4a4dfb005fb77c0b79c8cb9d13f Author: Roman Zippel Date: Sat Sep 3 15:57:09 2005 -0700 [PATCH] m68k: move cache functions into separate file Move a few cache functions into its own file and fix flush_icache_range() so it can handle both kernel and user addresses correctly (assuming context is set correctly). Turn copy_to_user_page/copy_from_user_page into inline functions and add a missing cache flush. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 69f447cffb911bb2d9737fa905f6d983ec2aa5d3 Author: Roman Zippel Date: Sat Sep 3 15:57:08 2005 -0700 [PATCH] m68k: sys_ptrace cleanup - create helper function singlestep_disable() - move variable definitions to the top of the function - use "out_eio" label as common error destination - don't clear failure value for PTRACE_SETREGS/PTRACE_GETREGS Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b3319f50acbe3a26c258cdd899b9baa2e5e94efc Author: Roman Zippel Date: Sat Sep 3 15:57:07 2005 -0700 [PATCH] m68k: indent sys_ptrace This reformats and properly indents sys_ptrace (only whitespace changes). Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c3c433e4f33afe255389ba3b1a003dc8deb3de9a Author: Shaohua Li Date: Sat Sep 3 15:57:07 2005 -0700 [PATCH] add suspend/resume for timer The timers lack .suspend/.resume methods. Because of this, jiffies got a big compensation after a S3 resume. And then softlockup watchdog reports an oops. This occured with HPET enabled, but it's also possible for other timers. Signed-off-by: Shaohua Li Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 57c4ce3cbfba1bb0da7f37b9328a713cbd5d0919 Author: Pavel Machek Date: Sat Sep 3 15:57:06 2005 -0700 [PATCH] pm: clean up /sys/power/disk Clean code up a bit, and only show suspend to disk as available when it is configured in. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6161b2ce8116b9a623260ab811e2c035b3fac2e5 Author: Pavel Machek Date: Sat Sep 3 15:57:05 2005 -0700 [PATCH] pm: fix process freezing If process freezing fails, some processes are frozen, and rest are left in "were asked to be frozen" state. Thats wrong, we should leave it in some consistent state. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 99dc7d63e0dcb457580241055b2a39d011309db8 Author: Pavel Machek Date: Sat Sep 3 15:57:05 2005 -0700 [PATCH] swsusp: fix error handling and cleanups Drop printing during normal boot (when no image exists in swap), print message when drivers fail, fix error paths and consolidate near-identical functions in disk.c (and functions with just one statement). Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd5d666b7995e542b7f81a4bb1c7ad634f4f6c51 Author: Shaohua Li Date: Sat Sep 3 15:57:04 2005 -0700 [PATCH] swsusp: add locking to software_resume It is trying to protect swsusp_resume_device and software_resume() from two users banging it from userspace at the same time. Signed-off-by: Shaohua Li Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ed9fcec85d5ef0e34ea18affe95e4a246714565 Author: Andreas Steinmetz Date: Sat Sep 3 15:57:03 2005 -0700 [PATCH] swsusup with dm-crypt mini howto The attached patch contains a mini howto for using dm-crypt together with swsusp. Signed-off-by: Andreas Steinmetz Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 56057e1a128a9aab516350500e5b154e70577929 Author: Michal Schmidt Date: Sat Sep 3 15:57:02 2005 -0700 [PATCH] swsusp: simpler calculation of number of pages in PBE list The function calc_nr uses an iterative algorithm to calculate the number of pages needed for the image and the pagedir. Exactly the same result can be obtained with a one-line expression. Note that this was even proved correct ;-). Signed-off-by: Michal Schmidt Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 46dacba52a19d1414ba249499a48382c16242d99 Author: Michal Schmidt Date: Sat Sep 3 15:57:01 2005 -0700 [PATCH] swsusp: prevent disks from spinning down and up Stop the disks from spinning down and up on suspend. Signed-off-by: Michal Schmidt Cc: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c2ff18f4070f6303a81fd7d9d967d7c9e01b588f Author: Andreas Steinmetz Date: Sat Sep 3 15:56:59 2005 -0700 [PATCH] encrypt suspend data for easy wiping The patch protects from leaking sensitive data after resume from suspend. During suspend a temporary key is created and this key is used to encrypt the data written to disk. When, during resume, the data was read back into memory the temporary key is destroyed which simply means that all data written to disk during suspend are then inaccessible so they can't be stolen lateron. Think of the following: you suspend while an application is running that keeps sensitive data in memory. The application itself prevents the data from being swapped out. Suspend, however, must write these data to swap to be able to resume lateron. Without suspend encryption your sensitive data are then stored in plaintext on disk. This means that after resume your sensitive data are accessible to all applications having direct access to the swap device which was used for suspend. If you don't need swap after resume these data can remain on disk virtually forever. Thus it can happen that your system gets broken in weeks later and sensitive data which you thought were encrypted and protected are retrieved and stolen from the swap device. Signed-off-by: Andreas Steinmetz Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 583a4e88db1eadc52116e1f97b4519de655b2b80 Author: Pavel Machek Date: Sat Sep 3 15:56:58 2005 -0700 [PATCH] fix pm_message_t stuff in -mm tree This should bits from -mm tree that are affected by pm_message_t conversion. [I'm not 100% sure I got all of them, but I certainly got all the errors on make allyesconfig build, and most of warnings, too. I'll go through the buildlog tommorow and fix any remaining bits]. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ca078bae813dd46c0f9b102fdfb4a3384641ff48 Author: Pavel Machek Date: Sat Sep 3 15:56:57 2005 -0700 [PATCH] swsusp: switch pm_message_t to struct This adds type-checking to pm_message_t, so that people can't confuse it with int or u32. It also allows us to fix "disk yoyo" during suspend (disk spinning down/up/down). [We've tried that before; since that cpufreq problems were fixed and I've tried make allyes config and fixed resulting damage.] Signed-off-by: Pavel Machek Signed-off-by: Alexander Nyberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 829ca9a30a2ddb727981d80fabdbff2ea86bc9ea Author: Pavel Machek Date: Sat Sep 3 15:56:56 2005 -0700 [PATCH] swsusp: fix remaining u32 vs. pm_message_t confusion Fix remaining bits of u32 vs. pm_message confusion. Should not break anything. Signed-off-by: Pavel Machek Signed-off-by: Rafael J. Wysocki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7e958883bced7e435f5a76349e15684858d3477c Author: Pavel Machek Date: Sat Sep 3 15:56:56 2005 -0700 [PATCH] suspend: update documentation Update suspend documentation. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7dc24db1757f950f8bd21b7191106d4bf5134be7 Author: Pierre Ossman Date: Sat Sep 3 15:56:55 2005 -0700 [PATCH] ISA DMA suspend for x86_64 Reset the ISA DMA controller into a known state after a suspend. Primary concern was reenabling the cascading DMA channel (4). Signed-off-by: Pierre Ossman Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 795312e763569ce4df67e7a0ca726a9901358fa2 Author: Pierre Ossman Date: Sat Sep 3 15:56:54 2005 -0700 [PATCH] ISA DMA suspend for i386 Reset the ISA DMA controller into a known state after a suspend. Primary concern was reenabling the cascading DMA channel (4). Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2a23b5d1e119fd10e25b8e93464c8d549f5a5c5d Author: Pavel Machek Date: Sat Sep 3 15:56:53 2005 -0700 [PATCH] remove busywait in refrigerator This should make refrigerator sleep properly, not busywait after the first schedule() returns. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52fdd08903a1d1162e184114837e232640191627 Author: Benjamin LaHaise Date: Sat Sep 3 15:56:52 2005 -0700 [PATCH] unify x86/x86-64 semaphore code This patch moves the common code in x86 and x86-64's semaphore.c into a single file in lib/semaphore-sleepers.c. The arch specific asm stubs are left in the arch tree (in semaphore.c for i386 and in the asm for x86-64). There should be no changes in code/functionality with this patch. Signed-off-by: Benjamin LaHaise Cc: Andi Kleen Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ad8d38342430f8b52f7a8458dce90caf8c8ca64 Author: Zwane Mwaikambo Date: Sat Sep 3 15:56:51 2005 -0700 [PATCH] i386 boottime for_each_cpu broken for_each_cpu walks through all processors in cpu_possible_map, which is defined as cpu_callout_map on i386 and isn't initialised until all processors have been booted. This breaks things which do for_each_cpu iterations early during boot. So, define cpu_possible_map as a bitmap with NR_CPUS bits populated. This was triggered by a patch i'm working on which does alloc_percpu before bringing up secondary processors. From: Alexander Nyberg i386-boottime-for_each_cpu-broken.patch i386-boottime-for_each_cpu-broken-fix.patch The SMP version of __alloc_percpu checks the cpu_possible_map before allocating memory for a certain cpu. With the above patches the BSP cpuid is never set in cpu_possible_map which breaks CONFIG_SMP on uniprocessor machines (as soon as someone tries to dereference something allocated via __alloc_percpu, which in fact is never allocated since the cpu is not set in cpu_possible_map). Signed-off-by: Zwane Mwaikambo Signed-off-by: Alexander Nyberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d7271b14b2e9e5905aba0fbf5c4dc4f8980c0cb2 Author: Zachary Amsden Date: Sat Sep 3 15:56:50 2005 -0700 [PATCH] i386: encapsulate copying of pgd entries Add a clone operation for pgd updates. This helps complete the encapsulation of updates to page tables (or pages about to become page tables) into accessor functions rather than using memcpy() to duplicate them. This is both generally good for consistency and also necessary for running in a hypervisor which requires explicit updates to page table entries. The new function is: clone_pgd_range(pgd_t *dst, pgd_t *src, int count); dst - pointer to pgd range anwhere on a pgd page src - "" count - the number of pgds to copy. dst and src can be on the same page, but the range must not overlap and must not cross a page boundary. Note that I ommitted using this call to copy pgd entries into the software suspend page root, since this is not technically a live paging structure, rather it is used on resume from suspend. CC'ing Pavel in case he has any feedback on this. Thanks to Chris Wright for noticing that this could be more optimal in PAE compiles by eliminating the memset. Signed-off-by: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 748f2edb52712aa3d926470a888608dc500d17e8 Author: George Anzinger Date: Sat Sep 3 15:56:48 2005 -0700 [PATCH] x86 NMI: better support for debuggers This patch adds a notify to the die_nmi notify that the system is about to be taken down. If the notify is handled with a NOTIFY_STOP return, the system is given a new lease on life. We also change the nmi watchdog to carry on if die_nmi returns. This give debug code a chance to a) catch watchdog timeouts and b) possibly allow the system to continue, realizing that the time out may be due to debugger activities such as single stepping which is usually done with "other" cpus held. Signed-off-by: George Anzinger Cc: Keith Owens Signed-off-by: George Anzinger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2f30ebca6c0c95e987cb9a1fd1495770a75432e Author: Zachary Amsden Date: Sat Sep 3 15:56:47 2005 -0700 [PATCH] x86: introduce a write acessor for updating the current LDT Introduce a write acessor for updating the current LDT. This is required for hypervisors like Xen that do not allow LDT pages to be directly written. Testing - here's a fun little LDT test that can be trivially modified to test limits as well. /* * Copyright (c) 2005, Zachary Amsden (zach@vmware.com) * This is licensed under the GPL. */ #include #include #include #include #include #include #include #define __KERNEL__ #include void main(void) { struct user_desc desc; char *code; unsigned long long tsc; code = (char *)mmap(0, 8192, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); desc.entry_number = 0; desc.base_addr = code; desc.limit = 1; desc.seg_32bit = 1; desc.contents = MODIFY_LDT_CONTENTS_CODE; desc.read_exec_only = 0; desc.limit_in_pages = 1; desc.seg_not_present = 0; desc.useable = 1; if (modify_ldt(1, &desc, sizeof(desc)) != 0) { perror("modify_ldt"); } printf("code base is 0x%08x\n", (unsigned)code); code[0x0ffe] = 0x0f; /* rdtsc */ code[0x0fff] = 0x31; code[0x1000] = 0xcb; /* lret */ __asm__ __volatile("lcall $7,$0xffe" : "=A" (tsc)); printf("TSC is 0x%016llx\n", tsc); } Signed-off-by: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e9f86e351fda5b3c40192fc3990453613f160779 Author: Zachary Amsden Date: Sat Sep 3 15:56:45 2005 -0700 [PATCH] x86: remove redundant TSS clearing When reviewing GDT updates, I found the code: set_tss_desc(cpu,t); /* This just modifies memory; ... */ per_cpu(cpu_gdt_table, cpu)[GDT_ENTRY_TSS].b &= 0xfffffdff; This second line is unnecessary, since set_tss_desc() has already cleared the busy bit. Commented disassembly, line 1: c028b8bd: 8b 0c 86 mov (%esi,%eax,4),%ecx c028b8c0: 01 cb add %ecx,%ebx c028b8c2: 8d 0c 39 lea (%ecx,%edi,1),%ecx => %ecx = per_cpu(cpu_gdt_table, cpu) c028b8c5: 8d 91 80 00 00 00 lea 0x80(%ecx),%edx => %edx = &per_cpu(cpu_gdt_table, cpu)[GDT_ENTRY_TSS] c028b8cb: 66 c7 42 00 73 20 movw $0x2073,0x0(%edx) c028b8d1: 66 89 5a 02 mov %bx,0x2(%edx) c028b8d5: c1 cb 10 ror $0x10,%ebx c028b8d8: 88 5a 04 mov %bl,0x4(%edx) c028b8db: c6 42 05 89 movb $0x89,0x5(%edx) => ((char *)%edx)[5] = 0x89 (equivalent) ((char *)per_cpu(cpu_gdt_table, cpu)[GDT_ENTRY_TSS])[5] = 0x89 c028b8df: c6 42 06 00 movb $0x0,0x6(%edx) c028b8e3: 88 7a 07 mov %bh,0x7(%edx) c028b8e6: c1 cb 10 ror $0x10,%ebx => other bits Commented disassembly, line 2: c028b8e9: 8b 14 86 mov (%esi,%eax,4),%edx c028b8ec: 8d 04 3a lea (%edx,%edi,1),%eax => %eax = per_cpu(cpu_gdt_table, cpu) c028b8ef: 81 a0 84 00 00 00 ff andl $0xfffffdff,0x84(%eax) => per_cpu(cpu_gdt_table, cpu)[GDT_ENTRY_TSS].b &= 0xfffffdff; (equivalent) ((char *)per_cpu(cpu_gdt_table, cpu)[GDT_ENTRY_TSS])[5] &= 0xfd Note that (0x89 & ~0xfd) == 0; i.e, set_tss_desc(cpu,t) has already stored the type field in the GDT with the busy bit clear. Eliminating redundant and obscure code is always a good thing; in fact, I pointed out this same optimization many moons ago in arch/i386/setup.c, back when it used to be called that. Signed-off-by: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a5201129307f414890f9a4410e38da205f5d7359 Author: Zachary Amsden Date: Sat Sep 3 15:56:44 2005 -0700 [PATCH] x86: make IOPL explicit The pushf/popf in switch_to are ONLY used to switch IOPL. Making this explicit in C code is more clear. This pushf/popf pair was added as a bugfix for leaking IOPL to unprivileged processes when using sysenter/sysexit based system calls (sysexit does not restore flags). When requesting an IOPL change in sys_iopl(), it is just as easy to change the current flags and the flags in the stack image (in case an IRET is required), but there is no reason to force an IRET if we came in from the SYSENTER path. This change is the minimal solution for supporting a paravirtualized Linux kernel that allows user processes to run with I/O privilege. Other solutions require radical rewrites of part of the low level fault / system call handling code, or do not fully support sysenter based system calls. Unfortunately, this added one field to the thread_struct. But as a bonus, on P4, the fastest time measured for switch_to() went from 312 to 260 cycles, a win of about 17% in the fast case through this performance critical path. Signed-off-by: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0998e4228aca046fbd747c3fed909791d52e88eb Author: Zachary Amsden Date: Sat Sep 3 15:56:43 2005 -0700 [PATCH] x86: privilege cleanup Privilege checking cleanup. Originally, these diffs were much greater, but recent cleanups in Linux have already done much of the cleanup. I added some explanatory comments in places where the reasoning behind certain tests is rather subtle. Also, in traps.c, we can skip the user_mode check in handle_BUG(). The reason is, there are only two call chains - one via die_if_kernel() and one via do_page_fault(), both entering from die(). Both of these paths already ensure that a kernel mode failure has happened. Also, the original check here, if (user_mode(regs)) was insufficient anyways, since it would not rule out BUG faults from V8086 mode execution. Saving the %ss segment in show_regs() rather than assuming a fixed value also gives better information about the current kernel state in the register dump. Signed-off-by: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2ab4461249df85b20930a7a57b54f39c5ae291a Author: Zachary Amsden Date: Sat Sep 3 15:56:42 2005 -0700 [PATCH] x86: more asm cleanups Some more assembler cleanups I noticed along the way. Signed-off-by: Zachary Amsden Cc: "H. Peter Anvin" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4f0cb8d978ab4b6e3b40147f619f48316d9d7f63 Author: Ingo Molnar Date: Sat Sep 3 15:56:41 2005 -0700 [PATCH] i386: fix incorrect TSS entry for LDT Noticed by Chuck Ebbert: the .ldt entry of the TSS was set up incorrectly. It never mattered since this was a leftover from old times, so remove it. Signed-off-by: Ingo Molnar Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c9b02a24130e3ff14a553d966a79f46cf806b037 Author: Zachary Amsden Date: Sat Sep 3 15:56:40 2005 -0700 [PATCH] i386: use set_pte macros in a couple places where they were missing Also, setting PDPEs in PAE mode does not require atomic operations, since the PDPEs are cached by the processor, and only reloaded on an explicit or implicit reload of CR3. Since the four PDPEs must always be present in an active root, and the kernel PDPE is never updated, we are safe even from SMIs and interrupts / NMIs using task gates (which reload CR3). Actually, much of this is moot, since the user PDPEs are never updated either, and the only usage of task gates is by the doublefault handler. It appears the only place PGDs get updated in PAE mode is in init_low_mappings() / zap_low_mapping() for initial page table creation and recovery from ACPI sleep state, and these sites are safe by inspection. Getting rid of the cmpxchg8b saves code space and 720 cycles in pgd_alloc on P4. Signed-off-by: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e7a2ff593c0e48b130434dee4d2fd3452a850e6f Author: Zachary Amsden Date: Sat Sep 3 15:56:39 2005 -0700 [PATCH] i386: load_tls() fix Subtle fix: load_TLS has been moved after saving %fs and %gs segments to avoid creating non-reversible segments. This could conceivably cause a bug if the kernel ever needed to save and restore fs/gs from the NMI handler. It currently does not, but this is the safest approach to avoiding fs/gs corruption. SMIs are safe, since SMI saves the descriptor hidden state. Signed-off-by: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2f2984eb4afb2a4298e3186cb49cc7e88dd6d929 Author: Zachary Amsden Date: Sat Sep 3 15:56:38 2005 -0700 [PATCH] i386: generate better code around descriptor update and access functions GCC can generate better code around descriptor update and access functions when there is not an explicit "eax" register constraint. Testing: You won't boot if this is messed up, since the TSS descriptor will be corrupted. Verified the assembler and booted. Signed-off-by: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4d37e7e3fd851428dede4d05d3e69d03795a744a Author: Zachary Amsden Date: Sat Sep 3 15:56:38 2005 -0700 [PATCH] i386: inline assembler: cleanup and encapsulate descriptor and task register management i386 inline assembler cleanup. This change encapsulates descriptor and task register management. Also, it is possible to improve assembler generation in two cases; savesegment may store the value in a register instead of a memory location, which allows GCC to optimize stack variables into registers, and MOV MEM, SEG is always a 16-bit write to memory, making the casting in math-emu unnecessary. Signed-off-by: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 245067d1674d451855692fcd4647daf9fd47f82d Author: Zachary Amsden Date: Sat Sep 3 15:56:37 2005 -0700 [PATCH] i386: cleanup serialize msr i386 arch cleanup. Introduce the serialize macro to serialize processor state. Why the microcode update needs it I am not quite sure, since wrmsr() is already a serializing instruction, but it is a microcode update, so I will keep the semantic the same, since this could be a timing workaround. As far as I can tell, this has always been there since the original microcode update source. Signed-off-by: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4bb0d3ec3e5b1e9e2399cdc641b3b6521ac9cdaa Author: Zachary Amsden Date: Sat Sep 3 15:56:36 2005 -0700 [PATCH] i386: inline asm cleanup i386 Inline asm cleanup. Use cr/dr accessor functions. Also, a potential bugfix. Also, some CR accessors really should be volatile. Reads from CR0 (numeric state may change in an exception handler), writes to CR4 (flipping CR4.TSD) and reads from CR2 (page fault) prevent instruction re-ordering. I did not add memory clobber to CR3 / CR4 / CR0 updates, as it was not there to begin with, and in no case should kernel memory be clobbered, except when doing a TLB flush, which already has memory clobber. I noticed that page invalidation does not have a memory clobber. I can't find a bug as a result, but there is definitely a potential for a bug here: #define __flush_tlb_single(addr) \ __asm__ __volatile__("invlpg %0": :"m" (*(char *) addr)) Signed-off-by: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2a0694d15d55d0deed928786a6393d5e45e37d76 Author: Roland McGrath Date: Sat Sep 3 15:56:35 2005 -0700 [PATCH] i386: clean up vDSO alignment padding This makes the vDSO use nops for all its padding around instructions, rather than sometimes zeros, and nop-pads the end of the area containing instructions to a 32-byte cache line, to keep text and data in separate lines. Signed-off-by: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 56f1d5d52a21b93bc2984c920b17e0d80df5d1b2 Author: Natalie.Protasevich@unisys.com Date: Sat Sep 3 15:56:34 2005 -0700 [PATCH] ES7000 platform update (i386) This is subarch update for ES7000. I've modified platform check code and removed unnecessary OEM table parsing for newer systems that don't use OEM information during boot. Parsing the table in fact is causing problems, and the platform doesn't get recognized. The patch only affects the ES7000 subach. Signed-off-by: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a1740913cae231fb8e485306fb09671ed9a6e550 Author: Karsten Wiese Date: Sat Sep 3 15:56:33 2005 -0700 [PATCH] via vt8237 apic bypass deassertion quirk The VIA VT8237's IOAPIC sends 'APIC De-Assert Messages' by default, causing another CPU interrupt when the IRQ pin is de-asserted. This feature is switched off by the patch to get rid of doubled ioapic level interrupt rates. Signed-off-by: Karsten Wiese Tested-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 252943efcfce945d8dd3738ca4c4b9cbeb4f3fa9 Author: Venkatesh Pallipadi Date: Sat Sep 3 15:56:32 2005 -0700 [PATCH] x86: Add the check for all the cores in a package in cache information Signed-off-by: Venkatesh Pallipadi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 911a62d42365076209e2c327e7688db296e35d62 Author: Venkatesh Pallipadi Date: Sat Sep 3 15:56:31 2005 -0700 [PATCH] x86: sutomatically enable bigsmp when we have more than 8 CPUs i386 generic subarchitecture requires explicit dmi strings or command line to enable bigsmp mode. The patch below removes that restriction, and uses bigsmp as soon as it finds more than 8 logical CPUs, Intel processors and xAPIC support. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 484b90c4b965d54037ff99b198d84cdf144f8a35 Author: Vivek Goyal Date: Sat Sep 3 15:56:31 2005 -0700 [PATCH] kdump: Save parameter segment in protected mode (x86) o With introduction of kexec as boot-loader, the assumption that parameter segment will always be loaded at lower address than kernel and will be addressable by early bootup page tables is no longer valid. In kexec on panic case parameter segment might well be loaded beyond kernel image and might not be addressable by early boot page tables. o This case might hit in the scenario where user has reserved a chunk of memory for second kernel, for example 16MB to 64MB, and has also built second kernel for physical memory location 16MB. In this case kexec has no choice but to load the parameter segment at a higher address than new kernel image at safe location where new kernel does not stomp it. o Though problem should automatically go away once relocatable kernel for i386 is in place and kexec can determine the location of new kernel at run time and load parameter segment at lower address than kernel image. But till then this patch can go in (assuming it does not break something else). o This patch moves up the boot parameter saving code. Now boot parameters are copied out in protected mode before page tables are initialized. This will ensure that parameter segment is always addressable irrespective of its physical location. Signed-off-by: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5fd75ebb1a58c1a3c9e3d9fdf75ce7286b79bb74 Author: Petr Tesarik Date: Sat Sep 3 15:56:28 2005 -0700 [PATCH] vm86: Honor TF bit when emulating an instruction If the virtual 86 machine reaches an instruction which raises a General Protection Fault (such as CLI or STI), the instruction is emulated (in handle_vm86_fault). However, the emulation ignored the TF bit, so the hardware debug interrupt was not invoked after such an emulated instruction (and the DOS debugger missed it). This patch fixes the problem by emulating the hardware debug interrupt as the last action before control is returned to the VM86 program. Signed-off-by: Petr Tesarik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ae65fd334232468a9d6b523a4fc141cd6ec5ea4 Author: Matt Tolentino Date: Sat Sep 3 15:56:27 2005 -0700 [PATCH] x86: fix EFI memory map parsing The memory descriptors that comprise the EFI memory map are not fixed in stone such that the size could change in the future. This uses the memory descriptor size obtained from EFI to iterate over the memory map entries during boot. This enables the removal of an x86 specific pad (and ifdef) in the EFI header. I also couldn't stomach the broken up nature of the function to put EFI runtime calls into virtual mode any longer so I fixed that up a bit as well. For reference, this patch only impacts x86. Signed-off-by: Matt Tolentino Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4116c527ea9517623369a5b3b037aedde280d672 Author: Venkatesh Pallipadi Date: Sat Sep 3 15:56:27 2005 -0700 [PATCH] hpet: use read_timer_tsc only when CPU has TSC Only use read_timer_tsc only when CPU has TSC. Thanks to Andrea for pointing this out. Should not be issue on any platforms as all recent systems that has HPET also has CPUs that supports TSC. The patch is still required for correctness. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 869f96a00e8f53c7db8470ca9cf72e2e3fa40119 Author: Ingo Molnar Date: Sat Sep 3 15:56:26 2005 -0700 [PATCH] x86: compress the stack layout of do_page_fault() This patch pushes the creation of a rare signal frame (SIGBUS or SIGSEGV) into a separate function, thus saving stackspace in the main do_page_fault() stackframe. The effect is 132 bytes less of stack used by the typical do_page_fault() invocation - resulting in a denser cache-layout. (Another minor effect is that in case of kernel crashes that come from a pagefault, we add less space to the already existing frame, giving the crash functions a slightly higher chance to do their stuff without overflowing the stack.) (The changes also result in slightly cleaner code.) argument bugfix from "Guillaume C." Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7e06066b87ffd2c7a7f4c3f1c612293307270976 Author: Adrian Bunk Date: Sat Sep 3 15:56:24 2005 -0700 [PATCH] arch/sh64/Kconfig: doesn't need it's own LOG_BUF_SHIFT The LOG_BUF_SHIFT from lib/Kconfig.debug is sufficient. Signed-off-by: Adrian Bunk Acked-by: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 59df6bbf386d8f26870b28307d0e4f06d631685f Author: Ralf Baechle Date: Sat Sep 3 15:56:23 2005 -0700 [PATCH] mips: kludge envdev to build for 64-bit MIPS with 32-bit compat Extend the compat mode kludgeology in envdev to cover MIPS as well. Or why we should need something like is_compat_task() ... Signed-off-by: Ralf Baechle Cc: Vojtech Pavlik Signed-off-by: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6fe7f2578fb4903af79abeb29bb9b9ab5eace1b5 Author: Yoichi Yuasa Date: Sat Sep 3 15:56:23 2005 -0700 [PATCH] mips: remove timex.h for vr41xx vr41xx doesn't need mach-vr41xx/timex.h. This patch has removed mach-vr41xx/timex.h. Signed-off-by: Yoichi Yuasa Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 766160c29fadbafad1d6eb5e965922c7e78beb88 Author: Yoichi Yuasa Date: Sat Sep 3 15:56:22 2005 -0700 [PATCH] mips: fix build warnings This patch has fixed the following warnings. arch/mips/kernel/genex.S:250:5: warning: "CONFIG_64BIT" is not defined arch/mips/math-emu/cp1emu.c:1128:5: warning: "__mips64" is not defined arch/mips/math-emu/cp1emu.c:1206:5: warning: "__mips64" is not defined arch/mips/math-emu/cp1emu.c:1270:5: warning: "__mips64" is not defined arch/mips/math-emu/cp1emu.c:323:5: warning: "__mips64" is not defined arch/mips/math-emu/cp1emu.c:808:5: warning: "__mips64" is not defined arch/mips/math-emu/cp1emu.c:953:5: warning: "__mips64" is not defined arch/mips/mm/tlbex.c:519:5: warning: "CONFIG_64BIT" is not defined include/asm/reg.h:73:5: warning: "CONFIG_64BIT" is not defined Signed-off-by: Yoichi Yuasa Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ed5ba2fbc6d03c41c4c3334648a6569bc42da764 Author: Yoichi Yuasa Date: Sat Sep 3 15:56:21 2005 -0700 [PATCH] mips: add more SYS_SUPPORT_*_KERNEL and CPU_SUPPORTS_*_KERNEL The addtion of SYS_SUPPORTS_*_KERNEL and CPU_SUPPORTS_*_KERNEL is halfway. This patch has added more SYS_SUPPORTS_*_KERNEL and CPU_SUPPORTS_*_KERNEL to arch/mips/Kconfig. Please apply. Signed-off-by: Yoichi Yuasa Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e63ea56fe2669c20f4668d89522500f4ab439b04 Author: Yoichi Yuasa Date: Sat Sep 3 15:56:20 2005 -0700 [PATCH] mips: add pcibios_bus_to_resource This patch has added pcibios_bus_to_resource to MIPS. Signed-off-by: Yoichi Yuasa Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e2de84920d9489f7fd87fa4b04d996d569def4fa Author: Yoichi Yuasa Date: Sat Sep 3 15:56:19 2005 -0700 [PATCH] mips: add pcibios_select_root Add pcibios_select_root to MIPS. Signed-off-by: Yoichi Yuasa Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ce588cd563e6b817adb0c7d03b3ed9c74cadc27 Author: Ralf Baechle Date: Sat Sep 3 15:56:19 2005 -0700 [PATCH] mips: fix coherency configuration Fix the MIPS coherency configuration such that we always keep the mapping state in when we need to on non-coherent platforms. Signed-off-by: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42a3b4f25af8f8d77feddf27f839fa0628dbff1a Author: Ralf Baechle Date: Sat Sep 3 15:56:17 2005 -0700 [PATCH] mips: nuke trailing whitespace Signed-off-by: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 875d43e72b5bf22161a81de7554f88eccf8a51ae Author: Ralf Baechle Date: Sat Sep 3 15:56:16 2005 -0700 [PATCH] mips: clean up 32/64-bit configuration Start cleaning 32-bit vs. 64-bit configuration. Signed-off-by: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 63fb6fd1c86181d9dd9ba0e6e6082799e149b56b Author: Yoichi Yuasa Date: Sat Sep 3 15:56:16 2005 -0700 [PATCH] mips: changed from VR41xx to VR4100 series in Kconfig This patch has changed from VR41XX to VR4100 series in arch/mips/Kconfig. Signed-off-by: Yoichi Yuasa Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e07a7235dd05891a8c1695213ae1f2b48b09f69e Author: Yoichi Yuasa Date: Sat Sep 3 15:56:15 2005 -0700 [PATCH] mips: remove vrc4171 config This patch has removed obsolete VRC4171 config. Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 466adc66cf6eea0268c8678834c8c6a56e5a2f9e Author: Yoichi Yuasa Date: Sat Sep 3 15:56:14 2005 -0700 [PATCH] fix warning of TANBAC_TB0219 in drivers/char/Kconfig $ make menuconfig scripts/kconfig/mconf arch/i386/Kconfig drivers/char/Kconfig:847:warning: 'select' used by config symbol 'TANBAC_TB0219' refer to undefined symbol 'PCI_VR41XX' Here is a patch for this warning fix. Signed-off-by: Yoichi Yuasa Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8dd4aebe49b24348e48581af835ac41c8e483d68 Author: Yoichi Yuasa Date: Sat Sep 3 15:56:14 2005 -0700 [PATCH] mips: add default select configs for vr41xx This patch has added default select configs for vr41xx. Signed-off-by: Yoichi Yuasa Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 63b799f9ded82444212afdcf61379a247d544909 Author: Yoichi Yuasa Date: Sat Sep 3 15:56:13 2005 -0700 [PATCH] mips: add TANBAC VR4131 multichip module This patch has added TANBAC VR4131 multichip module in arch/mips/Kconfig Signed-off-by: Yoichi Yuasa Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc4ec916f6ea0c2818e9b81c4e9b33231f5f70e4 Author: Ralf Baechle Date: Sat Sep 3 15:56:12 2005 -0700 [PATCH] MIPS Technologies PCI ID bits - MIPS Denmark does no longer exist; the PCI vendor ID is now owned by MIPS Technologies. - Add ID for SOC-it, MIPS's system controller. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 07119621e62de0a2c8db6e4896e762c498bfdd17 Author: Ralf Baechle Date: Sat Sep 3 15:56:11 2005 -0700 [PATCH] mips: add support for Qemu system architecture Add support for the virtual MIPS system that is emulated by Qemu. See http://www.linux-mips.org/wiki/Qemu for a detailed current status. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7901c7998267d9d8c3f1b226a8c8cfd7f8e48a01 Author: Ralf Baechle Date: Sat Sep 3 15:56:11 2005 -0700 [PATCH] DEC PMAGB B framebuffer update Revive HX frame buffer support for 2.6. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit af690a948cc545d1eca19acab23016b96e178dcf Author: Ralf Baechle Date: Sat Sep 3 15:56:09 2005 -0700 [PATCH] DEC PMAG BA frame buffer update Rewrite PMAG BA frame buffer driver for 2.6. Acked-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 61838ffeee8296de8bfee751e9ad67bf6c61d0b4 Author: Ralf Baechle Date: Sat Sep 3 15:56:09 2005 -0700 [PATCH] DEC PMAG AA framebuffer update Get it working again. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 003b54925e2ac78306f74ac433126ad5de387f7a Author: Ralf Baechle Date: Sat Sep 3 15:56:08 2005 -0700 [PATCH] mips: remove HP Laserjet remains Remove the one file which managed to survive the removel of HP Laserjet support. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab1418a31619a47d78843c20b5fa2245c29824ca Author: Adrian Bunk Date: Sat Sep 3 15:56:07 2005 -0700 [PATCH] more vr4181 removal Signed-off-by: Adrian Bunk Cc: Yoichi Yuasa Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0ad7305f52bc8880d50a6471c90d35a6768f2865 Author: Yoichi Yuasa Date: Sat Sep 3 15:56:07 2005 -0700 [PATCH] mips: moreover remove vr4181 We also need this patch for removing mips vr4181. Signed-off-by: Yoichi Yuasa Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0fdda107e10133583f31c72326959555bfb61042 Author: Ralf Baechle Date: Sat Sep 3 15:56:06 2005 -0700 [PATCH] mips: remove VR4181 support There seem to be no more users or interest in the NEC Osprey evaluation system for the NEC VR4181 SOC which is an old part anyway, so remove the code. More information on the Osprey can be found at http://www.linux-mips.org/wiki/Osprey. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8bb670c1407c2a4890810fd3e348dac1b89e669e Author: Yoichi Yuasa Date: Sat Sep 3 15:56:05 2005 -0700 [PATCH] mips: change system type name in proc for vr41xx This patch has changed system type name in proc for vr41xx. Signed-off-by: Yoichi Yuasa Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 979934da9e7a0005bd9c8b1d7d00febb59ff67f7 Author: Yoichi Yuasa Date: Sat Sep 3 15:56:04 2005 -0700 [PATCH] mips: update IRQ handling for vr41xx This patch has updated IRQ handling for vr41xx. o added common IRQ dispatch o changed IRQ number in int-handler.S o added resource management to icu.c Signed-off-by: Yoichi Yuasa Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 006cfb51ad12047497a2a5ad796fb8914a1bc487 Author: Yoichi Yuasa Date: Sat Sep 3 15:56:03 2005 -0700 [PATCH] mips: remove obsolete GIU function call for vr41xx This patch has removed obsolete GIU function call for vr41xx. Signed-off-by: Yoichi Yuasa Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0ba06ba6a142247589711b46f9ca7908adc21e21 Author: Jesper Juhl Date: Sat Sep 3 15:56:02 2005 -0700 [PATCH] frv: Remove export of strtok() Signed-off-by: Jesper Juhl Acked-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0287ebedfa032a57bb47f4bc5cb5e268ecd844ad Author: Nishanth Aravamudan Date: Sat Sep 3 15:56:01 2005 -0700 [PATCH] ppc64: replace schedule_timeout() with msleep_interruptible() Use msleep_interruptible() instead of schedule_timeout() in ppc64-specific code to cleanup/simplify the sleeping logic. Change the units of the parameter of do_event_scan_all_cpus() to milliseconds from jiffies. The return value of rtas_extended_busy_delay_time() was incorrectly being used as a jiffies value (it is actually milliseconds), which is fixed by using the value as a parameter to msleep_interruptible(). Also, use rtas_extended_busy_delay_time() in another case where similar logic is duplicated. Signed-off-by: Nishanth Aravamudan Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 233ccd0d0452682edb51725410e0f8c0384e8b34 Author: Olof Johansson Date: Sat Sep 3 15:55:59 2005 -0700 [PATCH] ppc64: Add VMX save flag to VPA We need to indicate to the hypervisor that it needs to save our VMX registers when switching partitions on a shared-processor system, just as it needs to for FP and PMC registers. This could be made to be on-demand when VMX is used, but we don't do that for FP nor PMC right now either so let's not overcomplicate things. Signed-off-by: Olof Johansson Acked-by: Paul Mackerras Cc: Anton Blanchard Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b749bfcd1be72f8cb8310e1cac12825bda029432 Author: Olaf Hering Date: Sat Sep 3 15:55:58 2005 -0700 [PATCH] ppc64: update xmon helptext xmon will do nothing but noise on a G5 if BOOTX_TEXT is not enabled. mention the recognized kernel cmdline options for xmon. Signed-off-by: Olaf Hering Cc: Paul Mackeras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f54bef9e9c84c8dc656c55dc96c1da7b6d1c53d8 Author: Mark A. Greer Date: Sat Sep 3 15:55:57 2005 -0700 [PATCH] ppc32: cpci690 updates Update the cpci690 platform code: - pass mem size in from bootwrapper via bi_rec - some minor fixups Signed-off-by: Mark A. Greer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f4c6cc8d1e2305796f7fdad52d83b88cea4d2276 Author: Mark A. Greer Date: Sat Sep 3 15:55:57 2005 -0700 [PATCH] ppc32: katana updates Update the katana platform support code: - if booted as zImage, pass mem size in via bi_req from bootwrapper - if booted as uImage, get mem size from bd_info passed in from u-boot - add support for 82544 present on katana 752i's - set cacheline size on pci devices - some minor fixups Signed-off-by: Mark A. Greer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d01c08c9ae91c1526d4564b400b3e0e04b49d1ba Author: Mark A. Greer Date: Sat Sep 3 15:55:56 2005 -0700 [PATCH] ppc32: mv64x60 updates & enhancements Updates and enhancement to the ppc32 mv64x60 code: - move code to get mem size from mem ctlr to bootwrapper - address some errata in the mv64360 pic code - some minor cleanups - export one of the bridge's regs via sysfs so user daemon can watch for extraction events Signed-off-by: Mark A. Greer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bbde630b553d349307fe719486bc06f8cf9c1a2d Author: Kumar Gala Date: Sat Sep 3 15:55:55 2005 -0700 [PATCH] ppc32: Added cputable entry for 7448 Added cputable entry for 7448 as well adding it to checks for saving and restoring of cpu state. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e8834801bf9e2ee96c3ac29adf0ff6840afcd841 Author: Eugene Surovegin Date: Sat Sep 3 15:55:54 2005 -0700 [PATCH] ppc32: export cacheable_memcpy() Add declaration and cacheable_memcpy(). I'll be needing this function in new 4xx EMAC driver I'm going to submit to netdev soon. IMHO, the better place for the declaration would be asm-powerpc/string.h, unfortunately, ppc64 doesn't have this function, so asm-ppc/system.h is the next best place. Signed-off-by: Eugene Surovegin Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3a0a401b40abe31b34673a190c57697e7eced149 Author: Eugene Surovegin Date: Sat Sep 3 15:55:53 2005 -0700 [PATCH] ppc32: add dcr_base field to ocp_func_mal_data Add dcr_base field to ocp_func_mal_data. This is preparation step for the new EMAC driver. Signed-off-by: Eugene Surovegin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 28fa031e765b808520173f750bafbade832ba909 Author: Eugene Surovegin Date: Sat Sep 3 15:55:53 2005 -0700 [PATCH] ppc32: move 4xx PHY_MODE_XXX defines to ibm_ocp.h Move 4xx PHY_MODE_XXX defines to asm-ppc/ibm_ocp.h. This is a preparation step for the new EMAC driver. Signed-off-by: Eugene Surovegin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7c31625aa844d549cbb8a7aafb94ec4fde8b54a3 Author: Arthur Othieno Date: Sat Sep 3 15:55:52 2005 -0700 [PATCH] ppc32: Add cputable entry for 750CXe DD2.4 ("Gekko") Add a table entry for 750CXe DD2.4 ("Gekko") as found in the GameCube from Nintendo: http://www-306.ibm.com/chips/techlib/techlib.nsf/techdocs/291C8D0EF3EAEC1687256B72005C745C#C1 Signed-off-by: Arthur Othieno Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac1ff0477cbe640a6a3652a0cd1aa78026f19246 Author: Arthur Othieno Date: Sat Sep 3 15:55:51 2005 -0700 [PATCH] ppc32: Re-order cputable for 750CXe DD2.4 entry "745/755" (pvr_value:0x00083000) is a catch-all entry. Since arch/ppc/kernel/misc.S:identify_cpu() returns on first match, move this lower in the table so 750CXe DD2.4 (pvr_value:0x00083214) may be correctly enumerated. Signed-off-by: Arthur Othieno Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66d2cc95d14b5d750a9c58209fddb62eb139eaab Author: Kumar Gala Date: Sat Sep 3 15:55:50 2005 -0700 [PATCH] ppc32: Added PCI support MPC83xx Adds support for the two PCI busses on MPC83xx and the MPC834x SYS/PIBS reference board. The code initializes PCI inbound/outbound windows, allocates and registers PCI memory/io space. Be aware that setup of the PCI buses on the PIBs board is expected to be done by the firmware. Signed-off-by: Tony Li Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cc9c540b6c4c883d7ff250c17647dedfa4184ca6 Author: Lee Nicks Date: Sat Sep 3 15:55:49 2005 -0700 [PATCH] ppc32: defconfig for Marvell EV64360BP board Here is the default configuration for Marvell EV64360BP board. It has been tested on the board. Signed-off-by: Lee Nicks Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3acb23440f90b03b19846d2b3a005dcbf61a55cf Author: Lee Nicks Date: Sat Sep 3 15:55:48 2005 -0700 [PATCH] ppc32: add support for Marvell EV64360BP board This patch adds support for Marvell EV64360BP board. So far, it supports mpsc serial console, gigabit ethernet, jffs2 root filesystem, etc. Other device support, like watchdog, RTC, will be added later. Signed-off-by: Lee Nicks Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 164ada643ddf4f492a206b9bf2f2b02918b618da Author: Kumar Gala Date: Sat Sep 3 15:55:47 2005 -0700 [PATCH] ppc32: add CONFIG_HZ While ppc32 has the CONFIG_HZ Kconfig option, it wasnt actually being used. Connect it up and set all platforms to 250Hz. This pretty much mimics the ppc64 patch from Anton Blanchard. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 88adfe70c667c9e8fe5ec68eba78af566b539e24 Author: Kumar Gala Date: Sat Sep 3 15:55:46 2005 -0700 [PATCH] ppc32: ppc_sys system on chip identification additions Add the ability to identify an SOC by a name and id. There are cases in which the integer identifier is not sufficient to specify a specific SOC. In these cases we can use a string to further qualify the match. Signed-off-by: Vitaly Bordug Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fa71f0e0f541e65280fdb9d60b142012f1951b7c Author: Eugene Surovegin Date: Sat Sep 3 15:55:45 2005 -0700 [PATCH] ppc32: disable IBM405_ERR77 and IBM405_ERR51 workarounds for 405EP Disable IBM405_ERR77 and IBM405_ERR51 errata workarounds for 405EP. This chip has these problems fixed. Signed-off-by: Eugene Surovegin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cc506644202d23bcf115999ee911a53f177ce682 Author: Eugene Surovegin Date: Sat Sep 3 15:55:45 2005 -0700 [PATCH] ppc32: fix Bamboo and Luan build warnings Fix STD_UART_OP definitions in Bamboo and Luan board ports which were causing "initialization makes pointer from integer without a cast" warnings. Signed-off-by: Eugene Surovegin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cce9d7e36f92f2d48de8c701b65ad27e76fedd02 Author: Eugene Surovegin Date: Sat Sep 3 15:55:44 2005 -0700 [PATCH] ppc32: fix EMAC Tx channel assignments for NPe405H Fix PowerPC NPe405H EMAC Tx channel assignments. EMAC unit in this chip uses common for 4xx "two Tx / one Rx" configuration. Signed-off-by: Eugene Surovegin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a6a4d4320aed1918bf79dfb6bd841317f33b8e9 Author: Roland Dreier Date: Sat Sep 3 15:55:43 2005 -0700 [PATCH] ppc32: Don't sleep in flush_dcache_icache_page() flush_dcache_icache_page() will be called on an instruction page fault. We can't sleep in the fault handler, so use kmap_atomic() instead of just kmap() for the Book-E case. Signed-off-by: Roland Dreier Acked-by: Matt Porter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 656de7e46901fe3228b592e1d9fc89c353f0fa4e Author: Matt Porter Date: Sat Sep 3 15:55:42 2005 -0700 [PATCH] ppc32: add cputable entry for 440SP Rev. A Adds the appropriate cputable entry for PPC440SP so cache line sizes are configured correctly. Signed-off-by: Matt Porter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac6295c289f205bed59b1edfdc4518468db7b1cb Author: Kumar Gala Date: Sat Sep 3 15:55:41 2005 -0700 [PATCH] ppc32: removed find_name.c No one uses find_name.c and no one seems to care about either. So I'm removing it. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9149fb3b8e6913eeb0c80010afef9c55892f6e61 Author: Eugene Surovegin Date: Sat Sep 3 15:55:40 2005 -0700 [PATCH] ppc32: add 440GX rev.F cputable entry Add PowerPC 440GX rev.F cputable entry. Signed-off-by: Eugene Surovegin Cc: Benjamin Herrenschmidt Cc: Matt Porter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39cdc4bfb5c587c617ab6a28083c19101154e149 Author: Kumar Gala Date: Sat Sep 3 15:55:39 2005 -0700 [PATCH] ppc32: Cleaned up global namespace of Book-E watchdog variables Renamed global variables used to convey if the watchdog is enabled and periodicity of the timer and moved the declarations into a header for these variables Signed-off-by: Matt McClintock Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b0531b9b3299f3066b1db78f1693edabbba08b5c Author: Kumar Gala Date: Sat Sep 3 15:55:38 2005 -0700 [PATCH] cpm_uart: Fix baseaddress for SMC 1 and 2 Base addess register for SMC 1 and 2 are never initialized. This means that they will not work unless a bootloader already configured them. The DPRAM already have space reserved, this patch just makes sure the base addess register is updated correctly on initialization. Signed-off-by: Rune Torgersen Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 638861d54eec6b04a88d5d8df8b790d87de80b8d Author: Kumar Gala Date: Sat Sep 3 15:55:37 2005 -0700 [PATCH] cpm_uart: use schedule_timeout instead of direct call to schedule use schedule_timeout instead of direct call to schedule Signed-off-by: Marcelo Tosatti Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0d8ba1a9793302fdcee3d6d4133c455023ca8ce9 Author: Kumar Gala Date: Sat Sep 3 15:55:36 2005 -0700 [PATCH] cpm_uart: Fix 2nd serial port on MPC8560 ADS The 2nd serial port on the MPC8560 ADS was not being configured correctly and thus could not be used as a console. Updated the defconfig for the board to configure the proper SCC channel for the 2nd serial port. Signed-off-by: Roy Zang Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2698ebcb4338f09206b5accd75bc5cf2ed3dc641 Author: Matt Porter Date: Sat Sep 3 15:55:35 2005 -0700 [PATCH] ppc32: add phy excluded features to ocp_func_emac_data This patch adds a field to struct ocp_func_emac_data that allows platform-specific unsupported PHY features to be passed in to the ibm_emac ethernet driver. This patch also adds some logic for the Bamboo eval board to populate this field based on the dip switches on the board. This is a workaround for the improperly biased RJ-45 sockets on the Rev. 0 Bamboo. Signed-off-by: Wade Farnsworth Signed-off-by: Matt Porter Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8e8fff09756bdb799154d034c63033192d6f8f89 Author: Kumar Gala Date: Sat Sep 3 15:55:34 2005 -0700 [PATCH] ppc32: Add ppc_sys descriptions for PowerQUICC II devices Added ppc_sys device and system definitions for PowerQUICC II devices. This will allow drivers for PQ2 to be proper platform device drivers. Which can be shared on PQ3 processors with the same peripherals. Signed-off-by: Matt McClintock Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a2f40ccd294d14e5aca464c1913e8e0d8de35fca Author: Kumar Gala Date: Sat Sep 3 15:55:33 2005 -0700 [PATCH] ppc32: Added support for the Book-E style Watchdog Timer PowerPC 40x and Book-E processors support a watchdog timer at the processor core level. The timer has implementation dependent timeout frequencies that can be configured by software. One the first Watchdog timeout we get a critical exception. It is left to board specific code to determine what should happen at this point. If nothing is done and another timeout period expires the processor may attempt to reset the machine. Command line parameters: wdt=0 : disable watchdog (default) wdt=1 : enable watchdog wdt_period=N : N sets the value of the Watchdog Timer Period. The Watchdog Timer Period meaning is implementation specific. Check User Manual for the processor for more details. This patch is based off of work done by Takeharu Kato. Signed-off-by: Matt McClintock Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 886b9fa49900b055e20cd98f379fda49835d1ee6 Author: Matt Porter Date: Sat Sep 3 15:55:32 2005 -0700 [PATCH] ppc32: Add usb support to IBM stb04xxx platforms Support ochi-ppc-soc.c on IBM stb04xxx platforms Signed-off-by: Dale Farnsworth Signed-off-by: Matt Porter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d27477c2259488825f2f425d24f209a1b6f8dc7d Author: Christoph Hellwig Date: Sat Sep 3 15:55:31 2005 -0700 [PATCH] ppc32: fix asm-ppc/dma-mapping.h sparse warning GFP flags must be passed as unisgned int __nocast these days, else we'll get tons of sparse warnings in every driver. Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 617bf9a47f017b7e91dab9ef9bdaaeaee24163a7 Author: Kumar Gala Date: Sat Sep 3 15:55:30 2005 -0700 [PATCH] ppc32: Remove board support for PCORE Support for the PCORE board is no longer maintained and thus being removed Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f4ad35a34bdc27ae18f97d684ca0e693bbffd5f5 Author: Kumar Gala Date: Sat Sep 3 15:55:29 2005 -0700 [PATCH] ppc32: Remove board support for SPD823TS Support for the SPD823TS board is no longer maintained and thus being removed Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b1a97776d0e4ad76e1e350e7ec1f4406af5f9e1 Author: Kumar Gala Date: Sat Sep 3 15:55:28 2005 -0700 [PATCH] ppc32: Remove board support for SM850 Support for the SM850 board is no longer maintained and thus being removed Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ea08dcfa5439acaf33660e372d44fc049a90b121 Author: Kumar Gala Date: Sat Sep 3 15:55:28 2005 -0700 [PATCH] ppc32: Remove board support for REDWOOD Support for the REDWOOD board is no longer maintained and thus being removed Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d2d34169cc9834f29dac0b02f95022b1e0b97e52 Author: Kumar Gala Date: Sat Sep 3 15:55:27 2005 -0700 [PATCH] ppc32: Remove board support for RAINIER Support for the RAINIER board is no longer maintained and thus being removed Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 37330c9146767fd4f5eb147b01cb500eabf773cf Author: Kumar Gala Date: Sat Sep 3 15:55:26 2005 -0700 [PATCH] ppc32: Remove board support for OAK Support for the OAK board is no longer maintained and thus being removed Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6db789b6a3a9ee41b22de3980748af85f7dbe416 Author: Kumar Gala Date: Sat Sep 3 15:55:25 2005 -0700 [PATCH] ppc32: Remove board support for MENF1 Support for the MENF1 board is no longer maintained and thus being removed Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 89d7f53030baa2616eb2fe87cbc19bc73111a78e Author: Kumar Gala Date: Sat Sep 3 15:55:24 2005 -0700 [PATCH] ppc32: Remove board support for MCPN765 Support for the MCPN765 board is no longer maintained and thus being removed Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba9d1e2a3da505f0574751c3041bbc307c30aeca Author: Kumar Gala Date: Sat Sep 3 15:55:23 2005 -0700 [PATCH] ppc32: Remove board support for K2 Support for the K2 board is no longer maintained and thus being removed Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94cb20e951511051367493a1399e16eb1a7433ae Author: Kumar Gala Date: Sat Sep 3 15:55:23 2005 -0700 [PATCH] ppc32: Remove defconfig for CEDAR Support for the CEDAR board no longer exists, removing the defconfig for it Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b8bc6cedb272542ca401dfb01b17bf11ecb56a8c Author: Kumar Gala Date: Sat Sep 3 15:55:22 2005 -0700 [PATCH] ppc32: Remove board support for BEECH Support for the BEECH board is no longer maintained and thus being removed Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f4f1269cb36adfb452c04dcb3d40f51b8a1956bb Author: Kumar Gala Date: Sat Sep 3 15:55:21 2005 -0700 [PATCH] ppc32: Remove board support for ASH Support for the ASH board is no longer maintained and thus being removed Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a3800d8ffa0a91f3047cbfa82e435d483ffc8dd4 Author: Kumar Gala Date: Sat Sep 3 15:55:20 2005 -0700 [PATCH] ppc32: Remove board support for ADIR Support for the ADIR board is no longer maintained and thus being removed Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b4dc82247184504ba6d0689566a25d03eb1095c Author: Adrian Bunk Date: Sat Sep 3 15:55:19 2005 -0700 [PATCH] arch/ppc/kernel/ppc_ksyms.c: remove unused #define EXPORT_SYMTAB_STROPS This #define is only used on sparc. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f549d6c18c0e8e6cf1bf0e7a47acc1daf7e2cec1 Author: Stephen Smalley Date: Sat Sep 3 15:55:18 2005 -0700 [PATCH] Generic VFS fallback for security xattrs This patch modifies the VFS setxattr, getxattr, and listxattr code to fall back to the security module for security xattrs if the filesystem does not support xattrs natively. This allows security modules to export the incore inode security label information to userspace even if the filesystem does not provide xattr storage, and eliminates the need to individually patch various pseudo filesystem types to provide such access. The patch removes the existing xattr code from devpts and tmpfs as it is then no longer needed. The patch restructures the code flow slightly to reduce duplication between the normal path and the fallback path, but this should only have one user-visible side effect - a program may get -EACCES rather than -EOPNOTSUPP if policy denied access but the filesystem didn't support the operation anyway. Note that the post_setxattr hook call is not needed in the fallback case, as the inode_setsecurity hook call handles the incore inode security state update directly. In contrast, we do call fsnotify in both cases. Signed-off-by: Stephen Smalley Acked-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b5bf6c55edf94e9c7fc01724d5b271f78eaf1d3f Author: Alexey Dobriyan Date: Sat Sep 3 15:55:17 2005 -0700 [PATCH] selinux: endian notations This patch adds endian notations to the SELinux code. Signed-off-by: Stephen Smalley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 782ebb992ec20b5afdd5786ee8c2f1b58b631f24 Author: Stephen Smalley Date: Sat Sep 3 15:55:16 2005 -0700 [PATCH] selinux: Reduce memory use by avtab This patch improves memory use by SELinux by both reducing the avtab node size and reducing the number of avtab nodes. The memory savings are substantial, e.g. on a 64-bit system after boot, James Morris reported the following data for the targeted and strict policies: #objs objsize kernmem Targeted: Before: 237888 40 9.1MB After: 19968 24 468KB Strict: Before: 571680 40 21.81MB After: 221052 24 5.06MB The improvement in memory use comes at a cost in the speed of security server computations of access vectors, but these computations are only required on AVC cache misses, and performance measurements by James Morris using a number of benchmarks have shown that the change does not cause any significant degradation. Note that a rebuilt policy via an updated policy toolchain (libsepol/checkpolicy) is required in order to gain the full benefits of this patch, although some memory savings benefits are immediately applied even to older policies (in particular, the reduction in avtab node size). Sources for the updated toolchain are presently available from the sourceforge CVS tree (http://sourceforge.net/cvs/?group_id=21266), and tarballs are available from http://www.flux.utah.edu/~sds. Signed-off-by: Stephen Smalley Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 720d6c29e146e96cca858057469951e91e0e6850 Author: Egry Gabor Date: Sat Sep 3 15:55:15 2005 -0700 [PATCH] kconfig: linux.pot for all arch The 'make update-po-config' creates the .pot file for the default arch. This patch enhances it with all arch. Signed-off-by: Egry Gabor Cc: Arnaldo Carvalho de Melo Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 964267e627966ffa018fc4a3e19e6bad337a9125 Author: Egry Gabor Date: Sat Sep 3 15:55:14 2005 -0700 [PATCH] kconfig: kxgettext: EOL fix The end of line character doesn't exist on end of help in all case, check it first. Signed-off-by: Egry Gabor Cc: Arnaldo Carvalho de Melo Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c196eff3060270f155343b63ef3d06f31ccfcd2e Author: Egry Gabor Date: Sat Sep 3 15:55:12 2005 -0700 [PATCH] kconfig: kxgettext: message fix The gettext doesn't handle the {CONFIG}:00000 markers as sources. I added a simple comment prefix for them. Signed-off-by: Egry Gabor Cc: Arnaldo Carvalho de Melo Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c07e02db76940c75fc92f2f2c9adcdbb09ed70d0 Author: Martin Hicks Date: Sat Sep 3 15:55:11 2005 -0700 [PATCH] VM: add page_state info to per-node meminfo Add page_state info to the per-node meminfo file in sysfs. This is mostly just for informational purposes. The lack of this information was brought up recently during a discussion regarding pagecache clearing, and I put this patch together to test out one of the suggestions. It seems like interesting info to have, so I'm submitting the patch. Signed-off-by: Martin Hicks Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e070ad49f31155d872d8e96cab2142840993e3c0 Author: Mauricio Lin Date: Sat Sep 3 15:55:10 2005 -0700 [PATCH] add /proc/pid/smaps Add a "smaps" entry to /proc/pid: show howmuch memory is resident in each mapping. People that want to perform a memory consumption analysing can use it mainly if someone needs to figure out which libraries can be reduced for embedded systems. So the new features are the physical size of shared and clean [or dirty]; private and clean [or dirty]. Take a look the example below: # cat /proc/4576/smaps 08048000-080dc000 r-xp /bin/bash Size: 592 KB Rss: 500 KB Shared_Clean: 500 KB Shared_Dirty: 0 KB Private_Clean: 0 KB Private_Dirty: 0 KB 080dc000-080e2000 rw-p /bin/bash Size: 24 KB Rss: 24 KB Shared_Clean: 0 KB Shared_Dirty: 0 KB Private_Clean: 0 KB Private_Dirty: 24 KB 080e2000-08116000 rw-p Size: 208 KB Rss: 208 KB Shared_Clean: 0 KB Shared_Dirty: 0 KB Private_Clean: 0 KB Private_Dirty: 208 KB b7e2b000-b7e34000 r-xp /lib/tls/libnss_files-2.3.2.so Size: 36 KB Rss: 12 KB Shared_Clean: 12 KB Shared_Dirty: 0 KB Private_Clean: 0 KB Private_Dirty: 0 KB ... (Includes a cleanup from "Richard Purdie" ) From: Torsten Foertsch show_smap calls first show_map and then prints its additional information to the seq_file. show_map checks if all it has to print fits into the buffer and if yes marks the current vma as written. While that is correct for show_map it is not for show_smap. Here the vma should be marked as written only after the additional information is also written. The attached patch cures the problem. It moves the functionality of the show_map function to a new function show_map_internal that is called with an additional struct mem_size_stats* argument. Then show_map calls show_map_internal with NULL as struct mem_size_stats* whereas show_smap calls it with a real pointer. Now the final if (m->count < m->size) /* vma is copied successfully */ m->version = (vma != get_gate_vma(task))? vma->vm_start: 0; is done only if the whole entry fits into the buffer. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 00e145b6d59a16dd7740197a18f7abdb3af004a9 Author: Manfred Spraul Date: Sat Sep 3 15:55:07 2005 -0700 [PATCH] slab: removes local_irq_save()/local_irq_restore() pair Proposed by and based on a patch from Eric Dumazet : This patch removes unnecessary critical section in ksize() function, as cli/sti are rather expensive on modern CPUS. It additionally adds a docbook entry for ksize() and further simplifies the code. Signed-Off-By: Manfred Spraul Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34342e863c3143640c031760140d640a06c6a5f8 Author: Eric Dumazet Date: Sat Sep 3 15:55:06 2005 -0700 [PATCH] mm/slab.c: prefetchw the start of new allocated objects Mostobjects returned by __cache_alloc() will be written by the caller, (but not all callers want to write all the object, but just at the begining) prefetchw() tells the modern CPU to think about the future writes, ie start some memory transactions in advance. Signed-off-by: Eric Dumazet Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 61e06037e764337da39dff307cbcdbe9cf288349 Author: Zachary Amsden Date: Sat Sep 3 15:55:06 2005 -0700 [PATCH] x86_64: avoid some atomic operations during address space destruction Any architecture that has hardware updated A/D bits that require synchronization against other processors during PTE operations can benefit from doing non-atomic PTE updates during address space destruction. Originally done on i386, now ported to x86_64. Doing a read/write pair instead of an xchg() operation saves the implicit lock, which turns out to be a big win on 32-bit (esp w PAE). Signed-off-by: Zachary Amsden Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a600388d28419305aad3c4c0af52c223cf6fa0af Author: Zachary Amsden Date: Sat Sep 3 15:55:04 2005 -0700 [PATCH] x86: ptep_clear optimization Add a new accessor for PTEs, which passes the full hint from the mmu_gather struct; this allows architectures with hardware pagetables to optimize away atomic PTE operations when destroying an address space. Removing the locked operation should allow better pipelining of memory access in this loop. I measured an average savings of 30-35 cycles per zap_pte_range on the first 500 destructions on Pentium-M, but I believe the optimization would win more on older processors which still assert the bus lock on xchg for an exclusive cacheline. Update: I made some new measurements, and this saves exactly 26 cycles over ptep_get_and_clear on Pentium M. On P4, with a PAE kernel, this saves 180 cycles per ptep_get_and_clear, for a whopping 92160 cycles savings for a full address space destruction. pte_clear_full is not yet used, but is provided for future optimizations (in particular, when running inside of a hypervisor that queues page table updates, the full hint allows us to avoid queueing unnecessary page table update for an address space in the process of being destroyed. This is not a huge win, but it does help a bit, and sets the stage for further hypervisor optimization of the mm layer on all architectures. Signed-off-by: Zachary Amsden Cc: Christoph Lameter Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fa5b08d5f818063d18433194f20359ef2ae50254 Author: Kyle Moffett Date: Sat Sep 3 15:55:03 2005 -0700 [PATCH] sab: consolidate kmem_bufctl_t This is used only in slab.c and each architecture gets to define whcih underlying type is to be used. Seems a bit silly - move it to slab.c and use the same type for all architectures: unsigned int. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0e5c9f39f64d8a55c5db37a5ea43e37d3422fd92 Author: Chen, Kenneth W Date: Sat Sep 3 15:55:02 2005 -0700 [PATCH] remove hugetlb_clean_stale_pgtable() and fix huge_pte_alloc() I don't think we need to call hugetlb_clean_stale_pgtable() anymore in 2.6.13 because of the rework with free_pgtables(). It now collect all the pte page at the time of munmap. It used to only collect page table pages when entire one pgd can be freed and left with staled pte pages. Not anymore with 2.6.13. This function will never be called and We should turn it into a BUG_ON. I also spotted two problems here, not Adam's fault :-) (1) in huge_pte_alloc(), it looks like a bug to me that pud is not checked before calling pmd_alloc() (2) in hugetlb_clean_stale_pgtable(), it also missed a call to pmd_free_tlb. I think a tlb flush is required to flush the mapping for the page table itself when we clear out the pmd pointing to a pte page. However, since hugetlb_clean_stale_pgtable() is never called, so it won't trigger the bug. Signed-off-by: Ken Chen Cc: Adam Litke Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 02b0ccef903e85673ead74ddb7c431f2f7ce183d Author: Adam Litke Date: Sat Sep 3 15:55:01 2005 -0700 [PATCH] hugetlb: check p?d_present in huge_pte_offset() For demand faulting, we cannot assume that the page tables will be populated. Do what the rest of the architectures do and test p?d_present() while walking down the page table. Signed-off-by: Adam Litke Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7bf07f3d4b4358aa6d99a26d7a0165f1e91c3fcc Author: Adam Litke Date: Sat Sep 3 15:55:00 2005 -0700 [PATCH] hugetlb: move stale pte check into huge_pte_alloc() Initial Post (Wed, 17 Aug 2005) This patch moves the if (! pte_none(*pte)) hugetlb_clean_stale_pgtable(pte); logic into huge_pte_alloc() so all of its callers can be immune to the bug described by Kenneth Chen at http://lkml.org/lkml/2004/6/16/246 > It turns out there is a bug in hugetlb_prefault(): with 3 level page table, > huge_pte_alloc() might return a pmd that points to a PTE page. It happens > if the virtual address for hugetlb mmap is recycled from previously used > normal page mmap. free_pgtables() might not scrub the pmd entry on > munmap and hugetlb_prefault skips on any pmd presence regardless what type > it is. Unless I am missing something, it seems more correct to place the check inside huge_pte_alloc() to prevent a the same bug wherever a huge pte is allocated. It also allows checking for this condition when lazily faulting huge pages later in the series. Signed-off-by: Adam Litke Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32e51a8c976fc72c3e9bcece9767d9908816bf8e Author: Adam Litke Date: Sat Sep 3 15:54:59 2005 -0700 [PATCH] hugetlb: add pte_huge() macro This patch adds a macro pte_huge(pte) for i386/x86_64 which is needed by a patch later in the series. Instead of repeating (_PAGE_PRESENT | _PAGE_PSE), I've added __LARGE_PTE to i386 to match x86_64. Signed-off-by: Adam Litke Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fd195c49fb17a21e232f50bddb2267150053cf34 Author: Deepak Saxena Date: Sat Sep 3 15:54:58 2005 -0700 [PATCH] arm: allow for arch-specific IOREMAP_MAX_ORDER Version 6 of the ARM architecture introduces the concept of 16MB pages (supersections) and 36-bit (40-bit actually, but nobody uses this) physical addresses. 36-bit addressed memory and I/O and ARMv6 can only be mapped using supersections and the requirement on these is that both virtual and physical addresses be 16MB aligned. In trying to add support for ioremap() of 36-bit I/O, we run into the issue that get_vm_area() allows for a maximum of 512K alignment via the IOREMAP_MAX_ORDER constant. To work around this, we can: - Allocate a larger VM area than needed (size + (1ul << IOREMAP_MAX_ORDER)) and then align the pointer ourselves, but this ends up with 512K of wasted VM per ioremap(). - Provide a new __get_vm_area_aligned() API and make __get_vm_area() sit on top of this. I did this and it works but I don't like the idea adding another VM API just for this one case. - My preferred solution which is to allow the architecture to override the IOREMAP_MAX_ORDER constant with it's own version. Signed-off-by: Deepak Saxena Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b4ee40ebbbaf3f8c775b023d89ceedda1167d79 Author: Paolo 'Blaisorblade' Giarrusso Date: Sat Sep 3 15:54:57 2005 -0700 [PATCH] mm: correct _PAGE_FILE comment _PAGE_FILE does not indicate whether a file is in page / swap cache, it is set just for non-linear PTE's. Correct the comment for i386, x86_64, UML. Also clearify _PAGE_NONE. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4944e76d81801b8e60ed3e7789443f210c16ed65 Author: Paolo 'Blaisorblade' Giarrusso Date: Sat Sep 3 15:54:56 2005 -0700 [PATCH] mm: remove implied vm_ops check If !vma->vm-ops we already BUG above, so retesting it is useless. The compiler cannot optimize this because BUG is a macro and is not thus marked noreturn; that should possibly be fixed. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d44ed4f86892e350f4b16a3489b7e7c1a9bb7ead Author: Paolo 'Blaisorblade' Giarrusso Date: Sat Sep 3 15:54:55 2005 -0700 [PATCH] shmem_populate: avoid an useless check, and some comments Either shmem_getpage returns a failure, or it found a page, or it was told it couldn't do any I/O. So it's useless to check nonblock in the else branch. We could add a BUG() there but I preferred to comment the offending function. This was taken out from one Ingo Molnar's old patch I'm resurrecting. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Ingo Molnar Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0abf40c1ac3f25d264c019e1cfe155d590defb87 Author: Martin Hicks Date: Sat Sep 3 15:54:54 2005 -0700 [PATCH] vm: slab.c spelling correction Fix a small spelling mistake. subtile->subtle Signed-off-by: Martin Hicks Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e83a9596712eb784e7e6604f43a2c140eb912743 Author: Paolo 'Blaisorblade' Giarrusso Date: Sat Sep 3 15:54:53 2005 -0700 [PATCH] comment typo fix smp_entry_t -> swap_entry_t Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 836d5ffd34550901ea024347693e689273ded8aa Author: Hugh Dickins Date: Sat Sep 3 15:54:53 2005 -0700 [PATCH] mm: fix madvise vma merging Better late than never, I've at last reviewed the madvise vma merging going into 2.6.13. Remove a pointless check and fix two little bugs - a simple test (with /proc//maps hacked to show ReadHints) showed both mismerges in practice: though being madvise, neither was disastrous. 1. Correct placement of the success label in madvise_behavior: as in mprotect_fixup and mlock_fixup, it is necessary to update vm_flags when vma_merge succeeds (to handle the exceptional Case 8 noted in the comments above vma_merge itself). 2. Correct initial value of prev when starting part way into a vma: as in sys_mprotect and do_mlock, it needs to be set to vma in this case (vma_merge handles only that minimum of cases shown in its comments). 3. If find_vma_prev sets prev, then the vma it returns is prev->vm_next, so it's pointless to make that same assignment again in sys_madvise. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53e9a6159fdc6419874ce4d86d3577dbedc77b62 Author: Martin Hicks Date: Sat Sep 3 15:54:51 2005 -0700 [PATCH] VM: zone reclaim atomic ops cleanup Christoph Lameter and Marcelo Tosatti asked to get rid of the atomic_inc_and_test() to cleanup the atomic ops in the zone reclaim code. Signed-off-by: Martin Hicks Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bce5f6ba340b09d8b29902add204bb95a6d3d88b Author: Martin Hicks Date: Sat Sep 3 15:54:50 2005 -0700 [PATCH] VM: add capabilites check to set_zone_reclaim Add a capability check to sys_set_zone_reclaim(). This syscall is not something that should be available to a user. Signed-off-by: Martin Hicks Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 242e54686257493f0b10ac557e730419d9af7d24 Author: Nick Piggin Date: Sat Sep 3 15:54:50 2005 -0700 [PATCH] mm: remove atomic This bitop does not need to be atomic because it is performed when there will be no references to the page (ie. the page is being freed). Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a61c349b28ec5aef7e929236571fd770fdef0bb Author: Nick Piggin Date: Sat Sep 3 15:54:49 2005 -0700 [PATCH] mm: remap ZERO_PAGE mappings filemap_xip's nopage routine maps the ZERO_PAGE into readonly mappings, if it has no data page to map there: then if the hole in the file is later filled, __xip_unmap uses an rmap technique to replace the ZERO_PAGEs mapped for that offset by the newly allocated file page, so that established mappings will see the newly written data. However, on MIPS (alone) there's not one but as many as eight ZERO_PAGEs, chosen for coloring by user virtual address; and if mremap has meanwhile been used to move a mapping containing a ZERO_PAGE, it will generally not match the ZERO_PAGE(address) __xip_unmap is looking for. To maintain XIP's established mappings correctly on MIPS, we need Nick's fix to mremap's move_one_page (originally presented as an optimization), to replace the ZERO_PAGE appropriate to the old address by the ZERO_PAGE appropriate to the new address. (But when I first saw this, I was thinking the ZERO_PAGEs themselves would get corrupted, very bad. Now I think it's the other way round, that the established mappings will fail to see the newly written data: incorrect, but not corrupting everything else. Whether filemap_xip's technique is generally safe, I'd hesitate to say in a hurry: it's interesting, but we've never tried to do that in tmpfs.) Signed-off-by: Hugh Dickins Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4d7670e0f649f9e6e6ea6c8bb9f52441fa00f92b Author: Nick Piggin Date: Sat Sep 3 15:54:48 2005 -0700 [PATCH] mm: cleanup rmap Thanks to Bill Irwin for pointing this out. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2822c1aa574d277b9ba0130b1e71c1a5874bc04a Author: Nick Piggin Date: Sat Sep 3 15:54:47 2005 -0700 [PATCH] mm: micro-optimise rmap Microoptimise page_add_anon_rmap. Although these expressions are used only in the taken branch of the if() statement, the compiler can't reorder them inside because atomic_inc_and_test is a barrier. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c3dce2d89c269d5373a120d4a22fc2426ec992b0 Author: Nick Piggin Date: Sat Sep 3 15:54:46 2005 -0700 [PATCH] mm: comment rmap Just be clear that VM_RESERVED pages here are a bug, and the test is not there because they are expected. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e21c8f145f5052c1c2fb4a4b41bee01c848159b Author: Christoph Lameter Date: Sat Sep 3 15:54:45 2005 -0700 [PATCH] /proc//numa_maps to show on which nodes pages reside This patch was recently discussed on linux-mm: http://marc.theaimsgroup.com/?t=112085728500002&r=1&w=2 I inherited a large code base from Ray for page migration. There was a small patch in there that I find to be very useful since it allows the display of the locality of the pages in use by a process. I reworked that patch and came up with a /proc//numa_maps that gives more information about the vma's of a process. numa_maps is indexes by the start address found in /proc//maps. F.e. with this patch you can see the page use of the "getty" process: margin:/proc/12008 # cat maps 00000000-00004000 r--p 00000000 00:00 0 2000000000000000-200000000002c000 r-xp 00000000 08:04 516 /lib/ld-2.3.3.so 2000000000038000-2000000000040000 rw-p 00028000 08:04 516 /lib/ld-2.3.3.so 2000000000040000-2000000000044000 rw-p 2000000000040000 00:00 0 2000000000058000-2000000000260000 r-xp 00000000 08:04 54707842 /lib/tls/libc.so.6.1 2000000000260000-2000000000268000 ---p 00208000 08:04 54707842 /lib/tls/libc.so.6.1 2000000000268000-2000000000274000 rw-p 00200000 08:04 54707842 /lib/tls/libc.so.6.1 2000000000274000-2000000000280000 rw-p 2000000000274000 00:00 0 2000000000280000-20000000002b4000 r--p 00000000 08:04 9126923 /usr/lib/locale/en_US.utf8/LC_CTYPE 2000000000300000-2000000000308000 r--s 00000000 08:04 60071467 /usr/lib/gconv/gconv-modules.cache 2000000000318000-2000000000328000 rw-p 2000000000318000 00:00 0 4000000000000000-4000000000008000 r-xp 00000000 08:04 29576399 /sbin/mingetty 6000000000004000-6000000000008000 rw-p 00004000 08:04 29576399 /sbin/mingetty 6000000000008000-600000000002c000 rw-p 6000000000008000 00:00 0 [heap] 60000fff7fffc000-60000fff80000000 rw-p 60000fff7fffc000 00:00 0 60000ffffff44000-60000ffffff98000 rw-p 60000ffffff44000 00:00 0 [stack] a000000000000000-a000000000020000 ---p 00000000 00:00 0 [vdso] cat numa_maps 2000000000000000 default MaxRef=43 Pages=11 Mapped=11 N0=4 N1=3 N2=2 N3=2 2000000000038000 default MaxRef=1 Pages=2 Mapped=2 Anon=2 N0=2 2000000000040000 default MaxRef=1 Pages=1 Mapped=1 Anon=1 N0=1 2000000000058000 default MaxRef=43 Pages=61 Mapped=61 N0=14 N1=15 N2=16 N3=16 2000000000268000 default MaxRef=1 Pages=2 Mapped=2 Anon=2 N0=2 2000000000274000 default MaxRef=1 Pages=3 Mapped=3 Anon=3 N0=3 2000000000280000 default MaxRef=8 Pages=3 Mapped=3 N0=3 2000000000300000 default MaxRef=8 Pages=2 Mapped=2 N0=2 2000000000318000 default MaxRef=1 Pages=1 Mapped=1 Anon=1 N2=1 4000000000000000 default MaxRef=6 Pages=2 Mapped=2 N1=2 6000000000004000 default MaxRef=1 Pages=1 Mapped=1 Anon=1 N0=1 6000000000008000 default MaxRef=1 Pages=1 Mapped=1 Anon=1 N0=1 60000fff7fffc000 default MaxRef=1 Pages=1 Mapped=1 Anon=1 N0=1 60000ffffff44000 default MaxRef=1 Pages=1 Mapped=1 Anon=1 N0=1 getty uses ld.so. The first vma is the code segment which is used by 43 other processes and the pages are evenly distributed over the 4 nodes. The second vma is the process specific data portion for ld.so. This is only one page. The display format is: Links to information in /proc//map This can be "default" "interleave={}", "prefer=" or "bind={}" MaxRef= Pages= Mapped= Anon= Nx= The content of the proc-file is self-evident. If this would be tied into the sparsemem system then the contents of this file would not be too useful. Signed-off-by: Christoph Lameter Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 839b9685e80592809d6dfdd865986cd1b5ddc2fb Author: Hugh Dickins Date: Sat Sep 3 15:54:43 2005 -0700 [PATCH] rmap: don't test rss Remove the three get_mm_counter(mm, rss) tests from rmap.c: there was a time when testing rss was important to avoid a particular race between dup_mmap and the anonmm rmap; but now it's just a rather silly pseudo- optimization, made even more obscure by the get_mm_counter macro. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3279ffd97f1b3962e40d3c5f09495ef8320b180b Author: Hugh Dickins Date: Sat Sep 3 15:54:43 2005 -0700 [PATCH] delete from_swap_cache BUG_ONs Three of the four BUG_ONs in delete_from_swap_cache are immediately repeated in __delete_from_swap_cache: delete those and add the one. But perhaps mm/ is altogether overprovisioned with historic BUGs? Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dae06ac43d56d23e50a2300d511b32a9e38cd657 Author: Hugh Dickins Date: Sat Sep 3 15:54:42 2005 -0700 [PATCH] swap: update swsusp use of swap_info Aha, swsusp dips into swap_info[], better update it to swap_lock. It's bitflipping flags with 0xFF, so get_swap_page will allocate from only the one chosen device: let's change that to flip SWP_WRITEOK. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d337b9194b1ce3b6fd5f3cb2799455ed2f9a3d1 Author: Hugh Dickins Date: Sat Sep 3 15:54:41 2005 -0700 [PATCH] swap: swap_lock replace list+device The idea of a swap_device_lock per device, and a swap_list_lock over them all, is appealing; but in practice almost every holder of swap_device_lock must already hold swap_list_lock, which defeats the purpose of the split. The only exceptions have been swap_duplicate, valid_swaphandles and an untrodden path in try_to_unuse (plus a few places added in this series). valid_swaphandles doesn't show up high in profiles, but swap_duplicate does demand attention. However, with the hold time in get_swap_pages so much reduced, I've not yet found a load and set of swap device priorities to show even swap_duplicate benefitting from the split. Certainly the split is mere overhead in the common case of a single swap device. So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock (generally we seem to prefer an _ in the name, and not hide in a macro). If someone can show a regression in swap_duplicate, then probably we should add a hashlock for the swap_map entries alone (shorts being anatomic), so as to help the case of the single swap device too. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 048c27fd72816b44e096997d1c6901c3abbfd45b Author: Hugh Dickins Date: Sat Sep 3 15:54:40 2005 -0700 [PATCH] swap: scan_swap_map latency breaks The get_swap_page/scan_swap_map latency can be so bad that even those without preemption configured deserve relief: periodically cond_resched. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52b7efdbe5f5696fc80338560a3fc51e0b0a993c Author: Hugh Dickins Date: Sat Sep 3 15:54:39 2005 -0700 [PATCH] swap: scan_swap_map drop swap_device_lock get_swap_page has often shown up on latency traces, doing lengthy scans while holding two spinlocks. swap_list_lock is already dropped, now scan_swap_map drop swap_device_lock before scanning the swap_map. While scanning for an empty cluster, don't worry that racing tasks may allocate what was free and free what was allocated; but when allocating an entry, check it's still free after retaking the lock. Avoid dropping the lock in the expected common path. No barriers beyond the locks, just let the cookie crumble; highest_bit limit is volatile, but benign. Guard against swapoff: must check SWP_WRITEOK before allocating, must raise SWP_SCANNING reference count while in scan_swap_map, swapoff wait for that to fall - just use schedule_timeout, we don't want to burden scan_swap_map itself, and it's very unlikely that anyone can really still be in scan_swap_map once swapoff gets this far. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7dfad4183bf9cd92f977caa3c12cc74f0eefc0e6 Author: Hugh Dickins Date: Sat Sep 3 15:54:38 2005 -0700 [PATCH] swap: scan_swap_map restyled Rewrite scan_swap_map to allocate in just the same way as before (taking the next free entry SWAPFILE_CLUSTER-1 times, then restarting at the lowest wholly empty cluster, falling back to lowest entry if none), but with a view towards dropping the lock in the next patch. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fb4f88dcabdc716c7c350e09cf4a38a419b007e1 Author: Hugh Dickins Date: Sat Sep 3 15:54:37 2005 -0700 [PATCH] swap: get_swap_page drop swap_list_lock Rewrite get_swap_page to allocate in just the same sequence as before, but without holding swap_list_lock across its scan_swap_map. Decrement nr_swap_pages and update swap_list.next in advance, while still holding swap_list_lock. Skip full devices by testing highest_bit. Swapoff hold swap_device_lock as well as swap_list_lock to clear SWP_WRITEOK. Reduces lock contention when there are parallel swap devices of the same priority. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 89d09a2c80ea6baafb559b86d545fada05e14ab5 Author: Hugh Dickins Date: Sat Sep 3 15:54:36 2005 -0700 [PATCH] swap: freeing update swap_list.next This makes negligible difference in practice: but swap_list.next should not be updated to a higher prio in the general helper swap_info_get, but rather in swap_entry_free; and then only in the case when entry is actually freed. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6eb396dc4a9781c5e7951143ab56ce5710687ab3 Author: Hugh Dickins Date: Sat Sep 3 15:54:35 2005 -0700 [PATCH] swap: swap unsigned int consistency The swap header's unsigned int last_page determines the range of swap pages, but swap_info has been using int or unsigned long in some cases: use unsigned int throughout (except, in several places a local unsigned long is useful to avoid overflows when adding). Signed-off-by: Hugh Dickins Signed-off-by: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53092a7402f227151a681b0c92ec8598c5618b1a Author: Hugh Dickins Date: Sat Sep 3 15:54:34 2005 -0700 [PATCH] swap: show span of swap extents The "Adding %dk swap" message shows the number of swap extents, as a guide to how fragmented the swapfile may be. But a useful further guide is what total extent they span across (sometimes scarily large). And there's no need to keep nr_extents in swap_info: it's unused after the initial message, so save a little space by keeping it on stack. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 11d31886dbcb61039ed3789e583d21c6e70960fd Author: Hugh Dickins Date: Sat Sep 3 15:54:34 2005 -0700 [PATCH] swap: swap extent list is ordered There are several comments that swap's extent_list.prev points to the lowest extent: that's not so, it's extent_list.next which points to it, as you'd expect. And a couple of loops in add_swap_extent which go all the way through the list, when they should just add to the other end. Fix those up, and let map_swap_page search the list forwards: profiles shows it to be twice as quick that way - because prefetch works better on how the structs are typically kmalloc'ed? or because usually more is written to than read from swap, and swap is allocated ascendingly? Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4cd3bb10ff0b21b77b5a4cd13b4bd36694e054c4 Author: Hugh Dickins Date: Sat Sep 3 15:54:33 2005 -0700 [PATCH] swap: move destroy_swap_extents calls sys_swapon's call to destroy_swap_extents on failure is made after the final swap_list_unlock, which is faintly unsafe: another sys_swapon might already be setting up that swap_info_struct. Calling it earlier, before taking swap_list_lock, is safe. sys_swapoff's call to destroy_swap_extents was safe, but likewise move it earlier, before taking the locks (once try_to_unuse has completed, nothing can be needing the swap extents). Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e2244ec2efa4ee1edf391d0001d314933e2b2974 Author: Hugh Dickins Date: Sat Sep 3 15:54:32 2005 -0700 [PATCH] swap: correct swapfile nr_good_pages If a regular swapfile lies on a filesystem whose blocksize is less than PAGE_SIZE, then setup_swap_extents may have to cut the number of usable swap pages; but sys_swapon's nr_good_pages was not expecting that. Also, setup_swap_extents takes no account of badpages listed in the swap header: not worth doing so, but ensure nr_badpages is 0 for a regular swapfile. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b0d9bcd4bb79a7834f8492f2ae5c2655a551f23d Author: Hugh Dickins Date: Sat Sep 3 15:54:31 2005 -0700 [PATCH] swap: update swapfile i_sem comment Update swap extents comment: nowadays we guard with S_SWAPFILE not i_sem. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fd4fd5aac1282825195c6816ed40a2a6d42db5bf Author: Stephen Rothwell Date: Sat Sep 3 15:54:30 2005 -0700 [PATCH] mm: consolidate get_order Someone mentioned that almost all the architectures used basically the same implementation of get_order. This patch consolidates them into asm-generic/page.h and includes that in the appropriate places. The exceptions are ia64 and ppc which have their own (presumably optimised) versions. Signed-off-by: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 28ae55c98e4d16eac9a05a8a259d7763ef3aeb18 Author: Dave Hansen Date: Sat Sep 3 15:54:29 2005 -0700 [PATCH] sparsemem extreme: hotplug preparation This splits up sparse_index_alloc() into two pieces. This is needed because we'll allocate the memory for the second level in a different place from where we actually consume it to keep the allocation from happening underneath a lock Signed-off-by: Dave Hansen Signed-off-by: Bob Picco Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e347261a80b57df792ab9464b5f0ed59add53a8 Author: Bob Picco Date: Sat Sep 3 15:54:28 2005 -0700 [PATCH] sparsemem extreme implementation With cleanups from Dave Hansen SPARSEMEM_EXTREME makes mem_section a one dimensional array of pointers to mem_sections. This two level layout scheme is able to achieve smaller memory requirements for SPARSEMEM with the tradeoff of an additional shift and load when fetching the memory section. The current SPARSEMEM implementation is a one dimensional array of mem_sections which is the default SPARSEMEM configuration. The patch attempts isolates the implementation details of the physical layout of the sparsemem section array. SPARSEMEM_EXTREME requires bootmem to be functioning at the time of memory_present() calls. This is not always feasible, so architectures which do not need it may allocate everything statically by using SPARSEMEM_STATIC. Signed-off-by: Andy Whitcroft Signed-off-by: Bob Picco Signed-off-by: Dave Hansen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 802f192e4a600f7ef84ca25c8b818c8830acef5a Author: Bob Picco Date: Sat Sep 3 15:54:26 2005 -0700 [PATCH] SPARSEMEM EXTREME A new option for SPARSEMEM is ARCH_SPARSEMEM_EXTREME. Architecture platforms with a very sparse physical address space would likely want to select this option. For those architecture platforms that don't select the option, the code generated is equivalent to SPARSEMEM currently in -mm. I'll be posting a patch on ia64 ml which uses this new SPARSEMEM feature. ARCH_SPARSEMEM_EXTREME makes mem_section a one dimensional array of pointers to mem_sections. This two level layout scheme is able to achieve smaller memory requirements for SPARSEMEM with the tradeoff of an additional shift and load when fetching the memory section. The current SPARSEMEM -mm implementation is a one dimensional array of mem_sections which is the default SPARSEMEM configuration. The patch attempts isolates the implementation details of the physical layout of the sparsemem section array. ARCH_SPARSEMEM_EXTREME depends on 64BIT and is by default boolean false. I've boot tested under aim load ia64 configured for ARCH_SPARSEMEM_EXTREME. I've also boot tested a 4 way Opteron machine with !ARCH_SPARSEMEM_EXTREME and tested with aim. Signed-off-by: Andy Whitcroft Signed-off-by: Bob Picco Signed-off-by: Dave Hansen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0216f86dafb389c0ad97529fd45e64e883298cfd Author: Matt Mackall Date: Sat Sep 3 15:54:25 2005 -0700 [PATCH] kbuild: fix make clean damaging hg repos Running 'make clean' was quietly deleting files in Mercurial kernel repositories matching '.*.d', which was corrupting the tags portions of the repository. Spotted and fixed by several people. Signed-off-by: Matt Mackall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e8a650150b1001bc34d506e4c44538463d368890 Author: Marcel Selhorst Date: Sat Sep 3 15:54:20 2005 -0700 [PATCH] tpm_infineon: Bugfix in PNPACPI-handling This patch corrects the PNP-handling inside the tpm-driver and some minor coding style bugs. Note: the pci-device and pnp-device mixture is currently necessary, since the used "tpm"-interface requires a pci-dev in order to register the driver. This will be fixed within the next iterations. Signed-off-by: Marcel Selhorst Cc: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e770e8506110a57c868bbef9706d132285c2090f Author: Michael Krufky Date: Sat Sep 3 15:54:18 2005 -0700 [PATCH] dvb: saa7134-dvb must select tda1004x Please apply this to 2.6.14, and also to 2.6.13.1 -stable. Without this patch, users will have to EXPLICITLY select tda1004x in Kconfig. This SHOULD be done automatically when saa7134-dvb is selected. This patch corrects this problem. Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 010988e888a0abbe7118635c1b33d049caae6b29 Author: Stefan Nickl Date: Mon Sep 5 01:57:46 2005 -0500 Input: HIDDEV - make HIDIOCSREPORT wait IO completion When trying to make the hiddev driver issue several Set_Report control transfers to a custom device with 2.6.13-rc6, only the first transfer in a row is carried out, while others immediately following it are silently dropped. This happens where hid_submit_report() (in hid-core.c) tests for HID_CTRL_RUNNING, which seems to be still set because the first transfer is not finished yet. As a workaround, inserting a delay between the two calls to ioctl(HIDIOCSREPORT) in userspace "solves" the problem. The straightforward fix is to add a call to hid_wait_io() to the implementation of HIDIOCSREPORT (in hiddev.c), just like for HIDIOCGREPORT. Works fine for me. Apparently, this issue has some history: http://marc.theaimsgroup.com/?l=linux-usb-users&m=111100670105558&w=2 Signed-off-by: Stefan Nickl Signed-off-by: Andrew Morton Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit 7d25258f69cedc2f2e55eb25ba2e2078060b44f4 Author: Brian Schau Date: Mon Sep 5 01:57:41 2005 -0500 Input: HID - add Wireless Security Lock to HID blacklist The device is a Wireless Security Lock (WSL). The device identifies itself as a Cypress Ultra Mouse. It is, however, not a mouse at all and as such, shouldn't be handled as one. Signed-off-by: Brian Schau Signed-off-by: Vojtech Pavlik Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit e875ce374759087771313c9e76b672b86ac20950 Author: Stelian Pop Date: Mon Sep 5 01:57:33 2005 -0500 Input: HID - add mapping for Powerbook USB keyboard Map custom HID events (such as the ones generated by some Logitech and Apple Powerbooks USB keyboards) to the FN keycode. Signed-off-by: Stelian Pop Signed-off-by: Vojtech Pavlik Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit 61cdecd9f5f602775af1e89c200179d093a94ae2 Author: Vojtech Pavlik Date: Mon Sep 5 00:13:32 2005 -0500 Input: HID - add the Trust Predator TH 400 gamepad to the badpad list Reported-by: Karl Relton Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit c58de6d949a9d2c386c4d814013b6c967c14ea5a Author: Vojtech Pavlik Date: Mon Sep 5 00:13:15 2005 -0500 Input: HID - add a quirk for the Apple Powermouse Add a quirk for the Apple Powermouse, remapping GenericDesktop.Z to Rel.HWheel, to allow horizontal scrolling in Linux. Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit c4786ca8a4274a0bbffe217917972943348bed64 Author: Vojtech Pavlik Date: Mon Sep 5 00:13:03 2005 -0500 Input: HID - fix URB success status handling Add a missing break; statement to the URB status handling in hid-core.c, avoiding flushing the request queue on success. Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit 8d9a9ae3b2941d94bb0023a3aca2ec2bfa83d0c2 Author: Vojtech Pavlik Date: Mon Sep 5 00:12:47 2005 -0500 Input: sunkbd - extend mapping to handle Type-6 Sun keyboards Map an unmarked key at 'Esc' position to KEY_MACRO Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit fb76b099f86624d3c629cfab071aa2296f65b7bb Author: Vojtech Pavlik Date: Mon Sep 5 00:12:39 2005 -0500 Input: iforce - use wait_event_interruptible_timeout The timeout while() loops in iforce-packets.c lack a set_current_state(TASK_INTERRUPTIBLE); call. The right solution is to replace them with wait_event_interruptible_timeout(). Reported-by: Nishanth Aravamudan Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit 39fd748f56012fdde4cf862f127ce4cdec50d661 Author: Micah F. Galizia Date: Mon Sep 5 00:12:15 2005 -0500 Input: HID - add support for Logitech UltraX Media Remote control The hid now supports the Logitech UltraX Media Remote control. For now, ID 45 on the consumer usage page has been incorrectly mapped to KEY_RADIO since no other devices uses it. Signed-off-by: Micah F. Galizia Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit bf0964dcda97e42964d312d0ff73a832171e080a Author: Michael Haboustak Date: Mon Sep 5 00:12:01 2005 -0500 Input: HID - handle multi-transascion reports Fixes handling of multi-transaction reports for HID devices. New function hid_size_buffers() that calculates the longest report for each endpoint and stores the result in the hid_device object. These lengths are used to allocate buffers that are large enough to store any report on the endpoint. For compatibility, the minimum size for an endpoint buffer set to HID_BUFFER_SIZE rather than the known optimal case (the longest report length). It fixes bug #3063 in bugzilla. Signed-off-by: Michael Haboustak I simplified the patch a bit to use just a single buffer size. Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit 903b126bffb77dc313b7c2971880df408bf41a9e Author: Vojtech Pavlik Date: Mon Sep 5 00:11:41 2005 -0500 Input: atkbd - handle keyboards generating scancode 0x7f Extend bat_xl handling to do err_xl handling, so that keyboards using 0x7f scancode for regular keys can work. Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit 8a409b0118c2d78f84f740f60fe03abda1fe3333 Author: Vojtech Pavlik Date: Mon Sep 5 00:08:08 2005 -0500 Input: HID - add more consumer usages Extend mapping of the consumer usage page in hid-input.c to handle more cases appearing on new USB keyboards. Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit 0aebfdac042b63d0f2625414062e138a4333181c Author: Vojtech Pavlik Date: Mon Sep 5 00:07:59 2005 -0500 Input: add HID simulation mappings Add simulation usage page mappings to hid-input.c to support a new crop of joysticks using them to designate Rudder and Throttle controls. Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit b8c9c642db4ab0811cc5bb0d8b90cc7819055c95 Author: Vojtech Pavlik Date: Mon Sep 5 00:07:37 2005 -0500 Inpur: recognize and ignore Logitech vendor usages in HID These get in our way with MX mice. Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit cde410a99d0dd38eb218be884d02034fcdf5125b Author: Nathan Scott Date: Mon Sep 5 11:47:01 2005 +1000 [XFS] Sort out some cosmetic differences between XFS trees. SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:23719a Signed-off-by: Nathan Scott commit 1aab60c25e9a500b9f15c1dfd775e70e7bde555c Author: Andrew Vasquez Date: Fri Aug 26 19:10:30 2005 -0700 [SCSI] qla2xxx: Update version number to 8.01.00-k. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit f6ef3b1872915c6d69ca36cf4ca16269cb9a73ad Author: Andrew Vasquez Date: Fri Aug 26 19:10:20 2005 -0700 [SCSI] qla2xxx: Stop firmware execution at unintialization time. On ISP24xx parts, stop execution of firmware during ISP tear-down. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit fe74c71f6bb63376d92bc606597f0818f5b11c2e Author: Andrew Vasquez Date: Fri Aug 26 19:10:10 2005 -0700 [SCSI] qla2xxx: Replace schedule_timeout(). From: Nishanth Aravamudan Replace schedule_timeout() with msleep()/msleep_interruptible() as appropriate, to guarantee the task delays as expected. Signed-off-by: Nishanth Aravamudan Signed-off-by: Domen Puncer Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 86cd6baa8294dc5b2cedd84fb5cf3944eaf5271f Author: Andrew Vasquez Date: Fri Aug 26 19:10:00 2005 -0700 [SCSI] qla2xxx: Remove bad call to fc_remove_host() during probe failure. fc_remove_host() should only be called after a scsi_host has been successfully added via scsi_add_host() -- any failures while qla2xxx probing would result in an incorrect call to fc_remove_host() during cleanup. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit afb046e2be724a90f21f7cf0ba50e328005bd038 Author: Andrew Vasquez Date: Fri Aug 26 19:09:40 2005 -0700 [SCSI] qla2xxx: Add host attributes. Export additional host information via the shost_attrs member in the scsi_host template. Attributes include: driver version, firmware version, ISP serial number, ISP type, ISP product ID, HBA model name, HBA model description, PCI interconnect information, and HBA port state. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit ce7e4af7f507c156c3fd3dbb41ffe4a77c700b54 Author: Andrew Vasquez Date: Fri Aug 26 19:09:30 2005 -0700 [SCSI] qla2xxx: Add change_queue_depth/type() API support. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 131736d34ebc3251d79ddfd08a5e57a3e86decd4 Author: Andrew Vasquez Date: Fri Aug 26 19:09:20 2005 -0700 [SCSI] qla2xxx: Remove redundant call to pci_unmap_sg(). In a corner-case failure where the request-q does not contain enough entries for a given request, pci_unmap_sg() would be called twice. Remove direct call and let the failure-path logic handle the unmapping. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit c32c4cb9fbe3bdc2a90c6eaae5ae30521d4ba9fc Author: Andrew Vasquez Date: Fri Aug 26 19:09:10 2005 -0700 [SCSI] qla2xxx: Remove RISC pause/release barriers during flash manipulation. Remove unnecessary RISC pause/release barriers during ISP24xx flash manipulation. The ISP24xx can arbitrate flash access requests during RISC executions. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 06c22bd13f4eb55e291d5a31280b2ae5a70ad00d Author: Andrew Vasquez Date: Fri Aug 26 19:09:00 2005 -0700 [SCSI] qla2xxx: Correct LED scheme definition. Original implementation used an overloaded bit in the EFI parameters. The correct bit is BIT_4 of the special_options section of NVRAM. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit c00c72ae01c03d3d172150392419040f8d55ab04 Author: Andrew Vasquez Date: Fri Aug 26 19:08:50 2005 -0700 [SCSI] qla2xxx: Simplify redundant target/device reset logic. Remove redundant qla2x00_target_reset() function in favour of the equivalent qla2x00_device_reset(). Update callers of old function. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit f7d289f62e2ea911ecb710015efd45c687fa81ce Author: Andrew Vasquez Date: Fri Aug 26 19:08:40 2005 -0700 [SCSI] qla2xxx: Correct domain/area exclusion logic. In an FL topology, limit port recognition to those devices not within the same area and domain of the ISP. The firmware will recogonize such devices during local-loop discovery. Some devices may respond to a PLOGI before they have completed their fabric login or they may not be a public device. In this case they will report: domain == 00 area == 00 alpa == which is valid. Exclude such devices from local loop discovery. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit cca5335caf2d19ef8bd6b833445d2c6ca652a89b Author: Andrew Vasquez Date: Fri Aug 26 19:08:30 2005 -0700 [SCSI] qla2xxx: Add FDMI support. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit ad3e0edaceb9771be7ffbd7aa24fb444a7ed85bf Author: Andrew Vasquez Date: Fri Aug 26 19:08:10 2005 -0700 [SCSI] qla2xxx: Export class-of-service (COS) information. Export COS information for the fc_host and fc_remote_port objects added by the driver. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 7524f9b9e72cd36f0a70defcd424eba81c180f42 Author: Andrew Vasquez Date: Fri Aug 26 19:08:00 2005 -0700 [SCSI] qla2xxx: Use dma_get_required_mask() in determining the 'ideal' DMA mask. In order to efficiently utilise the ISP's IOCB request-queue, use the dma_get_required_mask() function to determine the use of command-type 2 or 3 IOCBs when queueing SCSI commands. This applies to ISP2[123]xx chips only, as the ISP24xx uses command-type 7 IOCBs which use 64bit DSDs. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit c6678e0cfb41b029c3600c54b5bb65954de1230a Author: Christoph Hellwig Date: Thu Aug 18 16:24:53 2005 +0200 [SCSI] fusion: whitespace fixes Acked by: Moore, Eric Dean Signed-off-by: James Bottomley commit 637fa99b86a00a0b5767a982b83a512ff48ad6d2 Author: Christoph Hellwig Date: Thu Aug 18 16:25:44 2005 +0200 [SCSI] fusion: endianess fixes Assorted endianess fixes. I'll work on full endianess annotations later. Acked by: Moore, Eric Dean Signed-off-by: James Bottomley commit ccf3b7bd26b242b39d54148ea2117295721681d3 Author: Christoph Hellwig Date: Thu Aug 18 16:24:26 2005 +0200 [SCSI] fusion: update LSI headers Acked by: Moore, Eric Dean Signed-off-by: James Bottomley commit 69218ee5186aded6c78e12e083e073d000ff2e9b Author: Christoph Hellwig Date: Thu Aug 18 16:26:15 2005 +0200 [SCSI] fusion: extended config header support Acked by: Moore, Eric Dean Signed-off-by: James Bottomley commit 1ff927306e08b356d764e605eff7c50079550bd2 Author: Christoph Hellwig Date: Fri Aug 19 18:57:13 2005 +0200 [SCSI] aic7xxx: remove aiclib.c #include of C files and macro tricks to rename symbols are evil and just cause trouble. Let's doublicate the two functions as they're going to go away soon enough anyway. Signed-off-by: James Bottomley commit 77d71d222e871670300f3e3092e2a06f20c842f0 Author: Mark Haverkamp Date: Thu Sep 1 08:19:23 2005 -0700 [SCSI] aacraid: bad BUG_ON fix This was noticed by Doug Bazamic and the fix found by Mark Salyzyn at Adaptec. There was an error in the BUG_ON() statement that validated the calculated fib size which can cause the driver to panic. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit deb92b7ee98e8e580cafaa63bd1edbe6646877bc Author: Douglas Gilbert Date: Thu Sep 1 21:50:02 2005 +1000 [SCSI] sg direct io/mmap oops, st sync This patch adopts the same solution as proposed by Kai M. in a post titled: "[PATCH] SCSI tape signed/unsigned fix". The fix is in a function that the sg driver borrowed from the st driver so its maintenance is a little easier if the functions remain the same after the fix. - change nr_pages type from unsigned to signed so errors from get_user_pages() call are properly handled Signed-off-by: Douglas Gilbert Signed-off-by: James Bottomley commit 07542b832309b93a2741cd162a391ab909f66438 Author: James Bottomley Date: Wed Aug 31 20:27:22 2005 -0400 This patch fixes in st.c the bug in the signed/unsigned int comparison reported by Doug Gilbert and fixed by him in sg.c (see [PATCH] sg direct io/mmap oops). Doug fixed the comparison in sg.c. This fix for st.c does not touch the comparison but makes both arguments signed to remove the problem. The new code is adapted from linux/fs/bio.c. Signed-off-by: Kai Makisara Rejections fixed up and Signed-off-by: James Bottomley commit c31e887807a3eab26614ee142629ba447cbcc0dc Author: Nathan Scott Date: Mon Sep 5 10:06:55 2005 +1000 [XFS] Fix incorrect use of BMAPI_READ in unwritten extent handling (luckily just cosmetic). SGI-PV: 942232 SGI-Modid: xfs-linux-melb:xfs-kern:23718a Signed-off-by: Nathan Scott commit a3c476d8a19ded7c5f1e17ea07df377764d9d1d3 Author: Christoph Hellwig Date: Mon Sep 5 08:40:49 2005 +1000 [XFS] replace "extern inline" with "static inline" Patch from Adrian Bunk , thanks a lot! SGI-PV: 942227 SGI-Modid: xfs-linux:xfs-kern:198642a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit 4df08c52582be558e12316ae60bf077ca8f17a1e Author: Christoph Hellwig Date: Mon Sep 5 08:34:18 2005 +1000 [XFS] Switch kernel thread handling to the kthread_ API SGI-PV: 942063 SGI-Modid: xfs-linux:xfs-kern:198388a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit 2f926587512869ebf6bc820bd5f030e127aae774 Author: David Chinner Date: Mon Sep 5 08:33:35 2005 +1000 [XFS] Fix racy access to pb_flags. pagebuf_rele() modified pb_flags after the pagebuf had been unlocked if the buffer was delwri. At high load, this could result in a race when the superblock was being synced that would result the flags being incorrect and the iodone functions being executed incorrectly. This then leads to iclog callback failures or AIL list corruptions resulting in filesystem shutdowns. SGI-PV: 923981 SGI-Modid: xfs-linux:xfs-kern:23616a Signed-off-by: David Chinner Signed-off-by: Nathan Scott commit ba403ab43e896c57f32995ccba9a6bd6ec8dd1b9 Author: Christoph Hellwig Date: Mon Sep 5 08:33:00 2005 +1000 [XFS] Retry linux inode cacech lookup if we found a stale inode. This fixes crashes under high nfs load SGI-PV: 941429 SGI-Modid: xfs-linux:xfs-kern:197929a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit efa092f3d4c60be7e81de515db9f06e5f8426afc Author: Tim Shimmin Date: Mon Sep 5 08:29:01 2005 +1000 [XFS] Fixes a bug in the quota code when allocating a new dquot record which can cause an extent hole to be filled and a free extent to be processed. In this case, we make a few mistakes: forget to pass back the transaction, forget to put a hold on the buffer and forget to add the buf to the new transaction. SGI-PV: 940366 SGI-Modid: xfs-linux:xfs-kern:23594a Signed-off-by: Tim Shimmin Signed-off-by: Nathan Scott commit 0f9fffbcc1817c655d6dd40960ae2e0086b0f64f Author: Christoph Hellwig Date: Mon Sep 5 08:28:16 2005 +1000 [XFS] remove some dead code from pagebuf SGI-PV: 934766 SGI-Modid: xfs-linux:xfs-kern:197783a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit 02ba71de98d5eee63e82cc2d88f9ea8430810a9a Author: Christoph Hellwig Date: Mon Sep 5 08:28:02 2005 +1000 [XFS] allow a null behaviour pointer in linvfs_clear_inode SGI-PV: 940531 SGI-Modid: xfs-linux:xfs-kern:197782a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit 53937c52c3f1dff6100174f50a85c068f16713ae Author: Nathan Scott Date: Mon Sep 5 08:27:50 2005 +1000 [XFS] Manage spinlock differences between kernel versions a bit. SGI-PV: 904196 SGI-Modid: xfs-linux:xfs-kern:23563a Signed-off-by: Nathan Scott commit 526c420c44b45b11e25a98f37702cc3044ba9bdc Author: Eric Sandeen Date: Mon Sep 5 08:25:06 2005 +1000 [XFS] add handlers to fix xfs_flock_t alignment issues in compat ioctls SGI-PV: 938899 SGI-Modid: xfs-linux:xfs-kern:197403a Signed-off-by: Eric Sandeen Signed-off-by: Nathan Scott commit 0c147f9a864f043e6f93a4bb3519c1166419bd74 Author: Felix Blyakher Date: Mon Sep 5 08:24:49 2005 +1000 [XFS] Check if there is first behavior before calling VOP_RECLAIM from linvfs_clear_inode(). The behavior may go away in VOP_INACTIVE. SGI-PV: 941000 SGI-Modid: xfs-linux:xfs-kern:197355a Signed-off-by: Felix Blyakher Signed-off-by: Nathan Scott commit 4cd4a034a3ef020d9de48fe0a3f5f976e5134669 Author: Tim Shimmin Date: Mon Sep 5 08:24:10 2005 +1000 [XFS] Need to be able to reset sb_qflags if not mounting with quotas having previously mounted with quotas. SGI-PV: 940491 SGI-Modid: xfs-linux:xfs-kern:23388a Signed-off-by: Tim Shimmin Signed-off-by: Nathan Scott commit 56d433e430eb399a4b6d0e73d28af6e1d4713547 Author: Christoph Hellwig Date: Mon Sep 5 08:23:54 2005 +1000 [XFS] streamline the clear_inode path SGI-PV: 940531 SGI-Modid: xfs-linux:xfs-kern:196888a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit c1a073bdff997216eac25254a2716faf640e4e8d Author: Christoph Hellwig Date: Mon Sep 5 08:23:35 2005 +1000 [XFS] Delay I/O completion for unwritten extents after conversion SGI-PV: 936584 SGI-Modid: xfs-linux:xfs-kern:196886a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit f09738638d3bae6501e8e160c66233832d8c280f Author: Christoph Hellwig Date: Mon Sep 5 08:22:52 2005 +1000 [XFS] Delay direct I/O completion to a workqueue This is nessecary because aio+dio completions may happen from irq context but we need process context for converting unwritten extents. We also queue regular direct I/O completions to workqueue for regularity, there's only one queue_work call per syscall. SGI-PV: 934766 SGI-Modid: xfs-linux:xfs-kern:196857a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit 65b3da3705ff873d8704074a75ac983495863380 Author: Christoph Hellwig Date: Mon Sep 5 08:18:12 2005 +1000 [XFS] Add in the new xfs_aops.h header file for I/O completion struct. SGI-PV: 934766 SGI-Modid: xfs-linux:xfs-kern:196857a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit 664399e1fbdceb18da9c9c5534dedd62327c63e8 Author: Russell King Date: Sun Sep 4 19:45:00 2005 +0100 [ARM] Wrap calls to descriptor handlers This is part of Thomas Gleixner's generic IRQ patch, which converts ARM to use the generic IRQ subsystem. Here, we wrap calls to desc->handler() in an inline function, desc_handle_irq(). This reduces the size of Thomas' patch since the changes become more localised. Signed-off-by: Russell King commit 7801907b8c4a49f8ec033d13a938751114a97a55 Author: Russell King Date: Sun Sep 4 19:43:13 2005 +0100 [ARM] Change irq_chip wake/type methods to set_wake/set_type This is part of Thomas Gleixner's generic IRQ patch, which converts ARM to use the generic IRQ subsystem. Here, we rename two of the irq_chip methods - wake becomes set_wake, and type becomes set_type. Signed-off-by: Russell King commit e24da5d316667a91b3a19b5761a211946ec649bb Author: Pavel Machek Date: Sun Sep 4 11:33:12 2005 +0100 [ARM] Fix compilation in locomo.c Do not access children in struct device directly, use device_for_each_child helper instead. It fixes compilation. Signed-off-by: Pavel Machek Signed-off-by: Russell King commit 7db078be194469490caacac7d13bace38eaebdf5 Author: Russell King Date: Sun Sep 4 11:03:15 2005 +0100 [ARM] Stack starts at THREAD_START_SP offset, not THREAD_SIZE-8 Use the correct constants. Signed-off-by: Russell King commit ca6ca91d8c7498d45e0d35800503699164366f10 Author: Timothy Baldwin Date: Sun Sep 4 10:13:48 2005 +0100 [ARM] 2875/1: Data Abort fixes Patch from Timothy Baldwin All data aborts are treated as read accesses. The existing code updates the wrong bit of r1, also the comments are wrong in that the sense of the L bit is inverted. Signed-off-by: Timothy E. Baldwin Signed-off-by: Russell King commit 7545c24c6a6ab62922266197a72119212280ea2a Author: Dmitry Torokhov Date: Sun Sep 4 01:42:10 2005 -0500 Input: i8042 - add Lifebook E4010 to MUX blacklist Signed-off-by: Dmitry Torokhov commit 945ef0d428bc33c639e49d27fb8cc765adec3fdf Author: Dmitry Torokhov Date: Sun Sep 4 01:42:00 2005 -0500 Input: i8042 - add i8042.nokbd module option to allow supressing creation of keyboard port. Signed-off-by: Dmitry Torokhov commit c3d31e7f9a94800ba895a081e143e79954f6c62f Author: Dmitry Torokhov Date: Sun Sep 4 01:41:51 2005 -0500 Input: i8042 - fix IRQ printing when either KBD or AUX port is absent from ACPI/PNP tables. Signed-off-by: Dmitry Torokhov commit 8d5987a6e17fa36776a0c9964db0f24c3d070862 Author: Dmitry Torokhov Date: Sun Sep 4 01:41:38 2005 -0500 Input: make i8042_platform_init return 'real' error code Signed-off-by: Dmitry Torokhov commit 0854e52d86080c1043bc8988daef2ebda4775f64 Author: Dmitry Torokhov Date: Sun Sep 4 01:41:27 2005 -0500 Input: i8042 - clean up initialization code; abort if we can't create all ports. Signed-off-by: Dmitry Torokhov commit 4cee99564db7f65a6f88e4b752da52768cde3802 Author: Ian Campbell Date: Sun Sep 4 01:41:14 2005 -0500 Input: fix checking whether new keycode fits size-wise When dev->keycodesize == sizeof(int) the old code produces incorrect result. Signed-off-by: Ian Campbell Signed-off-by: Dmitry Torokhov commit d2b5ffca73594e4046f405e3ef2438ce41f76fb2 Author: Vojtech Pavlik Date: Sun Sep 4 01:40:55 2005 -0500 Input: psmouse - add new Logitech wheel mouse model Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit e6c047b98bbd09473c586744c681e877ebf954ff Author: Vojtech Pavlik Date: Sun Sep 4 01:40:43 2005 -0500 Input: ALPS - fix wheel decoding Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit cfe9e88866fe892f4f71bf132c64ec8bd5256e5e Author: Dmitry Torokhov Date: Sun Sep 4 01:40:20 2005 -0500 Input: rework psmouse attributes to reduce module size Rearrange attribute code to use generic show and set handlers instead of replicating them for every attribute; switch to using attribute_group instead of creating all attributes manually. All this saves about 4K. Signed-off-by: Dmitry Torokhov commit 9bed07d0fed01f7c39d128e59e5d35d7d67ff439 Author: Ben Dooks Date: Sat Sep 3 19:39:26 2005 +0100 [ARM] 2874/1: S3C2410 - add cpu_init() call after sleep wakeup Patch from Ben Dooks The power management sleep code needs to call cpu_init() to restore the cpu state after the system resumes from suspend. Also clear off an un-necessary comment. Thanks to Dimitry Andric for reporting the bug and for rmk for pointing out the cause. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit f36598aeca4c2dbaa607bf6f774e38eb965402f2 Author: Richard Purdie Date: Sat Sep 3 19:39:25 2005 +0100 [ARM] 2873/1: PCMCIA soc: Allow access to filesystems on CF at boot time Patch from Richard Purdie This change makes the soc pcmcia interfaces available earlier in the boot process meaning devices like CF microdrives can be used for the root filesystem. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 4a35a46bf1cda4737c428380d1db5d15e2590d18 Author: Len Brown Date: Sat Sep 3 12:40:06 2005 -0400 [ACPI] revert bad processor_core.c patch for bug 5128 Signed-off-by: Len Brown commit 1656fa579e44691a860b095016eee910bc0b2793 Author: Pierre Ossman Date: Sat Sep 3 16:45:49 2005 +0100 [MMC] support for mmc chip select in wbsd Use the chip select ios in the wbsd driver. Signed-off-by: Pierre Ossman Signed-off-by: Russell King commit 865e9f13c94891daed4f6a5f69c5d6ec04d4932f Author: Pierre Ossman Date: Sat Sep 3 16:45:02 2005 +0100 [MMC] ios for mmc chip select Adds a new ios for setting the chip select pin on MMC cards. Needed on SD controllers which use this pin for other things and therefore cannot have it pulled high at all times. Signed-off-by: Pierre Ossman Signed-off-by: Russell King commit 9b4e3b13b147e9b737de63188a9ae740eaa8c36d Author: Sergey Vlasov Date: Sat Sep 3 16:26:49 2005 +0100 [SERIAL] Fix moxa tty driver name The moxa driver was named "ttya", which is wrong: 1) Documentation/devices.txt says that the name should be "ttyMX". 2) First 10 ports (ttya0...ttya9) clash with the legacy pty driver. This patch changes the driver name to "ttyMX". http://bugme.osdl.org/show_bug.cgi?id=5012 Signed-off-by: Sergey Vlasov Signed-off-by: Russell King commit 707b1c84ec828da479107e839eae0322bacec4d7 Author: Adrian Bunk Date: Sat Sep 3 15:36:36 2005 +0100 [SERIAL] feature-removal-schedule.txt: remove {,un}register_serial entry If the feature is removed, there's no need to keep the entry in feature-removal-schedule.txt. Signed-off-by: Adrian Bunk Signed-off-by: Russell King commit 30b7a3bc133c5b4a723163be35157ed709fca91c Author: Russell King Date: Sat Sep 3 15:30:21 2005 +0100 [SERIAL] Prefix serial printks with KERN_INFO and pre-format Pre-format the IO part of the ttyS printks, and prefix them with KERN_INFO to avoid bootsplash corruption. Signed-off-by: Russell King commit 1cc77248106aafc12ba529953f652d6f8db2c84d Author: Chuck Ebbert <76306.1226@compuserve.com> Date: Fri Aug 19 14:14:07 2005 +0200 [WATCHDOG] softdog-timer-running-oops.patch The softdog watchdog timer has a bug that can create an oops: 1. Load the module without the nowayout option. 2. Open the driver and close it without writing 'V' before close. 3. Unload the module. The timer will continue to run... 4. Oops happens when timer fires. Reported Sun, 10 Oct 2004, by Michael Schierl Fix is easy: always take a reference on the module on open. Release it only when the device is closed and no timer is running. Tested on 2.6.13-rc6 using the soft_noboot option. While the timer is running and the device is closed, the module use count stays at 1. After the timer fires, it drops to 0. Repeatedly opening and closing the driver caused no problems. Please apply. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Wim Van Sebroeck commit 93642ecd463df30d032da8ac37c2676cee4ad876 Author: P@Draig Brady Date: Wed Aug 17 09:06:07 2005 +0200 [WATCHDOG] w83627hf_wdt.c-initialized_bios_bug Attached is a small update to the w83627hf watchdog driver to initialise appropriately if it was already initialised in the BIOS. On tyan motherboards for e.g. you can init the watchdog to 4 mins, then when the driver is loaded it sets the watchdog to "seconds" mode, and then machine will reboot within 4 seconds. So this patch resets the timeout to the configured value if the watchdog is already running. Signed-off-by: P@draig Brady Signed-off-by: Wim Van Sebroeck commit 94f1e9f316b10972b77a64344006c3bf8a4929b4 Author: Ben Dooks Date: Wed Aug 17 09:04:52 2005 +0200 [WATCHDOG] s3c2410 watchdog - replace reboot notifier Patch from Dimitry Andric Change to using platfrom driver's .shutdown method instead of an reboot notifier Signed-off-by: Dimitry Andric Signed-off-by: Ben Dooks Signed-off-by: Wim Van Sebroeck commit af4bb822bc65efb087cd36b83789f22161a6515b Author: Ben Dooks Date: Wed Aug 17 09:03:23 2005 +0200 [WATCHDOG] s3c2410 watchdog power management Patch from Dimitry Andric , updated by Ben Dooks . Patch is against 2.6.11-mm2 Add power management support to the s3c2410 watchdog, so that it is shut-down over suspend, and re-initialised on resume. Also add Dimitry to the list of authors. Signed-off-by: Dimitry Andric Signed-off-by: Ben Dooks Signed-off-by: Wim Van Sebroeck commit 2dab3cabc4b3c1ef53965233dc8a05e0ddeeb38e Author: Olaf Hering Date: Wed Aug 17 08:58:34 2005 +0200 [WATCHDOG] correct sysfs name for watchdog devices While looking for possible candidates for our udev.rules package, I found a few odd ->name properties. /dev/watchdog has minor 130 according to devices.txt. Since all watchdog drivers use the misc_register() call, they will end up in /sys/class/misc/$foo. udev may create the /dev/watchdog node if the driver is loaded. I dont have such a device, so I cant test it. The drivers below provide names with spaces and even with / in it. Not a big deal, but apps may expect /dev/watchdog. Signed-off-by: Olaf Hering Signed-off-by: Wim Van Sebroeck commit 09c8a9a0c0fe5b3182b6ecfa556fa77a55892c93 Author: Wim Van Sebroeck Date: Sat Sep 3 13:46:56 2005 +0200 [WATCHDOG] Kconfig+Makefile-clean Clean the Kconfig+Makefile according to a sorted list of the drivers of each architecture (and sub-architecture). Signed-off-by: Wim Van Sebroeck commit be3df0f94d77ba3cff40c14c3e21a753c40ba6f2 Author: Wim Van Sebroeck Date: Wed Aug 17 01:49:24 2005 +0200 [WATCHDOG] Makefile-probe_order-patch Re-arrange Makefile according to what we want to probe first. Signed-off-by: Wim Van Sebroeck commit 2413d2c12cf0dc5980d7b082d838d5468d83a8b9 Author: Len Brown Date: Sat Sep 3 02:55:47 2005 -0400 [ACPI] build fix - processor_core.c w/ !CONFIG_SMP http://bugzilla.kernel.org/show_bug.cgi?id=5128 Signed-off-by: Len Brown commit 824b558bbe2c298b165cdb54c33718994dda30bb Author: Luming Yu Date: Sun Aug 21 19:17:00 2005 -0400 [ACPI] acpi_video_device_write_state() now works http://bugzilla.kernel.org/show_bug.cgi?id=5060 Signed-off-by: Luming Yu Signed-off-by: Len Brown commit 9a31477a95d642dd42a1be7cc342f5902b56f584 Author: Venkatesh Pallipadi Date: Tue Aug 30 17:55:00 2005 -0400 [ACPI] fix processor_core.c for NR_CPUS > 256 http://bugzilla.kernel.org/show_bug.cgi?id=5128 Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit dbed12da5bb06b15c63930e9282b45daea566d7b Author: Bjorn Helgaas Date: Sat Sep 3 00:37:56 2005 -0400 [ACPI] PNPACPI IRQ workaround for HP workstations Move pcibios_penalize_isa_irq() to pnpacpi_parse_allocated_irqresource(). Previously we passed the GSI, not the IRQ, and we did it even if parsing the IRQ resource failed. Parse IRQ descriptors that contain multiple interrupts. This violates the spec (in _CRS, only one interrupt per descriptor is allowed), but some firmware, e.g., HP rx7620 and rx8620 descriptions of HPET, has this bug. Signed-off-by: Bjorn Helgaas Cc: Adam Belay Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 5f0110f2a716376f3b260703835f527ca8900946 Author: Kenji Kaneshige Date: Sat Sep 3 00:34:32 2005 -0400 [ACPI] fix run-time error checking in acpi_pci_irq_disable() The 'bus' field in pci_dev structure should be checked before calling pci_read_config_byte() because pci_bus_read_config_byte() called by pci_read_config_byte() refers to 'bus' field. Signed-off-by: Kenji Kaneshige Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 8713cbefafbb5a101ade541a4b0ffa108bf697cc Author: Adrian Bunk Date: Fri Sep 2 17:16:48 2005 -0400 [ACPI] add static to function definitions Signed-off-by: Adrian Bunk Signed-off-by: Len Brown commit aff8c2777d1a9edf97f26bf60579f9c931443eb1 Author: Robert Moore Date: Fri Sep 2 17:24:17 2005 -0400 [ACPI] ACPICA 20050902 Fixed a problem with the internal Owner ID allocation and deallocation mechanisms for control method execution and recursive method invocation. This should eliminate the OWNER_ID_LIMIT exceptions and "Invalid OwnerId" messages seen on some systems. Recursive method invocation depth is currently limited to 255. (Alexey Starikovskiy) http://bugzilla.kernel.org/show_bug.cgi?id=4892 Completely eliminated all vestiges of support for the "module-level executable code" until this support is fully implemented and debugged. This should eliminate the NO_RETURN_VALUE exceptions seen during table load on some systems that invoke this support. http://bugzilla.kernel.org/show_bug.cgi?id=5162 Fixed a problem within the resource manager code where the transaction flags for a 64-bit address descriptor were handled incorrectly in the type-specific flag byte. Consolidated duplicate code within the address descriptor resource manager code, reducing overall subsystem code size. Signed-off-by: Robert Moore Signed-off-by: Len Brown commit a94f18810f52d3a6de0a09bee0c7258b62eca262 Author: Len Brown Date: Sat Sep 3 00:09:12 2005 -0400 [ACPI] revert owner-id-3.patch Signed-off-by: Len Brown commit ebede60741e2cec6d210f137fd22a30e37abc0be Author: Al Viro Date: Fri Sep 2 12:20:18 2005 -0700 [SPARC32]: More dependencies fallout More stuff that got exposed to sparc32 build due to inclusion of drivers/char/Kconfig in arch/sparc/Kconfig needs to be excluded. Signed-off-by: Al Viro Signed-off-by: David S. Miller commit d70063c4634af060a5387337b7632f6334ca3458 Author: Al Viro Date: Fri Sep 2 12:18:03 2005 -0700 [ATM]: Fix dereference of uninitialized pointer in zatm Fixing breakage from [NET]: Kill skb->list - original was assign vcc do a bunch of stuff using ZATM_VCC(vcc)->pool as common subexpression Now we do int pos = ZATM_VCC(vcc)->pool; assign vcc do a bunch of stuff even though vcc is not even initialized when we enter that block... Signed-off-by: Al Viro Signed-off-by: David S. Miller commit d27400746189f3b5194b49575833ea660c430118 Author: Adrian Bunk Date: Fri Sep 2 16:58:06 2005 +0100 [SERIAL] crisv10: Remove {,un}register_serial dummies It seems we can simply kill these dummies with this patch. Signed-off-by: Adrian Bunk Signed-off-by: Russell King commit 504be3aa095903895f9b99abfed40709ff5d1e62 Author: Jeff Garzik Date: Fri Sep 2 04:44:25 2005 -0400 [wireless hostap] automatically select ieee80211 dependency in Kconfig commit 13ae6d81b963c7b22ab9c158ee5a392fb57579fe Author: Rolf Eike Beer Date: Fri Sep 2 09:03:09 2005 +0200 [PATCH] remove driverfs references from init/do_mounts.c This patch is against 2.6.10, but still applies cleanly. It's just s/driverfs/sysfs/ in this file. Signed-off-by: Rolf Eike Beer Signed-off-by: Linus Torvalds commit d51fe1be3f738e7d73f63bb5aa0df88bafb41a21 Author: Rolf Eike Beer Date: Fri Sep 2 08:59:25 2005 +0200 [PATCH] remove driverfs references from include/linux/cpu.h and net/sunrpc/rpc_pipe.c This patch is against 2.6.10, but still applies cleanly. It's just s/driverfs/sysfs/ in these two files. Signed-off-by: Rolf Eike Beer Signed-off-by: Linus Torvalds commit 6a9b28dda3baf6fbbda349788cfe236f631f0359 Author: Miles Bader Date: Fri Sep 2 15:13:31 2005 +0900 [PATCH] v850: Add show_mem Signed-off-by: Miles Bader Signed-off-by: Linus Torvalds commit 20216fc86d83e5e96fca7fa8d22de94d294695eb Author: Miles Bader Date: Fri Sep 2 15:13:30 2005 +0900 [PATCH] v850: Update defconfigs Signed-off-by: Miles Bader Signed-off-by: Linus Torvalds commit 023239c6c96dfacbf32e7162ee7692bdd4f58213 Author: Miles Bader Date: Fri Sep 2 15:13:30 2005 +0900 [PATCH] v850: Round up length passed to slram driver to a multiple of SLRAM_BLK_SZ Signed-off-by: Miles Bader Signed-off-by: Linus Torvalds commit 213b24c93b6c43d96973b9db453bf845c97bbe18 Author: Greg Ungerer Date: Fri Sep 2 10:42:52 2005 +1000 [PATCH] uclinux: use MAP_PRIVATE when mmaping code regions in flat binary loader Use MAP_PRIVATE when calling mmap to get memory for the code region. The flat loader was using MAP_SHARED, but underlying changes to the MMUless mmap means this is now wrong. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 03a002e783b71517a5203e681f84a2719e9cec0e Author: Greg Ungerer Date: Fri Sep 2 10:42:52 2005 +1000 [PATCH] m68knommu: update defconfig for m68knommu Updated defconfig for m68knommu arch. Patch originaly submitted by Jan Dittmer Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 4945b30291ba85a36adffdaafb75bd73f5d887b6 Author: Greg Ungerer Date: Fri Sep 2 10:42:52 2005 +1000 [PATCH] m68knommu: new board support in linker script . add support for the M5235EVB board . add support for the SOM5282 board . add support for the MOD5272 board . fix end of memory define for eLITE board Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit e70bd1160109f2b7e62222550a7af37910dba88a Author: Greg Ungerer Date: Fri Sep 2 10:42:52 2005 +1000 [PATCH] m68knommu: need pfn_valid macro Need pfn_valid macro, even on MMUless platforms. Enclose the macro args of __pa and __va in parentheses. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 8410a546765c10d929b82d1e8237398904a79283 Author: Greg Ungerer Date: Fri Sep 2 10:42:52 2005 +1000 [PATCH] m68knommu: use THREAD_SIZE instead of hard coded size Use the THREAD_SIZE define when manipulating the stack instead of hard coded values (for the 68328 and 68360 sub-architectures). Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 5c4dbba9fc5e562db502e775e95023453b620409 Author: Greg Ungerer Date: Fri Sep 2 10:42:52 2005 +1000 [PATCH] m68knommu: new family (523x) and board config support New architecture and board configuration support for m68knommu. . add 523x ColdFire support . add support for SOM5282 and MOD5272 boards . break up the 527x to be separate 5271 and 5275. There is some subtle differences that (like RAM config) that need to be dealt with . add option to support selecting 4k kernel stack Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 777354b63f3fabf702ff88f12c4d513a7219832b Author: Greg Ungerer Date: Fri Sep 2 10:42:52 2005 +1000 [PATCH] m68knommu: 523x ColdFire processor support in arch Makefile Add support for the 523x ColdFire family of processors Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit db81fb8486563573aca023dac30a2d70c46855e8 Author: Greg Ungerer Date: Fri Sep 2 10:42:52 2005 +1000 [PATCH] m68knommu: cleanup showstack() Make show_stack() consistent with other architectures. Put the vector string names in the .rodata section. Patch originally submitted by Philippe De Muyter . Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 5d052c170e9a7ac0c7d58fe4fbf39fca3c24f2cc Author: Greg Ungerer Date: Fri Sep 2 10:42:52 2005 +1000 [PATCH] uclinux: update MAINTAINERS entry for UCLINUX Modify maintainers for uClinux (MMUless). Neither Dave nor Jeff manitain the 2.6 code in mainline, so no point emailing them about problems. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 029fc1375fcf687a83faf7521358a9f5c589da13 Author: Greg Ungerer Date: Fri Sep 2 10:42:52 2005 +1000 [PATCH] m68knommu: fix ColdFire startup code to properly handle non 0 based ram Correctly determine the end of ram for ram setups that do not start at base address of 0. Add support for the MOD5272 board, which doesn not have a ram base of 0. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit e6070a1712e69779f322239056fb5f1e1db802ce Author: Greg Ungerer Date: Fri Sep 2 10:42:52 2005 +1000 [PATCH] m68knommu: new family (523x) and board setup . setup for the new 523x ColdFire family . break up of 527x to be 5271 and 5275 . some white space cleanup Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit b5aaf3f71cf5a6115cf76671b011de0209223fc2 Author: Greg Ungerer Date: Fri Sep 2 10:42:52 2005 +1000 [PATCH] m68knommu: 523x ColdFire processor init code Low level initialization code for the 523x ColdFire processor family. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 0829c3602f4df95898752c402ea90b92a3e33154 Author: Christoph Hellwig Date: Fri Sep 2 16:58:49 2005 +1000 [XFS] Add infrastructure for tracking I/O completions SGI-PV: 934766 SGI-Modid: xfs-linux:xfs-kern:196856a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit 51c91ed52b8a9a30fcb2a465b40c20a1f11735ba Author: Christoph Hellwig Date: Fri Sep 2 16:58:38 2005 +1000 [XFS] add infrastructure for waiting on I/O completion at inode reclaim time SGI-PV: 934766 SGI-Modid: xfs-linux:xfs-kern:196854a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit 592cb26bda6fe69838529acf71e50a6dee7acbb4 Author: Christoph Hellwig Date: Fri Sep 2 16:56:14 2005 +1000 [XFS] remove unessecary vnode flags SGI-PV: 934766 SGI-Modid: xfs-linux:xfs-kern:196852a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit 760dea671ea9c5b8c732d76d09673d6d052a186f Author: Christoph Hellwig Date: Fri Sep 2 16:56:02 2005 +1000 [XFS] Fix sparse warnings in kmem_* functions Patch from Victor Fusco SGI-PV: 940376 SGI-Modid: xfs-linux:xfs-kern:196705a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit 6f948fbd443255e3a918438ce41cd7581cf8146d Author: Tim Shimmin Date: Fri Sep 2 16:52:55 2005 +1000 [XFS] Need to unlock the AIL before calling xfs_force_shutdown() because when it goes to force out the log, and get the tail lsn, it will want to get the AIL lock. SGI-PV: 940076 SGI-Modid: xfs-linux:xfs-kern:23260a Signed-off-by: Tim Shimmin Signed-off-by: Nathan Scott commit 0432dab2d2d3b35347a95c01c78a40781b6431fb Author: Christoph Hellwig Date: Fri Sep 2 16:46:51 2005 +1000 [XFS] remove struct vnode::v_type SGI-PV: 936236 SGI-Modid: xfs-linux:xfs-kern:195878a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit 155ffd075caedcea5ad595c95403c71bfc391c4a Author: Nathan Scott Date: Fri Sep 2 16:43:48 2005 +1000 [XFS] Remove extraneous quotacheck diagnostics. SGI-PV: 907752 SGI-Modid: xfs-linux:xfs-kern:23163a Signed-off-by: Nathan Scott commit e69a333b5e0c8c6b687b07665a3cb5545657d2aa Author: Nathan Scott Date: Fri Sep 2 16:42:26 2005 +1000 [XFS] Add in grpid/nogrpid mount option parsing, actual code was always there.. SGI-PV: 939444 SGI-Modid: xfs-linux:xfs-kern:23162a Signed-off-by: Nathan Scott commit 7e9c63961558092d584936a874cf3fee80002eb6 Author: Tim Shimmin Date: Fri Sep 2 16:42:05 2005 +1000 [XFS] 929956 add log debugging and tracing info SGI-PV: 931456 SGI-Modid: xfs-linux:xfs-kern:23155a Signed-off-by: Tim Shimmin Signed-off-by: Nathan Scott commit 32fb9b57aef35b82434cfb4c9de18b484fc3ec88 Author: Tim Shimmin Date: Fri Sep 2 16:41:43 2005 +1000 [XFS] Fix up the calculation of the reservation overhead to hopefully include all the components which make up the transaction in the ondisk log. Having this incomplete has shown up as problems on IRIX when some v2 log changes went in. The symptom was the msg of "xfs_log_write: reservation ran out. Need to up reservation" and was seen on synchronous writes on files with lots of holes (and therefore lots of extents). SGI-PV: 931457 SGI-Modid: xfs-linux:xfs-kern:23095a Signed-off-by: Tim Shimmin Signed-off-by: Nathan Scott commit d52b44d07a43b723ac2fbf1bf4053031f723676c Author: Nathan Scott Date: Fri Sep 2 16:41:32 2005 +1000 [XFS] Fix regression in transaction reserved-block accounting for direct writes. SGI-PV: 938145 SGI-Modid: xfs-linux:xfs-kern:23088a Signed-off-by: Nathan Scott commit ad4a8ac4e9d9cffb0a4c9ebebc6bda9d8dbbfe99 Author: Eric Sandeen Date: Fri Sep 2 16:41:16 2005 +1000 [XFS] Fix check for writeable file in xfs_ioc_space ioctl code SGI-PV: 938905 SGI-Modid: xfs-linux:xfs-kern:195240a Signed-off-by: Eric Sandeen Signed-off-by: Nathan Scott commit 3bdbfb104e53b367892cc9510e6722346dfb656b Author: David Chinner Date: Fri Sep 2 16:40:47 2005 +1000 [XFS] Prevent the incore superblock sb_fdblocks count from leaking when we are getting ENOSPC errors on writes. When we fail to allocate space for indirect blocks in xfs_bmapi() make sure we release the direct block allocation before returning. SGI-PV: 938502 SGI-Modid: xfs-linux:xfs-kern:22986a Signed-off-by: David Chinner Signed-off-by: Nathan Scott commit bcec2b7f2bf856bdf2a8780a57fe78417a513682 Author: Nathan Scott Date: Fri Sep 2 16:40:17 2005 +1000 [XFS] Add a chunk of tracing code to diagnose truncate related issues. SGI-PV: 938410 SGI-Modid: xfs-linux:xfs-kern:22966a Signed-off-by: Nathan Scott commit eedb5530aad71aecbc1e99cb67f676c26280d3f9 Author: Nathan Scott Date: Fri Sep 2 16:39:56 2005 +1000 [XFS] Make metadata IO completion consistent with other IO completion handlers. SGI-PV: 938409 SGI-Modid: xfs-linux:xfs-kern:22965a Signed-off-by: Nathan Scott commit cdb626878f6f5e37d678d30c9cacf5726b88a656 Author: Christoph Hellwig Date: Fri Sep 2 16:24:19 2005 +1000 [XFS] replace vn_get usage by ihold SGI-PV: 938306 SGI-Modid: xfs-linux:xfs-kern:194627a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit 6475be16fd9b3c6746ca4d18959246b13c669ea8 Author: David S. Miller Date: Thu Sep 1 22:47:01 2005 -0700 [TCP]: Keep TSO enabled even during loss events. All we need to do is resegment the queue so that we record SACK information accurately. The edges of the SACK blocks guide our resegmenting decisions. With help from Herbert Xu. Signed-off-by: David S. Miller commit bb3f724e12eb9c62c92ff6f14a856bc58ba35f5e Author: Dean Roehrich Date: Fri Sep 2 15:43:05 2005 +1000 [XFS] send dmapi events from nopage for mmapped files SGI-PV: 935317 SGI-Modid: xfs-linux:xfs-kern:192007a Signed-off-by: Dean Roehrich Signed-off-by: Nathan Scott commit 536388be42c938fb6d0eece681526ce13bb50aab Author: Dean Roehrich Date: Fri Sep 2 15:35:43 2005 +1000 [XFS] upate copyrights SGI-PV: 933765 SGI-Modid: xfs-linux:xfs-kern:190760a Signed-off-by: Dean Roehrich Signed-off-by: Nathan Scott commit 616b1c7238f0de5cec12045267a924035f8ed317 Author: Dean Roehrich Date: Fri Sep 2 15:30:57 2005 +1000 [XFS] Update copyrights SGI-PV: 933551 SGI-Modid: xfs-linux:xfs-kern:190625a Signed-off-by: Dean Roehrich Signed-off-by: Nathan Scott commit a7a6cac204147634aba7487e4d618b028ff54c0d Author: David S. Miller Date: Thu Sep 1 21:51:26 2005 -0700 [SPARC]: Kill io_remap_page_range() It's been deprecated long enough and there are no in-tree users any longer. Signed-off-by: David S. Miller commit ef015786152adaff5a6a8bf0c8ea2f70cee8059d Author: Herbert Xu Date: Thu Sep 1 17:48:59 2005 -0700 [TCP]: Fix sk_forward_alloc underflow in tcp_sendmsg I've finally found a potential cause of the sk_forward_alloc underflows that people have been reporting sporadically. When tcp_sendmsg tacks on extra bits to an existing TCP_PAGE we don't check sk_forward_alloc even though a large amount of time may have elapsed since we allocated the page. In the mean time someone could've come along and liberated packets and reclaimed sk_forward_alloc memory. This patch makes tcp_sendmsg check sk_forward_alloc every time as we do in do_tcp_sendpages. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit d80d99d643090c3cf2b1f9fb3fadd1256f7e384f Author: Herbert Xu Date: Thu Sep 1 17:48:23 2005 -0700 [NET]: Add sk_stream_wmem_schedule This patch introduces sk_stream_wmem_schedule as a short-hand for the sk_forward_alloc checking on egress. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 2dac4b96b9362954a0638317b90e3e7bcb112e83 Author: YOSHIFUJI Hideaki Date: Thu Sep 1 17:44:49 2005 -0700 [IPV6]: Repair Incoming Interface Handling for Raw Socket. Due to changes to enforce checking interface bindings, sockets did not see loopback packets bound for our local address on our interface. e.g.) When we ping6 fe80::1%eth0, skb->dev points loopback_dev while IP6CB(skb)->iif indicates eth0. This patch fixes the issue by using appropriate incoming interface, in the sense of scoping architecture. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 573dbd95964b01a942aa0c68e92b06f2c9536964 Author: Jesper Juhl Date: Thu Sep 1 17:44:29 2005 -0700 [CRYPTO]: crypto_free_tfm() callers no longer need to check for NULL Since the patch to add a NULL short-circuit to crypto_free_tfm() went in, there's no longer any need for callers of that function to check for NULL. This patch removes the redundant NULL checks and also a few similar checks for NULL before calls to kfree() that I ran into while doing the crypto_free_tfm bits. I've succesfuly compile tested this patch, and a kernel with the patch applied boots and runs just fine. When I posted the patch to LKML (and other lists/people on Cc) it drew the following comments : J. Bruce Fields commented "I've no problem with the auth_gss or nfsv4 bits.--b." Sridhar Samudrala said "sctp change looks fine." Herbert Xu signed off on the patch. So, I guess this is ready to be dropped into -mm and eventually mainline. Signed-off-by: Jesper Juhl Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 5170dbebbb2e9159cdf6bbf35e5d79cd7009799a Author: KOVACS Krisztian Date: Thu Sep 1 17:44:06 2005 -0700 [NETFILTER]: CLUSTERIP: fix memcpy() length typo Fix a trivial typo in clusterip_config_init(). Signed-off-by: KOVACS Krisztian Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 12a49ffd842bf5b07c62eaabf178703ce4fe09d7 Author: Patrick Caulfield Date: Thu Sep 1 17:43:45 2005 -0700 [DECNET]: Tidy send side socket SKB allocation. Patch from Steve Whitehouse which I've vetted and tested: "This patch is really intended has a move towards fixing the sendmsg/recvmsg functions in various ways so that we will finally have working nagle. Also reduces code duplication." Signed-off-by: Patrick Caulfield Signed-off-by: David S. Miller commit eb6f1160ddb2fdadf50f350da79d0796c37f17e2 Author: Herbert Xu Date: Thu Sep 1 17:43:25 2005 -0700 [CRYPTO]: Use CRYPTO_TFM_REQ_MAY_SLEEP where appropriate This patch goes through the current users of the crypto layer and sets CRYPTO_TFM_REQ_MAY_SLEEP at crypto_alloc_tfm() where all crypto operations are performed in process context. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 64baf3cfea974d2b9e671ccfdbc03e030ea5ebc6 Author: Herbert Xu Date: Thu Sep 1 17:43:05 2005 -0700 [CRYPTO]: Added CRYPTO_TFM_REQ_MAY_SLEEP flag The crypto layer currently uses in_atomic() to determine whether it is allowed to sleep. This is incorrect since spin locks don't always cause in_atomic() to return true. Instead of that, this patch returns to an earlier idea of a per-tfm flag which determines whether sleeping is allowed. Unlike the earlier version, the default is to not allow sleeping. This ensures that no existing code can break. As usual, this flag may either be set through crypto_alloc_tfm(), or just before a specific crypto operation. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit fb4f10ed50f01b0f953068456bfb6e2885921b01 Author: Aaron Grothe Date: Thu Sep 1 17:42:46 2005 -0700 [CRYPTO]: Fix XTEA implementation The XTEA implementation was incorrect due to a misinterpretation of operator precedence. Because of the wide-spread nature of this error, the erroneous implementation will be kept, albeit under the new name of XETA. Signed-off-by: Aaron Grothe Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 75c80c382fbd08acf06fbef9d54c9844e806a8b4 Author: David S. Miller Date: Thu Sep 1 17:42:23 2005 -0700 [TG3]: Update driver version and release date. Signed-off-by: David S. Miller commit 51b9146869ab9492da785c5c9321d85f01655ab6 Author: Michael Chan Date: Thu Sep 1 17:41:28 2005 -0700 [TG3]: Minimize locking in TX path. This is similar to Eric Dumazet's tx_lock patch for tg3 but takes it one step further to eliminate the tx_lock in the tx_completion path when the tx queue is not stopped. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 86d9f7f0c9cf06d7d3cfa2a9f0514cf21fa5fda1 Author: Eric Lemoine Date: Thu Sep 1 17:41:07 2005 -0700 [SUNGEM]: Fix netpoll bug in Sun GEM Ether driver From: Eric Lemoine To me the bug is that __LINK_STATE_RX_SCHED can be set while __netif_rx_schedule() hasen't be called. Why don't fix it in the simplest way ? See attached patch (absolutely untested). Signed-off-by: Geoff Levand Signed-off-by: David S. Miller commit 0014c6156f9e7d034d20742d164d7d4da289b42a Author: Geoff Levand Date: Thu Sep 1 17:40:46 2005 -0700 [SUNGEM]: fix minor bug in sungem.h This changes the Sun Gem Ether driver's tx ring buffer length to the proper constant. Currently TX_RING_SIZE and RX_RING_SIZE are equal, so no malfunction occurs. Signed-off-by: Geoff Levand Signed-off-by: David S. Miller commit 732db659b83579b922c18dee9123e1529b5fb5d2 Author: Adrian Bunk Date: Thu Sep 1 17:40:26 2005 -0700 [IPVS]: "extern inline" -> "static inline" "extern inline" doesn't make much sense. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit ff4cc3ac93e1d0369928fd60ec1fe82417afc576 Author: Mike Kershaw Date: Thu Sep 1 17:40:05 2005 -0700 [TUNTAP]: Allow setting the linktype of the tap device from userspace Currently tun/tap only supports the EN10MB ARP type. For use with wireless and other networking types it should be possible to set the ARP type via an ioctl. Patch v2: Included check that the tap interface is down before changing the link type out from underneath it Signed-off-by: Mike Kershaw Signed-off-by: David S. Miller commit 86a8a83963a3f6beeca4900d26da93c7d2a9d92d Author: Russell King Date: Thu Sep 1 22:41:55 2005 +0100 [ARM] Fix ARMv6 page table bits We weren't explicitly setting the page table bits we desired in user_prot in the protection table, which resulted in the user mappings for v6 CPUs being marked global. Signed-off-by: Russell King commit 52c18fd2dc5c6d96cec4f48c69fc17b00edd9860 Author: Dave Jones Date: Thu Sep 1 11:01:02 2005 -0700 [CPUFREQ] Remove trailing whitespace before \n's in printks. From: Denis Vlasenko Signed-off-by: Dave Jones commit 80ac2912f846c01d702774bb6aa7100ec71e88b9 Author: Kumar Gala Date: Wed Aug 31 14:54:47 2005 +1000 [PATCH] ppc: L2 cache prefetch fixes on 745x We run into problems if we blindly enable L2 prefetching without checking that the L2 cache is actually enabled. Additionaly, if we disable the L2 cache we need to ensure that we disable L2 prefetching. Signed-off-by: Kumar Gala Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 8085ce084c0f0144c353963853f81486fc331120 Author: Benjamin Herrenschmidt Date: Wed Aug 31 14:16:53 2005 +1000 [PATCH] Fix PCI ROM mapping This fixes a problem with pci_map_rom() which doesn't properly update the ROM BAR value with the address thas allocated for it by the PCI code. This problem, among other, breaks boot on Mac laptops. It'ss a new version based on Linus latest one with better error checking. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 29db35edb2548c3b0299c53d62d5f26d77a8e58f Author: Dave Jones Date: Thu Sep 1 10:50:13 2005 -0700 [AGPGART] Remove trailing space before \n From: Denis Vlasenko Signed-off-by: Dave Jones commit 319e76a1ae835c34a2838c2bfebe3db4d5a6b387 Author: David Gibson Date: Wed Aug 31 14:34:05 2005 +1000 [PATCH] Fix bug in ppc64 dynamic hugepage support In adjusting the logic for SLB miss for the dynamic hugepage stuff, I messed up the !CONFIG_HUGETLB_PAGE case, failing to set the SLB flags properly. This fixes it. It also streamlines the logic for the HUGETLB_PAGE case (removing a couple of branches) while we're at it. Booted, and roughly tested on POWER5 (with and without HUGETLB_PAGE), iSeries/RS64 (no hugepage available), and G5 (with and without HUGETLB_PAGE). Signed-off-by: David Gibson Signed-off-by: Linus Torvalds commit 7eaa414ee86cda4c153002ed218b9a0ad17f7de1 Author: Adrian Bunk Date: Wed Aug 31 17:43:51 2005 +0200 [PATCH] Add missing select's to DVB_BUDGET_AV This fixes the following compile error: ... LD .tmp_vmlinux1 drivers/built-in.o: In function `frontend_init': budget-av.c:(.text+0xb9448): undefined reference to `tda10046_attach' budget-av.c:(.text+0xb9518): undefined reference to `tda10021_attach' drivers/built-in.o: In function `philips_tu1216_request_firmware': budget-av.c:(.text+0xb937b): undefined reference to `request_firmware' make: *** [.tmp_vmlinux1] Error 1 Signed-off-by: Adrian Bunk Acked-by: Johannes Stezenbach Acked-by: Michael Krufky Signed-off-by: Linus Torvalds commit bc49a661e6e82bfa8219c3d0a2e4dea51c847d23 Author: Russell King Date: Thu Sep 1 15:56:26 2005 +0100 [SERIAL] Move serial8250_*_port prototypes to linux/serial_8250.h Signed-off-by: Russell King commit 1d15b10f95d4c4295a0f2288c7be7b6a005490da Author: Dave Kleikamp Date: Thu Sep 1 09:05:39 2005 -0500 JFS: Implement jfs_init_security This atomically initializes the security xattr when an object is created Signed-off-by: Dave Kleikamp commit 4f4b401bfaa97edbea41a1fcab794148e7ac0421 Author: Dave Kleikamp Date: Thu Sep 1 09:02:43 2005 -0500 JFS: allow extended attributes to be set within a existing transaction Signed-off-by: Dave Kleikamp commit 103461a80c2f2dd95fe9a39a5decd984622c2a9e Author: Russell King Date: Thu Sep 1 14:51:59 2005 +0100 [ARM] Simplify setup_mm_for_reboot() No point checking what CPU architecture level we have each time within the loop, so precompute the base PMD flags outside the loop. Signed-off-by: Russell King commit 08f4ffb3eb4ff23daf9c61bcd523940d43c2270c Author: Russell King Date: Thu Sep 1 14:45:18 2005 +0100 [ARM] Convert open-coded __pmd_populate to use inline function Signed-off-by: Russell King commit f8dd49fa054814f365fcff8d72ca47e8afda9743 Author: Russell King Date: Thu Sep 1 14:25:45 2005 +0100 [SERIAL] mwave is no longer broken Signed-off-by: Russell King commit 569d2c34dcf259b07977835492aa8813d1168230 Author: Nicolas Pitre Date: Thu Sep 1 12:48:48 2005 +0100 [ARM] 2864/1: VST aka CONFIG_NO_IDLE_HZ support for SA11x0 Patch from Nicolas Pitre Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 20e912680842504ab4633deaa644c2b855ad3d44 Author: Nicolas Pitre Date: Thu Sep 1 12:48:47 2005 +0100 [ARM] 2863/1: clarify comment in PXA2xx and SA1x00 timer code Patch from Nicolas Pitre Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 5c53ff088cb76dca52bdf2ef36ea63147763f9ea Author: Nicolas Pitre Date: Thu Sep 1 12:48:40 2005 +0100 [ARM] 2862/1: VST aka CONFIG_NO_IDLE_HZ support for PXA2xx Patch from Nicolas Pitre Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 68d9102f76de7a923fb81c8b6de4764f8f50ed17 Author: Nicolas Pitre Date: Thu Sep 1 12:37:13 2005 +0100 [ARM] 2865/2: fix fadvise64_64 syscall argument passing Patch from Nicolas Pitre The prototype for sys_fadvise64_64() is: long sys_fadvise64_64(int fd, loff_t offset, loff_t len, int advice) The argument list is therefore as follows on legacy ABI: fd: type int (r0) offset: type long long (r1-r2) len: type long long (r3-sp[0]) advice: type int (sp[4]) With EABI this becomes: fd: type int (r0) offset: type long long (r2-r3) len: type long long (sp[0]-sp[4]) advice: type int (sp[8]) Not only do we have ABI differences here, but the EABI version requires one additional word on the syscall stack. To avoid the ABI mismatch and the extra stack space required with EABI this syscall is now defined with a different argument ordering on ARM as follows: long sys_arm_fadvise64_64(int fd, int advice, loff_t offset, loff_t len) This gives us the following ABI independent argument distribution: fd: type int (r0) advice: type int (r1) offset: type long long (r2-r3) len: type long long (sp[0]-sp[4]) Now, since the syscall entry code takes care of 5 registers only by default including the store of r4 to the stack, we need a wrapper to store r5 to the stack as well. Because that wrapper was missing and was always required this means that sys_fadvise64_64 never worked on ARM and therefore we can safely reuse its syscall number for our new sys_arm_fadvise64_64 interface. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit ce38b51edfe51abacb053e88d62cf96a0c003a04 Author: Mika Kukkonen Date: Sun Aug 7 22:49:39 2005 +0300 [CPUFREQ] Remove extra arg from dprintk in cpufreq/speedstep-smi.c Minor fallout from my upcoming __attribute__((format(printf,x,y))) patches. The variable 'result' is untouched, so this patch just removes it. Signed-off-by: Mika Kukkonen Signed-off-by: Dave Jones commit 123411f2d0da5c42eb9ee0912b6e824cbe88a411 Author: Mika Kukkonen Date: Sun Aug 7 23:13:00 2005 +0300 [CPUFREQ] dprintf format fixes in cpufreq/speedstep-centrino.c Ho-hum, did not notice there was more printf fixes for cpufreq (you should see the amount I have for isdn and reiser ...). Sorry for noise. Signed-off-by: Mika Kukkonen Signed-off-by: Dave Jones commit f914be79ab2144efe291d9fc383661e0e23dca44 Author: Venkatesh Pallipadi Date: Mon Aug 29 13:54:55 2005 -0700 [CPUFREQ] speedstep-centrino: skip extract_clock logic for acpi based centrino speedstep_centrino.c:extract_clock() assumes the bus speed of 100MHz, which is not true with latest laptops. Due to this assumption and due to the encoded frequency check during initialization, speedstep-centrino driver fails even on systems that has proper ACPI information to do the P-state transition. The change below moves the centrino-speedstep detection to be used only when table based P-state transition is done. For ACPI based P-state transition, we skip the centrino_cpu identification, and as a result we don't use the bus speed assumption in extract_clock. This change makes speedstep-centrino work on Pentium-M based systems, which have more than 100MHz bus speed. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Dave Jones commit 8085e1f1f0645fc6ddefcb54fdcba95808df5049 Author: Venkatesh Pallipadi Date: Thu Aug 25 13:14:06 2005 -0700 [CPUFREQ] Bugfix: Call driver exit in cpufreq_add_dev error path A minor fix for cpufreq_add_dev() error path. We need to call driver->exit() if driver_init() call has succeeded. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Dave Jones commit fbff868db3a4cc6a89d51da9a6d49b26c29d04fb Author: Jouni Malinen Date: Sun Aug 28 17:53:32 2005 -0700 [PATCH] hostap: Fix null pointer dereference in prism2_pccard_card_present() local->hw_priv was initialized only after the interrupt handler was registered. This could trigger a NULL pointer dereference in prism2_pccard_card_present() that assumed that local->hw_priv is always set (and it should have been). Fix this by setting local->hw_priv before registering the interrupt handler. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit ee05f031ec72cc06abc4002992649c3a8344d246 Author: Michael Ellerman Date: Thu Sep 1 11:29:29 2005 +1000 [PATCH] iseries_veth: Be consistent about driver name, increment version The iseries_veth driver tells sysfs that it's called 'iseries_veth', but if you ask it via ethtool it thinks it's called 'veth'. I think this comes from 2.4 when the driver was called 'veth', but it's definitely called 'iseries_veth' now, so fix it. To make sure we don't do it again define DRV_NAME and use it everywhere. While we're at it, change the version number to 2.0, to reflect the changes made in this patch series. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit 59f17aebabef709a32a8fc09b4cd3507f32dea01 Author: Michael Ellerman Date: Thu Sep 1 11:29:27 2005 +1000 [PATCH] iseries_veth: Remove studly caps from iseries_veth.c Having merged iseries_veth.h, let's remove some of the studly caps that came with it. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit 642d1a4c36b9002a45ea6498bda5d1e911eeb933 Author: Michael Ellerman Date: Thu Sep 1 11:29:25 2005 +1000 [PATCH] iseries_veth: Incorporate iseries_veth.h in iseries_veth.c iseries_veth.h is only used by iseries_veth.c, so merge the former into the latter. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit 07a5c1727d6bf5c917034fe4006acf726cb158bf Author: Michael Ellerman Date: Thu Sep 1 11:29:21 2005 +1000 [PATCH] iseries_veth: Add sysfs support for port structs Also to aid debugging, add sysfs support for iseries_veth's port structures. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit 76812d81238cda5c5c4060da27517a08287620fc Author: Michael Ellerman Date: Thu Sep 1 11:29:20 2005 +1000 [PATCH] iseries_veth: Add sysfs support for connection structs To aid in field debugging, add sysfs support for iseries_veth's connection structures. At the moment this is all read-only, however we could think about adding write support for some attributes in future. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit db5e8718eac0b8166d6fd05b1ed7f8114c243988 Author: Michael Ellerman Date: Thu Sep 1 11:29:19 2005 +1000 [PATCH] iseries_veth: Fix bogus counting of TX errors There's a number of problems with the way iseries_veth counts TX errors. Firstly it counts conditions which aren't really errors as TX errors. This includes if we don't have a connection struct for the other LPAR, or if the other LPAR is currently down (or just doesn't want to talk to us). Neither of these should count as TX errors. Secondly, it counts one TX error for each LPAR that fails to accept the packet. This can lead to TX error counts higher than the total number of packets sent through the interface. This is confusing for users. This patch fixes that behaviour. The non-error conditions are no longer counted, and we introduce a new and I think saner meaning to the TX counts. If a packet is successfully transmitted to any LPAR then it is transmitted and tx_packets is incremented by 1. If there is an error transmitting a packet to any LPAR then that is counted as one error, ie. tx_errors is incremented by 1. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit e0808494ff44d5cedcaf286bb8a93d08e8d9af49 Author: Michael Ellerman Date: Thu Sep 1 11:29:18 2005 +1000 [PATCH] iseries_veth: Simplify full-queue handling The iseries_veth driver often has multiple netdevices sending packets over a single connection to another LPAR. If the bandwidth to the other LPAR is exceeded, all the netdevices must have their queues stopped. The current code achieves this by queueing one incoming skb on the per-netdevice port structure. When the connection is able to send more packets we iterate through the port structs and flush any packet that is queued, as well as restarting the associated netdevice's queue. This arrangement makes less sense now that we have per-connection TX timers, rather than the per-netdevice generic TX timer. The new code simply detects when one of the connections is full, and stops the queue of all associated netdevices. Then when a packet is acked on that connection (ie. there is space again) all the queues are woken up. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit 24562ffa8bdf3a111278a8b93ab92837b9ec9113 Author: Michael Ellerman Date: Thu Sep 1 11:29:17 2005 +1000 [PATCH] iseries_veth: Add a per-connection ack timer Currently the iseries_veth driver contravenes the specification in Documentation/networking/driver.txt, in that if packets are not acked by the other LPAR they will sit around forever. This patch adds a per-connection timer which fires if we've had no acks for five seconds. This is superior to the generic TX timer because it catches the case of a small number of packets being sent and never acked. This fixes a bug we were seeing on real systems, where some IPv6 neighbour discovery packets would not be acked and then prevent the module from being removed, due to skbs lying around. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit 48683d72f8146dfb896e05c90d3544bbad63778c Author: Michael Ellerman Date: Thu Sep 1 11:29:12 2005 +1000 [PATCH] iseries_veth: Remove TX timeout code The iseries_veth driver uses the generic TX timeout watchdog, however a better solution is in the works, so remove this code. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit f0c129caa34b4bb0944bbb758b56c3d85b105557 Author: Michael Ellerman Date: Thu Sep 1 11:29:09 2005 +1000 [PATCH] iseries_veth: Use kobjects to track lifecycle of connection structs The iseries_veth driver can attach to multiple vlans, which correspond to multiple net devices. However there is only 1 connection between each LPAR, so the connection structure may be shared by multiple net devices. This makes module removal messy, because we can't deallocate the connections until we know there are no net devices still using them. The solution is to use ref counts on the connections, so we can delete them (actually stop) as soon as the ref count hits zero. This patch fixes (part of) a bug we were seeing with IPv6 sending probes to a dead LPAR, which would then hang us forever due to leftover skbs. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit ec60beebed497691c97d674c1facac5ca3d7a4b3 Author: Michael Ellerman Date: Thu Sep 1 11:29:08 2005 +1000 [PATCH] iseries_veth: Make init_connection() & destroy_connection() symmetrical This patch makes veth_init_connection() and veth_destroy_connection() symmetrical in that they allocate/deallocate the same data. Currently if there's an error while initialising connections (ie. ENOMEM) we call veth_module_cleanup(), however this will oops because we call driver_unregister() before we've called driver_register(). I've never seen this actually happen though. So instead we explicitly call veth_destroy_connection() for each connection, any that have been set up will be deallocated. We also fix a potential leak if vio_register_driver() fails. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit cbf9074cc30ca0eee19c9bd7304faf9f1beb1e76 Author: Michael Ellerman Date: Thu Sep 1 11:29:07 2005 +1000 [PATCH] iseries_veth: Only call dma_unmap_single() if dma_map_single() succeeded The iseries_veth driver unconditionally calls dma_unmap_single() even when the corresponding dma_map_single() may have failed. Rework the code a bit to keep the return value from dma_unmap_single() around, and then check if it's a dma_mapping_error() before we do the dma_unmap_single(). Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit b08bd5c0a3110f143faeef9cd057d9d8ff2f0714 Author: Michael Ellerman Date: Thu Sep 1 11:29:06 2005 +1000 [PATCH] iseries_veth: Replace lock-protected atomic with an ordinary variable The iseries_veth driver uses atomic ops to manipulate the in_use field of one of its per-connection structures. However all references to the flag occur while the connection's lock is held, so the atomic ops aren't necessary. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit d7893ddd1b2110a54a5b1773a405748172ba1fe5 Author: Michael Ellerman Date: Thu Sep 1 11:29:05 2005 +1000 [PATCH] iseries_veth: Remove redundant message stack lock The iseries_veth driver keeps a stack of messages for each connection and a lock to protect the stack. However there is also a per-connection lock which makes the message stack lock redundant. Remove the message stack lock and document the fact that callers of the stack-manipulation functions must hold the connection's lock. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit 2a5391a12297d1759b1c736634acb95793d43fb3 Author: Michael Ellerman Date: Thu Sep 1 11:29:02 2005 +1000 [PATCH] iseries_veth: Fix broken promiscuous handling Due to a logic bug, once promiscuous mode is enabled in the iseries_veth driver it is never disabled. The driver keeps two flags, promiscuous and all_mcast which have exactly the same effect. This is because we only ever receive packets destined for us, or multicast packets. So consolidate them into one promiscuous flag for simplicity. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit 58c5900bdaffbf76afd7ad5e053410cb95eb3169 Author: Michael Ellerman Date: Thu Sep 1 11:29:00 2005 +1000 [PATCH] iseries_veth: Try to avoid pathological reset behaviour The iseries_veth driver contains a state machine which is used to manage how connections are setup and neogotiated between LPARs. If one side of a connection resets for some reason, the two LPARs can get stuck in a race to re-setup the connection. This can lead to the connection being declared dead by one or both ends. In practice the connection is declared dead by one or both ends approximately 8/10 times a connection is reset, although it is rare for connections to be reset. (an example here: http://michael.ellerman.id.au/files/misc/veth-trace.html) The core of the problem is that the end that resets the connection doesn't wait for the other end to become aware of the reset. So the resetting end starts setting the connection back up, and then receives a reset from the other end (which is the response to the initial reset). And so on. We're severely limited in what we can do to fix this. The protocol between LPARs is essentially fixed, as we have to interoperate with both OS/400 and old Linux drivers. Which also means we need a fix that only changes the code on one end. The only fix I've found given that, is to just blindly sleep for a bit when resetting the connection, in the hope that the other end will get itself sorted. Needless to say I'd love it if someone has a better idea. This does work, I've so far been unable to get it to break, whereas without the fix a reset of one end will lead to a dead connection ~8/10 times. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit abfda4719c61550be4efaf277d4a904a7930d410 Author: Michael Ellerman Date: Thu Sep 1 11:28:59 2005 +1000 [PATCH] iseries_veth: Remove a FIXME WRT deletion of the ack_timer The iseries_veth driver has a timer which we use to send acks. When the connection is reset or stopped we need to delete the timer. Currently we only call del_timer() when resetting a connection, which means the timer might run again while the connection is being re-setup. As it turns out that's ok, because the flags the timer consults have been reset. It's cleaner though to call del_timer_sync() once we've dropped the lock, although the timer may still run between us dropping the lock and calling del_timer_sync(), but as above that's ok. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit 61a3c6966158dfd9b1279c10ea8eeb3bc7acdef4 Author: Michael Ellerman Date: Thu Sep 1 11:28:57 2005 +1000 [PATCH] iseries_veth: Cleanup error and debug messages Currently the iseries_veth driver prints the file name and line number in its error messages. This isn't very useful for most users, so just print "iseries_veth: message" instead. - convert uses of veth_printk() to veth_debug()/veth_error()/veth_info() - make terminology consistent, ie. always refer to LPAR not lpar - be consistent about printing return codes as %d not %x - make format strings fit in 80 columns Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik commit 8a36895c0ddac143b7f0e87d46153f4f75d9fff7 Author: David S. Miller Date: Wed Aug 31 15:01:33 2005 -0700 [SPARC64]: Use 'unsigned long' for port argument to I/O string ops. This kills warnings when building drivers/ide/ide-iops.c and puts us in-line with what other platforms do here. Signed-off-by: David S. Miller commit 8813dfbfc56b3f7c369b3115c2f70bcacd77ec51 Author: Alexey Y. Starikovskiy Date: Thu Aug 25 09:56:52 2005 +0400 [ACPI] Error: Invalid owner_id: 00 Signed-off-by: Alexey Y. Starikovskiy Signed-off-by: Len Brown commit 5981d644209c38029df7f91eb8c61bc5952f182b Author: Alan Cox Date: Wed Aug 31 22:19:33 2005 +0100 [SERIAL] Convert mwave to use serial8250_(un)?register_port Signed-off-by: Alan Cox Signed-off-by: Russell King commit a994018a5fc987702dfb4f5d31172842ea6186dc Author: Martin Hicks Date: Wed Aug 31 11:21:00 2005 -0700 [IA64] uncached allocator: use generic (not sn2 specific) functions Change sn2-specific calls into generic functions. Without this change the uncached allocator will not work on non-sn2 platforms. Signed-off-by: Greg Edwards Signed-off-by: Martin Hicks Signed-off-by: Tony Luck commit 0f302dc35412dc67035efc188b9d5c40711b4222 Author: Sascha Hauer Date: Wed Aug 31 21:48:47 2005 +0100 [ARM] 2866/1: add i.MX set_mctrl / get_mctrl functions Patch from Sascha Hauer This patch adds support for setting and getting RTS / CTS via set_mtctrl / get_mctrl functions. Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit 147056fb84150966d736fe21fa01d5e0f08e0980 Author: David Vrabel Date: Wed Aug 31 21:45:14 2005 +0100 [ARM] 2869/1: ixp4xx: correct ioread*/iowrite* Patch from David Vrabel Correct the ioread* and iowrite* functions. In particular, add an offset to the cookie in ioport_map so we can map I/O port ranges starting from 0 (0 is for reporting errors). Signed-off-by: David Vrabel Signed-off-by: Russell King commit dcb86e8cbd66c5bd6b51a5485ea3ff35bb4ced22 Author: Catalin Marinas Date: Wed Aug 31 21:45:14 2005 +0100 [ARM] 2868/1: Include linux/cpumask.h in arch/arm/common/gic.c Patch from Catalin Marinas Minor compilation error fix. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 4fbd1514173a80f9dc93e8ebbd6d4eb97cee123e Author: Yann Droneaud Date: Tue Jun 7 16:54:01 2005 +0200 [ACPI] check acpi_disabled in IPMI Signed-off-by: Yann Droneaud Signed-off-by: Len Brown commit f21ee2d4245293ee6906eb7afd0a701f40e839b9 Author: Steve Longerbeam Date: Wed Aug 31 21:22:20 2005 +0100 [ARM] 2867/2: unaligned ldrd/strd fixups Patch from Steve Longerbeam Adds an implementation of unaligned LDRD and STRD fixups. Also fixes a bug where do_alignment() would misinterpret and fixup an unaligned LDRD/STRD as LDRH/STRH, causing memory corruption. This is the same as Patch #2867/1, but with minor whitespace and comments changes, plus a check for arch-level >= v5TE before printing ai_dword count in proc_alignment_read(). Signed-off-by: Steve Longerbeam Signed-off-by: Russell King commit a1cddb88920b915eaba10712ecfd0fc698b00a22 Author: Jack Steiner Date: Wed Aug 31 08:05:00 2005 -0700 [IA64-SGI] Add new vendor-specific SAL calls for: - notifying the PROM of specific features that are supported by the OS. This is used to enable PROM feature if and only if the corresponding feature is implemented in the OS - fetch feature sets that are supported by the current PROM. This allows the OS to selectively enable features when the PROM support is available. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 6cf07a8cc86a0b471466c7fe45892f7ef434015b Author: Peter Chubb Date: Tue Aug 23 20:07:00 2005 -0700 [IA64] Fix nasty VMLPT problem... I've solved the problem I was having with the simulator and not booting Debian. The problem is that the number of bits for the virtual linear array short-format VHPT (Virtually mapped linear page table, VMLPT for short) is being tested incorrectly. There are two problems: 1. The PAL call that should tell the kernel the size of the virtual address space isn't implemented for the simulator, so the kernel uses the default 50. This is addressed separately in dc90e95f310f4f821c905b2aec8e9449bb3270fa 2. In arch/ia64/mm/init.c there's code to calcualte the size of the VMLPT based on the number of implemented virtual address bits and the page size. It checks to see if the VMLPT base address overlaps the top of the mapped region, but this check doesn't allow for the address space hole, and in fact will never trigger. Here's an alternative test and panic, that I think is more accurate. Signed-off-by: Peter Chubb Signed-off-by: Tony Luck commit 714d2dc14914f0f7bb008effe830c99eb47c75df Author: Peter Chubb Date: Thu Aug 25 17:39:00 2005 -0700 [IA64] Allow /proc/pal/cpu0/vm_info under the simulator Not all of the PAL VM calls are implemented for the SKI simulator. Don't just give up if one fails, print information from the calls that succeed. Signed-off-by: Peter Chubb Signed-off-by: Tony Luck commit dc90e95f310f4f821c905b2aec8e9449bb3270fa Author: Peter Chubb Date: Wed Aug 24 17:13:00 2005 -0700 [IA64] Add PAL_VM_SUMMARY/PAL_MEM_ATTRIB to bootloader for SKI This patch implements PAL_VM_SUMMARY (and PAL_MEM_ATTRIB for good measure) and pretends that the simulated machine is a McKinley. Some extra comments and clean-up by Tony Luck. Signed-off-by: Peter Chubb Signed-off-by: Tony Luck commit afc7097f45bdfddc2a0d375ef4a2c38b6e09c339 Author: Jeff Garzik Date: Wed Aug 31 06:11:16 2005 -0400 [netdrvr de2104x] store PCI bus addresses in unsigned long BZ# 4475. commit 1a4493584078be87fa9dcbdd8def3cb53d41720c Author: Jeff Garzik Date: Wed Aug 31 05:48:59 2005 -0400 [netdrvr tulip] new PCI ID Noted in BZ# 2960. commit 3618886f645c2ede45742d3e3d22a96b2ee2f527 Author: Ben Dooks Date: Wed Aug 31 09:42:14 2005 +0100 [ARM] 2857/2: Dynamic tick - fix OOPS if configured and not provided Patch from Ben Dooks timer_dyn_reprogram() fails with an OOPS if the configuration for CONFIG_NO_IDLE_HZ is enabled, and the system has no support for it. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 5843e37e24d7cf32f7996dd015245633e0790595 Author: David S. Miller Date: Tue Aug 30 21:46:19 2005 -0700 [SPARC64]: Use drivers/Kconfig And move some other stuff into drivers/sbus/char/Kconfig. Signed-off-by: David S. Miller commit 61a7afa2c476a3be261cf88a95b0dea0c3bd29d4 Author: James Bottomley Date: Tue Aug 16 18:27:34 2005 -0500 [SCSI] embryonic RAID class The idea behind a RAID class is to provide a uniform interface to all RAID subsystems (both hardware and software) in the kernel. To do that, I've made this class a transport class that's entirely subsystem independent (although the matching routines have to match per subsystem, as you'll see looking at the code). I put it in the scsi subdirectory purely because I needed somewhere to play with it, but it's not a scsi specific module. I used a fusion raid card as the test bed for this; with that kind of card, this is the type of class output you get: jejb@titanic> ls -l /sys/class/raid_devices/20\:0\:0\:0/ total 0 lrwxrwxrwx 1 root root 0 Aug 16 17:21 component-0 -> ../../../devices/pci0000:80/0000:80:04.0/host20/target20:1:0/20:1:0:0/ lrwxrwxrwx 1 root root 0 Aug 16 17:21 component-1 -> ../../../devices/pci0000:80/0000:80:04.0/host20/target20:1:1/20:1:1:0/ lrwxrwxrwx 1 root root 0 Aug 16 17:21 device -> ../../../devices/pci0000:80/0000:80:04.0/host20/target20:0:0/20:0:0:0/ -r--r--r-- 1 root root 16384 Aug 16 17:21 level -r--r--r-- 1 root root 16384 Aug 16 17:21 resync -r--r--r-- 1 root root 16384 Aug 16 17:21 state So it's really simple: for a SCSI device representing a hardware raid, it shows the raid level, the array state, the resync % complete (if the state is resyncing) and the underlying components of the RAID (these are exposed in fusion on the virtual channel 1). As you can see, this type of information can be exported by almost anything, including software raid. The more difficult trick, of course, is going to be getting it to perform configuration type actions with writable attributes. Signed-off-by: James Bottomley commit 2b7d6a8cb9718fc1d9e826201b64909c44a915f4 Author: James Bottomley Date: Sun Aug 28 09:13:17 2005 -0500 [SCSI] attribute container final klist fixes Since the attribute container deletes from a klist while it's walking it, it is vulnerable to the problem (and fix) here: http://marc.theaimsgroup.com/?l=linux-scsi&m=112485448830217 The attached fixes this (but won't compile without the above). It also fixes the logical reversal in the traversal loop which meant that we were never actually traversing the loop to hit this bug in the first place. Signed-off-by: James Bottomley commit 53c165e0a6c8a4ff7df316557528fa7a52d20711 Author: James Bottomley Date: Mon Aug 22 10:06:19 2005 -0500 [SCSI] correct attribute_container list usage One of the changes in the attribute_container code in the scsi-misc tree was to add a lock to protect the list of devices per container. This, unfortunately, leads to potential scheduling while atomic problems if there's a sleep in the function called by a trigger. The correct solution is to use the kernel klist infrastructure instead which allows lockless traversal of a list. Signed-off-by: James Bottomley commit 2ef27778a26dd828dd0d348ff12d2c180062746e Author: David S. Miller Date: Tue Aug 30 20:21:34 2005 -0700 [SPARC64]: Preserve nucleus ctx page size during TLB flushes. Signed-off-by: David S. Miller commit 6f1062330499cee10396bf3fc66a03eb228c5fad Author: Jeff Garzik Date: Tue Aug 30 21:52:18 2005 -0400 [libata] fix ATAPI-enable typo Dumb typo spotted by Mark Lord. commit 3c2cafaf50a0f9e7efe2b3f584f3bba6c5ee929a Author: David S. Miller Date: Tue Aug 30 15:11:52 2005 -0700 [SPARC64]: Do not expand CHEETAH_LOG_ERROR 3 times. We only need to expand this thing once, saving some text section space. Signed-off-by: David S. Miller commit ff67b59726a8cd3549b069dfa78de2f538d3b8e3 Author: Tony Luck Date: Tue Aug 30 14:59:24 2005 -0700 [IA64] Low byte of current->personality is not a bitmask. Peter Staubach pointed out that it is not correct to check current->personality & PER_LINUX32 (this will have false hits on several other personality values). Signed-off-by: Tony Luck commit b1b5d7f9b7ac6a8e3452ac43a53eebf69fdf5a77 Author: Dave Kleikamp Date: Tue Aug 30 14:28:56 2005 -0500 JFS: jfs_delete_inode should always call clear_inode. Signed-off-by: Dave Kleikamp commit dbd2fdf549317de00e0b5ea465de5372039b7ee8 Author: David S. Miller Date: Tue Aug 30 11:26:15 2005 -0700 [SPARC64]: Kill BRANCH_IF_ANY_CHEETAH() from copy page. Just patch the branch at boot time instead. Signed-off-by: David S. Miller commit 62c592edead3c3a045662595f7ade3c12f133373 Author: Marcelo Tosatti Date: Tue Aug 30 13:40:22 2005 -0300 [PATCH] ppc32 8xx: fix warnings in m8xx_setup.c The following patch fixes two warnings in arch/ppc/syslib/m8xx_setup.c Signed-off-by: Marcelo Tosatti Signed-off-by: Linus Torvalds commit 81d4af1340badcd2100c84fbd1bfd13156de41aa Author: Ivan Kokshaysky Date: Tue Aug 30 18:48:52 2005 +0400 [PATCH] x86: pci_assign_unassigned_resources() update I had some time to think about PCI assign issues in 2.6.13-rc series. The major problem here is that we call pci_assign_unassigned_resources() way too early - at subsys_initcall level. Therefore we give no chances to ACPI and PnP routines (called at fs_initcall level) to reserve their respective resources properly, as the comments in drivers/pnp/system.c and drivers/acpi/motherboard.c suggest: /** * Reserve motherboard resources after PCI claim BARs, * but before PCI assign resources for uninitialized PCI devices */ So I moved the pci_assign_unassigned_resources() call to pcibios_assign_resources() (fs_initcall), which should hopefully fix a lot of problems and make PCIBIOS_MIN_IO tweaks unnecessary. Other changes: - remove resource assignment code from pcibios_assign_resources(), since it duplicates pci_assign_unassigned_resources() functionality and actually does nothing in 2.6.13; - modify ROM assignment code as per Ben's suggestion: try to use firmware settings by default (if PCI_ASSIGN_ROMS is not set); - set CARDBUS_IO_SIZE back to 4K as it's a wonderful stress test for various setups. Confirmed by Tero Roponen (who had problems with the 4kB CardBus IO size previously). Signed-off-by: Linus Torvalds commit c88469704d63787e8d44ca5ea1c1bd0adc29572d Author: Clemens Ladisch Date: Tue Aug 2 15:26:52 2005 +0200 [ALSA] usb-audio: throttle MIDI URB resubmits on USB errors USB generic driver When a USB error occurs that might indicate that the device has been unplugged, don't resubmit the URB immediately to prevent flooding the log with error messages before khubd has us disconnect()ed. Signed-off-by: Clemens Ladisch commit 374b1873571bf80dc0c1fcceaaad067980f3b9de Author: Jeff Garzik Date: Tue Aug 30 05:42:52 2005 -0400 [libata] update several drivers to use pci_iomap()/pci_iounmap() commit ea6ba10bbb88e106f9e2db7dc253993bb3bbbe3b Author: Jeff Garzik Date: Tue Aug 30 05:18:18 2005 -0400 [libata] __iomem annotations for various drivers commit e005f01de32f22be8af255f2761018e9766000d2 Author: Jeff Garzik Date: Tue Aug 30 04:18:28 2005 -0400 [libata ahci] minor remove/unplug path cleanup Don't bother calling a hook, to call our own module, to call a helper than simply calls ionumap(). If you unroll all that convolution, you get a simple kfree()+iounmap() pair of calls. commit 1623c81eece58740279b8de802fa5895221f2044 Author: Jeff Garzik Date: Tue Aug 30 03:37:42 2005 -0400 [libata] allow ATAPI to be enabled with new atapi_enabled module option ATAPI is getting close to being ready. To increase exposure, we enable the code in the upstream kernel, but default it to off (present behavior). Users must pass atapi_enabled=1 as a module option (if module) or on the kernel command line (if built in) to turn on discovery of their ATAPI devices. commit d568121ce3151c36cc4718dd4e977f217c6144c2 Author: Takashi Iwai Date: Tue Aug 30 08:58:37 2005 +0200 [PATCH] Assign device pointer to OSS devices Add register_sound_special_device() function to allow assignment of device pointer to a specific OSS device for HAL. Signed-off-by: Takashi Iwai commit 68c339d9068502347015ce462530ec54c4d841e4 Author: Jaroslav Kysela Date: Tue Aug 30 08:48:35 2005 +0200 [ALSA] version 1.0.10rc1 commit c6c0b841dd85c878fe9794862b10ce8eb4e90761 Author: Lee Revell Date: Mon Aug 29 17:42:00 2005 +0200 [ALSA] Add identification for Live 5.1 [SB0220] EMU10K1/EMU10K2 driver Add identification for Live 5.1 [SB0220] Signed-off-by: Lee Revell Signed-off-by: Takashi Iwai commit 6a293552ba0d104ef9d35b48972a01540fbd181b Author: Takashi Iwai Date: Fri Aug 26 17:26:40 2005 +0200 [ALSA] emu10k1 - Add missing ac97 support on SBLive! Player 5.1 EMU10K1/EMU10K2 driver Added the missing ac97 support on SBLive! Player 5.1. Signed-off-by: Takashi Iwai commit 9970dce56686d7b71310388025d8925d3d29e6ec Author: Takashi Iwai Date: Thu Aug 25 20:30:27 2005 +0200 [ALSA] intel8x0 - Add quirk for FSC 4010 Intel8x0 driver Added ac97_quirk for FSC 4010. Signed-off-by: Takashi Iwai commit 7153a558ad598ff521f1d9430982e2a4a6865126 Author: Takashi Iwai Date: Thu Aug 25 19:51:47 2005 +0200 [ALSA] pcm - Fix zero-division in 32bit compat layer PCM Midlevel Fixed zero-division bug in PCM 32bit compat layer. Signed-off-by: Takashi Iwai commit e0c93cf311b3eaa04bfb5769cff38861d4e748c8 Author: Daniel Horchner Date: Thu Aug 25 13:02:24 2005 +0200 [ALSA] intel8x0 - add AC97_TUNE_MUTE_LED quirk for HP nx8220 laptop 103c:0934 Intel8x0 driver Signed-off-by: Jaroslav Kysela commit c347e9fca710551f0def6a4d58505a6f4c0d87f6 Author: Clemens Ladisch Date: Thu Aug 25 11:10:05 2005 +0200 [ALSA] usb-audio: fix Emagic MIDI protocol handling USB generic driver Emagic devices pad their packets not with 0xff bytes but with a 0xff byte followed by garbage, so we have to stop at the first such byte. Signed-off-by: Clemens Ladisch commit a278655ff5d0c9d5eb34cf99f3a4c20da09eb09e Author: Takashi Iwai Date: Wed Aug 24 17:57:25 2005 +0200 [ALSA] Fix missing spin_unlock au88x0 driver,Common EMU synth Fixed missing spin_unlock. Signed-off-by: Takashi Iwai commit f442e8b0eae4fbb6bbf9b8b005002b51a59e23bf Author: Adrian Bunk Date: Wed Aug 24 17:01:02 2005 +0200 [ALSA] include/sound/gus.h: 'extern inline' -> 'static inline' GUS Library 'extern inline' doesn't make much sense. Signed-off-by: Adrian Bunk Signed-off-by: Takashi Iwai commit 07e4ca50a5f82aa6eab52e348059579b250c63db Author: Takashi Iwai Date: Wed Aug 24 14:14:57 2005 +0200 [ALSA] hda-intel - Fix ULI M5461 support HDA Intel driver Fix and clean up for the support of ULI M5461 - set CORB/RIRB sizes explicitly - add workarounds for ULI on ia32 - max number of streams depends on the chip type now - increase the size of BDL Signed-off-by: Takashi Iwai commit 3c10a9d9f8c76fd87c92a14c201ae211d0b81288 Author: Takashi Iwai Date: Tue Aug 23 20:02:27 2005 +0200 [ALSA] hda-codec - Add beep support for Uniwill HDA Codec driver Added the missing beep support for Uniwill laptop (ALSA bug#1358). Signed-off-by: Takashi Iwai commit 5ba094dbf14828858cdff27c8201df33b7a0bc96 Author: Takashi Iwai Date: Tue Aug 23 19:27:31 2005 +0200 [ALSA] vxpocket - Register device pointer Digigram VX Pocket driver Add snd_card_set_dev() to register the device pointer. Signed-off-by: Takashi Iwai commit adf111e6ff1674b81cae3ff7cdd5a5d1edf003f0 Author: Takashi Iwai Date: Tue Aug 23 19:01:38 2005 +0200 [ALSA] vxpocket - Fix wrong index assignment Digigram VX Pocket driver Fixed the wrong index number assignment. Signed-off-by: Takashi Iwai commit 328ac7da6f49f2c8b8af349fef525ad79b4a3987 Author: Takashi Iwai Date: Tue Aug 23 15:50:41 2005 +0200 [ALSA] vxpocket - Add missing event callback Digigram VX Pocket driver Added the missing event callback. Signed-off-by: Takashi Iwai commit e0be4d32bdae5cebc4e6d9dc65886e279aa69d08 Author: Takashi Iwai Date: Tue Aug 23 11:11:03 2005 +0200 [ALSA] Fix compilation without CONFIG_PROC_FS Memalloc module Fix an error when built without CONFIG_PROC_FS. Signed-off-by: Takashi Iwai commit befdf316eaba02ed52284fb78a8027ff35c6a736 Author: Takashi Iwai Date: Mon Aug 22 13:57:55 2005 +0200 [ALSA] hda-codec - Code clean up HDA Codec driver Use struct instead of array to improve the readability of hda_codec.c. Signed-off-by: Takashi Iwai commit 9d8f53f2bba3c2c06e1e78126222aecf91f8ecdd Author: Nicolas Graziano Date: Mon Aug 22 13:47:16 2005 +0200 [ALSA] hda-intel - correct a bug in detection of rate supported HDA Codec driver The insertion of the rate 9600 make a shift in detection of supported rate, put this rate at the end of the list. Signed-off-by: Nicolas Graziano Signed-off-by: Takashi Iwai commit 66d10647feb32178e1204d5b5c7126b1731efe9c Author: Sergey Vlasov Date: Mon Aug 22 13:43:39 2005 +0200 [ALSA] HP nx6110 quirks Intel8x0 driver,AC97 Codec The HP nx6110 laptop needs to have Headphone Jack Sense enabled so that the internal speakers will be turned off when headphones are plugged in. Also ac97_quirk=hp_only is needed to make a single Master volume in the mixer instead of separate volumes for internal speakers and headphones, which just confuses the user. Signed-off-by: Sergey Vlasov Signed-off-by: Takashi Iwai commit 5049c35b1389097a1c0c7686519928eaaf31e40b Author: Jaroslav Kysela Date: Mon Aug 22 12:19:14 2005 +0200 [ALSA] ac97_bus - revert last change and do it only in the ALSA tree AC97 Codec Signed-off-by: Jaroslav Kysela commit 34ad73b9c5b5b25b795136c23f65b9a3ac21130b Author: Jaroslav Kysela Date: Mon Aug 22 11:30:37 2005 +0200 [ALSA] ac97_bus - replace with for consistency AC97 Codec Signed-off-by: Jaroslav Kysela commit 352dbfd0e6eb7733bcca79c14f8711bb86b55e4e Author: Takashi Iwai Date: Fri Aug 19 17:49:10 2005 +0200 [ALSA] via82xx - Add DXS entry for MSI 7142 VIA82xx driver Added the DXS entry for MSI 7142 (K8MM-V). Signed-off-by: Takashi Iwai commit 41e4845c426024ec41724326397a36b3aa2cb6a3 Author: Jaroslav Kysela Date: Thu Aug 18 13:43:12 2005 +0200 [ALSA] PCM resume cleanups Digigram VX core,CS4231 driver,ATIIXP driver,VIA82xx driver VIA82xx-modem driver,au88x0 driver,CS46xx driver,Trident driver This patch disables SNDRV_PCM_INFO_RESUME flag for drivers which does not support the full resume. Signed-off-by: Jaroslav Kysela commit 61be3ce0f2d9d80bc271e58c42cb9b021b3d48d8 Author: Bjorge Dijkstra Date: Tue Aug 16 17:05:05 2005 +0200 [ALSA] ac97 - make ac97 codec device name unique AC97 Codec The patch fixes the bus_id conflict error when registering two codecs of the same type (ALSA bug#1334). Signed-off-by: Bjorge Dijkstra Signed-off-by: Takashi Iwai commit e8da2fbc2dd1fb4d603442f7220d23a2192955fa Author: Takashi Iwai Date: Tue Aug 16 16:55:13 2005 +0200 [ALSA] hdspm - Fix module parameter description RME9652 driver Fix the module parameter description after proofreading. Signed-off-by: Takashi Iwai commit 1204de32d0df87892e56062042e25c775ca0e08c Author: Takashi Iwai Date: Tue Aug 16 16:54:12 2005 +0200 [ALSA] nm256 - Fix PM and irq handling NM256 driver - Fixed the PCM resume - restoring the rate setting - Fixed the handling of buggy irqs - Dynamically acquire/release irq handler to make the driver more robust to unknown irq storms (as OSS driver does). Signed-off-by: Takashi Iwai commit 1cfe43d21bc5ff751e95b6a62410e05956c09e38 Author: Takashi Iwai Date: Tue Aug 16 16:52:24 2005 +0200 [ALSA] intel8x0 - Fix PM Intel8x0 driver Fixed the PCM resume of intel8x0. Restores the requested register setting. Signed-off-by: Takashi Iwai commit 65d11d95515db3efb629202104cfc672476618b5 Author: Jaroslav Kysela Date: Tue Aug 16 13:05:43 2005 +0200 [ALSA] ALSA timer - fixed compilation Timer Midlevel Signed-off-by: Jaroslav Kysela commit 5ca307b28d6fa12f46b4ad32cb4bb854f8ee69c3 Author: Jaroslav Kysela Date: Tue Aug 16 11:32:04 2005 +0200 [ALSA] Timer API - SNDRV_TIMER_EVENT_RESUME - val is resolution in ns ALSA Core Signed-off-by: Jaroslav Kysela commit a501dfa3a763451dedd583eb90a6c9e90d0e3a3c Author: Jaroslav Kysela Date: Tue Aug 16 11:09:05 2005 +0200 [ALSA] Timer API - added SUSPEND/RESUME events PCM Midlevel,Timer Midlevel,ALSA Core - added SNDRV_TIMER_EVENT_SUSPEND / RESUME events - changed timer events from PAUSE / CONTINUE in PCM midlevel to SUSPEND / RESUME Signed-off-by: Jaroslav Kysela commit 47123197c5522f4ae3dc5914e7832dd047f9ddc8 Author: Jaroslav Kysela Date: Mon Aug 15 20:53:07 2005 +0200 [ALSA] hda-intel: Suspend/resume fixes for PCM devices HDA Intel driver - removed SNDRV_PCM_INFO_RESUME (the driver cannot do PCM resume at the time) - fixed chip->pcm_devs initialization Signed-off-by: Jaroslav Kysela commit 5a47fe3c5e8f394fb1578bbe8117f3dcc250b6fd Author: Jaroslav Kysela Date: Mon Aug 15 20:01:40 2005 +0200 [ALSA] hda-patch-realtek - added pci subdevice ID for Acer TravelMate 8100 (3 stack model + digital out) HDA Codec driver Signed-off-by: Jaroslav Kysela commit 16d3f140fc265c9b9c0f8975e0b36fe15912508f Author: Takashi Iwai Date: Mon Aug 15 15:02:28 2005 +0200 [ALSA] via82xx - Fix SPDIF sample rates VIA82xx driver Fixed the sample rates set in the fourth DXS channel with Non-VRA mode. Signed-off-by: Takashi Iwai commit b27113102f576092cd8f5d6ce8365aa6e2f58134 Author: Takashi Iwai Date: Mon Aug 15 15:01:10 2005 +0200 [ALSA] Fix PCM 32bit compat layer PCM Midlevel Fixed the handling of boundary in PCM 32bit compat layer. Positions in hwsync are bound in the 32bit boundary size. Signed-off-by: Takashi Iwai commit cff79742fc9e80242a9147a348621e4373c76287 Author: Jaroslav Kysela Date: Mon Aug 15 13:08:04 2005 +0200 [ALSA] opl3sa2 - use different name for PnP BIOS driver OPL3SA2 driver - use different name (opl3sa2-pnpbios) for PnP BIOS driver - don't print warning when manual config of resources fails (PnP BIOS) Signed-off-by: Jaroslav Kysela commit 3e6c6139f0cf9c196c3fd700055f2e22ca22e726 Author: Clemens Ladisch Date: Mon Aug 15 09:13:32 2005 +0200 [ALSA] ac97: make patch_wolfson_wm97??_specific() functions static AC97 Codec Make the patch_wolfson_wm97??_specific() functions static again. This patch was accidentally reverted in rev. 1.92. Signed-off-by: Clemens Ladisch commit 6207e51b79f89352a8623f806df5bfafb012e489 Author: Clemens Ladisch Date: Mon Aug 15 08:35:25 2005 +0200 [ALSA] usb-audio: use vmalloc for the PCM buffer USB generic driver With the double buffering, we no longer need contiguous memory for the PCM buffer, so we can use vmalloc() instead of the preallocation functions, and increase the maximum size to 256 KB. Signed-off-by: Clemens Ladisch commit 55851f734d7af7e5362d43b60331c95c32a3b027 Author: Clemens Ladisch Date: Mon Aug 15 08:34:16 2005 +0200 [ALSA] usb-audio: use usb_buffer_alloc/free USB generic driver Use the USB buffer allocation functions to avoid repeated DMA mappings of our buffers, which are re-used quite a lot. Signed-off-by: Clemens Ladisch commit daa150ef7d437d17973210f47a1c58623415df94 Author: Clemens Ladisch Date: Mon Aug 15 08:25:50 2005 +0200 [ALSA] usb-audio: properly lock hwptr_done accesses USB generic driver Take the substream lock when reading hwptr_done to avoid a race condition with the updates in the URB callbacks. Signed-off-by: Clemens Ladisch commit 9624ea812c7afd2e403c56366cadddb9ecfb88c6 Author: Clemens Ladisch Date: Mon Aug 15 08:25:24 2005 +0200 [ALSA] usb-audio: actually schedule playback URBs at frame boundaries USB generic driver Change prepare_playback_urb() not to stop preparing packets before a frame boundary has been reached. Signed-off-by: Clemens Ladisch commit 7efd8bc800324a967a37e8a425433468b7f06adb Author: Clemens Ladisch Date: Mon Aug 15 08:24:44 2005 +0200 [ALSA] usb-audio: double-buffer all playback data USB generic driver We always had to use double buffering when capturing, and when playback data for one URB crosses a buffer boundary. The latter would make hwptr updates less precise because the double-buffered data is read from the buffer much earlier than the other data is read by the host controller. Double-buffering all data allows to update hwptr immediately after the data was copied to the USB buffer(s), which has the additional benefit of avoiding the latency imposed by the host controller's delay of up to one frame when interrupting. Signed-off-by: Clemens Ladisch commit b263a9bdf9394062a4fc4272ebed60de331c5490 Author: Clemens Ladisch Date: Mon Aug 15 08:22:39 2005 +0200 [ALSA] usb-audio: optimize handling of capture URBs USB generic driver When preparing capture URBs, we don't need to stop when we cross a period boundary because we now never handle more than one millisecond of data per URB anyway. When handling captured data, use an extra flag to call snd_pcm_period_elapsed() no more than once. This allows us to move the period boundary checking code before the copying of the data which avoids a second locking of the substream's lock. Signed-off-by: Clemens Ladisch commit 99250872fc619bb5b5ddddcf1c58714a774526fc Author: James Courtier-Dutton Date: Fri Aug 12 23:54:58 2005 +0200 [ALSA] Add new card ID. Fixes ALSA bug #1297 EMU10K1/EMU10K2 driver Signed-off-by: James Courtier-Dutton commit 1b05962e8b2d8a1b1f5934087a4a00f7532fa2d1 Author: James Courtier-Dutton Date: Fri Aug 12 23:50:13 2005 +0200 [ALSA] Add new ID. Fixes ALSA bug #1298 CA0106 driver Signed-off-by: James Courtier-Dutton commit 53b266632b79e2adc48754d5a6e9e5ebbde08c12 Author: Jaroslav Kysela Date: Fri Aug 12 17:35:09 2005 +0200 [ALSA] opl3sa2 - fixed typo in PnP BIOS IDs (YMF0021 -> YMH0021) OPL3SA2 driver Signed-off-by: Jaroslav Kysela commit 1265509cb0f00206c2ed93f120121dd818a3902d Author: Jaroslav Kysela Date: Fri Aug 12 17:24:24 2005 +0200 [ALSA] opl3sa2 driver - added support for PnP BIOS devices OPL3SA2 driver The driver has been extended to support also PnP BIOS devices. The detection path is: 1) detect PnP BIOS devices 2) detect ISA PnP devices Signed-off-by: Jaroslav Kysela commit f347c774c37c83e7b2d2b75d962ca40b9a283b2b Author: Takashi Iwai Date: Fri Aug 12 16:47:49 2005 +0200 [ALSA] via82xx - Add DXS entry for MSI K8MM-V VIA82xx driver Added the DXS entry for MSI K8MM-V. Also fixed a typo in last patch for Acer Aspire 1524 WLMi. Signed-off-by: Takashi Iwai commit 4b4994869d68328276f6a3cc9df90cce8c82b43d Author: Philip Prindeville Date: Fri Aug 12 16:46:17 2005 +0200 [ALSA] Add VT1617A codec support AC97 Codec Added (minimal) support of VT1617A codec with SPDIF. Signed-off-by: Takashi Iwai commit 47672310789431c16de22f16934febf4d55b4bb0 Author: Takashi Iwai Date: Fri Aug 12 16:44:04 2005 +0200 [ALSA] hda-intel - Add SiS966 support HDA Intel driver Added SiS966 pci id to snd-hda-intel driver. Signed-off-by: Takashi Iwai commit a93bf99077886d209f8e72bc134e1ceb36e76aa2 Author: Clemens Ladisch Date: Fri Aug 12 15:19:39 2005 +0200 [ALSA] usb-audio: schedule high speed URBs with 1 ms alignment USB generic driver The EHCI driver doesn't interrupt more than once per millisecond, and organizes all iso transfers with frame-sized ITDs, so we can (try to) be more efficient by aligning all URBs on frame boundaries. Signed-off-by: Clemens Ladisch commit 71d848ca00a16179b17e58e5f51c2d9a6c4f97a2 Author: Clemens Ladisch Date: Fri Aug 12 15:18:00 2005 +0200 [ALSA] usb-audio: make nrpacks parameter writeable USB generic driver The nrpacks module parameter is used only when initializing a playback stream, so it doesn't hurt to make it writeable. Signed-off-by: Clemens Ladisch commit d6db392e9235c48bb945624798e9beede7b85b12 Author: Clemens Ladisch Date: Fri Aug 12 08:28:27 2005 +0200 [ALSA] usb-audio: fix packets per URB calculation for playback USB generic driver When determining how many packets are needed for one period, we cannot assume that all packets have their maximum size -- we always use the nominal sample rate when sending data, and could use an even lower rate when the endpoint uses frequency feedback. Signed-off-by: Clemens Ladisch commit 15a24c0778e9bdd48d8e1cf60a263837b5c30ed5 Author: Clemens Ladisch Date: Fri Aug 12 08:25:26 2005 +0200 [ALSA] usb-audio: use 1 ms URBs when capturing USB generic driver When capturing audio data, we do not know beforehand how many samples the device sends per frame, so we have to use URBs that are as short as possible to make sure that we can handle period boundaries without any additional latencies. Furthermore, the total count of URBs submitted doesn't matter when capturing, so we can just use the maximum number. Signed-off-by: Clemens Ladisch commit a53fc188ec6fc406276799da465fe789c40d96b2 Author: Clemens Ladisch Date: Thu Aug 11 15:59:17 2005 +0200 [ALSA] make local objects static Memalloc module,PCM Midlevel,Timer Midlevel,GUS Library,AC97 Codec ALI5451 driver,RME9652 driver Make some functions/variables that are used in only one file static. Signed-off-by: Clemens Ladisch commit b65f824c1ea954ea2b974e42c064f72bfbfe3dd2 Author: Sasha Khapyorsky Date: Thu Aug 11 11:18:38 2005 +0200 [ALSA] hda-codec - support for Si3054/5 HDA modems HDA generic driver,HDA Codec driver Support for Si3054/5 HDA modem codecs. Signed-off-by: Sasha Khapyorsky Signed-off-by: Takashi Iwai commit 673b683a07272bdc1f757aa32784b9fcc4b3a014 Author: Sasha Khapyorsky Date: Thu Aug 11 11:00:16 2005 +0200 ALSA CVS update HDA Codec driver,HDA generic driver Summar: hda-codec - MFG support This adds Modem Functional Group (MFG) support and option for 9600 sample rate. Signed-off-by: Sasha Khapyorsky Signed-off-by: Takashi Iwai commit 443feb882679e21ba5d1e0ff9eff067ac26d9461 Author: Karsten Wiese Date: Wed Aug 10 11:18:19 2005 +0200 [ALSA] ALSA's struct _snd_pcm_substream: Obsolete open_flag PCM Midlevel,ALSA<-OSS emulation,USB USX2Y This patch removes open_flag from struct _snd_pcm_substream. All of its uses are substituted by querying struct _snd_pcm_substream's member ffile instead. Signed-off-by: Karsten Wiese Signed-off-by: Takashi Iwai commit 9bcf655109ae06a8e652671a0de6fe2da5c213c2 Author: Clemens Ladisch Date: Wed Aug 10 10:21:43 2005 +0200 [ALSA] ymfpci: add per-voice volume controls YMFPCI driver Implements mixer controls for the volume of each playback substream of the main PCM device. Signed-off-by: Clemens Ladisch commit a55bfdc5821df787068da15a6864f2c669d7d22c Author: Dirk Opfer Date: Mon Aug 8 16:29:43 2005 +0200 [ALSA] Fix compiler warnings in PXA2XX-AC97 ARM PXA2XX driver - change pxa2xx_ac97_do_suspend and pxa2xx_ac97_do_resume to use the expected arguments Signed-off-by: Dirk Opfer Signed-off-by: Takashi Iwai commit 064d2112ff24937f9aabb6baae8de88b6e5ef453 Author: Liam Girdwood Date: Fri Aug 5 10:25:08 2005 +0200 [ALSA] WM9713 modem detection AC97 Codec This patch fixes a problem whereby the WM9713 has modem functionality incorrectly detected after an AC97 cold reset. Changes:- o Cleared AC97_SCAP_MODEM in wm9713 scaps Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai commit 4a677ac5d0a4fad286cdfb4890a5e2de61534b1c Author: Liam Girdwood Date: Fri Aug 5 10:24:36 2005 +0200 [ALSA] PXA27x AC97 warm reset ARM PXA2XX driver This patch extends the period of an AC97 warm reset on the PXA27x from 50uS to 500uS. The shorter reset didn't always guarantee that the codec would wake up. Changes:- o Change pxa27x warm reset period to 500uS o Removed double semi-colon. Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai commit 5b8f7f7329289fa3b74ef8cdbaa9d2929787d3e6 Author: Takashi Iwai Date: Wed Aug 3 14:02:47 2005 +0200 [ALSA] ad1816a - Add clockfreq module option Documentation,AD1816A driver Added clockfreq module option for the card with a different clock frequency than 33kHz. Signed-off-by: Takashi Iwai commit 5549d54992391d81a8cbfbaac45a958876fbc9cb Author: Clemens Ladisch Date: Wed Aug 3 13:50:30 2005 +0200 [ALSA] use PCM interface for IEC958 controls Digigram VX core,ENS1370/1+ driver,CA0106 driver,EMU10K1/EMU10K2 driver RME HDSP driver,RME9652 driver For consistency, use the PCM interface instead of MIXER for IEC958 default/mask/stream mixer controls. Signed-off-by: Clemens Ladisch commit 10e8d78a94fc57f1bf11d50b97ff85b005e46d0b Author: Clemens Ladisch Date: Wed Aug 3 13:40:08 2005 +0200 [ALSA] use SNDRV_CTL_NAME_IEC958 macro CMI8330 driver,ENS1370/1+ driver,FM801 driver,VIA82xx driver,AC97 Codec ALI5451 driver,CS46xx driver,EMU10K1/EMU10K2 driver,HDA Codec driver ICE1712 driver,ICE1724 driver Where appropriate, use the SNDRV_CTL_NAME_IEC958 instead of a literal string. Signed-off-by: Clemens Ladisch commit 506d4c6a5f909d78c3d624693f10d8cc0eafda48 Author: Takashi Iwai Date: Wed Aug 3 14:02:47 2005 +0200 [ALSA] ad1816a - Add clockfreq module option Documentation Added clockfreq module option for the card with a different clock frequency than 33kHz. Signed-off-by: Takashi Iwai commit 267d4d6475cf591a5f838449b40cbacfc2915e8b Author: Henrik Kretzschmar Date: Fri Jul 29 16:59:31 2005 +0200 [ALSA] adds __init and in snd_memory_init() ALSA Core This patch adds the __init macro to snd_memory_init(). Signed-off-by: Henrik Kretzschmar Signed-off-by: Takashi Iwai commit 0ca06a00e206b963587ac471e6d1c52bf33b9a18 Author: Liam Girdwood Date: Fri Jul 29 16:13:36 2005 +0200 [ALSA] AC97 bus interface for ad-hoc drivers AC97 Codec,PCI drivers I've made the review changes and as requested I've pasted the RFC by Nicolas below:- 'I would like to know what people think of the following patch. It allows for a codec on an AC97 bus to be shared with other drivers which are completely unrelated to audio. It registers a new bus type, and whenever a codec instance is created then a device for it is also registered with the driver model using that bus type. This allows, for example, to use the extra features of the UCB1400 like the touchscreen interface and the additional GPIOs and ADCs available on that chip for battery monitoring. I have a working UCB1400 touchscreen driver here that simply registers with the driver model happily working alongside with audio features using this.' Changes over RFC:- o Now matches codec name within codec group. o Added ac97_dev_release() to stop kernel complaining about no release method for device. o Added 'config SND_AC97_BUS' to sound/pci/Kconfig and moved 'config SND_AC97_CODEC' out with the PCI=n statement. o module is now called snd-ac97-bus Signed-off-by: Liam Girdwood Signed-off-by: Nicolas Pitre Signed-off-by: Takashi Iwai commit 67ed4161f60d76b3b27efc085b36357a6a90768c Author: Clemens Ladisch Date: Fri Jul 29 15:32:58 2005 +0200 [ALSA] sound - fix .iface field of mixer control elements Documentation,CS46xx driver,EMU10K1/EMU10K2 driver,AD1848 driver SB16/AWE driver,CMIPCI driver,ENS1370/1+ driver,RME32 driver RME96 driver,ICE1712 driver,ICE1724 driver,KORG1212 driver RME HDSP driver,RME9652 driver This patch changes .iface to SNDRV_CTL_ELEM_IFACE_MIXER whre _PCM or _HWDEP was used in controls that are not associated with a specific PCM (sub)stream or hwdep device, and changes some controls that got inconsitent .iface values due to copy+paste errors. Furthermore, it makes sure that all control that do use _PCM or _HWDEP use the correct number in the .device field. Signed-off-by: Clemens Ladisch commit 42dfd0adab83c95890e562623264999914771763 Author: Takashi Iwai Date: Fri Jul 29 14:18:39 2005 +0200 [ALSA] via82xx - Add dxs entry for Acer Aspire 1524 WMLi VIA82xx driver Added the dxs entry for Acer Aspire 1524 WMLi. Signed-off-by: Takashi Iwai commit b9f5a89c74e541533766dcda55d34a06253f60f3 Author: Nicolas Graziano Date: Fri Jul 29 12:17:20 2005 +0200 [ALSA] hda-codec - Fix LFE volume/switch HDA Codec driver Fixed LFE volume/switch control. Signed-off-by: Nicolas Graziano Signed-off-by: Takashi Iwai commit d827560c96346e0b8b02c1000cc347d73488c818 Author: Takashi Iwai Date: Fri Jul 29 11:56:41 2005 +0200 [ALSA] hda-codec - Add default config for ASUS P5AD2 HDA Codec driver Added the default config for ASUS P5AD2. Signed-off-by: Takashi Iwai commit cb8e2f83851ff17b1b361644e82420a923fbc318 Author: Takashi Iwai Date: Fri Jul 29 11:54:32 2005 +0200 [ALSA] hda-codec - Fix reordering of surround channels HDA Codec driver - Fixed the reordering of surround channels. Originally reported by Nicolas GRAZIANO . - Show the selected ssid when debug option is set. Signed-off-by: Takashi Iwai commit 3998b70fd0ab40a276147a0f55816d383fcbeb54 Author: Liam Girdwood Date: Fri Jul 29 11:41:55 2005 +0200 [ALSA] WM97xx AC97 codec controls AC97 Codec o Enhanced current WM97xx support to provide additional controls and use the kcontrol suffix naming convention. o Added AC97_HAS_NO_MIC, AC97_HAS_NO_TONE and AC97_HAS_NO_STD_PCM. o Cleaned up WM97xx related comments. o Removed some wm9713 double mono controls and replaced with stereo controls. Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai commit d8971fcb702e24d1e22c77fd1772f182ffee87e3 Author: Stephen Hemminger Date: Mon Aug 29 22:51:28 2005 -0700 [INET]: compile errors when DEBUG is defined Fix build problem found by compiling driver with DEBUG defined that used tcp.h. Since pr_debug(arg) expands to printk("<7>" arg) the argument needs to be string that can be concatenated. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit d7ce78fd9a51ca0d6b9a8cf35baef884ddb9a95c Author: David S. Miller Date: Mon Aug 29 22:46:43 2005 -0700 [SPARC64]: Eliminate irq_cpustat_t. We can put the __softirq_pending mask in the cpudata, no need for the silly NR_CPUS array in kernel/softirq.c Signed-off-by: David S. Miller commit 7ef24b69f9ff4858d7242059fbb19477c10e6dd7 Author: Andrew Morton Date: Thu Aug 25 17:14:46 2005 -0700 [PATCH] s2io build fix Damir Perisa reports: drivers/net/s2io.h:765: error: invalid lvalue in assignment drivers/net/s2io.h:766: error: invalid lvalue in assignment That's a gcc4 error. I don't see why the casts are there anyway.. Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 8913ca1c9ccb5eb6471afd419159729eef6e2730 Author: David Gibson Date: Wed Jul 27 15:47:23 2005 +1000 [PATCH] Remove nested feature sections The {BEGIN,END}_FTR_SECTION asm macros used in ppc64 to nop out sections of code at runtime cannot be nested. However, we do nest them in hash_low.S. We get away with it there, because there is nothing between the BEGIN markers for each section. However, that's confusing to someone reading the code. This patch removes the nested ifset and ifclr feature sections, replacing them with a single feature section in the full mask/value form. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit a18ecf413ca9846becb760f7f990c2c62c15965e Author: Bob Moore Date: Mon Aug 15 03:42:00 2005 -0800 [ACPI] ACPICA 20050815 Implemented a full bytewise compare to determine if a table load request is attempting to load a duplicate table. The compare is performed if the table signatures and table lengths match. This will allow different tables with the same OEM Table ID and revision to be loaded. Although the BIOS is technically violating the ACPI spec when this happens -- it does happen -- so Linux must handle it. Signed-off-by: Robert Moore Signed-off-by: Len Brown commit 597f95e2bfbe9b83ed8b0761ebf4e7d55fd4df17 Author: Joel Schopp Date: Fri Aug 12 14:34:58 2005 -0500 [PATCH] ppc64: lparconfig.c memory leak This patch fixes a rare memory leak found by Coverity. Signed-off-by: Joel Schopp Signed-off-by: Paul Mackerras commit 5ff98ae18bec792d77bfea801aa4b3385b98b355 Author: Joel Schopp Date: Thu Aug 11 17:39:28 2005 -0500 [PATCH] ppc64: of_device.c remove useless code Coverity found more unused code. Signed-off-by: Joel Schopp Signed-off-by: Paul Mackerras commit 717522ff44f1fbee5ea09e83d7cd4b5c956e30f9 Author: Anton Blanchard Date: Wed Aug 24 08:53:03 2005 +1000 [PATCH] ppc64: Add CONFIG_HZ While ppc64 has the CONFIG_HZ Kconfig option, it wasnt actually being used. Connect it up and set all platforms to 250Hz. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 04ed65190a5d1562220dd3a7fc9eac2402c7104c Author: Jake Moilanen Date: Wed Aug 24 15:22:12 2005 -0500 [PATCH] oprofile PVR 970MP Here's the 970MP's PVR (processor version register) entry for oprofile. Signed-off-by: Jake Moilanen Signed-off-by: Paul Mackerras commit 7fea82ab1a74030f79a2adfac1af3d93b8638fc3 Author: Olof Johansson Date: Sun Aug 28 21:42:10 2005 -0500 [PATCH] PPC64: Don't try to claim memory from OF at 1GB mark Some RS64-based machines (p620, F80, others) have problems with firmware returning 0xdeadbeef instead of failure to allocations that end at the 1GB mark. We have two options: 1. Detect the undocumented 0xdeadbeef return value and interpret it as a failure. 2. Avoid allocating that high. (2) is really the cleaner solution here. 768MB is plenty of room so use that as the max alloc_top instead of 1GB. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit 6f9aa727433fe7647869c9b64ce2f7b5feac0052 Author: Stephen Rothwell Date: Mon Aug 29 14:08:11 2005 +1000 [PATCH] Move all the very similar files to asm-powerpc They differed in either simple comments or in the protecting ifdefs. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 88999ceb55bf959e63df0c911915166b005977fc Author: Stephen Rothwell Date: Mon Aug 29 14:06:56 2005 +1000 [PATCH] Move the identical files from include/asm-ppc{,64} Move the identical files from include/asm-ppc{,64}/ to include/asm-powerpc/. Remove hdreg.h completely as it is unused in the tree. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 45e2a6e4e5e22acd4321f69e84b726c2a568dacf Author: Stephen Rothwell Date: Mon Aug 29 13:15:50 2005 +1000 [PATCH] Create include/asm-powerpc The ppc and ppc64 trees are hopefully going to merge over time, so this patch begins the process by creating a place for the merging of the header files. Create include/asm-powerpc (and move linkage.h into it from asm-{ppc,ppc64} since we don't like empty directories). Modify the ppc and ppc64 Makefiles to cope. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit fb120da678c517f72d4b39932062c2191827b331 Author: Stephen Rothwell Date: Wed Aug 17 16:42:59 2005 +1000 [PATCH] Make MODULE_DEVICE_TABLE work for vio devices Make MODULE_DEVICE_TABLE work for vio devices. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 71d276d751ff5ddba28312aecefb174b20a5b970 Author: Stephen Rothwell Date: Wed Aug 17 16:41:44 2005 +1000 [PATCH] Create vio_bus_ops Create vio_bus_ops so that we just pass a structure to vio_bus_init instead of three separate function pointers. Rearrange vio.h to avoid forward references. vio.h only needs struct device_node from prom.h so remove the include and just declare it. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit b877b90f227fb9698d99fb70492d432362584082 Author: Stephen Rothwell Date: Wed Aug 17 16:40:12 2005 +1000 [PATCH] Create vio_register_device Take some assignments out of vio_register_device_common and rename it to vio_register_device. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 5c0b4b8759f78c31172088a91e10733fc014ccee Author: Stephen Rothwell Date: Wed Aug 17 16:37:35 2005 +1000 [PATCH] Formatting changes to vio.c Formatting changes to vio.c to bring it closer to the kernel coding standard. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 1e4a79e0458beca871c662028610ae3a88e3f1bf Author: Stephen Rothwell Date: Mon Aug 29 18:26:01 2005 +1000 [PATCH] fix iSeries build for gcc-3.4 gcc 3.4 (at least the build we are using) puts the gcc generated .ident string into a .note section at the end of the files it compiles (gcc 3.3.3-hammer and gcc 4.0.2 Debian puts it in the .text section). This means that the lparmap.s file we produce in the iSeries build may end with a .note section. When we include it into head.S, the assembler can no longer resolve some of the conditional branches since the target label ends up too far away. This patch just forces us back to the .text section after including lparmap.s. The breakage was caused by my patch "iSeries build with newer assemblers and compilers" (sha1-id: 2ad56496627630ebc99f06af5f81ca23e17e014e). Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 2739e8cf113ce6e931608986a28bab5a42c0acd9 Author: David Gibson Date: Tue Aug 30 12:54:07 2005 +1000 [PATCH] Restore lparmap.s include for iSeries A mistake rebasing the series of ppc64 head.S cleanup patches meant the #include of lparmap.s, needed for iSeries was lost. This patch puts it back again. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit b74d0bd53406c23636707565d87ddaa55d315b26 Author: Andrew Morton Date: Wed Aug 10 13:53:41 2005 +1000 [PATCH] ppc64: four level pagetables fix With CONFIG_HUGETLB_PAGE=n: In file included from kernel/sysctl.c:37: include/linux/hugetlb.h:104:1: warning: "hugetlb_free_pgd_range" redefined In file included from include/linux/mm.h:36, from kernel/sysctl.c:23: include/asm/pgtable.h:492:1: warning: this is the location of the previous definition Signed-off-by: Andrew Morton Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit d992895ba2b27cf5adf1ba0ad6d27662adc54c5e Author: Nick Piggin Date: Sun Aug 28 16:49:11 2005 +1000 [PATCH] Lazy page table copies in fork() Defer copying of ptes until fault time when it is possible to reconstruct the pte from backing store. Idea from Andi Kleen and Nick Piggin. Thanks to input from Rik van Riel and Linus and to Hugh for correcting my blundering. Ray Fucillo reports: "I applied this latest patch to a 2.6.12 kernel and found that it does resolve the problem. Prior to the patch on this machine, I was seeing about 23ms spent in fork for ever 100MB of shared memory segment. After applying the patch, fork is taking about 1ms regardless of the shared memory size." Signed-off-by: Nick Piggin Signed-off-by: Linus Torvalds commit c530cfb1ce1e8f230744c3f3bd86771f50725053 Author: Arnaldo Carvalho de Melo Date: Mon Aug 29 02:15:54 2005 -0300 [CCID3]: Call sk->sk_write_space(sk) when receiving a feedback packet This makes the send rate calculations behave way more closely to what is specified, with the jitter previously seen on x and x_recv disappearing completely on non lossy setups. This resembles the tcp_data_snd_check code, that possibly we'll end up using in DCCP as well, perhaps moving this code to inet_connection_sock. For now I'm doing the simplest implementation tho. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit a84ffe430342db6ee585a5038f3242a6b4112d69 Author: Arnaldo Carvalho de Melo Date: Sun Aug 28 04:51:32 2005 -0300 [DCCP]: Introduce DCCP_SOCKOPT_PACKET_SIZE So that applications can set dccp_sock->dccps_pkt_size, that in turn is used in the CCID3 half connection init routines to set ccid3hc[tr]x_s and use it in its rate calculations. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit e438befd76a5a743725a89365140a8a7bf276096 Author: Tony Luck Date: Mon Aug 29 16:13:36 2005 -0700 [IA64-SGI] One new use of "UNCACHED" needed fixing for sn2 region cleanup Some shub2 changes were not in the tree when Greg cleaned up the sn2 region definitions in 1b66776da71e33dff5edcc0b096ec3b7c40c75ad, so this one didn't get fixed. Signed-off-by: Tony Luck commit 0ac4f893f20ed524198da5ebf591fc0b9e2ced2f Author: Harald Welte Date: Sat Aug 27 22:37:30 2005 -0700 [NETFILTER6]: Add new ip6tables HOPLIMIT target This target allows users to modify the hoplimit header field of the IPv6 header. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 5f2c3b910744f68e1a507f027398f404b3feb5fb Author: Harald Welte Date: Sat Aug 27 22:37:03 2005 -0700 [NETFILTER]: Add new iptables TTL target This new iptables target allows manipulation of the TTL of an IPv4 packet. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 29e4f8b3c340c4b2a0c6dd197b985e03826afd13 Author: Arnaldo Carvalho de Melo Date: Sun Aug 28 02:00:28 2005 -0300 [CCID3]: Move ccid3_hc_rx_detect_loss to packet_history.c Renaming it to dccp_rx_hist_detect_loss. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 072ab6c68e3dd158b68d97eaff16734474d2f8f8 Author: Arnaldo Carvalho de Melo Date: Sun Aug 28 01:19:14 2005 -0300 [CCID3]: Move ccid3_hc_rx_add_hist to packet_history.c Renaming it to dccp_rx_hist_add_packet. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 36729c1a73c354a155db18d64d9e79b86c446fcf Author: Arnaldo Carvalho de Melo Date: Sun Aug 28 00:47:15 2005 -0300 [DCCP]: Move the calc_X routines to dccp_tfrc_lib Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 5cea0ddce56ff3406a81fbbab80ef45c65701673 Author: Arnaldo Carvalho de Melo Date: Sat Aug 27 23:50:46 2005 -0300 [DCCP]: Introduce dccp_tfrc_lib module with net/dccp/ccids/lib/*.c I'll now take a look at the other proposed TFRC DCCP CCIDs to find more code that is now in ccid3.c and move to this module, the loss event rate, calc_X, etc most probably will be moved there. The main goal of these changes is to pave the way for the implementation of more TFRC based DCCP CCIDs and to shrink ccid3.c, reducing its complexity and helping in getting it rock solid. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 4524b259541e1eea07020af825d8e7b0e4faaec5 Author: Arnaldo Carvalho de Melo Date: Sat Aug 27 23:18:26 2005 -0300 [DCCP]: Just move packet_history.[ch] to net/dccp/ccids/lib/ Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit ae6706f0678b89de07ad3b456893cc883584f711 Author: Arnaldo Carvalho de Melo Date: Sat Aug 27 23:03:09 2005 -0300 [CCID3]: Move the loss interval code to loss_interval.[ch] And put this into net/dccp/ccids/lib/, where packet_history.[ch] will also be moved and then we'll have a tfrc_lib.ko module that will be used by dccp_ccid3.ko and other CCIDs that are variations of TFRC (RFC 3448). Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit cfc3c525a3b434cabf92bf7054f2c6c93497fbea Author: Arnaldo Carvalho de Melo Date: Sat Aug 27 20:20:37 2005 -0300 [CCID3]: Move the CCID3 defines to ccid3.h Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 6b5e633ab1525b4def3f36b53903b00586e9966d Author: Arnaldo Carvalho de Melo Date: Sat Aug 27 20:11:28 2005 -0300 [CCID3]: Introduce usecs_div To avoid open coding this all over the place. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit b6ee3d4ada4e85d9b9b9164c1327ef0850c79d5e Author: Arnaldo Carvalho de Melo Date: Sat Aug 27 18:18:18 2005 -0300 [CCID3]: Reorganise timeval handling Introducing functions to add to or subtract from a timeval variable and renaming now_delta to timeval_new_delta that calls do_gettimeofday and then timeval_delta, that should be used when there are several deltas made relative to the current time or setting variables to it, so as to avoid calling do_gettimeofday excessively. I'm leaving these "timeval_" prefixed funcions internal to DCCP for a while till we're sure there are no subtle bugs in it. It also is more correct as it checks if the number of usecs added to or subtracted from a tv_usec field is more than 2 seconds. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 1f2333aea3269e196c44ae9a220e714cc1427792 Author: Arnaldo Carvalho de Melo Date: Sat Aug 27 03:51:58 2005 -0300 [CCID3]: Reflow to mostly fit under 80 columns No code changes. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit d6809c12b3334a929c39bf08ea63bd819e0500f7 Author: Arnaldo Carvalho de Melo Date: Sat Aug 27 03:06:35 2005 -0300 [DCCP]: Introduce dccp_wait_for_ccid and use it in dccp_write_xmit This is not quite what I think we should have long term but improves performance for now, so lets use it till we get CCID3 working well, then we can think about using sk_write_queue, perhaps using some ideas from Juwen Lai's old stack for 2.4.20. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 75b3f207b433dcb807fcf0f47de1c8398571ba5f Author: Arnaldo Carvalho de Melo Date: Sat Aug 27 02:35:30 2005 -0300 [DCCP]: Make the Debug Menu available when DCCP is statically linked too Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit ba89966c1984513f4f2cc0a6c182266be44ddd03 Author: Eric Dumazet Date: Fri Aug 26 12:05:31 2005 -0700 [NET]: use __read_mostly on kmem_cache_t , DEFINE_SNMP_STAT pointers This patch puts mostly read only data in the right section (read_mostly), to help sharing of these data between CPUS without memory ping pongs. On one of my production machine, tcp_statistics was sitting in a heavily modified cache line, so *every* SNMP update had to force a reload. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 29cb9f9c5502f6218cd3ea574efe46a5e55522d2 Author: David S. Miller Date: Thu Aug 25 16:23:11 2005 -0700 [LIB]: Make TEXTSEARCH_BM plain tristate like the others And select it when the relevant modules are enabled. Signed-off-by: David S. Miller commit 8082e4ed0a61da347f1c7f210493c4e9e55c8cd0 Author: Pablo Neira Ayuso Date: Thu Aug 25 16:12:22 2005 -0700 [LIB]: Boyer-Moore extension for textsearch infrastructure strike #2 Attached the implementation of the Boyer-Moore string search algorithm for the new textsearch infrastructure. I've added as well a note about the limitations that this approach presents, as Thomas has remarked. Signed-off-by: Pablo Neira Ayuso Signed-off-by: David S. Miller commit cf4ef01440ca5c6d96f2ea2b793a37a0a863a045 Author: Paul E. McKenney Date: Thu Aug 25 16:08:37 2005 -0700 [LIST]: Add docbook header comments for hlist_add_{before,after}_rcu() Signed-off-by: David S. Miller commit 57bf1451ac79640c5a0a4f31284c43539fac2903 Author: Alexey Dobriyan Date: Thu Aug 25 16:06:19 2005 -0700 [NET]: net/802: more endian annotations The rest of endian warnings now belongs to tr.c exclusively. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 73eef4cddb2738c4e8c5ef157ebb1b19d6c9272f Author: Michael Chan Date: Thu Aug 25 15:39:15 2005 -0700 [BNX2]: update version and minor fixes Update version and add 4 minor fixes, the last 2 were suggested by Jeff Garzik: 1. check for a valid ethernet address before setting it 2. zero out bp->regview if init_one encounters an error and unmaps the IO address. This prevents remove_one from unmapping again. 3. use netif_rx_schedule() instead of hand coding the same. 4. use IRQ_HANDLED and IRQ_NONE. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit c770a65cee7cc250d7bccd99fa55e742988ae4e0 Author: Michael Chan Date: Thu Aug 25 15:38:39 2005 -0700 [BNX2]: change irq locks to bh locks Change all locks from spin_lock_irqsave() to spin_lock_bh(). All places that require spinlocks are in BH context. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit e89bbf1049aac3625fdafe3657ed8d7d5373d351 Author: Michael Chan Date: Thu Aug 25 15:36:58 2005 -0700 [BNX2]: remove atomics in tx Remove atomic operations in the fast tx path. Expensive atomic operations were used to keep track of the number of available tx descriptors. The new code uses the difference between the consumer and producer index to determine the number of free tx descriptors. As suggested by Jeff Garzik, the name of the inline function is changed to all lower case. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit cd339a0ed61097d92ce03b6d1042b1e4d58535e7 Author: Michael Chan Date: Thu Aug 25 15:35:24 2005 -0700 [BNX2]: speedup serdes linkup This speeds up link-up time on 5706 SerDes if the link partner does not autoneg, a rather common scenario in blade servers. Some blade servers use IPMI for keyboard input and it's important to minimize link disruptions. The speedup is achieved by shortening the timer to (HZ / 3) during the transient period right after initiating a SerDes autoneg. If autoneg does not complete, parallel detect can be done sooner. After the transient period is over, the timer goes back to its normal HZ interval. As suggested by Jeff Garzik, the timer initialization is moved to bnx2_init_board() from bnx2_open(). An eeprom bit is also added to allow default forced SerDes speed for even faster link-up time. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit afdc08b9f9a7174d7912a160f657f39d46379b5e Author: Michael Chan Date: Thu Aug 25 15:34:29 2005 -0700 [BNX2]: Fix rtnl deadlock in bnx2_close This fixes an rtnl deadlock problem when flush_scheduled_work() is called from bnx2_close(). In rare cases, linkwatch_event() may be on the workqueue from a previous close of a different device and it will try to get the rtnl lock which is already held by dev_close(). The fix is to set a flag if we are in the reset task which is run from the workqueue. bnx2_close() will loop until the flag is cleared. As suggested by Jeff Garzik, the loop is changed to call msleep(1) instead of yield() in the original patch. flush_scheduled_work() is also moved to bnx2_remove_one() before the netdev is freed. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 2373ce1ca04dd46bf2b8b0f9a799eb2a90da92fb Author: Robert Olsson Date: Thu Aug 25 13:01:29 2005 -0700 [IPV4]: Convert FIB Trie to RCU. * Removes RW-lock * Proteced read functions uses rcu_dereference proteced with rcu_read_lock() * writing of procted pointer w. rcu_assigen_pointer * Insert/Replace atomic list_replace_rcu * A BUG_ON condition removed.in trie_rebalance With help from Paul E. McKenney. Signed-off-by: Robert Olsson Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit e5b4376074e02b783e56a8f7c42d544e18112c4e Author: Robert Olsson Date: Thu Aug 25 13:01:03 2005 -0700 [IPV4]: Prepare FIB core for RCU. * RCU versions of hlist_***_rcu * fib_alias partial rcu port just whats needed now. Signed-off-by: Robert Olsson Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 3625796806419d97641d90e0f197eab9b952212e Author: Ralf Baechle Date: Wed Aug 24 11:38:53 2005 -0700 [IPV4]: Module export of ip_rcv() no longer needed. With ip_rcv nowhere outside the IP stack being used anymore it's EXPORT_SYMBOL is not needed any longer either. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller commit c91326db013ddff478da8a8d66fb99ef4579f19a Author: Ralf Baechle Date: Wed Aug 24 11:37:45 2005 -0700 [AX25/NETROM/ROSE]: Kill net/ip.h inclusion All these are claiming to include to get ip_rcv() but in fact don't need the header at all, so away with the inclusion. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller commit 98a82febb6340466824c3a453738d4fbd05db81a Author: Ralf Baechle Date: Wed Aug 24 11:35:51 2005 -0700 [AX25/NETROM]: Cleanup direct calls into IP stack Get rid of the calls to ip_rcv and arp_rcv which were layering violations anyway. With those being replaced by netif_rx, less parts of AX.25 and relatives depend on INET support actually being enabled. This also will make PF_PACKET sockets work for IP and ARP packets received over AX.25 and for IP packets over NET/ROM. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller commit 0c7770c740156c8802c23d24fc094d06967d997d Author: Stephen Hemminger Date: Tue Aug 23 21:59:41 2005 -0700 [IPV4]: FIB trie cleanup This is a redo of earlier cleanup stuff: * replace DBG() macro with pr_debug() * get rid of duplicate extern's that are already in fib_lookup.h * use BUG_ON and WARN_ON * don't use BUG checks for null pointers where next statement would get a fault anyway * remove debug printout when rebalance causes deep tree * remove trailing blanks Signed-off-by: Stephen Hemminger Signed-off-by: Robert Olsson Signed-off-by: David S. Miller commit 331968bd0c1b2437f3ad773cbf55f2e0737bafc0 Author: Arnaldo Carvalho de Melo Date: Tue Aug 23 21:54:23 2005 -0700 [DCCP]: Initial dccp_poll implementation Tested with a patched netcat, no horror stories so far 8) Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 8efa544f9c84919c047dc2f96e308c902e8fb1a4 Author: Arnaldo Carvalho de Melo Date: Tue Aug 23 21:54:00 2005 -0700 [DCCP]: Call the HC exit routines at dccp_v4_destroy_sock Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit dc40c7bc76054f5e4382835ca2bafb895b993a8a Author: Arnaldo Carvalho de Melo Date: Tue Aug 23 21:52:58 2005 -0700 [ICSK]: Generalise tcp_listen_poll Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 2babe1f6fea717c36c008c878fe095d1ca5696c1 Author: Arnaldo Carvalho de Melo Date: Tue Aug 23 21:52:35 2005 -0700 [DCCP]: Introduce dccp_get_info And also hc_tx and hc_rx get_info functions for the CCIDs to fill in information that is specific to them. For now reusing struct tcp_info, later I'll try to figure out a better solution, for now its really nice to get this kind of info: [root@qemu ~]# ./ss -danemi State Recv-Q Send-Q Local Addr:Port Peer Addr:Port LISTEN 0 0 *:5001 *:* ino:628 sk:c1340040 mem:(r0,w0,f0,t0) cwnd:0 ssthresh:0 ESTAB 0 0 172.20.0.2:5001 172.20.0.1:32785 ino:629 sk:c13409a0 mem:(r0,w0,f0,t0) ts rto:1000 rtt:0.004/0 cwnd:0 ssthresh:0 rcv_rtt:61.377 This, for instance, shows that we're not congestion controlling ACKs, as the above output is in the ttcp receiving host, and ttcp is a one way app, i.e. the received never calls sendmsg, so ccid_hc_tx_send_packet is never called, so the TX half connection stays in TFRC_SSTATE_NO_SENT state and hctx_rtt is never calculated, stays with the value set in ccid3_hc_tx_init, 4us, as show above in milliseconds (0.004ms), upcoming patches will fix this. rcv_rtt seems sane tho, matching ping results :-) Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 4fded33b3e8177d1d2eec0ccc69af8dfe8b4c3c3 Author: Arnaldo Carvalho de Melo Date: Tue Aug 23 21:51:59 2005 -0700 [CCID3]: Calculate the RTT in the RX half connection Using TIMESTAMP_ECHO and ELAPSED_TIME options received. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit d4b81ff70547b40c9b0742b163e8354560003cc0 Author: Arnaldo Carvalho de Melo Date: Tue Aug 23 21:51:36 2005 -0700 [DCCP]: Export dccp_insert_option_timestamp to CCIDs And don't insert a TIMESTAMP option in all packets, leave the decision to the CCIDs. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 012e13eac7579fcc7618df4ca1d5af3cdc03748c Author: Arnaldo Carvalho de Melo Date: Tue Aug 23 21:51:13 2005 -0700 [CCID]: Make ccid_hc_[rt]x_exit accept NULL arguments Just like kfree, etc it will just not call the CCID exit routines when the private data area is set to NULL. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit a4beb1b64f5846e216bf2c439022df480151902a Author: Arnaldo Carvalho de Melo Date: Tue Aug 23 21:50:45 2005 -0700 [DCCP]: Send a DATAACK packet when we have a TIMESTAMP_ECHO pending Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 20472af986569b0615bd77f0fd7ca9e3d33e9895 Author: Arnaldo Carvalho de Melo Date: Tue Aug 23 21:50:21 2005 -0700 [DCCP]: Fix skb leak in dccp_sendmsg Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 7ad07e7cf343181002c10c39d3f57a88e4903d4f Author: Arnaldo Carvalho de Melo Date: Tue Aug 23 21:50:06 2005 -0700 [DCCP]: Implement the CLOSING timer So that we retransmit CLOSE/CLOSEREQ packets till they elicit an answer or we hit a timeout. Most of the machinery uses TCP approaches, this code has to be polished & audited, but this is better than we had before. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 58e45131dc269eff0983c6d44494f9e687686900 Author: David S. Miller Date: Sun Aug 21 23:46:01 2005 -0700 [DCCP]: Fix printf format warnings on 64-bit. Signed-off-by: David S. Miller commit 05465343bf74e00c8c2c5a310740157de3149f27 Author: Patrick McHardy Date: Sun Aug 21 23:31:43 2005 -0700 [NETFILTER]: Add goto target Originally written by Henrik Nordstrom , taken from netfilter patch-o-matic and added ip6_tables support. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 764d8a9f240729534a1d8a0ffd39e722cf5cc5af Author: Patrick McHardy Date: Sun Aug 21 23:31:06 2005 -0700 [NETFILTER]: Add IPv6 REJECT target Originally written by Yasuyuki Kozakai , taken from netfilter patch-o-matic and fixed up to work with current kernels. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 7567662ba896ee0c33d6215f32e2011488a6d1bf Author: Pablo Neira Ayuso Date: Sun Aug 21 23:30:34 2005 -0700 [NETFILTER]: Add string match Signed-off-by: Pablo Neira Ayuso Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 24117727b753426d85ba09671c24854834f81b2c Author: Arnaldo Carvalho de Melo Date: Sun Aug 21 05:40:16 2005 -0300 [DCCP]: Fix ackno setting in SYNC/SYNCACK packets Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 03ace394ac9bcad38043a381ae5f4860b9c9fa1c Author: Arnaldo Carvalho de Melo Date: Sun Aug 21 05:36:45 2005 -0300 [DCCP]: Fix the ACK and SEQ window variables settings This is from a first audit, more eyeballs are more than welcome. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit a3054d48b9b9d6290eccc9fc09c286ef450d9b1d Author: Arnaldo Carvalho de Melo Date: Sun Aug 21 05:35:18 2005 -0300 [DCCP]: Give more info on Step 6 failure debug printk Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 2807d4ffb0dccb8f932c3e1701b6b6163153d333 Author: Arnaldo Carvalho de Melo Date: Sun Aug 21 05:33:48 2005 -0300 [DCCP]: Fix seqno setting in dccp_v4_ctl_send_reset Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit c68e64cfb5ac675b002215b5659146b73d2e9d5d Author: Arnaldo Carvalho de Melo Date: Sun Aug 21 05:07:37 2005 -0300 [CCID3]: Reintroduce ccid3hctx_t_rto CCID3 keeps this variable in usecs, inet_connection_socks in jiffies, so to avoid Mars orbiter losses lets reintroduce ccid3hctx_t_rto 8) Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 33d043d65bbd3d97efca96c9bbada443cac3c4da Author: Thomas Graf Date: Sat Aug 20 17:27:34 2005 -0700 [IPV4]: ip_finish_output() can be inlined Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 9070683bdac59a3b26e2ce6dd0d05fbfcb3fc7d8 Author: Thomas Graf Date: Sat Aug 20 17:27:09 2005 -0700 [IPV4]: Remove some dead code from ip_forward() Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 3e192beaf5ef260a31e84a12c0a04eff2eec02ab Author: Thomas Graf Date: Sat Aug 20 17:26:30 2005 -0700 [IPV4]: Avoid common branch mispredictions in ip_rcv_finish() Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit d245407e758b14c464c609b632873f85709360c7 Author: Thomas Graf Date: Sat Aug 20 17:26:12 2005 -0700 [IPV4]: Move ip options parsing out of ip_rcv_finish() Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit e9c604227391308b185aa6b14c7f93b0a0c2e51b Author: Thomas Graf Date: Sat Aug 20 17:25:52 2005 -0700 [IPV4]: Avoid common branch misprediction while checking csum in ip_rcv() Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 58615242417638794a5ba299c49e3fbd6f47c2a3 Author: Thomas Graf Date: Sat Aug 20 17:25:29 2005 -0700 [IPV4]: Consistency and whitespace cleanup of ip_rcv() Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 2c656491e9ce77e12337073973794c4be467a489 Author: Thomas Graf Date: Sat Aug 20 17:24:25 2005 -0700 [NET]: Fix ipl=>ihl typo in ip_fast_csum Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit a6f9a70578b981321b63786ac8015f17cca4fcbd Author: Jon Wetzel Date: Sat Aug 20 17:15:54 2005 -0700 [NET]: Add support for getting the permanent hardware address. This patch adds a new field to net device to hold the permanent hardware address, and adds a new generic ethtool_op function to get that address. Signed-off-by: Jon Wetzel Signed-off-by: John W. Linville Signed-off-by: David S. Miller commit 8cd25c1fcfbf6460983e99091d278187421c1a1d Author: Adrian Bunk Date: Sat Aug 20 17:14:11 2005 -0700 [NET]: fix PROC_FS=n compile Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 1bc0986957b63a2fbbc46ab95d3d1d72830bda83 Author: Ian McDonald Date: Sat Aug 20 00:23:43 2005 -0300 [DCCP]: Fix the timestamp options This changes timestamp, timestamp echo, and elapsed time to use units of 10 usecs as per DCCP spec. This has been tested to verify that times are correct. Also fixed up length and used hton/ntoh more. Still to add in later patches: - actually use elapsed time to adjust RTT (commented out as was prior to this patch) - send options at times more closely following the spec (content is now correct) Signed-off-by: Ian McDonald Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit bf0ff9e578ba7dd8331005f00ad7310122011f43 Author: David S. Miller Date: Fri Aug 19 16:37:30 2005 -0700 [IPVS]: ipv4_table --> ipvs_ipv4_table Fix conflict with symbol of same name in global namespace. Signed-off-by: David S. Miller commit c59eab4637dbc3f832503be4ccb9213b0f323d92 Author: Arnaldo Carvalho de Melo Date: Thu Aug 18 21:12:02 2005 -0300 [DCCP]: Use LIMIT_NETDEBUG in some debugging printks Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 5480855bfbc125f34d9b752689bb9a64da7e1fc6 Author: Arnaldo Carvalho de Melo Date: Thu Aug 18 20:47:02 2005 -0300 [DCCP]: Set dccp_ctl_socket to NULL in dccp_ctl_sock_exit Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit b1c9fe7b818acbd36dc908c5c1ad4cab34c67b39 Author: Ian McDonald Date: Thu Aug 18 20:45:29 2005 -0300 [DCCP]: Fix elapsed time option as per section 13.2 of spec v11 The elapsed time can be two bytes or four bytes only. Signed-off-by: Ian McDonald Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit d179cd12928443f3ec29cfbc3567439644bd0afc Author: David S. Miller Date: Wed Aug 17 14:57:30 2005 -0700 [NET]: Implement SKB fast cloning. Protocols that make extensive use of SKB cloning, for example TCP, eat at least 2 allocations per packet sent as a result. To cut the kmalloc() count in half, we implement a pre-allocation scheme wherein we allocate 2 sk_buff objects in advance, then use a simple reference count to free up the memory at the correct time. Based upon an initial patch by Thomas Graf and suggestions from Herbert Xu. Signed-off-by: David S. Miller commit e92ae93a8aa66aea12935420cb22d4df1c18d023 Author: Arnaldo Carvalho de Melo Date: Wed Aug 17 03:10:59 2005 -0300 [DCCP]: Send SYNCACK packets in response to SYNC packets Also fix step 6 when receiving SYNC or SYNCACK packets, i.e. we were not using the updated swl. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit ba602a816132dcc66e875dddf2c62512a9f6f8cb Author: David S. Miller Date: Tue Aug 16 20:50:16 2005 -0700 [IPVS]: Rename tcp_{init,exit}() --> ip_vs_tcp_{init,exit}() Conflicts with global namespace functions with the same name. Signed-off-by: David S. Miller commit bf73d1c5d726ac717755efc7e15d2a86dd383448 Author: Adrian Bunk Date: Tue Aug 16 20:45:45 2005 -0700 [IRDA]: Possible cleanups. This patch contains the following possible cleanups: - make the following needlessly global function static: - irnet/irnet_ppp.c: irnet_init - remove the following unneeded EXPORT_SYMBOL's: - irlmp.c: sysctl_discovery_timeout - irlmp.c: irlmp_reasons - irlmp.c: irlmp_dup - irqueue.c: hashbin_find_next Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 4c6ea29d82e0d1b9b37e6b879e0a7fd6c409333d Author: Arnaldo Carvalho de Melo Date: Tue Aug 16 19:46:48 2005 -0300 [IP]: Introduce ip_options_get_from_user This variant is needed to satisfy sparse __user annotations. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 6ed8a48582c08432e84e5610564c1d25fe00dd7f Author: Arnaldo Carvalho de Melo Date: Tue Aug 16 19:02:15 2005 -0300 [NETLINK]: Fix sparse warnings Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 20380731bc2897f2952ae055420972ded4cd786e Author: Arnaldo Carvalho de Melo Date: Tue Aug 16 02:18:02 2005 -0300 [NET]: Fix sparse warnings Of this type, mostly: CHECK net/ipv6/netfilter.c net/ipv6/netfilter.c:96:12: warning: symbol 'ipv6_netfilter_init' was not declared. Should it be static? net/ipv6/netfilter.c:101:6: warning: symbol 'ipv6_netfilter_fini' was not declared. Should it be static? Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 9deff7f2365958c5c5aa8cb5a0dd651c4dd83f8f Author: Andrew Morton Date: Mon Aug 15 21:13:25 2005 -0700 [RXRPC]: Fix build failure introduced by skb->stamp changes. Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 63a1222b1fd79c52491c14534b086bffbfaed8bf Author: Andrew Morton Date: Mon Aug 15 20:35:44 2005 -0700 [DECNET]: Fix build after netlink changes. Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 216efaaaa006d2f3ecbb5bbc2b6673423813254e Author: James Morris Date: Mon Aug 15 20:34:48 2005 -0700 [SELINUX]: Update for tcp_diag rename to inet_diag. Also, support dccp sockets. Signed-off-by: James Morris Signed-off-by: David S. Miller commit 066286071d3542243baa68166acb779187c848b3 Author: Patrick McHardy Date: Mon Aug 15 12:33:26 2005 -0700 [NETLINK]: Add "groups" argument to netlink_kernel_create Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 9a4595bc7e67962f13232ee55a64e063062c3a99 Author: Patrick McHardy Date: Mon Aug 15 12:32:15 2005 -0700 [NETLINK]: Add set/getsockopt options to support more than 32 groups NETLINK_ADD_MEMBERSHIP/NETLINK_DROP_MEMBERSHIP are used to join/leave groups, NETLINK_PKTINFO is used to enable nl_pktinfo control messages for received packets to get the extended destination group number. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit f7fa9b10edbb9391bdd4ec8e8b3d621d0664b198 Author: Patrick McHardy Date: Mon Aug 15 12:29:13 2005 -0700 [NETLINK]: Support dynamic number of multicast groups per netlink family Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit ab33a1711cf60bfb562b1ab89ac9f23d1425e8b1 Author: Patrick McHardy Date: Sun Aug 14 19:31:36 2005 -0700 [NETLINK]: Return -EPROTONOSUPPORT in netlink_create() if no kernel socket is registered This is necessary for dynamic number of netlink groups to make sure we know the number of possible groups before bind() is called. With this change pure userspace communication using unused netlink protocols becomes impossible. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit ac6d439d2097b72ea0cbc2322ce1263a38bc1fd0 Author: Patrick McHardy Date: Sun Aug 14 19:29:52 2005 -0700 [NETLINK]: Convert netlink users to use group numbers instead of bitmasks Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit d629b836d151d43332492651dd841d32e57ebe3b Author: Patrick McHardy Date: Sun Aug 14 19:27:50 2005 -0700 [NETLINK]: Use group numbers instead of bitmasks internally Using the group number allows increasing the number of groups without beeing limited by the size of the bitmask. It introduces one limitation for netlink users: messages can't be broadcasted to multiple groups anymore, however this feature was never used inside the kernel. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 77247bbb3094246be9d057e7be442cc708f123a8 Author: Patrick McHardy Date: Sun Aug 14 19:27:13 2005 -0700 [NETLINK]: Fix module refcounting problems Use-after-free: the struct proto_ops containing the module pointer is freed when a socket with pid=0 is released, which besides for kernel sockets is true for all unbound sockets. Module refcount leak: when the kernel socket is closed before all user sockets have been closed the proto_ops struct for this family is replaced by the generic one and the module refcount can't be dropped. The second problem can't be solved cleanly using module refcounting in the generic socket code, so this patch adds explicit refcounting to netlink_create/netlink_release. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit db080529798b497eb5a37b92a25e966be5a7dd5d Author: Patrick McHardy Date: Sun Aug 14 19:26:34 2005 -0700 [NETLINK]: Remove unused groups member from struct netlink_skb_parms Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 43e943c32b9213b5d25407b281c94aaa474fd9a6 Author: Patrick McHardy Date: Sun Aug 14 19:25:47 2005 -0700 [NETLINK]: Fix missing dst_groups initializations in netlink_broadcast users netlink_broadcast users must initialize NETLINK_CB(skb).dst_groups to the destination group mask for netlink_recvmsg. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit ad93e266a17c6f606e96304c866eb73665ae34fa Author: Evgeniy Polyakov Date: Sun Aug 14 19:24:58 2005 -0700 [NETLINK]: w1_int.c: fix default netlink group w1 does not need to multicast its state to several groups at once, and upcoming netlink changes will not allow bitmask for groups anyway. Signed-off-by: Evgeniy Polyakov Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 7de76272b54e3677bcd247d1e1809015236a298d Author: David S. Miller Date: Sun Aug 14 18:01:08 2005 -0700 [IPX]: Fix build error in ipx_recvmsg() Missing semicolon introduced by skb->stamp changeset: d3258b7d8ed96f97032639bc745179f1951b0da5 Signed-off-by: David S. Miller commit a10cedd4b905236603c6c4fd77cf338ebbfb1a60 Author: Patrick McHardy Date: Sun Aug 14 21:05:53 2005 -0300 [DCCP]: Fix compiler warnings may be a false warning if there always is something on ccid3hcrx_hist: net/dccp/ccids/ccid3.c: In function 'ccid3_hc_rx_packet_recv': net/dccp/ccids/ccid3.c:1634: warning: 'tstamp.tv_usec' may be used uninitialized in this function net/dccp/ccids/ccid3.c:1634: warning: 'tstamp.tv_sec' may be used uninitialized in this function const on inline functions doesn't have any effect: net/dccp/dccp.h:64: warning: type qualifiers ignored on function return type net/dccp/dccp.h:70: warning: type qualifiers ignored on function return type net/dccp/dccp.h:76: warning: type qualifiers ignored on function return type Signed-off-by: Patrick McHardy Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit a1d3a35518779df0579dd9de0121354b49c68ddc Author: Arnaldo Carvalho de Melo Date: Sat Aug 13 22:42:25 2005 -0300 [DCCP]: Fix sparse warnings Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 8649b0d4166e6e80ffa298e75abd8f2afdd491a6 Author: Arnaldo Carvalho de Melo Date: Sat Aug 13 20:36:01 2005 -0300 [DCCP]: Fix RESET handling in dccp_rcv_state_process To avoid holding TIMEWAIT state for sockets in the LISTEN state. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 725ba8eee3881e619c8e5a0116f1bdb6480ac2d9 Author: Arnaldo Carvalho de Melo Date: Sat Aug 13 20:35:39 2005 -0300 [DCCP]: Introduce the DCCP Kernel hacking menu Only available if CONFIG_DEBUG_KERNEL is enabled in the "Kernel Hacking" Menu. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 531669a0a9041d60d13920973ef8aa4f743c14a0 Author: Arnaldo Carvalho de Melo Date: Sat Aug 13 20:35:17 2005 -0300 [DCCP]: Rewrite dccp_sendmsg to be more like UDP Based on discussions with Nishida-san. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 7690af3fff7633e40b1b9950eb8489129251d074 Author: Arnaldo Carvalho de Melo Date: Sat Aug 13 20:34:54 2005 -0300 [DCCP]: Just reflow the source code to fit in 80 columns Andrew Morton should be happy now 8) Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit c173437669967301facff151bfeb7bae67354e4c Author: Arnaldo Carvalho de Melo Date: Sat Aug 13 20:34:23 2005 -0300 [PACKET_HISTORY]: Add dccphtx_rtt and rename the win_count fields As requested by Ian. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Ian McDonald Signed-off-by: David S. Miller commit 34b4a4a624bafe089107966a6c56d2a1aca026d4 Author: Christoph Hellwig Date: Sun Aug 14 17:33:59 2005 -0700 [NETFILTER]: Remove tasklist_lock abuse in ipt{,6}owner Rip out cmd/sid/pid matching since its unfixable broken and stands in the way of locking changes to tasklist_lock. Signed-off-by: Christoph Hellwig Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 000efe1d86620244b8e017429e57fab4170ab05a Author: Gary Wayne Smith Date: Sun Aug 14 17:33:24 2005 -0700 [NETFILTER]: Make NETMAP target usable in OUTPUT Signed-off-by: Gary Wayne Smith Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 9baa5c67ff4ce57b6b9f68c90714a1bb876fccd7 Author: Patrick McHardy Date: Sun Aug 14 17:32:50 2005 -0700 [NETFILTER]: Don't exclude local packets from MASQUERADING Increases consistency in source-address selection. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit fb13ab2849074244a51ae5147483610529a29ced Author: Domen Puncer Date: Sun Aug 14 17:32:05 2005 -0700 [NETFILTER]: Remove two unused files Signed-off-by: Domen Puncer Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit a61bbcf28a8cb0ba56f8193d512f7222e711a294 Author: Patrick McHardy Date: Sun Aug 14 17:24:31 2005 -0700 [NET]: Store skb->timestamp as offset to a base timestamp Reduces skb size by 8 bytes on 64-bit. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 25ed891019b84498c83903ecf53df7ce35e9cff6 Author: Patrick McHardy Date: Sat Aug 13 13:58:21 2005 -0700 [NETFILTER]: Nicer names for ipt_connbytes constants Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 8ffde671730df0b392ca478643b88ef7153244c0 Author: Patrick McHardy Date: Sat Aug 13 13:57:58 2005 -0700 [NETFILTER]: Fix div64_64 in ipt_connbytes Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 9d810fd2d28a9d672eca3136476af1a54a380bb2 Author: Harald Welte Date: Sat Aug 13 13:56:26 2005 -0700 [NETFILTER]: Add new iptables "connbytes" match This patch ads a new "connbytes" match that utilizes the CONFIG_NF_CT_ACCT per-connection byte and packet counters. Using it you can do things like packet classification on average packet size within a connection. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 0ba2c6e8c0fb5cde5a23a213c2e7cb851b85c310 Author: Harald Welte Date: Sat Aug 13 13:55:44 2005 -0700 [NETFILTER]: introduce and use aligned_u64 data type As proposed by Andi Kleen, this is required esp. for x86_64 architecture, where 64bit code needs 8byte aligned 64bit data types, but 32bit userspace apps will only align to 4bytes. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 17b085eacef81a6286bd478f2ec75e04abb091cb Author: Arnaldo Carvalho de Melo Date: Fri Aug 12 12:59:17 2005 -0300 [INET_DIAG]: Move the tcp_diag interface to the proper place With this the previous setup is back, i.e. tcp_diag can be built as a module, as dccp_diag and both share the infrastructure available in inet_diag. If one selects CONFIG_INET_DIAG as module CONFIG_INET_TCP_DIAG will also be built as a module, as will CONFIG_INET_DCCP_DIAG, if CONFIG_IP_DCCP was selected static or as a module, if CONFIG_INET_DIAG is y, being statically linked CONFIG_INET_TCP_DIAG will follow suit and CONFIG_INET_DCCP_DIAG will be built in the same manner as CONFIG_IP_DCCP. Now to aim at UDP, converting it to use inet_hashinfo, so that we can use iproute2 for UDP sockets as well. Ah, just to show an example of this new infrastructure working for DCCP :-) [root@qemu ~]# ./ss -dane State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 0 *:5001 *:* ino:942 sk:cfd503a0 ESTAB 0 0 127.0.0.1:5001 127.0.0.1:32770 ino:943 sk:cfd50a60 ESTAB 0 0 127.0.0.1:32770 127.0.0.1:5001 ino:947 sk:cfd50700 TIME-WAIT 0 0 127.0.0.1:32769 127.0.0.1:5001 timer:(timewait,3.430ms,0) ino:0 sk:cf209620 Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit a8c2190ee7da1a1dc68ff1a6b5f03feb61e523a5 Author: Arnaldo Carvalho de Melo Date: Fri Aug 12 12:56:38 2005 -0300 [INET_DIAG]: Rename tcp_diag.[ch] to inet_diag.[ch] Next changeset will introduce net/ipv4/tcp_diag.c, moving the code that was put transitioanlly in inet_diag.c. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 73c1f4a033675f168df7e98bbeeafca3c644b8a6 Author: Arnaldo Carvalho de Melo Date: Fri Aug 12 12:51:49 2005 -0300 [TCPDIAG]: Just rename everything to inet_diag Next changeset will rename tcp_diag.[ch] to inet_diag.[ch]. I'm taking this longer route so as to easy review, making clear the changes made all along the way. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 4f5736c4c7cf6f9bd8db82b712cfdd51c87e06b9 Author: Arnaldo Carvalho de Melo Date: Fri Aug 12 09:27:49 2005 -0300 [TCPDIAG]: Introduce inet_diag_{register,unregister} Next changeset will rename tcp_diag to inet_diag and move the tcp_diag code out of it and into a new tcp_diag.c, similar to the net/dccp/diag.c introduced in this changeset, completing the transition to a generic inet_diag infrastructure. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 5324a040ccc708998e61ea93e669b81312f0ae11 Author: Arnaldo Carvalho de Melo Date: Fri Aug 12 09:26:18 2005 -0300 [INET6_HASHTABLES]: Move inet6_lookup functions to net/ipv6/inet6_hashtables.c Doing this we allow tcp_diag to support IPV6 even if tcp_diag is compiled statically and IPV6 is compiled as a module, removing the previous restriction while not building any IPV6 code if it is not selected. Now to work on the tcpdiag_register infrastructure and then to rename the whole thing to inetdiag, reflecting its by then completely generic nature. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 505cbfc577f3fa778005e2800b869eca25727d5f Author: Arnaldo Carvalho de Melo Date: Fri Aug 12 09:19:38 2005 -0300 [IPV6]: Generalise the tcp_v6_lookup routines In the same way as was done with the v4 counterparts, this will be moved to inet6_hashtables.c. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit b766b305d3f2d8be173e5d9853534ea1afdbabba Author: Harald Welte Date: Fri Aug 12 11:36:44 2005 -0700 [NETFILTER]: Fix gcc-3.4.x warning about iplicit operator precedence Fix gcc-3.4.x warning about iplicit operator precedence in NF_QUEUE_NR() Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 0a242efc4fb859b2da506cdf8f3366231602e4ff Author: Denis Vlasenko Date: Thu Aug 11 15:32:53 2005 -0700 [NET]: Deinline netif_carrier_{on,off}(). # grep -r 'netif_carrier_o[nf]' linux-2.6.12 | wc -l 246 # size vmlinux.org vmlinux.carrier text data bss dec hex filename 4339634 1054414 259296 5653344 564360 vmlinux.org 4337710 1054414 259296 5651420 563bdc vmlinux.carrier And this ain't an allyesconfig kernel! Signed-off-by: David S. Miller commit 5917ed961def82a4dba9198d11a75f79d115a8cb Author: Harald Welte Date: Thu Aug 11 15:31:15 2005 -0700 [NETFILTER]: Fix NF_QUEUE_NR() macro I obviously wanted to use bitwise-or, not logical or. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 622439270c74f3ad4f69d1417aca4bb3b79514f4 Author: Harald Welte Date: Thu Aug 11 15:30:45 2005 -0700 [NETFILTER]: Fix compilation when no PROC_FS enabled Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit e41aac41e3856c87fee52c5b8bca71705d15449b Author: Arnaldo Carvalho de Melo Date: Thu Aug 11 14:37:16 2005 -0700 [TCPDIAG]: Introduce CONFIG_IP_TCPDIAG_DCCP Similar to CONFIG_IP_TCPDIAG_IPV6 Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 14ab9b867aa6c107b4886bdc5b23f277ab10792e Author: Peter Hagervall Date: Wed Aug 10 14:18:16 2005 -0700 [BNX2]: Possible sparse fixes, take two This patch contains the following possible cleanups/fixes: - use C99 struct initializers - make a few arrays and structs static - remove a few uses of literal 0 as NULL pointer - use convenience function instead of cast+dereference in bnx2_ioctl() - remove superfluous casts to u8 * in calls to readl/writel Signed-off-by: Peter Hagervall Acked-by: Michael Chan Signed-off-by: David S. Miller commit 07dc3f0718d2c88c3094a0aadeeb4744effc5439 Author: Benjamin LaHaise Date: Wed Aug 10 14:16:04 2005 -0700 [NET]: Make use of ->private_data in sockfd_lookup Please consider the patch below which makes use of file->private_data to store the pointer to the socket, which avoids touching several unused cachelines in the dentry and inode in sockfd_lookup. Signed-off-by: Benjamin LaHaise Signed-off-by: David S. Miller commit cef07fd6029c20f95571d09cefce45ee3276a920 Author: Arnaldo Carvalho de Melo Date: Wed Aug 10 13:29:27 2005 -0300 [CCID3]: Ditch USEC_IN_SEC as time.h has USEC_PER_SEC That is equivalent, no need to have a private one. Signed-off-by: Arnaldo Carvalho de Melo commit 8c60f3fab55712f23f2bd557ceedfbb00c649f37 Author: Arnaldo Carvalho de Melo Date: Wed Aug 10 12:59:38 2005 -0300 [CCID3]: Separate most of the packet history code This also changes the list_for_each_entry_safe_continue behaviour to match its kerneldoc comment, that is, to start after the pos passed. Also adds several helper functions from previously open coded fragments, making the code more clear. Signed-off-by: Arnaldo Carvalho de Melo commit 540722ffc3a0d7e11d97a13e1ce6f3bc23b061c1 Author: Arnaldo Carvalho de Melo Date: Wed Aug 10 05:54:28 2005 -0300 [TCPDIAG]: Implement cheapest way of supporting DCCPDIAG_GETSOCK With ugly ifdefs, etc, but this actually: 1. keeps the existing ABI, i.e. no need to recompile the iproute2 utilities if not interested in DCCP. 2. Provides all the tcp_diag functionality in DCCP, with just a small patch that makes iproute2 support DCCP. Of course I'll get this cleaned-up in time, but for now I think its OK to be this way to quickly get this functionality. iproute2-ss050808 patch at: http://vger.kernel.org/~acme/iproute2-ss050808.dccp.patch Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 6687e988d9aeaccad6774e6a8304f681f3ec0a03 Author: Arnaldo Carvalho de Melo Date: Wed Aug 10 04:03:31 2005 -0300 [ICSK]: Move TCP congestion avoidance members to icsk This changeset basically moves tcp_sk()->{ca_ops,ca_state,etc} to inet_csk(), minimal renaming/moving done in this changeset to ease review. Most of it is just changes of struct tcp_sock * to struct sock * parameters. With this we move to a state closer to two interesting goals: 1. Generalisation of net/ipv4/tcp_diag.c, becoming inet_diag.c, being used for any INET transport protocol that has struct inet_hashinfo and are derived from struct inet_connection_sock. Keeps the userspace API, that will just not display DCCP sockets, while newer versions of tools can support DCCP. 2. INET generic transport pluggable Congestion Avoidance infrastructure, using the current TCP CA infrastructure with DCCP. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 64ce207306debd7157f47282be94770407bec01c Author: Patrick McHardy Date: Tue Aug 9 20:50:53 2005 -0700 [NET]: Make NETDEBUG pure printk wrappers Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 64cf1e5d8b5f88d56509260e08fa0d8314277350 Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 20:45:21 2005 -0700 [DCCP]: Finish the TIMEWAIT minisock support Using most of the infrastructure TCP uses, with a dccp_death_row, etc. As per my current interpretation of the draft what we have with this changeset seems to be all we need (or very close to it 8)). Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 696ab2d3bffc746fb8cf3712f066d42b9886aeed Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 20:45:03 2005 -0700 [TIMEWAIT]: Move inet_timewait_death_row routines to net/ipv4/inet_timewait_sock.c Also export the ones that will be used in the next changeset, when DCCP uses this infrastructure. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 295ff7edb8f72b77d524759266f7524deae379b3 Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 20:44:40 2005 -0700 [TIMEWAIT]: Introduce inet_timewait_death_row That groups all of the tables and variables associated to the TCP timewait schedulling/recycling/killing code, that now can be isolated from the TCP specific code and used by other transport protocols, such as DCCP. Next changeset will move this code to net/ipv4/inet_timewait_sock.c Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 0b4e03bf0bc43ad6250a1e2fa25fc3eb2b028977 Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 20:31:11 2005 -0700 [DCCP]: Initialize icsk_rto in dccp_v4_init_sock Fixes nasty bug related to the retransmit timer (yeah, DCCP does retransmits) firing too early. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 27258ee54f8cd4a43d09319aa5448145afc2cb8d Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 20:30:56 2005 -0700 [DCCP]: Introduce dccp_write_xmit from code in dccp_sendmsg This way it gets closer to the TCP flow, where congestion window checks are done, it seems we can map ccid_hc_tx_send_packet in dccp_write_xmit to tcp_snd_wnd_test in tcp_write_xmit, a CCID2 decision should just fit in here as well... Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 0d48d93947dd9ea21c5cdc76a8581b06a4a39281 Author: Marcel Holtmann Date: Tue Aug 9 20:30:28 2005 -0700 [Bluetooth]: Move packet type into the SKB control buffer This patch moves the usage of packet type into the SKB control buffer. After this patch it is now possible to shrink the sk_buff structure and redefine its pkt_type. Signed-off-by: Marcel Holtmann Signed-off-by: David S. Miller commit 2eb25a6c34504254760e67172f7518d6bfdd7676 Author: Victor Fusco Date: Tue Aug 9 20:29:11 2005 -0700 [Bluetooth]: Fix sparse warnings (__nocast type) This patch fixes the sparse warnings "implicit cast to nocast type" for the priority or gfp_mask parameters of the memory allocations. Signed-off-by: Victor Fusco Signed-off-by: Domen Puncer Signed-off-by: Marcel Holtmann Signed-off-by: David S. Miller commit 3a5e903c09aed19ca4a1bb26d87b8d6461a93818 Author: J. Suter Date: Tue Aug 9 20:28:46 2005 -0700 [Bluetooth]: Implement RFCOMM remote port negotiation This patch implements the remote port negotiation (RPN) of the RFCOMM protocol for Bluetooth. Signed-off-by: J. Suter Signed-off-by: Marcel Holtmann Signed-off-by: David S. Miller commit 7b9eb9e2099f6f4acd6a36bcd7820d27c3cf5ee3 Author: Timo Teräs Date: Tue Aug 9 20:28:21 2005 -0700 [Bluetooth]: Call tty_hangup() when DCD is de-asserted The RFCOMM layer does not handle properly the de-assertation of CD signal. It should call tty_hangup() to work properly. Signed-off-by: Timo Teräs Signed-off-by: Marcel Holtmann Signed-off-by: David S. Miller commit 85a1e930bf628700e8e9c166b1f5c1c26d3651cc Author: Marcel Holtmann Date: Tue Aug 9 20:28:02 2005 -0700 [Bluetooth]: Track page scan repetition mode changes The HCI page scan repetition mode change event contains the actual page scan repetition mode for the remote device. It is the same value that is received from an inquiry response and it can be used to make further reconnections faster. Signed-off-by: Marcel Holtmann Signed-off-by: David S. Miller commit 45bb4bf08b9c16122af84d3f26a018c8022b24e5 Author: Marcel Holtmann Date: Tue Aug 9 20:27:49 2005 -0700 [Bluetooth]: Workaround for inquiry results with RSSI and page scan mode This patch implements a workaround for buggy Bluetooth 1.2 devices from Silicon Wave. Their inquiry results with RSSI contain the page scan mode field. This field was removed in the final Bluetooth 1.2 specification. Signed-off-by: Marcel Holtmann Signed-off-by: David S. Miller commit 4aa769b99724953a6f322c648c0cfbe8c6616382 Author: Marcel Holtmann Date: Tue Aug 9 20:27:37 2005 -0700 [Bluetooth]: Update and cleanup of the virtual HCI driver This patch cleans up the virtual HCI driver. It also adds support for the dynamic minor device number allocation. Signed-off-by: Marcel Holtmann Signed-off-by: David S. Miller commit f6ccf55419c4f0021e7382f000f2fd14a29f3d3c Author: David S. Miller Date: Tue Aug 9 20:27:14 2005 -0700 [DCCP]: Fix u64 printf format warnings. Signed-off-by: David S. Miller commit 1d3de414eb20d937d82c5219fd13ee4cedc499cb Author: Harald Welte Date: Tue Aug 9 20:26:55 2005 -0700 [NETFILTER]: New iptables DCCP protocol header match Using this new iptables DCCP protocol header match, it is possible to create simplistic stateless packet filtering rules for DCCP. It permits matching of port numbers, packet type and options. Signed-off-by: Harald Welte Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit e2e268665f6c01686b477a6b0cc5a70bab689d54 Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 20:26:28 2005 -0700 [DCCP]: Fix struct sockaddr_dccp definition Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 5a47a470e602eecb168ddd3b78841b84ceddd319 Author: Harald Welte Date: Tue Aug 9 20:26:03 2005 -0700 [DCCP]: make include-able from userspace The protocol header files in are usually structured in a way to be included by userspace code. The top section consists of general protocol structure definitions, typedefs, enums - followed by an #ifdef __KERNEL__ section. Currently doesn't follow that convention and can therefore not be used from userspace. However, for example iptables' libipt_dccp.c actually needs various definitions from there. Signed-off-by: Harald Welte Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit bb435b8d816582064ee0ddb1e2a6fbca67f34108 Author: Stephen Hemmigner Date: Tue Aug 9 20:25:39 2005 -0700 [IPV4]: fib_trie: Use const Use const where possible and get rid of EXTRACT() macro that was never used. Signed-off-by: Stephen Hemmigner Signed-off-by: Robert Olsson Signed-off-by: David S. Miller commit 2f80b3c8262d0d646812f776db024d88d569a0c1 Author: Robert Olsson Date: Tue Aug 9 20:25:06 2005 -0700 [IPV4]: fib_trie: Use ERR_PTR to handle errno return Signed-off-by: Robert Olsson Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 91b9a277fc4d207249e459a455abf804ebb5499d Author: Olof Johansson Date: Tue Aug 9 20:24:39 2005 -0700 [IPV4]: FIB Trie cleanups. Below is a patch that cleans up some of this, supposedly without changing any behaviour: * Whitespace cleanups * Introduce DBG() * BUG_ON() instead of if () { BUG(); } * Remove some of the deep nesting to make the code flow more comprehensible * Some mask operations were simplified Signed-off-by: Olof Johansson Signed-off-by: Robert Olsson Signed-off-by: David S. Miller commit 7663f18807805f02608457af8e2f59eee5d910fd Author: Yasuyuki Kozakai Date: Tue Aug 9 20:24:15 2005 -0700 [NETFILTER]: return ENOMEM when ip_conntrack_alloc() fails. This patch fixes the bug which doesn't return ERR_PTR(-ENOMEM) if it failed to allocate memory space from slab cache. This bug leads to erroneously not dropped packets under stress, and wrong statistic counters ('invalid' is incremented instead of 'drop'). It was introduced during the ctnetlink merge in the net-2.6.14 tree, so no stable or mainline releases affected. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 8a61fadb3908454ccfa538aaa75eb1d22def5700 Author: Harald Welte Date: Tue Aug 9 20:23:53 2005 -0700 [NETFILTER]: check nf_log function call arguments Check whether pf is too large in order to prevent array overflow. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit d72367b6f36e557f122beefaa8c6b80eb1c7f245 Author: Harald Welte Date: Tue Aug 9 20:23:36 2005 -0700 [NETFILTER]: more verbose return codes from nf_{log,queue} This adds EEXIST to distinguish between the following return values: 0: nobody was registered, registration successful EEXIST: the exact same handler was already registered, no registration required EBUSY: somebody else is registered, registration unsuccessful. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit bbd86b9fc469b7e91dc7444e6abb8930811d79cb Author: Harald Welte Date: Tue Aug 9 20:23:11 2005 -0700 [NETFILTER]: add /proc/net/netfilter interface to nf_queue This patch adds a /proc/net/netfilter/nf_queue file, similar to the recently-added /proc/net/netfilter/nf_log. It indicates which queue handler is registered to which protocol family. This is useful since there are now multiple queue handlers in the treee (ip[6]_queue, nfnetlink_queue). Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit fbcd923c3e0c8ec9e4ed64f5a4e5766807b32729 Author: Harald Welte Date: Tue Aug 9 20:22:10 2005 -0700 [NETFILTER]: add correct bridging support to nfnetlink_{queue,log} This patch adds support for passing the real 'physical' device ifindex down to userspace via nfnetlink_log and nfnetlink_queue. This feature basically obsoletes net/bridge/netfilter/ebt_ulog.c, and it is likely ebt_ulog.c will die with one of the next couple of patches. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit f6ebe77f955d77a988ce726f0818ec0103b11323 Author: Harald Welte Date: Tue Aug 9 20:21:49 2005 -0700 [NETFILTER]: split net/core/netfilter.c into net/netfilter/*.c This patch doesn't introduce any code changes, but merely splits the core netfilter code into four separate files. It also moves it from it's old location in net/core/ to the recently-created net/netfilter/ directory. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 210a9ebef2d1bd32d9e9d81c84d538e237769cdb Author: Harald Welte Date: Tue Aug 9 20:20:54 2005 -0700 [NETFILTER]: ip{6}_queue: prevent unregistration race with nfnetlink_queue Since nfnetlink_queue can override ip{6}_queue as queue handlers, we can no longer blindly unregister whoever is registered for PF_INET[6], but only unregister ourselves. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit f682faefb8c6045468c4cf0fe435128352683c22 Author: Harald Welte Date: Tue Aug 9 20:20:34 2005 -0700 [NETFILTER]: fix autoloading of nfnetlink_log This patch adds the MODULE_ALIAS required for netnlink autoloading of nfnetlink_log. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 91483c4b711549bff5e9069e25c4c1400b135198 Author: Andrew Morton Date: Tue Aug 9 20:20:07 2005 -0700 [SUNRPC]: svcsock.c needs linux/tcp.h Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 2669d63d20683828f673b606915957f3a070602d Author: Harald Welte Date: Tue Aug 9 20:19:44 2005 -0700 [NETFILTER]: move conntrack helper buffers from BSS to kmalloc()ed memory According to DaveM, it is preferrable to have large data structures be allocated dynamically from the module init() function rather than putting them as static global variables into BSS. This patch moves the conntrack helper packet buffers into dynamically allocated memory. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit bb97d31f5130d677644d9931ef38613d1164ec94 Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 20:19:14 2005 -0700 [INET]: Make inet_create try to load protocol modules Syntax is net-pf-PROTOCOL_FAMILY-PROTOCOL-SOCK_TYPE and if this fails net-pf-PROTOCOL_FAMILY-PROTOCOL. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 087fe256f0aef8d16b19a30c6fb10b899bf1a701 Author: Michael Chan Date: Tue Aug 9 20:17:41 2005 -0700 [TG3]: Fix bug in setting a tg3_flag Found a bug while reviewing the patches the second time. The TG3_FLAG_TXD_MBOX_HWBUG flag is set after the register access methods have been determined. This patch fixes it by moving it up before the various access methods are assigned. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 15f5a585c6b8dac31ed0a55693aacf51934f0f5d Author: Michael Chan Date: Tue Aug 9 20:17:28 2005 -0700 [TG3]: Eliminate one register write in tg3_restart_ints() The register write to register 0x68 to restart interrupts is unnecessary as the interrupt wasn't masked in that register by the irq handler. This will save one register write in the fast path. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 6892914fb7980d844f2bac859f4095df9ebd18da Author: Michael Chan Date: Tue Aug 9 20:17:14 2005 -0700 [TG3]: Add indirect register method for 5703 behind ICH This patch adds the new workaround for 5703 A1/A2 if it is behind certain ICH bridges. The workaround disables memory and uses config. cycles only to access all registers. The 5702/03 chips can mistakenly decode the special cycles from the ICH chipsets as memory write cycles, causing corruption of register and memory space. Only certain ICH bridges will drive special cycles with non-zero data during the address phase which can fall within the 5703's address range. This is not an ICH bug as the PCI spec allows non-zero address during special cycles. However, only these ICH bridges are known to drive non-zero addresses during special cycles. The indirect_lock is also changed to spin_lock_irqsave from spin_lock_bh because it is used in irq handler when using the indirect method to disable interrupts. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 09ee929cccfd0b56ea3724b3c6299fbbe813df43 Author: Michael Chan Date: Tue Aug 9 20:17:00 2005 -0700 [TG3]: Add mailbox read method This patch adds the mailbox read method and also adds an inline function tw32_mailbox_f() for mailbox writes that require read flush. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 1ee582d8e49a1c9dd43b2599f1cd26507182a8d4 Author: Michael Chan Date: Tue Aug 9 20:16:46 2005 -0700 [TG3]: Add various register methods This patch adds various dedicated register read/write methods for the existing workarounds, including PCIX target workaround, write with read flush, etc. The chips that require these workarounds will use these dedicated access functions. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 2009493065e01b1fe27c1b98ffbcfab98e185f72 Author: Michael Chan Date: Tue Aug 9 20:16:32 2005 -0700 [TG3]: Add basic register access function pointers This patch adds the basic function pointers to do register accesses in the fast path. This was suggested by David Miller. The idea is that various register access methods for different hardware errata can easily be implemented with these function pointers and performance will not be degraded on chips that use normal register access methods. The various register read write macros (e.g. tw32, tr32, tw32_mailbox) are redefined to call the function pointers. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 757f612e091e7d13707eedc3ff71f1a9b53f5537 Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 20:16:04 2005 -0700 [CCID3]: Reenable list_for_each_entry_safe_continue usage Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 74459dc7bacda04d14626d239c8f5c4dac22560d Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 20:15:51 2005 -0700 [LIST]: Introduce list_for_each_entry_safe_continue Used in the dccp CCID3 code, that is going to be submitted RSN. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 95b81ef794278c835b321f6376b0522cd5df59b7 Author: Yoshifumi Nishida Date: Tue Aug 9 20:15:35 2005 -0700 [DCCP]: Fix checksum routines Signed-off-by: Yoshifumi Nishida Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit a019d6fe2b9da68ea4ba6cf3c4e86fc1dbf554c3 Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 20:15:09 2005 -0700 [ICSK]: Move generalised functions from tcp to inet_connection_sock This also improves reqsk_queue_prune and renames it to inet_csk_reqsk_queue_prune, as it deals with both inet_connection_sock and inet_request_sock objects, not just with request_sock ones thus belonging to inet_request_sock. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 7c657876b63cb1d8a2ec06f8fc6c37bb8412e66c Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 20:14:34 2005 -0700 [DCCP]: Initial implementation Development to this point was done on a subversion repository at: http://oops.ghostprotocols.net:81/cgi-bin/viewcvs.cgi/dccp-2.6/ This repository will be kept at this site for the foreseable future, so that interested parties can see the history of this code, attributions, etc. If I ever decide to take this offline I'll provide the full history at some other suitable place. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit c4365c9235f80128c3c3d5993074173941b1c1f0 Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 20:12:30 2005 -0700 [RANDOM]: Introduce secure_dccp_sequence_number Code contributed by Stephen Hemminger. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit d8c97a9451068dd9f7b838a240bb6db894133a5e Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 20:12:12 2005 -0700 [NET]: Export symbols needed by the current DCCP code Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 295f7324ff8d9ea58b4d3ec93b1aaa1d80e048a9 Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 20:11:56 2005 -0700 [ICSK]: Introduce reqsk_queue_prune from code in tcp_synack_timer With this we're very close to getting all of the current TCP refactorings in my dccp-2.6 tree merged, next changeset will export some functions needed by the current DCCP code and then dccp-2.6.git will be born! Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 0a5578cf8e5e045aaa68643c17ce885426697c6b Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 20:11:41 2005 -0700 [ICSK]: Generalise tcp_listen_{start,stop} This also moved inet_iif from tcp to inet_hashtables.h, as it is needed by the inet_lookup callers, perhaps this needs a bit of polishing, but for now seems fine. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 9f1d2604c71498579609b1532fedc5a89276bb00 Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 20:11:24 2005 -0700 [ICSK]: Introduce inet_csk_clone Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 3f421baa4720b708022f8bcc52a61e5cd6f10bf8 Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 20:11:08 2005 -0700 [NET]: Just move the inet_connection_sock function from tcp sources Completing the previous changeset, this also generalises tcp_v4_synq_add, renaming it to inet_csk_reqsk_queue_hash_add, already geing used in the DCCP tree, which I plan to merge RSN. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 463c84b97f24010a67cd871746d6a7e4c925a5f9 Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 20:10:42 2005 -0700 [NET]: Introduce inet_connection_sock This creates struct inet_connection_sock, moving members out of struct tcp_sock that are shareable with other INET connection oriented protocols, such as DCCP, that in my private tree already uses most of these members. The functions that operate on these members were renamed, using a inet_csk_ prefix while not being moved yet to a new file, so as to ease the review of these changes. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 87d11ceb9deb7a3f13fdee6e89d9bb6be7d27a71 Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 20:10:12 2005 -0700 [SOCK]: Introduce sk_clone Out of tcp_create_openreq_child, will be used in dccp_create_openreq_child, and is a nice sock function anyway. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit c676270bcd25015b978722ec0352c330dcc87883 Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 20:09:59 2005 -0700 [INET_TWSK]: Introduce inet_twsk_alloc With the parts of tcp_time_wait that are not TCP specific, tcp_time_wait uses it and so will dccp_time_wait. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit e48c414ee61f4ac8d5cff2973e66a7cbc8a93aa5 Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 20:09:46 2005 -0700 [INET]: Generalise the TCP sock ID lookup routines And also some TIME_WAIT functions. [acme@toy net-2.6.14]$ grep built-in /tmp/before.size /tmp/after.size /tmp/before.size: 282955 13122 9312 305389 4a8ed net/ipv4/built-in.o /tmp/after.size: 281566 13122 9312 304000 4a380 net/ipv4/built-in.o [acme@toy net-2.6.14]$ I kept them still inlined, will uninline at some point to see what would be the performance difference. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 8feaf0c0a5488b3d898a9c207eb6678f44ba3f26 Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 20:09:30 2005 -0700 [INET]: Generalise tcp_tw_bucket, aka TIME_WAIT sockets This paves the way to generalise the rest of the sock ID lookup routines and saves some bytes in TCPv4 TIME_WAIT sockets on distro kernels (where IPv6 is always built as a module): [root@qemu ~]# grep tw_sock /proc/slabinfo tw_sock_TCPv6 0 0 128 31 1 tw_sock_TCP 0 0 96 41 1 [root@qemu ~]# Now if a protocol wants to use the TIME_WAIT generic infrastructure it only has to set the sk_prot->twsk_obj_size field with the size of its inet_timewait_sock derived sock and proto_register will create sk_prot->twsk_slab, for now its only for INET sockets, but we can introduce timewait_sock later if some non INET transport protocolo wants to use this stuff. Next changesets will take advantage of this new infrastructure to generalise even more TCP code. [acme@toy net-2.6.14]$ grep built-in /tmp/before.size /tmp/after.size /tmp/before.size: 188646 11764 5068 205478 322a6 net/ipv4/built-in.o /tmp/after.size: 188144 11764 5068 204976 320b0 net/ipv4/built-in.o [acme@toy net-2.6.14]$ Tested with both IPv4 & IPv6 (::1 (localhost) & ::ffff:172.20.0.1 (qemu host)). Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 33b62231908c58ae04185e4f1063d1e35a7c8576 Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 20:09:06 2005 -0700 [INET]: Generalise tcp_v4_lookup_listener [acme@toy net-2.6.14]$ grep built-in /tmp/before /tmp/after /tmp/before: 282560 13122 9312 304994 4a762 net/ipv4/built-in.o /tmp/after: 282560 13122 9312 304994 4a762 net/ipv4/built-in.o Will be used in DCCP, not exporting it right now not to get in Adrian Bunk's exported-but-not-used-on-modules radar 8) Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 81849d106b1fb97f8e2d311c0c4d36347def55b8 Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 20:08:50 2005 -0700 [INET]: Generalise tcp_v4_hash & tcp_unhash It really just makes the existing code be a helper function that tcp_v4_hash and tcp_unhash uses, specifying the right inet_hashinfo, tcp_hashinfo. One thing I'll investigate at some point is to have the inet_hashinfo pointer in sk_prot, so that we get all the hashtable information from the sk pointer, this can lead to some extra indirections that may well hurt performance/code size, we'll see. Ultimate idea would be that sk_prot would provide _all_ the information about a protocol implementation. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit c752f0739f09b803aed191c4765a3b6650a08653 Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 20:08:28 2005 -0700 [TCP]: Move the tcp sock states to net/tcp_states.h Lots of places just needs the states, not even linux/tcp.h, where this enum was, needs it. This speeds up development of the refactorings as less sources are rebuilt when things get moved from net/tcp.h. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit f3f05f7046e7c85b04af390d95a82a27160dd5d0 Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 20:08:09 2005 -0700 [INET]: Generalise the tcp_listen_ lock routines Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 6e04e02165a7209a71db553b7bc48d68421e5ebf Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 20:07:35 2005 -0700 [INET]: Move tcp_port_rover to inet_hashinfo Also expose all of the tcp_hashinfo members, i.e. killing those tcp_ehash, etc macros, this will more clearly expose already generic functions and some that need just a bit of work to become generic, as we'll see in the upcoming changesets. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 2d8c4ce51903636ce0f60addc8134aa50ab8fa76 Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 20:07:13 2005 -0700 [INET]: Generalise tcp_bind_hash & tcp_inherit_port This required moving tcp_bucket_cachep to inet_hashinfo. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit ff21d5774b4a186c98be6398eacde75d896db804 Author: Pablo Neira Ayuso Date: Tue Aug 9 20:06:42 2005 -0700 [NETFILTER]: fix list traversal order in ctnetlink Currently conntracks are inserted after the head. That means that conntracks are sorted from the biggest to the smallest id. This happens because we use list_prepend (list_add) instead list_add_tail. This can result in problems during the list iteration. list_for_each(i, &ip_conntrack_hash[cb->args[0]]) { h = (struct ip_conntrack_tuple_hash *) i; if (DIRECTION(h) != IP_CT_DIR_ORIGINAL) continue; ct = tuplehash_to_ctrack(h); if (ct->id <= *id) continue; In that case just the first conntrack in the bucket will be dumped. To fix this, we iterate the list from the tail to the head via list_for_each_prev. Same thing for the list of expectations. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 28b19d99ac6d92e4fb2fe34144c495019a638a64 Author: Pablo Neira Ayuso Date: Tue Aug 9 20:06:27 2005 -0700 [NETFILTER]: Fix typo in ctnl_exp_cb array (no bug, just memory waste) This fixes the size of the ctnl_exp_cb array that is IPCTNL_MSG_EXP_MAX instead of IPCTNL_MSG_MAX. Simple typo. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 37012f7fd326eb3c959428a4fe7e203e6304fe43 Author: Pablo Neira Ayuso Date: Tue Aug 9 20:06:11 2005 -0700 [NETFILTER]: fix conntrack refcount leak in unlink_expect() In unlink_expect(), the expectation is removed from the list so the refcount must be dropped as well. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 14a50bbaa51202b676a95e9b41bc5ed6c77aa9cc Author: Pablo Neira Ayuso Date: Tue Aug 9 20:05:52 2005 -0700 [NETFILTER]: ctnetlink: make sure event order is correct The following sequence is displayed during events dumping of an ICMP connection: [NEW] [DESTROY] [UPDATE] This happens because the event IPCT_DESTROY is delivered in death_by_timeout(), that is called from the icmp protocol helper (ct->timeout.function) once we see the reply. To fix this, we move this event to destroy_conntrack(). Signed-off-by: Pablo Neira Ayuso Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 1444fc559b01aa5d4fedf4ee4f306a9e9cd56f95 Author: Harald Welte Date: Tue Aug 9 20:04:07 2005 -0700 [NETFILTER]: don't use nested attributes for conntrack_expect We used to use nested nfattr structures for ip_conntrack_expect. This is bogus, since ip_conntrack and ip_conntrack_expect are communicated in different netlink message types. both should be encoded at the top level attributes, no extra nesting required. This patch addresses the issue. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit a42827b71b87fc9816d2f58626e825b0eb500efe Author: Harald Welte Date: Tue Aug 9 20:03:54 2005 -0700 [NETFILTER]: cleanup nfnetlink_check_attributes() 1) memset return parameter 'cda' (nfattr pointer array) only on success 2) a message without attributes and just a 'struct nfgenmsg' is valid, don't return -EINVAL 3) use likely() and unlikely() where apropriate Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 927ccbcc28dceee29dad876982768cca29738564 Author: Harald Welte Date: Tue Aug 9 20:03:40 2005 -0700 [NETFILTER]: attribute count is an attribute of message type, not subsytem Prior to this patch, every nfnetlink subsystem had to specify it's attribute count. However, in reality the attribute count depends on the message type within the subsystem, not the subsystem itself. This patch moves 'attr_count' from 'struct nfnetlink_subsys' into nfnl_callback to fix this. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit bd9a26b7f2ee7567571bb5b7acc1a256c544a0dd Author: Harald Welte Date: Tue Aug 9 20:03:22 2005 -0700 [NETFILTER]: fix ctnetlink 'create_expect' parsing There was a stupid copy+paste mistake where we parse the MASK nfattr into the "tuple" variable instead of the "mask" variable. This patch fixes it. Thanks to Pablo Neira. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 88aa0429048d08c18f2772782588f953bbbd79be Author: Pablo Neira Date: Tue Aug 9 20:02:55 2005 -0700 [NETFILTER]: conntrack_netlink: Fix locking during conntrack_create The current codepath allowed for ip_conntrack_lock to be unlock'ed twice. Signed-off-by: Pablo Neira Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 94cd2b67641e7ddc2e6ed71d76e00116957423db Author: Pablo Neira Date: Tue Aug 9 20:02:36 2005 -0700 [NETFILTER]: remove bogus memset() calls from ip_conntrack_netlink.c nfattr_parse_nested() calls nfattr_parse() which in turn does a memset on the 'tb' array. All callers therefore don't need to memset before calling it. Signed-off-by: Pablo Neira Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit a86888b925299330053d20e0eba03ac4d2648c4b Author: Patrick McHardy Date: Tue Aug 9 20:02:13 2005 -0700 [NETFILTER]: Fix multiple problems with the conntrack event cache refcnt underflow: the reference count is decremented when a conntrack entry is removed from the hash but it is not incremented when entering new entries. missing protection of process context against softirq context: all cache operations need to locally disable softirqs to avoid races. Additionally the event cache can't be initialized when a packet enteres the conntrack code but needs to be initialized whenever we cache an event and the stored conntrack entry doesn't match the current one. incorrect flushing of the event cache in ip_ct_iterate_cleanup: without real locking we can't flush the cache for different CPUs without incurring races. The cache for different CPUs can only be flushed when no packets are going through the code. ip_ct_iterate_cleanup doesn't need to drop all references, so flushing is moved to the cleanup path. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit a55ebcc4c4532107ad9eee1c9bb698ab5f12c00f Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 20:01:14 2005 -0700 [INET]: Move bind_hash from tcp_sk to inet_sk This should really be in a inet_connection_sock, but I'm leaving it for a later optimization, when some more fields common to INET transport protocols now in tcp_sk or inet_sk will be chunked out into inet_connection_sock, for now its better to concentrate on getting the changes in the core merged to leave the DCCP tree with only DCCP specific code. Next changesets will take advantage of this move to generalise things like tcp_bind_hash, tcp_put_port, tcp_inherit_port, making the later receive a inet_hashinfo parameter, and even __tcp_tw_hashdance, etc in the future, when tcp_tw_bucket gets transformed into the struct timewait_sock hierarchy. tcp_destroy_sock also is eligible as soon as tcp_orphan_count gets moved to sk_prot. A cascade of incremental changes will ultimately make the tcp_lookup functions be fully generic. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 77d8bf9c6208eb535f05718168ffcc476be0ca8c Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 20:00:51 2005 -0700 [INET]: Move the TCP hashtable functions/structs to inet_hashtables.[ch] Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 0f7ff9274e72fd254fbd1ab117bbc1db6e7cdb34 Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 19:59:44 2005 -0700 [INET]: Just rename the TCP hashtable functions/structs to inet_ This is to break down the complexity of the series of patches, making it very clear that this one just does: 1. renames tcp_ prefixed hashtable functions and data structures that were already mostly generic to inet_ to share it with DCCP and other INET transport protocols. 2. Removes not used functions (__tb_head & tb_head) 3. Removes some leftover prototypes in the headers (tcp_bucket_unlock & tcp_v4_build_header) Next changesets will move tcp_sk(sk)->bind_hash to inet_sock so that we can make functions such as tcp_inherit_port, __tcp_inherit_port, tcp_v4_get_port, __tcp_put_port, generic and get others like tcp_destroy_sock closer to generic (tcp_orphan_count will go to sk->sk_prot to allow this). Eventually most of these functions will be used passing the transport protocol inet_hashinfo structure. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 304a16180fb6d2b153b45f6fbbcec1fa814496e5 Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 19:59:20 2005 -0700 [INET]: Move the TCP ehash functions to include/net/inet_hashtables.h To be shared with DCCP (and others), this is the start of a series of patches that will expose the already generic TCP hash table routines. The few changes noticed when calling gcc -S before/after on a pentium4 were of this type: movl 40(%esp), %edx cmpl %esi, 472(%edx) je .L168 - pushl $291 + pushl $272 pushl $.LC0 pushl $.LC1 pushl $.LC2 [acme@toy net-2.6.14]$ size net/ipv4/tcp_ipv4.before.o net/ipv4/tcp_ipv4.after.o text data bss dec hex filename 17804 516 140 18460 481c net/ipv4/tcp_ipv4.before.o 17804 516 140 18460 481c net/ipv4/tcp_ipv4.after.o Holler if some weird architecture has issues with things like this 8) Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 0597f2680d666a3bcf101ac0c771ba7e50016bbd Author: Harald Welte Date: Tue Aug 9 19:58:39 2005 -0700 [NETFILTER]: Add new "nfnetlink_log" userspace packet logging facility This is a generic (layer3 independent) version of what ipt_ULOG is already doing for IPv4 today. ipt_ULOG, ebt_ulog and finally also ip[6]t_LOG will be deprecated by this mechanism in the long term. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 608c8e4f7b6e61cc783283e9dff8a465a5ad59bb Author: Harald Welte Date: Tue Aug 9 19:58:27 2005 -0700 [NETFILTER]: Extend netfilter logging API This patch is in preparation to nfnetlink_log: - loggers now have to register struct nf_logger instead of nf_logfn - nf_log_unregister() replaced by nf_log_unregister_pf() and nf_log_unregister_logger() - add comment to ip[6]t_LOG.h to assure nobody redefines flags - add /proc/net/netfilter/nf_log to tell user which logger is currently registered for which address family - if user has configured logging, but no logging backend (logger) is available, always spit a message to syslog, not just the first time. - split ip[6]t_LOG.c into two parts: Backend: Always try to register as logger for the respective address family Frontend: Always log via nf_log_packet() API - modify all users of nf_log_packet() to accomodate additional argument Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 838ab6364956d9bdcefe84712de1621cf20a40b3 Author: Harald Welte Date: Tue Aug 9 19:50:45 2005 -0700 [NETFILTER]: Add refcounting and /proc/net/netfilter interface to nfnetlink_queue Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 32519f11d38ea8f4f60896763bacec7db1760f9c Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 19:50:02 2005 -0700 [INET]: Introduce inet_sk_rebuild_header From tcp_v4_rebuild_header, that already was pretty generic, I only needed to use sk->sk_protocol instead of the hardcoded IPPROTO_TCP and establish the requirement that INET transport layer protocols that want to use this function map TCP_SYN_SENT to its equivalent state. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 6cbb0df788b90777a7ed0f9d8261260353f48076 Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 19:49:02 2005 -0700 [SOCK]: Introduce sk_setup_caps From tcp_v4_setup_caps, that always is preceded by a call to __sk_dst_set, so coalesce this sequence into sk_setup_caps, removing one call to a TCP function in the IP layer. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 614c6cb4f225a7da9f13e5dd0fac3b531078eb9f Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 19:47:37 2005 -0700 [SOCK]: Rename __tcp_v4_rehash to __sk_prot_rehash This operation was already generic and DCCP will use it. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit e6848976b721eeb5551cd94673faafeef78d9f35 Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 19:45:38 2005 -0700 [NET]: Cleanup INET_REFCNT_DEBUG code Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit d13964f4490157b8a290903362bfbc54f750a6bc Author: Patrick McHardy Date: Tue Aug 9 19:45:02 2005 -0700 [IPV4/6]: Check if packet was actually delivered to a raw socket to decide whether to send an ICMP unreachable Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 0bd1b59b15e4057101c89d4db15a3683c0d897f7 Author: Andrew McDonald Date: Tue Aug 9 19:44:42 2005 -0700 [IPV6]: Check interface bindings on IPv6 raw socket reception Take account of whether a socket is bound to a particular device when selecting an IPv6 raw socket to receive a packet. Also perform this check when receiving IPv6 packets with router alert options. Signed-off-by: Andrew McDonald Signed-off-by: David S. Miller commit 7af4cc3fa158ff1dda6e7451c7e6afa6b0bb85cb Author: Harald Welte Date: Tue Aug 9 19:44:15 2005 -0700 [NETFILTER]: Add "nfnetlink_queue" netfilter queue handler over nfnetlink - Add new nfnetlink_queue module - Add new ipt_NFQUEUE and ip6t_NFQUEUE modules to access queue numbers 1-65535 - Mark ip_queue and ip6_queue Kconfig options as OBSOLETE - Update feature-removal-schedule to remove ip[6]_queue in December Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 0ab43f84995f2c2fcc5cc58a9accaa1095e1317f Author: Harald Welte Date: Tue Aug 9 19:43:44 2005 -0700 [NETFILTER]: Core changes required by upcoming nfnetlink_queue code - split netfiler verdict in 16bit verdict and 16bit queue number - add 'queuenum' argument to nf_queue_outfn_t and its users ip[6]_queue - move NFNL_SUBSYS_ definitions from enum to #define - introduce autoloading for nfnetlink subsystem modules - add MODULE_ALIAS_NFNL_SUBSYS macro - add nf_unregister_queue_handlers() to register all handlers for a given nf_queue_outfn_t - add more verbose DEBUGP macro definition to nfnetlink.c - make nfnetlink_subsys_register fail if subsys already exists - add some more comments and debug statements to nfnetlink.c Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 2cc7d5730957c4a3f3659d17d2ba5e06d5581c1f Author: Harald Welte Date: Tue Aug 9 19:42:34 2005 -0700 [NETFILTER]: Move reroute-after-queue code up to the nf_queue layer. The rerouting functionality is required by the core, therefore it has to be implemented by the core and not in individual queue handlers. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 4fdb3bb723db469717c6d38fda667d8b0fa86ebd Author: Harald Welte Date: Tue Aug 9 19:40:55 2005 -0700 [NETLINK]: Add properly module refcounting for kernel netlink sockets. - Remove bogus code for compiling netlink as module - Add module refcounting support for modules implementing a netlink protocol - Add support for autoloading modules that implement a netlink protocol as soon as someone opens a socket for that protocol Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 020b4c12dbe3868d792a01d7c1470cd837abe10f Author: Harald Welte Date: Tue Aug 9 19:39:00 2005 -0700 [NETFILTER]: Move ipv4 specific code from net/core/netfilter.c to net/ipv4/netfilter.c Netfilter cleanup - Move ipv4 code from net/core/netfilter.c to net/ipv4/netfilter.c - Move ipv6 netfilter code from net/ipv6/ip6_output.c to net/ipv6/netfilter.c Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 089af26c706d1473f641c909fee7c878d29c1f1a Author: Harald Welte Date: Tue Aug 9 19:37:23 2005 -0700 [NETFILTER]: Rename skb_ip_make_writable() to skb_make_writable() There is nothing IPv4-specific in it. In fact, it was already used by IPv6, too... Upcoming nfnetlink_queue code will use it for any kind of packet. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 373ac73595491b7c1f2f10cb37e9b7bae6901227 Author: Patrick McHardy Date: Tue Aug 9 19:36:53 2005 -0700 [NETFILTER]: C99 initizalizers for NAT protocols Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 86e65da9c1fc6fb421b9f796b597b3eced6b55ab Author: David S. Miller Date: Tue Aug 9 19:36:29 2005 -0700 [NET]: Remove explicit initializations of skb->input_dev Instead, set it in one place, namely the beginning of netif_receive_skb(). Based upon suggestions from Jamal Hadi Salim. Signed-off-by: David S. Miller commit 0742fd53a3774781255bd1e471e7aa2e4a82d5f7 Author: Adrian Bunk Date: Tue Aug 9 19:35:47 2005 -0700 [IPV4]: possible cleanups This patch contains the following possible cleanups: - make needlessly global code static - #if 0 the following unused global function: - xfrm4_state.c: xfrm4_state_fini - remove the following unneeded EXPORT_SYMBOL's: - ip_output.c: ip_finish_output - ip_output.c: sysctl_ip_default_ttl - fib_frontend.c: ip_dev_find - inetpeer.c: inet_peer_idlock - ip_options.c: ip_options_compile - ip_options.c: ip_options_undo - net/core/request_sock.c: sysctl_max_syn_backlog Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit f2ccd8fa06c8e302116e71df372f5c1f83432e03 Author: David S. Miller Date: Tue Aug 9 19:34:12 2005 -0700 [NET]: Kill skb->real_dev Bonding just wants the device before the skb_bond() decapsulation occurs, so simply pass that original device into packet_type->func() as an argument. It remains to be seen whether we can use this same exact thing to get rid of skb->input_dev as well. Signed-off-by: David S. Miller commit b6b99eb5409d75ae35390057cd28f3aedfbd4cf4 Author: Patrick McHardy Date: Tue Aug 9 19:33:51 2005 -0700 [NET]: Reduce tc_index/tc_verd to u16 Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 83e3609eba3818f6e18b8bf9442195169ac306b7 Author: Arnaldo Carvalho de Melo Date: Tue Aug 9 19:33:31 2005 -0700 [REQSK]: Move the syn_table destroy from tcp_listen_stop to reqsk_queue_destroy Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 080774a243f56ce2195ace96fba3d18548ee48ce Author: Harald Welte Date: Tue Aug 9 19:32:58 2005 -0700 [NETFILTER]: Add ctnetlink subsystem Add ctnetlink subsystem for userspace-access to ip_conntrack table. This allows reading and updating of existing entries, as well as creating new ones (and new expect's) via nfnetlink. Please note the 'strange' byte order: nfattr (tag+length) are in host byte order, while the payload is always guaranteed to be in network byte order. This allows a simple userspace process to encapsulate netlink messages into arch-independent udp packets by just processing/swapping the headers and not knowing anything about the actual payload. Signed-off-by: Harald Welte Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 6f1cf16582160c4839f05007c978743911aa022b Author: Stephen Hemminger Date: Tue Aug 9 19:31:17 2005 -0700 [NET]: Remove HIPPI private from skbuff.h This removes the private element from skbuff, that is only used by HIPPI. Instead it uses skb->cb[] to hold the additional data that is needed in the output path from hard_header to device driver. PS: The only qdisc that might potentially corrupt this cb[] is if netem was used over HIPPI. I will take care of that by fixing netem to use skb->stamp. I don't expect many users of netem over HIPPI Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit b0573dea1fb32ebc72ffa05980fd840df1d80860 Author: Patrick McHardy Date: Tue Aug 9 19:30:51 2005 -0700 [NET]: Introduce SO_{SND,RCV}BUFFORCE socket options Allows overriding of sysctl_{wmem,rmrm}_max Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit f9e815b376dc19e6afc551cd755ac64e9e42d81f Author: Harald Welte Date: Tue Aug 9 19:30:24 2005 -0700 [NETFITLER]: Add nfnetlink layer. Introduce "nfnetlink" (netfilter netlink) layer. This layer is used as transport layer for all userspace communication of the new upcoming netfilter subsystems, such as ctnetlink, nfnetlink_queue and some day even the mythical pkttables ;) Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit ac3247baf8ecadf168642e3898b0212c29c79715 Author: Harald Welte Date: Tue Aug 9 19:28:03 2005 -0700 [NETFILTER]: connection tracking event notifiers This adds a notifier chain based event mechanism for ip_conntrack state changes. As opposed to the previous implementations in patch-o-matic, we do no longer need a field in the skb to achieve this. Thanks to the valuable input from Patrick McHardy and Rusty on the idea of a per_cpu implementation. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit abc3bc58047efa72ee9c2e208cbeb73d261ad703 Author: Patrick McHardy Date: Tue Aug 9 19:25:56 2005 -0700 [NET]: Kill skb->tc_classid Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 8728b834b226ffcf2c94a58530090e292af2a7bf Author: David S. Miller Date: Tue Aug 9 19:25:21 2005 -0700 [NET]: Kill skb->list Remove the "list" member of struct sk_buff, as it is entirely redundant. All SKB list removal callers know which list the SKB is on, so storing this in sk_buff does nothing other than taking up some space. Two tricky bits were SCTP, which I took care of, and two ATM drivers which Francois Romieu fixed up. Signed-off-by: David S. Miller Signed-off-by: Francois Romieu commit 6869c4d8e066e21623c812c448a05f1ed931c9c6 Author: Harald Welte Date: Tue Aug 9 19:24:19 2005 -0700 [NETFILTER]: reduce netfilter sk_buff enlargement As discussed at netconf'05, we're trying to save every bit in sk_buff. The patch below makes sk_buff 8 bytes smaller. I did some basic testing on my notebook and it seems to work. The only real in-tree user of nfcache was IPVS, who only needs a single bit. Unfortunately I couldn't find some other free bit in sk_buff to stuff that bit into, so I introduced a separate field for them. Maybe the IPVS guys can resolve that to further save space. Initially I wanted to shrink pkt_type to three bits (PACKET_HOST and alike are only 6 values defined), but unfortunately the bluetooth code overloads pkt_type :( The conntrack-event-api (out-of-tree) uses nfcache, but Rusty just came up with a way how to do it without any skb fields, so it's safe to remove it. - remove all never-implemented 'nfcache' code - don't have ipvs code abuse 'nfcache' field. currently get's their own compile-conditional skb->ipvs_property field. IPVS maintainers can decide to move this bit elswhere, but nfcache needs to die. - remove skb->nfcache field to save 4 bytes - move skb->nfctinfo into three unused bits to save further 4 bytes Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit bf3a46aa9b96f6eb3a49a568f72a2801c3e830c0 Author: Harald Welte Date: Tue Aug 9 19:22:01 2005 -0700 [NETFILTER]: convert nfmark and conntrack mark to 32bit As discussed at netconf'05, we convert nfmark and conntrack-mark to be 32bits even on 64bit architectures. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 083bc6b3c9b52b5998cc49d4aa2f8f15c2e84e6b Author: Deepak Saxena Date: Mon Aug 29 22:54:53 2005 +0100 [ARM] 2853/1: Make alloc_init_supersection() work with 36-bit mappings Patch from Deepak Saxena Working on adding support for 36-bit static mappings for ARMv6 and Intel's XSC3 core and noticed that alloc_init_supersection currently increments the phys addr by 1MB on each of the 16 iterations and then forces alignment to supersection size (16MB). This is really uneeded b/c we have already forced the phys address to be 16MB aligned in create_mapping(). Furthermore, this breaks 36-bit addressing b/c bits [23:20] of the PMD contain bits [35:32] of the physical address and the masking causes us to loose those bits thus ending up with an incorrect virt -> phys translation. The other option is to have an alloc_init_supersection36. Tested on Intel IXP2350 CPU with 36-bit static I/O mappings. Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit 3e88a579d05e1bb6c51d88f0936e372895edb8ff Author: Richard Purdie Date: Mon Aug 29 22:46:33 2005 +0100 [ARM] 2861/1: PXA: Add some extra pxa27x register definitions Patch from Richard Purdie Add some extra pxa27x register definitions needed for the Sharp SL-C3000 (Spitz). Signed-off-by: Richard Purdie Signed-off-by: Russell King commit cb85a502e0c2019d8bc302b011150bd62ecf70ab Author: Nicolas Pitre Date: Mon Aug 29 22:46:32 2005 +0100 [ARM] 2858/1: ARM has sys_fadvise64_64 only Patch from Nicolas Pitre There is no need to define __ARCH_WANT_SYS_FADVISE64 on ARM since it only serves to compile in a compatibility wrapper for sys_fadvise64 which never was tied to any syscall number. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 01b9c414828d951148a3792237ff3bf6e6debc85 Author: Ben Dooks Date: Mon Aug 29 22:46:31 2005 +0100 [ARM] 2856/1: S3C2440 - show DVS status at startup Patch from Ben Dooks Show the state of DVS (Dynamic Voltage Scaling) when starting up on the S3C2440 Signed-off-by: Ben Dooks Signed-off-by: Russell King commit d6b0bf213b4be478029b768fcee80058ace7150a Author: Ben Dooks Date: Mon Aug 29 22:46:30 2005 +0100 [ARM] 2855/1: S3C2410 - add CLKSLOW definitions, and show in init Patch from Ben Dooks Add the definitions for the S3C2410_CLKSLOW registers to the header files, and show the values when the system starts up Signed-off-by: Ben Dooks Signed-off-by: Russell King commit bdf82b59c5dcf04bbdbd1938eefca14dd9cb44d3 Author: Deepak Saxena Date: Mon Aug 29 22:46:30 2005 +0100 [ARM] 2836/1: Cleanup IXP4xx GPIO code Patch from Deepak Saxena This patch implements the set_irq_type() hooks for configuring GPIO IRQ type and updates all the platforms to use it instead of the gpio_line_config() function which is now used to configure input vs. output on the pins. Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit e605ecd7c8a38f65759c938a235a1b84f41a744e Author: Deepak Saxena Date: Mon Aug 29 22:46:29 2005 +0100 [ARM] 2834/1: Remove IXP4xx board-specific map_io routines Patch from Deepak Saxena None of the board-specific map_io routines do anything, so kill them. Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit 4f07118f656c179740cad35b827032e2e29b1210 Author: David S. Miller Date: Mon Aug 29 12:46:22 2005 -0700 [SPARC64]: More fully work around Spitfire Errata 51. It appears that a memory barrier soon after a mispredicted branch, not just in the delay slot, can cause the hang condition of this cpu errata. So move them out-of-line, and explicitly put them into a "branch always, predict taken" delay slot which should fully kill this problem. Signed-off-by: David S. Miller commit 442464a50077ff00454ff8d7628cbe1b8eacc034 Author: David S. Miller Date: Mon Aug 29 12:46:07 2005 -0700 [SPARC64]: Make debugging spinlocks usable again. When the spinlock routines were moved out of line into kernel/spinlock.c this made it so that the debugging spinlocks record lock acquisition program counts in the kernel/spinlock.c functions not in their callers. This makes the debugging info kind of useless. So record the correct caller's program counter and now this feature is useful once more. Signed-off-by: David S. Miller commit ca7c8d2c1e2a2f2445cb5e00f45b93af57f22c1b Author: Kumar Gala Date: Mon Aug 29 12:45:44 2005 -0700 [SPARC]: remove use of asm/segment.h Removed sparc architecture specific users of asm/segment.h and asm-sparc/segment.h itself Signed-off-by: Kumar Gala Signed-off-by: David S. Miller commit 3d6364abcfdaedeb34418c2894f61251d48614f6 Author: Kumar Gala Date: Mon Aug 29 12:45:30 2005 -0700 [SPARC64]: remove use of asm/segment.h Removed sparc64 architecture specific users of asm/segment.h and asm-sparc64/segment.h itself Signed-off-by: Kumar Gala Signed-off-by: David S. Miller commit 6c52a96e6cacb35403b85c3b42db0faf26f3ed85 Author: David S. Miller Date: Mon Aug 29 12:45:11 2005 -0700 [SPARC64]: Revamp Spitfire error trap handling. Current uncorrectable error handling was poor enough that the processor could just loop taking the same trap over and over again. Fix things up so that we at least get a log message and perhaps even some register state. In the process, much consolidation became possible, particularly with the correctable error handler. Prefix assembler and C function names with "spitfire" to indicate that these are for Ultra-I/II/IIi/IIe only. More work is needed to make these routines robust and featureful to the level of the Ultra-III error handlers. Signed-off-by: David S. Miller commit bde4e4ee9f90142d550e2684dec2c8df302f5f8e Author: David S. Miller Date: Mon Aug 29 12:44:57 2005 -0700 [SPARC64]: Do not call winfix_dax blindly Verify we really are taking a data access exception trap, at TL1, from one of the window spill/fill handlers. Else call a new function, data_access_exception_tl1, to log the error. Signed-off-by: David S. Miller commit 5ea68e02766c52c153c62fc423cda659a80e45fa Author: David S. Miller Date: Mon Aug 29 12:44:40 2005 -0700 [SPARC64]: Fix trap state reading for instruction_access_exception. 1) Read ASI_IMMU SFSR not ASI_DMMU. 2) IMMU has no SFAR, read TPC instead 3) Delete old and incorrect comment about the DTLB protection trap having a dependency on the SFSR contents in order to function correctly Signed-off-by: David S. Miller commit aa7e16d6b88b3b38db0d2ee49ed5e44e7b2045ec Author: Jeff Garzik Date: Mon Aug 29 15:12:56 2005 -0400 [libata sata_nv] NVIDIA ok'd license change from OSL+GPL to GPL commit bf4e70e54cf31dcca48d279c7f7e71328eebe749 Author: Al Viro Date: Sun Aug 28 03:52:22 2005 +0100 [PATCH] missing include in smc-ultra Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 03ecc6749ab2bfe7baf84b3e0e35018884758fa3 Author: Al Viro Date: Sun Aug 28 03:47:50 2005 +0100 [PATCH] missing include in tda80xx Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 9e2d3cd34a159948dc753a14573e16bffc04dba8 Author: Al Viro Date: Sun Aug 28 03:19:14 2005 +0100 [PATCH] mod_devicetable.h fixes * ieee1394_device_id has kernel_ulong_t field after an odd number of __u32 ones. Since mod_devicetable.h is included both from kernel and from host build helper, we may be in trouble if we are building on 32bit host for 64bit target - userland sees unsigned long long, kernel sees unsigned long and while their sizes match, alignments might not. Fixed by forcing alignment. Fortunately, almost nobody else needs that - the rest of such fields is naturally aligned as it is. * of_device_id has void * in it. Host userland helpers need kernel_ulong_t instead, since their void * might have nothing to do with the kernel one. Fixed in the same way it's done for similar problems in pcmcia_device_id (ifdef __KERNEL__). * pcmcia_device_id has the same problem as ieee1394_device_id. Fixed the same way. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 5bbe6ab938208bb3d4e16f7a28b11fcddd4f9ff2 Author: Benjamin LaHaise Date: Sun Aug 28 18:05:17 2005 -0400 [PATCH] new name for 2.6.14 We've had Woozy Numbat for a while now. Here's an updated name care of Jeff Garzik and myself. Signed-off-by: Benjamin LaHaise Signed-off-by: Linus Torvalds commit 69be8f189653cd81aae5a74e26615b12871bb72e Author: Steven Rostedt Date: Mon Aug 29 11:44:09 2005 -0400 [PATCH] convert signal handling of NODEFER to act like other Unix boxes. It has been reported that the way Linux handles NODEFER for signals is not consistent with the way other Unix boxes handle it. I've written a program to test the behavior of how this flag affects signals and had several reports from people who ran this on various Unix boxes, confirming that Linux seems to be unique on the way this is handled. The way NODEFER affects signals on other Unix boxes is as follows: 1) If NODEFER is set, other signals in sa_mask are still blocked. 2) If NODEFER is set and the signal is in sa_mask, then the signal is still blocked. (Note: this is the behavior of all tested but Linux _and_ NetBSD 2.0 *). The way NODEFER affects signals on Linux: 1) If NODEFER is set, other signals are _not_ blocked regardless of sa_mask (Even NetBSD doesn't do this). 2) If NODEFER is set and the signal is in sa_mask, then the signal being handled is not blocked. The patch converts signal handling in all current Linux architectures to the way most Unix boxes work. Unix boxes that were tested: DU4, AIX 5.2, Irix 6.5, NetBSD 2.0, SFU 3.5 on WinXP, AIX 5.3, Mac OSX, and of course Linux 2.6.13-rcX. * NetBSD was the only other Unix to behave like Linux on point #2. The main concern was brought up by point #1 which even NetBSD isn't like Linux. So with this patch, we leave NetBSD as the lonely one that behaves differently here with #2. Signed-off-by: Linus Torvalds commit 2cba582a49f1535c1a12a687cfb3dab713c22cc4 Author: Jeff Garzik Date: Mon Aug 29 05:12:30 2005 -0400 [libata sata_promise] Do not attempt to use SATA phy on PATA controllers commit c594adad5653491813959277fb87a2fef54c4e05 Author: David Gibson Date: Thu Aug 11 16:55:21 2005 +1000 [PATCH] Dynamic hugepage addresses for ppc64 Paulus, I think this is now a reasonable candidate for the post-2.6.13 queue. Relax address restrictions for hugepages on ppc64 Presently, 64-bit applications on ppc64 may only use hugepages in the address region from 1-1.5T. Furthermore, if hugepages are enabled in the kernel config, they may only use hugepages and never normal pages in this area. This patch relaxes this restriction, allowing any address to be used with hugepages, but with a 1TB granularity. That is if you map a hugepage anywhere in the region 1TB-2TB, that entire area will be reserved exclusively for hugepages for the remainder of the process's lifetime. This works analagously to hugepages in 32-bit applications, where hugepages can be mapped anywhere, but with 256MB (mmu segment) granularity. This patch applies on top of the four level pagetable patch (http://patchwork.ozlabs.org/linuxppc64/patch?id=1936). Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit 9a5573e378c5c8976c6000a7643b52e2a0481688 Author: Michael Ellerman Date: Tue Aug 9 15:20:20 2005 +1000 [PATCH] ppc64: Check of_chosen in check_for_initrd() You can't call get_property() on a NULL node, so check if of_chosen is set in check_for_initrd(). Signed-off-by: Michael Ellerman arch/ppc64/kernel/setup.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) Signed-off-by: Paul Mackerras commit 95920324f51b3a12603cf6d9bacbd831f34c5b60 Author: Michael Ellerman Date: Tue Aug 9 15:20:19 2005 +1000 [PATCH] ppc64: unflatten_device_tree() should check if lmb_alloc() fails unflatten_device_tree() doesn't check if lmb_alloc() succeeds or not, it should. All it can do is panic, but at least there's an error message (assuming you have some sort of console at that point). Signed-off-by: Michael Ellerman arch/ppc64/kernel/prom.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) Signed-off-by: Paul Mackerras commit 145ec7d51ae507c7cc8889ad05e24af05bbd9147 Author: Michael Ellerman Date: Tue Aug 9 15:20:18 2005 +1000 [PATCH] ppc64: Fix a misleading printk in unflatten_dt_node() When unflatten_dt_node() fails to find an OF_DT_END_NODE tag it prints "Weird tag at start of node", this should be "Weird tag at end of node". Signed-off-by: Michael Ellerman arch/ppc64/kernel/prom.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Signed-off-by: Paul Mackerras commit 180a33627d958d5d9d3602dde6ac74b315e136f0 Author: Michael Ellerman Date: Tue Aug 9 11:13:36 2005 +1000 [PATCH] ppc64: Move ppc64_enable_pmcs() logic into a ppc_md function This patch moves power4_enable_pmcs() to arch/ppc64/kernel/pmc.c. I've tested it on P5 LPAR and P4. It does what it used to. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit b13cfd173f73c3f6f9a307b7b6e64d45fbd756b2 Author: Olaf Hering Date: Thu Aug 4 19:26:42 2005 +0200 [PATCH] ppc64: allow xmon=off If both CONFIG_XMON and CONFIG_XMON_DEFAULT is enabled in the .config, there is no way to disable xmon again. setup_system calls first xmon_init, later parse_early_param. So a new 'xmon=off' cmdline option will do the right thing. Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit bef5686229810709091fb6e505071f4aa41e3760 Author: Michael Ellerman Date: Wed Aug 3 20:21:26 2005 +1000 [PATCH] ppc64: Remove CONFIG_MSCHUNKS We can now remove CONFIG_MSCHUNKS as it doesn't do anything interesting anymore. The only macro in abs_addr.h which is called by non-iSeries code is phys_to_abs(), so remove the other dummy implementations, and we add a firmware feature check to phys_to_abs(). Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 71e1f55ad4bc4c8bcfe696400a950a34263a750e Author: Michael Ellerman Date: Wed Aug 3 20:21:26 2005 +1000 [PATCH] ppc64: Simplify some lmb functions lmb_phys_mem_size() can always return lmb.memory.size, as long as it's called after lmb_analyze(), which it is. There's no need to recalculate the size on every call. lmb_analyze() was calculating a few things we then threw away, so just don't calculate them to start with. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 180379dcefb39e8bd05d562b0685e9084dffcc0a Author: Michael Ellerman Date: Wed Aug 3 20:21:26 2005 +1000 [PATCH] ppc64: Remove physbase from the lmb_property struct We no longer need the lmb code to know about abs and phys addresses, so remove the physbase variable from the lmb_property struct. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit e88bcd1b29f63738b702e57d831758706162347e Author: Michael Ellerman Date: Wed Aug 3 20:21:25 2005 +1000 [PATCH] ppc64: Remove redundant abs_to_phys() macro abs_to_phys() is a macro that turns out to do nothing, and also has the unfortunate property that it's not the inverse of phys_to_abs() on iSeries. The following is for my benefit as much as everyone else. With CONFIG_MSCHUNKS enabled, the lmb code is changed such that it keeps a physbase variable for each lmb region. This is used to take the possibly discontiguous lmb regions and present them as a contiguous address space beginning from zero. In this context each lmb region's base address is its "absolute" base address, and its physbase is it's "physical" address (from Linux's point of view). The abs_to_phys() macro does the mapping from "absolute" to "physical". Note: This is not related to the iSeries mapping of physical to absolute (ie. Hypervisor) addresses which is maintained with the msChunks structure. And the msChunks structure is not controlled via CONFIG_MSCHUNKS. Once upon a time you could compile for non-iSeries with CONFIG_MSCHUNKS enabled. But these days CONFIG_MSCHUNKS depends on CONFIG_PPC_ISERIES, so for non-iSeries code abs_to_phys() is a no-op. On iSeries we always have one lmb region which spans from 0 to systemcfg->physicalMemorySize (arch/ppc64/kernel/iSeries_setup.c line 383). This region has a base (ie. absolute) address of 0, and a physbase address of 0 (as calculated in lmb_analyze() (arch/ppc64/kernel/lmb.c line 144)). On iSeries, abs_to_phys(aa) is defined as lmb_abs_to_phys(aa), which finds the lmb region containing aa (and there's only one, ie. 0), and then does: return lmb.memory.region[0].physbase + (aa - lmb.memory.region[0].base) physbase == base == 0, so you're left with "return aa". So remove abs_to_phys(), and lmb_abs_to_phys() which is the implementation of abs_to_phys() for iSeries. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit a4a0f97020444f83bf22bb9c8c20d8af2b4e6317 Author: Michael Ellerman Date: Wed Aug 3 20:21:24 2005 +1000 [PATCH] ppc64: Remove redundant use of pointers in lmb code The lmb code is all written to use a pointer to an lmb struct. But it's always the same lmb struct, called "lmb". So we take the address of lmb, call it _lmb and then start using _lmb->foo everywhere, which is silly. This patch removes the _lmb pointers and replaces them with direct references to the one "lmb" struct. We do the same for some _mem and _rsv pointers which point to lmb.memory and lmb.reserved respectively. This patch looks quite busy, but it's basically just: s/_lmb->/lmb./g s/_mem->/lmb.memory./g s/_rsv->/lmb.reserved./g s/_rsv/&lmb.reserved/g s/mem->/lmb.memory./g Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit aefd16b0c5a594b5feaba23954ad74061f45c8a5 Author: Michael Ellerman Date: Wed Aug 3 20:21:24 2005 +1000 [PATCH] ppc64: Remove redundant uses of physRpn_to_absRpn physRpn_to_absRpn is a no-op on non-iSeries platforms, remove the two redundant calls. There's only one caller on iSeries so fold the logic in there so we can get rid of it completely. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit ce21795275ab469b97384faa36462350af17eca0 Author: Michael Ellerman Date: Wed Aug 3 20:21:23 2005 +1000 [PATCH] ppc64: Consolidate some macros The only caller of chunk_offset() and abs_chunk() is phys_to_abs(), so fold the former two into the latter. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 56e97b71bf55edb69dc8e9715553972ce50b1564 Author: Michael Ellerman Date: Wed Aug 3 20:21:23 2005 +1000 [PATCH] ppc64: Rename msChunks structure Rename the msChunks struct to get rid of the StUdlY caps and make it a bit clearer what it's for. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 34c8f6961fc601294a38c5bd5ca12131b2e52674 Author: Michael Ellerman Date: Wed Aug 3 20:21:23 2005 +1000 [PATCH] ppc64: msChunks cleanups Chunks are 256KB, so use constants for the size/shift/mask, rather than getting them from the msChunks struct. The iSeries debugger (??) might still need access to the values in the msChunks struct, so we keep them around for now, but set them from the constant values. Replace msChunks_entry typedef with regular u32. Simplify msChunks_alloc() to manipulate klimit directly, rather than via a parameter. Move msChunks_alloc() and msChunks into iSeries_setup.c, as that's where they're used. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 38e85dc18036804ada8698951cfad4e6114fec1b Author: Michael Ellerman Date: Wed Aug 3 20:21:23 2005 +1000 [PATCH] ppc64: Remove PTRRELOC() from msChunks code The msChunks code was written to work on pSeries, but now it's only used on iSeries. This means there's no need to do PTRRELOC anymore, so remove it all. A few places were getting "extern reloc_offset()" from abs_addr.h, move it into system.h instead. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit aed31351941aa990fb0865c186565a589c56d3fe Author: Stephen Rothwell Date: Wed Aug 3 14:43:21 2005 +1000 [PATCH] ppc64: introduce FW_FEATURE_ISERIES Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 8d15a3e55f49678b0900dcf5c1cddb322a129325 Author: Stephen Rothwell Date: Wed Aug 3 14:40:16 2005 +1000 [PATCH] ppc64: make firmware_has_feature() stronger Make firmware_has_feature() evaluate at compile time for the non pSeries case and tidy up code where possible. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 1ababe11480d59d75be806804c71fa55d203a5a6 Author: Stephen Rothwell Date: Wed Aug 3 14:35:25 2005 +1000 [PATCH] ppc64: create firmware_has_feature() Create the firmware_has_feature() inline and move the firmware feature stuff into its own header file. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 7a6af5e38054d8e658a4b1b703902331a845de1a Author: Stephen Rothwell Date: Wed Aug 3 14:32:30 2005 +1000 [PATCH] ppc64: remove firmware features from cpu_spec The firmware_features field of struct cpu_spec should really be a separate variable as the firmware features do not depend on the chip and the bitmask is constructed independently. By removing it, we save 112 bytes from the cpu_specs array and we access the bitmask directly instead of via the cur_cpu_spec pointer. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 6fbb49d56d228b666cb4534bbc3c2dfe833c8053 Author: David Gibson Date: Fri Aug 19 14:52:32 2005 +1000 [PATCH] Move variables in ppc64 head.S from .data to .bss The ppc64 head.S defines several zero-initialized structures, such as the empty_zero_page and the kernel top-level pagetable. Currently they are defined to be in the data section. However, they're not used until after the bss is cleared, so this patch moves them to the bss, saving two and a half pages from the vmlinux. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit 91a57fc6723d778e12686b5106a38583072fd767 Author: David Gibson Date: Fri Aug 19 14:52:32 2005 +1000 [PATCH] Tweak comments in ppc64 head.S This patch adjust some comments in head.S for accuracy, clarity, and spelling. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit 1d086e6bd605ac44154e019fe96ae3568e8b2ba2 Author: David Gibson Date: Fri Aug 19 14:52:32 2005 +1000 [PATCH] Remove unneeded #defines in head.S arch/ppc64/kernel/head.S #defines SECONDARY_PROCESSORS then has some #ifdefs based on it. Whatever purpose this had is long lost, this patch removes it. Likewise, head.S defines H_SET_ASR, which is now defined, along with other hypervisor call numbers in hvcall.h. This patch deletes it, as well, from head.S. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit 60ba44945714d9b7dae8b85ab0926f6f13809c73 Author: David Gibson Date: Fri Aug 19 14:52:32 2005 +1000 [PATCH] Fix apparent code overlap in ppc64 head.S An #if/#else construct near the top of ppc64's head.S appears to create overlapping sections of code for iSeries and pSeries (i.e. one thing on iSeries and something different in the same place on pSeries). In fact, checking the various absolute offsets, it doesn't. This patch unravels the #ifdefs to make it more obvious what's going on. This accomplishes another microstep towards a single kernel image which can boot both iSeries and pSeries. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit 0ab20002f4b41f4b1799bad5948389da1c4c8444 Author: David Gibson Date: Fri Aug 19 14:52:31 2005 +1000 [PATCH] Remove general use functions from head.S As well as the interrupt vectors and initialization code, head.S contains several asm functions which are used during runtime. This patch moves these to misc.S, a more sensible location for random asm support code. A couple The functions moved are: disable_kernel_fp giveup_fpu disable_kernel_altivec giveup_altivec __setup_cpu_power3 (empty function) Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit c59c464a3e29830bcfae5eea1777cad9e00087f3 Author: David Gibson Date: Fri Aug 19 14:52:31 2005 +1000 [PATCH] Change address of ppc64 initial segment table On ppc64 machines with segment tables, CPU0's segment table is at a fixed address, currently 0x9000. This patch moves it to the free space at 0x6000, just below the fwnmi data area. This saves 8k of space in vmlinux and the runtime kernel image. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit ec465515eeb662f66725c8c483a46b6bdd9bdd48 Author: David Gibson Date: Fri Aug 19 14:52:31 2005 +1000 [PATCH] Move iSeries and common vectors into unused space in head.S In the ppc64 kernel head.S there is currently quite a lot of unused space between the naca (at fixed address 0x4000) and the fwnmi data area (at fixed address 0x7000). This patch moves various exception vectors and support code into this region to use the wasted space. The functions load_up_fpu and load_up_altivec are moved down as well, since they are essentially continuations of the fp_unavailable_common and altivec_unavailable_common vectors, respectively. Likewise, the fwnmi vectors themselves are moved down into this area, because while the location of the fwnmi data area is fixed by the RPA, the vectors themselves can be anywhere sufficiently low. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit 2e2446ea0758cd57dd065962d9544e3f4d44ea2b Author: David Gibson Date: Fri Aug 19 14:52:31 2005 +1000 [PATCH] Remove NACA fixed address constraint Comments in head.S suggest that the iSeries naca has a fixed address, because tools expect to find it there. The only tool which appears to access the naca is addRamDisk, but both the in-kernel version and the version used in RHEL and SuSE in fact locate the NACA the same way as the hypervisor does, by following the pointer in the hvReleaseData structure. Since the requirement for a fixed address seems to be obsolete, this patch removes the naca from head.S and replaces it with a normal C initializer. For good measure, it removes an old version of addRamDisk.c which was sitting, unused, in the ppc32 tree. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit 19dbd0f6a74f7529d6d49dd50ad6b31adbe0598d Author: Stephen Rothwell Date: Tue Jul 12 17:50:26 2005 +1000 [PATCH] ppc64: split pSeries specific parts out of vio.c This patch just splits out the pSeries specific parts of vio.c. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 6312236fe82bbd3b0e1dee60b3eb3b270a2f6aeb Author: Stephen Rothwell Date: Tue Jul 12 17:45:27 2005 +1000 [PATCH] ppc64: make the bus matching function platform specific This patch allows us to have a different bus if matching function for each platform. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 8c65b5c955b8598d9c63b4e97392377269873a54 Author: Stephen Rothwell Date: Tue Jul 12 17:42:49 2005 +1000 [PATCH] ppc64: move iSeries vio iommu init Since the iSeries vio iommu tables cannot be used until after the vio bus has been initialised, move the initialisation of the tables to there. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 3e494c80481653bbc810b4e67651097595ea0294 Author: Stephen Rothwell Date: Tue Jul 12 17:40:17 2005 +1000 [PATCH] ppc64: split iSeries specific parts out of vio.c This patch splits the iSeries specific parts out of vio.c. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 6020164499ff3a61cd8bebceb9e294a155079f71 Author: Frank Rowand Date: Tue Jun 28 16:48:04 2005 -0700 [PATCH] ppc64: change duplicate Kconfig menu "General setup" to "Bus Options" arch/ppc64/Kconfig defines a "General setup" menu, but also sources init/Kconfig which also defines a "General setup" menu. Both of these menus appear at the top level of make menuconfig. Having two menus with the same name is confusing. This patch renames the ppc64/Kconfig menu to be "Bus Options" and moves options in this menu which are not bus related to the end of the "Platform support" menu. There are many variations among architectures on the exact naming of the "Bus Options" menu. I chose to use the simplest one, which is also used in arch/ppc/Kconfig. Signed-off-by: Frank Rowand Signed-off-by: Paul Mackerras commit 293da76b3d4c2f362f906bce8c5d2e053bdf8d44 Author: Jake Moilanen Date: Thu Jun 9 09:31:12 2005 -0500 [PATCH] ppc64: PCI device-node failure detection OpenFirmware marks devices as failed in the device-tree when a hardware problem is detected. The kernel needs to fail config reads/writes to prevent a kernel crash when incorrect data is read. This patch validates that the device-node is not marked "fail" when config space reads/writes are attempted. Signed-off-by: Jake Moilanen Signed-off-by: Paul Mackerras commit 34153fa3af45d84f3221d9b67ba2ab7e8a220d28 Author: Benjamin Herrenschmidt Date: Tue Aug 9 10:36:34 2005 +0200 [PATCH] flattened device tree changes This patch updates the format of the flattened device-tree passed between the boot trampoline and the kernel to support a more compact representation, for use by embedded systems mostly. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit e28f7faf05159f1cfd564596f5e6178edba6bd49 Author: David Gibson Date: Fri Aug 5 19:39:06 2005 +1000 [PATCH] Four level pagetables for ppc64 Implement 4-level pagetables for ppc64 This patch implements full four-level page tables for ppc64, thereby extending the usable user address range to 44 bits (16T). The patch uses a full page for the tables at the bottom and top level, and a quarter page for the intermediate levels. It uses full 64-bit pointers at every level, thus also increasing the addressable range of physical memory. This patch also tweaks the VSID allocation to allow matching range for user addresses (this halves the number of available contexts) and adds some #if and BUILD_BUG sanity checks. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit decd300b30e499fe6be1bbfc5650fc971de8c1fa Author: Olaf Hering Date: Mon Aug 8 13:24:38 2005 +1000 [PATCH] ppc64: make arch/ppc64/boot standalone Make the bootheader for ppc64 independent from kernel and libc headers. * add -nostdinc -isystem $gccincludes to not include libc headers * declare all functions in header files, also the stuff from string.S * declare some functions static * use stddef.h to get size_t (hopefully ok) * remove ppc32-types.h, only elf.h used the __NN types With further modifications by Paul Mackerras and Stephen Rothwell. Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit e13934563db047043ccead26412f552375cea90c Author: Andy Fleming Date: Wed Aug 24 18:46:21 2005 -0500 [PATCH] PHY Layer fixup This patch adds back the code that was taken out, thus re-enabling: * The PHY Layer to initialize without crashing * Drivers to actually connect to PHYs * The entire PHY Control Layer This patch is used by the gianfar driver, and other drivers which are in development. Signed-off-by: Andy Fleming Signed-off-by: Jeff Garzik commit af36d7f0df56de3e3e4bbfb15d0915097ecb8cab Author: Jeff Garzik Date: Sun Aug 28 20:18:39 2005 -0400 [libata] license change, other bits - changes license of all code from OSL+GPL to plain ole GPL - except for NVIDIA, who hasn't yet responded about sata_nv - copyright holders were already contacted privately - adds info in each driver about where hardware/protocol docs may be obtained - where I have made major contributions, updated copyright dates commit a8eef8a22232e64be76410100c52038b21bda7ed Author: Kalle Valo Date: Sun Aug 28 22:46:57 2005 +0300 [PATCH] hostap: Fix null pointer dereference in prism2_pccard_card_present() With my Buffalo WLI-CF-S11G PC Card kernel oopses every time in prism2_interrupt() when I try load the hostap module. local->hw_priv is null during the first call to prism2_interrupt(). It feels like interrupts are enabled too early, or something. This patch fixes the symptom, but not the cause. Signed-off-by: Kalle Valo Signed-off-by: Jeff Garzik commit 6c5b90d2c84d557baed56e71729504b467ff3e5b Author: Jouni Malinen Date: Sun Aug 28 10:51:36 2005 -0700 [PATCH] hostap: Fix hash values for product strings hostap_cs: 0.4.1-kernel (Jouni Malinen ) pcmcia: hostap_cs: invalid hash for product string "BUFFALO": is 0x1b01a57b, should be 0x2decece3 pcmcia: see Documentation/pcmcia/devicetable.txt for details pcmcia: hostap_cs: invalid hash for product string "WLI-CF-S11G": is 0xefd5102a, should be 0x82067c18 pcmcia: see Documentation/pcmcia/devicetable.txt for details This patch fixes them. Signed-off-by: Kalle Valo Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit c6e3f95df7328479e2a454eedb5614eacbdb84ac Author: Jouni Malinen Date: Sun Aug 28 10:51:35 2005 -0700 [PATCH] hostap: Update version Version 0.4.4 of Host AP driver was released, so let's sync the version number in netdev-2.6 tree. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 91cb70c1769d9b72dd1efe40c31f01005820b09e Author: Jouni Malinen Date: Sun Aug 28 10:51:34 2005 -0700 [PATCH] ieee80211: Fix debug comments ipw->ieee80211 Debug variables and procfs dir should be "ieee80211", not "ipw". Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 51e828b6a123912f27afc512377ad3e2ab40d2eb Author: Jouni Malinen Date: Sun Aug 28 10:51:33 2005 -0700 [PATCH] ieee80211: Remove EAPOL debug IEEE 802.11 code has no business touching payloads of EAPOL frames. There are some EAPOL structures defined for debugging and these were confusingly called EAP types which they are not. Let's just remove these before someone else starts using them in the kernel. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 5f55d0850e4ae0b4bfabc9a372af5b9f52be02da Author: Jouni Malinen Date: Sun Aug 28 10:51:32 2005 -0700 [PATCH] ieee80211: Remove WIRELESS_EXT < 17 support No need to maintain support for WIRELESS_EXT < 17 since this kernel tree is already using WIRELESS_EXT 18. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 4cd426f24ff2d95dd9b3aa15fa5fca9736678ad5 Author: Pavel Machek Date: Sun Aug 28 22:39:08 2005 +0100 [ARM] drop i386-isms from arm Kconfig This kills i386-specific stuff from arm Kconfig. Please apply, Signed-off-by: Pavel Machek Signed-off-by: Russell King commit e514385be2b355c1f3fc6385a98a6a0fc04235ae Author: James Bottomley Date: Tue Aug 9 11:55:36 2005 -0500 [SCSI] fix sense buffer length handling problem The new bio code was incorrectly converted from stack allocated to kmalloc'd buffer handling. There are two places where it incorrectly uses sizeof(*sense) to get the size of the sense buffer. This actually produces one, so no sense data was ever getting back, causing failure in things like disk spin up. Signed-off-by: James Bottomley commit c9d297c543f379a27a34082070ed03a8ef846fc2 Author: James Bottomley Date: Tue Jun 28 09:18:21 2005 -0500 [SCSI] fix 3ware raid emulated commands The 3ware emulated commands all expect they are executing in the use_sg == 0 case, which isn't true either in the block layer rework or an SG_IO ioctl. Fix this by adding the correct kmapping of the first element in the sg list. Signed-off-by: James Bottomley commit f189c5cb8ddde0c01838f2b3bc7650e86c097a14 Author: Christoph Hellwig Date: Sun Jun 19 11:32:53 2005 +0200 [SCSI] comment cleanup for spi_execute Signed-off-by: James Bottomley commit 1ccb48bb163853c24840c0a50c2a6df1affe029c Author: akpm@osdl.org Date: Sun Jun 26 00:12:51 2005 -0700 [SCSI] fix C syntax problem in scsi_lib.c Older gcc's require variable definitions at the beginning of a block. Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 84743bbcf9fc3767aa33f769898432538281e6dc Author: James Bottomley Date: Sun Jun 12 22:37:10 2005 -0500 [SCSI] convert ch to use scsi_execute_req I also tinkered with it's sense recognition routines to make them take scsi_sense_hdr structures instead of raw sense data. Signed-off-by: James Bottomley commit 820732b501a5bbdd3bde1263f391891e21b5ed8c Author: James Bottomley Date: Sun Jun 12 22:21:29 2005 -0500 [SCSI] convert sr to scsi_execute_req This follows almost the identical model to sd, except that there's one ioctl which returns raw sense data, so it had to use scsi_execute() instead. Signed-off-by: James Bottomley commit ea73a9f23906c374b697cd5b0d64f6dceced63de Author: James Bottomley Date: Sun Aug 28 11:33:52 2005 -0500 [SCSI] convert sd to scsi_execute_req (and update the scsi_execute_req API) This one removes struct scsi_request entirely from sd. In the process, I noticed we have no callers of scsi_wait_req who don't immediately normalise the sense, so I updated the API to make it take a struct scsi_sense_hdr instead of simply a big sense buffer. Signed-off-by: James Bottomley commit 33aa687db90dd8541bd5e9a762eebf880eaee767 Author: James Bottomley Date: Sun Aug 28 11:31:14 2005 -0500 [SCSI] convert SPI transport class to scsi_execute This one's slightly more difficult. The transport class uses REQ_FAILFAST, so another interface (scsi_execute) had to be invented to take the extra flag. Also, the sense functions are shifted around to allow spi_execute to place data directly into a struct scsi_sense_hdr. With this change, there's probably a lot of unnecessary sense buffer allocation going on which we can fix later. Signed-off-by: James Bottomley commit 1cf72699c1530c3e4ac3d58344f6a6a40a2f46d3 Author: James Bottomley Date: Sun Aug 28 11:27:01 2005 -0500 [SCSI] convert the remaining mid-layer pieces to scsi_execute_req After this, we just have some drivers, all the ULDs and the SPI transport class using scsi_wait_req(). Signed-off-by: James Bottomley commit 51490c89f95b8581782e9baa855da166441852be Author: Pete Zaitcev Date: Tue Jul 5 18:18:08 2005 -0700 [SCSI] sr.c: Fix getting wrong size Here's the problem. Try to do this on 2.6.12: - Kill udev and HAL - Insert a CD-ROM into a SCSI or USB CD-ROM drive - Run dd if=/dev/scd0 - cat /sys/block/sr0/size - Eject the CD, insert a different one - Run dd if=/dev/scd0 This is likely to do "access beyond the end of device", if you let it - cat /sys/block/sr0/size This shows the size of a previous CD, even though dd was supposed to revalidate the device. - Run dd if=/dev/scd0 The second run of dd works correctly! The bug was introduced in 2.5.31, when Al fixes the recursive opens in partitioning. Before, the code worked like this: - Block layer called cdrom_open directly - cdrom_open called sr_open - sr_open called check_disk_change - check_disk_change called sr_media_change - sr_media_change did cd->needs_disk_change=1 - before returning sr_open tested cd->needs_disk_change and called get_sector_size. In 2.6.12, the check_disk_change is called from cdrom_open only. Thus: - Block layer calls sr_bd_open - sr_bd_open calls cdrom_open - cdrom_open calls sr_open - sr_open tests cd->needs_disk_change, which wasn't set yet; returns - cdrom_open calls check_disk_change - check_disk_change calls sr_media_change - sr_media_change does cd->needs_disk_change=1, but nobody cares Acked by: Alexander Viro Signed-off-by: James Bottomley commit 8224bfa84d510630b40ea460b2bb380c91acb8ae Author: Dave C Boutcher Date: Mon Aug 22 14:38:26 2005 -0500 [SCSI] ibmvscsi timeout fix This patch fixes a long term borkenness in ibmvscsi where we were using the wrong timeout field from the scsi command (and using the wrong units.) Now broken by the fact that the scsi_cmnd timeout field is gone entirely. This only worked before because all the SCSI targets assumed that 0 was default. Signed-off-by: Dave Boutcher Signed-off-by: James Bottomley commit de540a53f2f7b68a48c3021e5ab78ea49f6cf21c Author: Adrian Bunk Date: Sat Aug 20 21:27:27 2005 +0200 [SCSI] drivers/scsi/constants.c should include scsi_dbg.h C files should include the files with the prototypes for their global functions. Signed-off-by: Adrian Bunk Signed-off-by: James Bottomley commit caca1779870b1bcc0fb07e48ebd2403901f356b8 Author: James Bottomley Date: Tue Aug 16 17:26:10 2005 -0500 [SCSI] add missing attribute container function prototype attribute_container_classdev_to_container is an exported function of the attribute_container.c file. However, there's no prototype for it. Now I actually want to use it, so add one. Signed-off-by: James Bottomley commit be042f240a8528b8f6b741a484cdbbf515698388 Author: Dave C Boutcher Date: Mon Aug 15 16:52:58 2005 -0500 [SCSI] ibmvscsi eh locking With the removal of the spinlocking around eh calls, we need to add a little more locking back in, otherwise we do some naked list manipulation. Signed-off-by: Dave Boutcher Signed-off-by: James Bottomley commit 3b2946cc96bfafa90a555c70b2e876cbbd0fae98 Author: Mark Haverkamp Date: Mon Aug 15 10:50:24 2005 -0700 [SCSI] aacraid: Fix aacraid probe breakage (updated) This patch fixes the bad assumption of the aacraid driver with use_sg. I used the 3w-xxxx driver fix as a guide for this. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit ebd8bb7647e908e8654e565fa289b0300f9f8fa7 Author: James Bottomley Date: Mon Aug 15 16:13:19 2005 -0500 [SCSI] fix transport class corner case after rework If your transport class sets the ATTRIBUTE_CONTAINER_NO_CLASSDEVS flag, then its configure method never gets called. This patch fixes that so that the configure method is called with a NULL classdev. Also remove a spurious inverted comma in the transport_class comments. Signed-off-by: James Bottomley commit 392160335c798bbe94ab3aae6ea0c85d32b81bbc Author: James Bottomley Date: Wed Jun 15 18:48:29 2005 -0500 [SCSI] use scatter lists for all block pc requests and simplify hw handlers Original From: Mike Christie Add scsi_execute_req() as a replacement for scsi_wait_req() Fixed up various pieces (added REQ_SPECIAL and caught req use after free) commit 8e6401187ef7fb1edc2740832b48bf47ed2c90f2 Author: James Bottomley Date: Wed Jun 15 18:16:09 2005 -0500 update scsi_wait_req to new format for blk_rq_map_kern() commit e537a36d528053f6b9dbe6c88e763e835c0d3517 Author: James Bottomley Date: Sun Jun 5 02:07:14 2005 -0500 [SCSI] use scatter lists for all block pc requests and simplify hw handlers Here's the proof of concept for this one. It converts scsi_wait_req to do correct REQ_BLOCK_PC submission (and works nicely in my setup). The final goal should be to eliminate struct scsi_request, but that can't be done until the character submission paths of sg and st are also modified. There's some loss of functionality to this: retries are no longer controllable (except by setting REQ_FASTFAIL) and the wait_req API needs to be altered, but it looks very nice. Signed-off-by: James Bottomley commit 86f0cd505781e42000763821ec6f70127a6abaae Author: Francois Romieu Date: Wed Aug 24 01:14:23 2005 +0200 [PATCH] r8169: avoid conflict between revisions 2 and 3 of the Linksys EG1032 Both revisions share the same PCI device ID and vendor ID but revision 2 of the device uses SysKonnect's chipset whereas revision 3 of the device uses Realtek's 8169 chipset. Credit goes to Christiaan Lutzer for reporting the issue and giving the actual value for the different revisions. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 815f62bf742718458ba822a7e1f51f285eb997f2 Author: Ralf Baechle Date: Wed Aug 24 18:06:36 2005 +0100 [PATCH] SMP rewrite of mkiss Rewrite the mkiss driver to make it SMP-proof following the example of 6pack.c. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: Jeff Garzik commit 135932651fd1eeb95eb6c5d4f6652aae73fe2c24 Author: Jeff Garzik Date: Sat Aug 27 04:20:12 2005 -0400 [libata scsi] fix read/write translation edge cases Fix bugs for unlikely edge cases noticed by Douglas Gilbert: - When READ(6)/WRITE(6) sector count == 0, treat it as 256 sectors - For other READ(x)/WRITE(x), when sector count == 0, error. We don't support successfully completing zero-length transfers at this time. commit d18d36b4edbb980c9de7fe00724c3ded5de1b7a7 Author: Jeff Garzik Date: Sat Aug 27 04:13:52 2005 -0400 libata: fix a few alan-isms commit a4d61e84804f3b14cc35c5e2af768a07c0f64ef6 Author: Roland Dreier Date: Thu Aug 25 13:40:04 2005 -0700 [PATCH] IB: move include files to include/rdma Move the InfiniBand headers from drivers/infiniband/include to include/rdma. This allows InfiniBand-using code to live elsewhere, and lets us remove the ugly EXTRA_CFLAGS include path from the InfiniBand Makefiles. Signed-off-by: Roland Dreier commit 1ad62a19f177e61d4dde111ba35fb4badd0c2106 Author: Michael S. Tsirkin Date: Wed Aug 24 14:41:51 2005 -0700 [PATCH] IPoIB: Fix device removal race Currently we may have work scheduled in default kernel workqueue when the device is going down. The device could get freed before this workqueue gets serviced. I am actually seeing this causing system hangs. The following patch fixes this by using ipoib_workqueue which gets flushed when the device is going down. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit fe9e08e17af414a5fd8f3141b0fd88677f81a883 Author: Sean Hefty Date: Fri Aug 19 13:50:33 2005 -0700 [PATCH] IB: Add handling for ABORT and STOP RMPP MADs. Add handling for ABORT / STOP RMPP MADs. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit b9ef520f9caf20aba8ac7cb2bbba45b52ff19d53 Author: Sean Hefty Date: Fri Aug 19 13:46:34 2005 -0700 [PATCH] IB: fix userspace CM deadlock Fix deadlock condition resulting from trying to destroy a cm_id from the context of a CM thread. The synchronization around the ucm context structure is simplified as a result, and some simple code cleanup is included. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 4ce059378c04b40c2e9f658b1c6a2e9078b85c7c Author: Roland Dreier Date: Fri Aug 19 12:03:17 2005 -0700 [PATCH] IPoIB: Set full membership bit in P_Keys Always make sure that the full membership bit is set in the P_Keys that IPoIB uses. This makes sure that all hosts join the correct multicast groups so that hosts that are partial partition members can talk to the rest of the network. Signed-off-by: Roland Dreier commit ec34a922d243c3401a694450734e9effb2bafbfe Author: Roland Dreier Date: Fri Aug 19 10:59:31 2005 -0700 [PATCH] IB/mthca: Add SRQ implementation Add mthca support for shared receive queues (SRQs), including userspace SRQs. Signed-off-by: Roland Dreier commit d20a40192868082eff6fec729b311cb8463b4a21 Author: Roland Dreier Date: Fri Aug 19 10:36:11 2005 -0700 [PATCH] IB/mthca: Handle context tables smaller than our chunk size When creating a table in context memory where the table is smaller than our chunk size, we don't want to allocate and map a full chunk. Instead, allocate just enough memory to cover the table. This can be pretty simple because all tables are a power-of-2 size, so either the table is a multiple of the chunk size, or it's smaller than one chunk. Signed-off-by: Roland Dreier commit c04bc3d1f417a8a90eef9ab46523dfd44858b28d Author: Roland Dreier Date: Fri Aug 19 10:33:35 2005 -0700 [PATCH] IB/mthca: Move WQE structures into their own header Move the definitions of the WQE structures from mthca_qp.c into mthca_wqe.h, so that we'll be able to share them when we add the SRQ code in mthca_srq.c. Signed-off-by: Roland Dreier commit 288bdeb4bc5b89befd7ee2f0f0183604034ff6c5 Author: Roland Dreier Date: Fri Aug 19 09:19:05 2005 -0700 [PATCH] IB/mthca: Simplify handling of completions with error Mem-free HCAs never generate error CQEs that complete multiple WQEs, so just skip the call to mthca_free_err_wqe() for them rather than having logic to handle the mem-free case in mthca_free_err_wqe(). Signed-off-by: Roland Dreier commit 87b816706bb2b79fbaff8e0b8e279e783273383e Author: Roland Dreier Date: Thu Aug 18 13:39:31 2005 -0700 [PATCH] IB/mthca: Factor out common queue alloc code Clean up the allocation of memory for queues by factoring out the common code into mthca_buf_alloc() and mthca_buf_free(). Now CQs and QPs share the same queue allocation code, which we'll also use for SRQs. Signed-off-by: Roland Dreier commit f520ba5aa48e2891c3fb3e364eeaaab4212c7c45 Author: Roland Dreier Date: Thu Aug 18 12:24:13 2005 -0700 [PATCH] IB: userspace SRQ support Add SRQ support to userspace verbs module. This adds several commands and associated structures, but it's OK to do this without bumping the ABI version because the commands are added at the end of the list so they don't change the existing numbering. There are two cases to worry about: 1. New kernel, old userspace. This is OK because old userspace simply won't try to use the new SRQ commands. None of the old commands are changed. 2. Old kernel, new userspace. This works perfectly as long as userspace doesn't try to use SRQ commands. If userspace tries to use SRQ commands, it will get EINVAL, which is perfectly reasonable: the kernel doesn't support SRQs, so we couldn't do any better. Signed-off-by: Roland Dreier commit d41fcc6705eddd04f7218c985b6da35435ed73cc Author: Roland Dreier Date: Thu Aug 18 12:23:08 2005 -0700 [PATCH] IB: Add SRQ support to midlayer Make the required core API additions and changes for shared receive queues (SRQs). Signed-off-by: Roland Dreier commit d1887ec2125988adccbd8bf0de638c41440bf80e Author: Roland Dreier Date: Thu Aug 18 12:14:11 2005 -0700 [PATCH] IB/mthca: Report correct max_msg_sz Set the max_msg_sz port property correctly in mthca's port_query function. Also zero out the attr struct so that we don't leave any other members uninitialized. Signed-off-by: Roland Dreier commit da6561c285a6e28a075b97fd5a1560a2b0ce843e Author: Roland Dreier Date: Wed Aug 17 07:39:10 2005 -0700 [PATCH] IB/mthca: Use correct port width capability value When we call the INIT_IB firmware command to bring up a port, use the actual port width capability returned by the QUERY_DEV_LIM command instead of always trying to enable both 1X and 4X. This fixes breakage seen when the firmware is build to allow 4X only. Signed-off-by: Roland Dreier commit 2aeba9a03b0d249fc710b9939fc089ce53d8cd30 Author: Olaf Hering Date: Mon Aug 15 14:29:03 2005 -0700 [PATCH] IB: Remove unnecessary includes of changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason. Remove unneeded includes of . Signed-off-by: Olaf Hering Signed-off-by: Roland Dreier commit 5dd2ce1200f4b12687d74de89a527f99e16c344e Author: Hal Rosenstock Date: Mon Aug 15 14:16:36 2005 -0700 [PATCH] IB: Fix ib_mad_thread_completion_handler declaration Change ib_mad_thread_completion_handler to conform to ib_comp_handler declaration. Signed-off-by: Hal Rosenstock Signed-off-by: Roland Dreier commit 7f9f2dba729cee6ea10596ccb07447d467705b08 Author: Guy German Date: Mon Aug 15 07:38:50 2005 -0700 [PATCH] IB/mthca: use generic function instead of arbel_ version in mthca_free_region() Use the generic key_to_hw_index() function instead of the Arbel-specific version in mthca_free_region(). Signed-off-by: Guy German Signed-off-by: Roland Dreier commit ffbf4c34f1916fa1e0554269c94c57da4a21a348 Author: Roland Dreier Date: Mon Aug 15 07:35:16 2005 -0700 [PATCH] IB: unmap FMRs when destroying FMR pool Make sure that all FMRs are unmapped before we deallocate them so that we don't leak references to our protection domain when destroying an FMR pool. (Bug reported by Guy German ) Signed-off-by: Roland Dreier commit 2e8b981c5d5c6fe5479ad47c44e3e76ebb5408ef Author: Michael S. Tsirkin Date: Sat Aug 13 21:19:38 2005 -0700 [PATCH] IB/mthca: add HCA board ID to sysfs info Add support for reporting HCA board ID returned from QUERY_ADAPTER firmware command through sysfs. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 97f52eb438be7caebe026421545619d8a0c1398a Author: Sean Hefty Date: Sat Aug 13 21:05:57 2005 -0700 [PATCH] IB: sparse endianness cleanup Fix sparse warnings. Use __be* where appropriate. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 92a6b34bf4d0d11c54b2a6bdd6240f98cb326200 Author: Hal Rosenstock Date: Sat Aug 13 20:50:27 2005 -0700 [PATCH] IB: Eliminate redundant NULL checks IPoIB: Eliminate NULL checks prior to calling kfree Signed-off-by: Hal Rosenstock Signed-off-by: Roland Dreier commit 2a1d9b7f09aaaacf235656cb32a40ba2c79590b3 Author: Roland Dreier Date: Wed Aug 10 23:03:10 2005 -0700 [PATCH] IB: Add copyright notices Make some lawyers happy and add copyright notices for people who forgot to include them when they actually touched the code. Signed-off-by: Roland Dreier commit 49f6a7fbe123dde25ca4193a7d60705784e18317 Author: Tziporet Koren Date: Wed Aug 10 23:00:50 2005 -0700 [PATCH] IB: Update current firmware versions in mthca driver Update FW versions in mthca according to July 05 Mellanox release Signed-off-by: Tziporet Koren Signed-off-by: Roland Dreier commit d395bf12d1ba61437e546eb642f0d7ea666123ff Author: Venkatesh Pallipadi Date: Thu Aug 25 15:59:00 2005 -0400 [ACPI] Reduce acpi-cpufreq switching latency by 50% The acpi-cpufreq driver does a P-state get after a P-state set to verify whether set went through successfully. This test is kind of redundant as set goes throught most of the times, and the test is also expensive as a get of P-states can take a lot of time (same as a set operation) as it goes through SMM mode. Effectively, we are doubling the P-state latency due to this get opertion. momdule parameter "acpi_pstate_strict" restores orginal paranoia. http://bugzilla.kernel.org/show_bug.cgi?id=5129 Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit 953d1137fc4aba16deace262e93974913596dcfe Author: Jeff Garzik Date: Fri Aug 26 19:46:24 2005 -0400 [libata sata_sil] list documentation URL, since its public commit f8220c7f15c54aefb4976ad7c6e2aa98b27a8ce8 Author: Kenneth Chen Date: Fri Aug 26 14:57:00 2005 -0700 [IA64] Delete erroneous copy_page.o in global lib-y list copy_page.o appeared twice in arch/ia64/lib/Makefile. The one in global lib-y is wrong where it should be just in lib-$(CONFIG_ITANIUM). Both copy_page.o and copy_page_mck.o are build for Itanium2 processor and the link order will pick up the low performing copy_page function (originally written for itanium processor). In this case, we really want the copy_page_mck.o for optimized version. Signed-off-by: Kenneth Chen Signed-off-by: Tony Luck commit 4db8699bcfa8faddb5727b1cb010a4d9b8a42e8c Author: Venkatesh Pallipadi Date: Fri Jul 29 16:15:00 2005 -0700 [IA64] Add ACPI based P-state support Patch to support P-state transitions on ia64. This driver is based on ACPI, and uses the ACPI processor driver interface to find out the P-state support information for the processor. This driver plugs into generic cpufreq infrastructure. Once this driver is loaded successfully, ondemand/userspace governor can be used to change the CPU frequency dynamically based on load or on request from userspace process. Refer : ACPI specification - http://www.acpi.info P-state related PAL calls - http://developer.intel.com/design/itanium/downloads/24869909.pdf Signed-off-by: Venkatesh Pallipadi Signed-off-by: Tony Luck commit d1e079b3fc90c7c114f46771e983a72ac8740882 Author: Russ Anderson <(rja@sgi.com)> Date: Mon Aug 15 14:46:00 2005 -0700 [IA64-SGI] fix bte_copy() calling smp_processor_id() while preemptible bte_copy() calls calls smp_processor_id(), which will get flagged if preemption if enabled. raw_smp_processor_id() is used instead because we are just using it to pick a BTE interface and are not tied to a specific cpu. Signed-off-by: Russ Anderson (rja@sgi.com) Signed-off-by: Tony Luck commit b73fc89f6d1f84326e5e897ad249d00a9f218fd7 Author: Alan Cox Date: Fri Aug 26 16:03:19 2005 +0100 [PATCH] libata: regularize dma_start/stop arguments Needed for a few PATA drivers. Also fix up a wrong comment. Signed-off-by: Jeff Garzik commit 31433ea369d250ad011577eee6110d3efcb9d861 Author: Alan Cox Date: Fri Aug 26 15:56:47 2005 +0100 [PATCH] libata: typo You spelt heuristic wrongly. Also reformatted to 80 columns, ignore the diff and fix the typo if you prefer that. Signed-off-by: Jeff Garzik commit 8409668b561fbe464f7a392e8dc77eca225d27ac Author: Mark Maule Date: Thu Aug 25 11:45:00 2005 -0700 [IA64] altix: Abstract irq_affinity at the sn pci provider Altix patch to abstract irq_affinity down to the pci provider level since different SGI hardware implements this in different ways. Signed-off-by: Mark Maule Signed-off-by: Tony Luck commit 3690b6c124fbc7259634f3b80d92a6d9fe51ec79 Author: Francois Romieu Date: Fri Aug 26 00:30:37 2005 +0200 [PATCH] sis190: complete the mii probe before registering the netdevice The userspace must not be able to issue ethtool command and manage the mii before it is completely initialized. Avoid some pesky "eth%d" messages. Signed-off-by: Arnaud Patard Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit b8f6153ee421014f42b620238f4203a4106db309 Author: Jeff Garzik Date: Thu Aug 25 22:01:20 2005 -0400 libata: fix EH locking Wrap ata_qc_complete() calls in EH context in spinlocks, to prevent races (mainly in ATAPI code paths). commit 831a179fc9387af6dbaa12816ae1e074d1f1a730 Author: Jeff Garzik Date: Thu Aug 25 20:59:10 2005 -0400 hostap: s/IEEE80211_FCTL_WEP/IEEE80211_FCTL_PROTECTED/ to fix build commit 099c5bb169e9816a7761336f668b63010762807b Author: Jiri Benc Date: Thu Aug 25 20:15:10 2005 -0400 ieee80211: use endian-aware types From: Michael Wu This patch: - fixes misc. whitespace/comments - replaces u16 with __le16/__be16 where appropriate Signed-off-by: Michael Wu Signed-off-by: Jiri Benc commit 95d5185d1ab6875b86a639310919dc48a716c7be Author: Jiri Benc Date: Thu Aug 25 20:13:04 2005 -0400 ieee80211: convert defines to enums From: Gertjan van Wingerde Attached patch cleans up the long lists of #defines for status codes, reason codes, and information elements. Signed-off-by: Gertjan van Wingerde Signed-off-by: Jiri Benc commit f13baae43e97e84d3f06080908db75a017c62165 Author: Jiri Benc Date: Thu Aug 25 20:11:46 2005 -0400 ieee80211: new constants from latest 802.11x specifications From: Gertjan van Wingerde Attached patch updates the definitions of the generic ieee80211 stack to the latest versions of the published 802.11x specification suite. Signed-off-by: Gertjan van Wingerde Signed-off-by: Jiri Benc commit 8d45ff7d7bd85d9066f5b498cda5c4a52ac36a7f Author: Jiri Benc Date: Thu Aug 25 20:09:39 2005 -0400 ipw2200: minor cleanups This removes one trap for a programmer, few unused macros, and one unused struct. Signed-off-by: Pavel Machek Signed-off-by: Jiri Benc commit 771abed990d8642f289f733dc0fa8a395ab31ca1 Author: Jiri Benc Date: Thu Aug 25 20:08:22 2005 -0400 This removes support for old (and non-mainline) kernels from ipw2200. Signed-off-by: Pavel Machek Signed-off-by: Jiri Benc commit 3ce329cec29b788bd5d9aaa446fd7ecdd4df64fe Author: Jiri Benc Date: Thu Aug 25 20:07:01 2005 -0400 ipw2100: interface-up carrier state fix From: Imre Deak I had a problem where doing an open after a close left the device unusable. netif_carrier_on should be called whenever we go to the associated state, but this is not so in case of a close->open sequence. Signed-off-by: Jiri Benc commit 53788015c736b9957448aebd7b7c286da217ee51 Author: Jiri Benc Date: Thu Aug 25 20:05:45 2005 -0400 ipw2100: Fix incorrectly named config option. Signed-off-by: Jiri Benc Signed-off-by: Jirka Bohac commit c4aee8c21ff5d8d6f9a27112468f5e840d5ced1b Author: Jiri Benc Date: Thu Aug 25 20:04:43 2005 -0400 ipw2100: minor cleanups From: Adrian Bunk This patch contains the following possible cleanups: - make needlessly global code static - remove the unused IPW_DEBUG_ENABLED Signed-off-by: Adrian Bunk Signed-off-by: Jiri Benc commit 797b4f7652a4dcf06bdf6a8c870991acdf56c03d Author: Jiri Benc Date: Thu Aug 25 20:03:27 2005 -0400 ipw2100: remove custom debug-print macros From: Pavel Machek ipw2100 uses custom debug prints that are sometimes longer and always harder to read than normal printk. They also introduced some bugs where prefix is printed twice. Signed-off-by: Pavel Machek Signed-off-by: Jiri Benc commit 19f7f74297e7f88f60c183acb105a5488dd189b6 Author: Jiri Benc Date: Thu Aug 25 20:02:10 2005 -0400 ipw2100: remove strange symbol prefixes From: Pavel Machek ipw2100 uses strange X__ prefixes even for symbols already prefixed by ipw2100. Fixed. Signed-off-by: Pavel Machek Signed-off-by: Jiri Benc commit e88187eedc0a9223914b23b063342db8bcc31f9c Author: Jiri Benc Date: Thu Aug 25 20:00:53 2005 -0400 ieee80211: Puts debug macros together and makes escape_essid not inlined. Signed-off-by: Jiri Benc Signed-off-by: Jirka Bohac commit 78f81cc4355c31c798564ff7efb253cc4cdce6c0 Author: Borislav Deianov Date: Wed Aug 17 00:00:00 2005 -0400 [ACPI] IBM ThinkPad ACPI Extras Driver v0.12 http://ibm-acpi.sf.net/ Signed-off-by: Borislav Deianov Signed-off-by: Len Brown commit 611494dccacb3e42f55359df74d604b67312598b Author: Malli Chilakala Date: Thu Aug 25 13:06:52 2005 -0700 [PATCH] e100: Driver version, white space, comments & other Driver version, white space, comments & other Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 685fac63f5ca6c5ca06bab641e1a32bbf9287e89 Author: Malli Chilakala Date: Thu Aug 25 13:06:34 2005 -0700 [PATCH] e100: CPU cycle saver microcode Add cpu cycle saver microcode to 8086:{1209/1229} other than ICH devices. Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit e6280f26b43775d8fa0c54e50c92491cfccbf738 Author: Malli Chilakala Date: Thu Aug 25 13:06:23 2005 -0700 [PATCH] e100: Increased delay loop for command blocks Increased delay loop for command blocks Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 996ec3533ae15424e339089a8045ca1c998f8a87 Author: Malli Chilakala Date: Thu Aug 25 13:06:08 2005 -0700 [PATCH] e100: fixed endian bug in xmit_prepare routine Fixed endian bug associated with cb_i bit in xmit_prepare Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit a074fb860846937a4a46dbbf439cbbb2e2ba960c Author: Malli Chilakala Date: Thu Aug 25 13:05:57 2005 -0700 [PATCH] e100: added msleep_interruptible delay added msleep_interruptible delay right before returning from diag_test Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 136df52d532af9c19e5cd0e43a54ea4ee2d934fc Author: Malli Chilakala Date: Thu Aug 25 13:05:41 2005 -0700 [PATCH] e100: Do not check Rx packet length against mtu Do not check Rx packet length against mtu - patch from Darren Tucker Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit d0d59b98d7a0b3801ce03e695ba885b698a6d122 Author: Len Brown Date: Thu Aug 25 12:41:22 2005 -0400 [IA64] fix allnoconfig build cc: Tony Luck Signed-off-by: Len Brown commit 6153df7b2f4d27c8bde054db1b947369a6f64d83 Author: Len Brown Date: Thu Aug 25 12:27:09 2005 -0400 [ACPI] delete CONFIG_ACPI_PCI Delete the ability to build an ACPI kernel that does not include PCI support. When such a machine is created and it requires a tuned kernel, send a patch. http://bugzilla.kernel.org/show_bug.cgi?id=1364 Signed-off-by: Len Brown commit 07fefe4ca93b3e45b2bea32871a4496067888852 Author: Len Brown Date: Thu Aug 25 12:22:04 2005 -0400 [ACPI] remove "default m" from acpi/Kconfig Andi Kleen suggested it was unconventional for us to "default m" on ACPI modules -- even though they are expected to be deployed as modules. But as "default n" would likely result in some users building nonsense kernels, we compromise to "default y". Distros are expected to continue to use =m in their configs. Signed-off-by: Len Brown commit bfea6c2af798d9a882bbc6b9ae9893ab1864d230 Author: Len Brown Date: Thu Aug 25 12:15:11 2005 -0400 [ACPI] reduce use of EXPERIMENTAL in acpi/Kconfig Distros are shipping modules we had marked EXPERIMENTAL, so clearly it has lost some meaning. Delete that dependency for shipping modules, retaining it only for ACPI_HOTKEY and ACPI_CONTAINER to emphasize that they lack testing on real hardware. Signed-off-by: Len Brown commit eb7b6b32644f7a48357e02f8004f88b3220f3494 Author: Len Brown Date: Thu Aug 25 12:08:25 2005 -0400 [ACPI] IA64-related ACPI Kconfig fixes Build issues were mostly in the ACPI=n case -- don't do that. Select ACPI from IA64_GENERIC. Add some missing dependencies on ACPI. Mark BLACKLIST_YEAR and some laptop-only ACPI drivers as X86-only. Let me know when you get an IA64 Laptop. Signed-off-by: Len Brown commit 5b9021bc5800796e23e4994f8cf2dc61536be0a7 Author: Russ Anderson <(rja@sgi.com)> Date: Wed Aug 17 10:00:00 2005 -0700 [IA64] SGI SN remove redundant partition SAL call Clean up of SGI SN partitioning related code. The SN_SAL_GET_SN_INFO SAL call returns the partition ID, making the SN_SAL_SYSCTL_PARTITION_GET SAL call redundant. Remove sn_partid and use sn_partition_id. Signed-off-by: Russ Anderson (rja@sgi.com) Signed-off-by: Tony Luck commit 5390970d1c11b6d5d6a8253a718ed100e2178e14 Author: Mark Goodwin Date: Tue Aug 16 00:51:00 2005 -0700 [IA64] - SGI SN hwperf enhancements - Update the SN pci device info to use the nearest node function to allocate driver memory on the nearest node (rather than defaulting to node 0). Signed-off-by: Mark Goodwin Signed-off-by: Tony Luck commit 60a3ba0bb45995ecf9cfe208527d7cfd6128d053 Author: Mark Goodwin Date: Wed Aug 17 15:17:00 2005 -0700 [IA64] - SGI SN hwperf enhancements - Add a new exported function for determining the nearest node with CPUs for I/O nodes and fix a bug where the hwperf dynamic misc device was being registered before misc_init(). Signed-off-by: Mark Goodwin Signed-off-by: Tony Luck commit ecc3c30ae39c4d3cbf249a1ebd599465e0e25708 Author: Mark Goodwin Date: Tue Aug 16 00:50:00 2005 -0700 [IA64] - SGI SN hwperf enhancements - export_pci_topology Bugfix to export PCI topology information in /proc/sgi_sn/sn_topology. Signed-off-by: Mark Goodwin Signed-off-by: Tony Luck commit 1b66776da71e33dff5edcc0b096ec3b7c40c75ad Author: Greg Edwards Date: Mon Aug 22 09:57:00 2005 -0700 [IA64] clean up sn2 region definitions Clean up some duplicate region definitions in sn2 code. Signed-off-by: Greg Edwards Signed-off-by: Tony Luck commit 0a41e2501160587eb8f66cef3bdf1c6f2cb86997 Author: Peter Chubb Date: Tue Aug 16 19:54:00 2005 -0700 [IA64] Rationalise Region Definitions Currently, region numbers are defined in several files, with several names. For example, we have REGION_KERNEL in asm/page.h and RGN_KERNEL in pgtable.h We also have address definitions that should depend on the RGN_XXX macros, but are currently just long constants. The following patch reorganises all the definitions so that they have the same form (RGN_XXX), are in one place, and that addresses that depend on RGN_XXX are derived from them. (This is a necessary but not sufficient patch to allow UML-like operation on IA64). Thanks to David Mosberger for catching the change I missed in mmu_context.h. Signed-off-by: Peter Chubb Signed-off-by: Tony Luck commit b5f3616ba73699d07deee1f244179fae49502052 Author: Bjorn Helgaas Date: Tue Aug 23 09:24:00 2005 -0700 [IA64] fix IO_SPACE_SPARSE_ENCODING macro ambiguity Parenthesize "p" to avoid ambiguity. No callers have a problem today; this is just to clean up the bad form. Signed-off-by: Bjorn Helgaas Signed-off-by: Tony Luck commit 38d26b9f577ec63ba64926c45f4ee3805ed2041c Author: Adrian Bunk Date: Wed Aug 24 03:58:00 2005 -0700 [IA64] arch/ia64/hp/sim/boot/fw-emu.c: remove egcs workaround Kernel 2.6 doesn't support egcs, and I didn't find any user of this function. Signed-off-by: Adrian Bunk Signed-off-by: Tony Luck commit a877bd36f7584fd7e4729099348cfc9190ba00aa Author: Kumar Gala Date: Wed Aug 24 09:53:00 2005 -0700 [IA64] remove use of asm/segment.h Removed IA64 architecture specific users of asm/segment.h The removal of asm-ia64/segment.h itself can wait until all of the kernel source has been purged of references. Signed-off-by: Kumar Gala Signed-off-by: Tony Luck commit 76f58584824c61eb5b3bdbf019236815921d2e7c Author: Len Brown Date: Wed Aug 24 12:10:49 2005 -0400 [ACPI] delete CONFIG_ACPI_BUS it is a synonym for CONFIG_ACPI Signed-off-by: Len Brown commit 8466361ad5233d4356a4601e16b66c25277920d1 Author: Len Brown Date: Wed Aug 24 12:09:07 2005 -0400 [ACPI] delete CONFIG_ACPI_INTERPRETER it is a synonym for CONFIG_ACPI Signed-off-by: Len Brown commit 888ba6c62bc61a995d283977eb3a6cbafd6f4ac6 Author: Len Brown Date: Wed Aug 24 12:07:20 2005 -0400 [ACPI] delete CONFIG_ACPI_BOOT it has been a synonym for CONFIG_ACPI since 2.6.12 Signed-off-by: Len Brown commit 16592d269801ea68130b283c888ffb3c3e988299 Author: Christoph Lameter Date: Mon Aug 22 12:20:00 2005 -0700 [IA64] Remove rwsem limitation of 32k waiters We ran into the limit with the maximum number of waiters at one of our sites. This patch increases the number of possible waiters from 2^15 to 2^31 by using a long for the counter in struct rw_semaphore. S390 and alpha already do this. Signed-off-by: Christoph Lameter Acked-by: Kenneth Chen Signed-off-by: Tony Luck commit 8531c5ffbca65f6df868637c26e6df6f88bff738 Author: Arthur Kepner Date: Tue Aug 23 01:34:53 2005 -0400 [PATCH] bonding: inherit zero-copy flags of slaves This change allows a bonding device to inherit the "zero-copy" features of its slave devices. It was inspired by a couple of previous postings on this topic: http://marc.theaimsgroup.com/?l=bonding-devel&m=111924607327794&w=2 http://marc.theaimsgroup.com/?l=bonding-devel&m=111925242706297&w=2 and it's largely a combination of the patches that appear in those emails. Signed-off-by: Arthur Kepner commit efcce839360fb3a7b6dedeacaec80f68b0f2d052 Author: Finn Thain Date: Sat Aug 20 15:53:22 2005 +1000 [PATCH] macsonic/jazzsonic network drivers update The purpose of this patch: - Adopt the DMA API (jazzsonic, macsonic & core driver). - Adopt the driver model (macsonic). This part was cribbed from jazzsonic. As a consequence, macsonic once again works as a module. Driver model is also used by the DMA calls. - Support 16 bit cards (macsonic & core driver, also affects jazzsonic) This code was adapted from the mac68k linux 2.2 kernel, where it has languished for a long time. - Support more 32-bit mac cards (macsonic) Also from mac68k repo. - Zero-copy buffer handling (core driver) Provides a nice performance improvement. The new algorithm incidentally helped to replace the old Jazz DMA code. The patch was tested on a variety of macs (several 32-bit quadra built-in NICs, a 16-bit LC PDS NIC and a 16-bit comm-slot NIC), and also on MIPS Jazz. Signed-off-by: Finn Thain Acked-by: Thomas Bogendoerfer Signed-off-by: Jeff Garzik commit e4deec6304cbd5fd08bf573eccc68787945071c2 Author: Tejun Heo Date: Tue Aug 23 07:27:25 2005 +0900 [PATCH] sil: apply M15W quirk selectively (take 2) As SII reports that only original 3112's are affected by M15W quirk, This patch adds SIL_FLAG_MOD15WRITE to selectively apply M15W quirk depending on chipsets. As of yet, we don't know exactly which PCI IDs are for original 3112, so M15W quirk is applied to all except for 3512 and 3124. Once more info is avaliable, we can change some of these sil_3112_m15w's to sil_3112. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 40e8c82c74b9be793601e098fd1313bc2632c5dc Author: Tejun Heo Date: Mon Aug 22 17:12:45 2005 +0900 [PATCH] libata: implement ata_poll_qc_complete and use it in polling functions [PATCH libata-dev-2.6:upstream] implement ata_poll_qc_complete and use it in polling functions Previously, libata polling functions turned irq back on and completed qc commands without holding host lock. This creates a race condition between the polling task and interrupts from other ports on the same host set or spurious interrupt from itself. This patch implements ata_poll_qc_complete which enables irq and completes qc atomically and convert all polling functions. Note: atapi_packet_task() didn't use to turn irq back on or clear ATA_FLAG_NOINTR on error exits. This patch makes it use ata_poll_qc_complete which does both. Note: With this change, ALL invocations of ata_qc_complete() are now done under host_set lock. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit c1389503710ef4b4e5d21bea284afde19e9619cf Author: Tejun Heo Date: Mon Aug 22 14:59:24 2005 +0900 [PATCH] fix atapi_packet_task vs. intr race (take 2) Interrupts from devices sharing the same IRQ could cause ata_host_intr to finish commands being processed by atapi_packet_task if the commands are using ATA_PROT_ATAPI_NODATA or ATA_PROT_ATAPI_DMA protocol. This is because libata interrupt handler is unaware that interrupts are not expected during that period. This patch adds ATA_FLAG_NOINTR flag to tell the interrupt handler that we're not expecting interrupts. Note that once proper HSM is implemented for interrupt-driven PIO, this should be merged into it and this flag will be removed. ahci.c is a different kind of beast, so it's left alone. * The following drivers use ata_qc_issue_prot and ata_interrupt, so changes in libata core will do. ata_piix sata_sil sata_svw sata_via sata_sis sata_uli * The following drivers use ata_qc_issue_prot and custom intr handler. They need this change to work correctly. sata_nv sata_vsc * The following drivers use custom issue function and intr handler. Currently all custom issue functions don't support ATAPI, so this change is irrelevant, updated for consistency and to avoid later mistakes. sata_promise sata_qstor sata_sx4 Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit c0b34ad2956036cdba87792d6c46d8f491539df1 Author: Martin Wilck Date: Thu Aug 4 09:04:56 2005 +0200 [PATCH] Fix HD activity LED with ahci Patch: fix wrong HD activity control by ahci driver The ahci driver 1.0 sets the SActive bit on every transaction, causing the LED to light up. The SActive bit is used only for native command queuing (NCQ) which the current driver version doesn't implement. Resetting the SActive bit is the device's responsibility (by sending a "Set Device Bits FIS" to the host adapter) but this is not required in response to non-NCQ commands, and (most) devices don't. Thus the LED stays always on. This patch fixes the LED behavior. Spec references: http://www.intel.com/technology/serialata/pdf/rev1_1.pdf, sec. 3.3.13, 5.5.1 http://www.serialata.org/docs/serialata10a.pdf http://www.intel.com/design/storage/papers/25266401.pdf Signed-off-by: Martin.Wilck@fujitsu-siemens.com Signed-off-by: Jeff Garzik commit 9309049544935f804b745aa4dea043fb39b2bf2a Author: Daniel Drake Date: Mon Aug 22 14:59:23 2005 +0100 [PATCH] sata_promise: Add PDC40519 id The Promise TX4200 is a 4-port SATA controller based on the PDC40519 chip. It meets the description of the 20319, so just a simple ID needs to be added to support this hardware. Thanks to Martin Povolný for testing. Signed-off-by: Daniel Drake Signed-off-by: Jeff Garzik commit 08b791c02b86e25f456cba64f5f1a1f90326db1d Author: Otto Meier Date: Mon Aug 22 14:58:57 2005 +0100 [PATCH] sata_promise: Add PDC40718 id Otto Meier recently submitted a patch to support the PDC40718 chip (marketed as SATA300 TX4, a 4-port SATA controller). Signed-off-by: Otto Meier Signed-off-by: Daniel Drake Signed-off-by: Jeff Garzik commit 3f3791d30036a367f05b9d0be28ce7ff2e017a5a Author: Albert Lee Date: Tue Aug 16 14:25:38 2005 +0800 [PATCH] libata: Clear ATA_QCFLAG_ACTIVE flag before calling the completion callback Description: After calling the completion callback, the libata error handler might be running and getting atapi sense data. Clearing the ATA_QCFLAG_ACTIVE flag at this point might interfere with the libata error handler. Changes: - Clear the ATA_QCFLAG_ACTIVE flag before calling the completion callback (and also before the error handler) - Add some comment Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 2600636065406dc14948ac2d2913c66c51be80d5 Author: Dale Farnsworth Date: Mon Aug 22 15:53:29 2005 -0700 [PATCH] mv643xx: add workaround for HW checksum generation bug [PATCH] [NET] mv643xx: add workaround for HW checksum generation bug The hardware checksum generator on the mv64xxx occasionally generates an incorrect checksum. This patch works around the issue and enables hardware checksum generation. Signed-off-by: Dale Farnsworth Signed-off-by: Jeff Garzik commit 7a9aff3cff807261e476a1719273a4ac5d254ecb Author: Dave Airlie Date: Tue Aug 23 12:15:43 2005 +1000 drm: fix a bad VERSION check. I found why my G5 was crashing when using the linux-2.6 version of the DRM + git-drm.patch from 2.6.13-rc6-mm1, but not with the CVS DRM. The reason was that dev->agp->cant_use_aperture wasn't getting set, and the reason for that was that no longer gets included and the #if LINUX_VERSION_CODE < 0x020408 in drm_agpsupport.c was going the wrong way. With this patch (and a few others) a 32-bit server works correctly, as does DRI. From: Paul Mackerras Signed-off-by: Dave Airlie commit e0c93142ceed0a2ea4f5b8e9d0f62c884241e9c0 Author: Adrian Bunk Date: Sat Aug 20 17:20:28 2005 +0100 [ARM] fs/adfs/adfs.h: "extern inline" doesn't make sense "extern inline" doesn't make sense. Signed-off-by: Adrian Bunk Signed-off-by: Russell King commit 88f399cd0a5a540db2815eee3002f8f00ef6461e Author: Dave Airlie Date: Sat Aug 20 17:43:33 2005 +1000 drm: fixes for powerpc Remove a bogus check on whether an area is memory (we need a better interface) also change pgprot flags for powerpc don't check on x86-64 either From: Paul Mackerras Signed-off-by: Dave Airlie commit ffbbf7a3ccdcac7526296a55968e5dac0626fd9e Author: Dave Airlie Date: Sat Aug 20 17:40:04 2005 +1000 drm: add new texture upload code from r300 project Paul Mackerras did some new upload code for r300, I forgot to add it to the kernel with r300 merge. Signed-off-by: Dave Airlie commit 945a787675cc5ba362f5d4ce135d2a2c20be5985 Author: Peer Chen Date: Sat Aug 20 01:10:06 2005 -0400 [netdrvr uli526x] fix problems found in review - s/DEVICE/net_device/ - improve formatting - remove dead code - check return value, in several areas commit e960fc5c7d9144b1ce80dda9891ca7dfc656c078 Author: ravinandan.arakali@neterion.com Date: Fri Aug 12 10:15:59 2005 -0700 [PATCH] S2io: Hardware fixes for Xframe II adapter Hi, Patch Description: This patch incorporates the following hardware fixes required for Xframe II adapter. 1. New values to program the dtx_control register. 2. Disable memory controller interrupts(MC_INTR) since these are now monitored thru' a poll routine. 3. Don't reset an XframeII card on an ECC double-bit error(It can recover). 4. Save/restore PCI config space before/after a reset irrespective of Xframe I or II card. 5. Bumped up the driver version no. to 2.0.3.1 Please review the patch and apply the same if it looks ok. Signed-off-by: Ravinandan Arakali Signed-off-by: Jeff Garzik commit 3d52365c4f62edb9ff9710e1c57952e957b2879f Author: Jochen Friedrich Date: Fri Aug 19 15:51:46 2005 +0200 [PATCH] tms380tr: remove prototypes in Space.c Cleanup: remove two prototypes. Signed-off-by: Jochen Friedrich Signed-off-by: Jeff Garzik commit 84c3ea01d163a24323d827e1d280dc3346905972 Author: Jochen Friedrich Date: Fri Aug 19 21:05:56 2005 -0400 [netdrvr] Convert madgemc to new MCA API. Now that all tms380 devices have a valid struct device with dma_mask, remove dmalimit from tmsdev_init(). Kconfig: depend tms380tr and madgemc on MCA. abyss.c, proteon.c, skisa.c, tmspci.c, tms380tr.h: remove dmalimit parameter from tmsdev_init(). tms380tr.c: use device->dma_mask instead of dmalimit. madgemc.c: move to new MCA API using struct device. Signed-off-by: Jochen Friedrich Signed-off-by: Jeff Garzik commit dce773771834221817e2d359a7e07a618ba08807 Author: Russell King Date: Fri Aug 19 09:42:52 2005 +0100 [MMC] Use an IDR for host name indicies Signed-off-by: Russell King commit 1ad434d7cf5f490c71cfbbb2fb91076c01c8704e Author: Russell King Date: Fri Aug 19 09:42:21 2005 +0100 [MMC] Use class device name for mmc host name There's no point in having the host name duplicated between the mmc_host structure and the encapsulated class device structure. Signed-off-by: Russell King commit 00b137cfda5276b3d2c87d44236fe4c5ee68b405 Author: Russell King Date: Fri Aug 19 09:41:24 2005 +0100 [MMC] Add MMC class devices Create a mmc_host class to allow enumeration of MMC host controllers even though they have no card(s) inserted. Patch based on work by Pierre Ossman. Signed-off-by: Russell King commit d366b6436386875b1310ce8f70e3f9dea4647bac Author: Russell King Date: Fri Aug 19 09:40:08 2005 +0100 [MMC] Add mmc_hostname() macro mmc_hostname() returns a pointer to the hostname for the mmc_host. Signed-off-by: Russell King commit 9f7f0098eaadd9200ab52ad0dad523f797d3bf39 Author: Jeff Garzik Date: Fri Aug 19 03:52:49 2005 -0400 [netdrvr eepro100] check for skb==NULL before calling rx_align(skb) commit b4ee21f442ba7a8c43e00b32088d437259890cd0 Author: Andrew Morton Date: Wed Jul 27 01:14:44 2005 -0700 [PATCH] e1000 printk warning fix 2 drivers/net/e1000/e1000_main.c: In function `e1000_clean_tx_irq': drivers/net/e1000/e1000_main.c:2774: warning: size_t format, dma_addr_t arg (arg 8) Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit d9a8a0a3574525bf422fd2f05eec739c0d25814f Author: Komuro Date: Sat Aug 6 12:01:43 2005 +0900 [PATCH] network: fix fmvj18x_cs multicast code The multicast code of the fmvj18x_cs driver is broken. I fixed it to work properly. Signed-off-by: komurojun-mbn@nifty.com Signed-off-by: Jeff Garzik commit e9985d53e3da3b51d0334d0622c449fda78ae089 Author: Adrian Bunk Date: Tue Aug 9 02:41:00 2005 +0200 [PATCH] SIS190 must select MII SIS190 must select MII since it's using it. While I was editing the Kconfig entry, I also converted the spaces to tabs. Signed-off-by: Adrian Bunk Signed-off-by: Jeff Garzik commit 913168de6284cd27810e9ee7ae029d408a2a0555 Author: Francois Romieu Date: Sat Jul 30 01:12:11 2005 +0200 [PATCH] r8169: PCI ID for the Linksys EG1032 The Linksys EG1032 uses Realtek's 8169 chipset. Credit goes to Bob Wilson for the report. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit b2dabd5aadae6a93026f35269e1e53c1a0c6de2d Author: Andrew Morton Date: Wed Jul 13 00:33:46 2005 -0700 [PATCH] more-u32-vs-pm_message_t-fixes-6 Cc: Pavel Machek Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit a51d74409d856e472bad753aecf1f2715718c242 Author: Nishanth Aravamudan Date: Mon Jun 27 09:20:04 2005 -0700 [PATCH] net/cycx_drv: replace delay_cycx() with msleep_interruptible() Use msleep_interruptible() instead of delay_cycx() to guarantee the task delays as expected. Remove the prototype and definition of delay_cycx(). Signed-off-by: Nishanth Aravamudan Signed-off-by: Jeff Garzik commit 1b1b3c9b6d346d441a99e2de0b34f3ba93963ad8 Author: Manfred Spraul Date: Sat Aug 6 23:47:55 2005 +0200 [PATCH] forcedeth: Initialize link settings in every nv_open() Rüdiger found a bug in nv_open that explains some of the reports with duplex mismatches: nv_open calls nv_update_link_speed for initializing the hardware link speed registers. If current link setting matches the values in np->linkspeed and np->duplex, then the function does nothing. Usually, doing nothing is the right thing, but not in nv_open: During nv_open, the registers must be initialized because the nic was reset. The attached patch fixes that by setting np->linkspeed to an invalid value before calling nv_update_link_speed from nv_open. Signed-Off-By: Manfred Spraul Signed-off-by: Jeff Garzik commit e8579e72ca240f3fbaa669f09a9d610436505366 Author: Alex Williamson Date: Thu Aug 4 13:06:00 2005 -0700 [IA64, X86_64] fix swiotlb sizing Fix swiotlb sizing to match what the comments and the kernel parameters documentation indicate. Given a default 16k page size kernel (ia64) and a 2k swiotlb page size, we're off by a multiple of 8 trying to size the swiotlb. When specified on the boot line, the swiotlb is made 8x bigger than requested. When left to the default value, it's 8x smaller than the comments indicate. For x86_64 the multiplier would be 2x. The patch below fixes this. Now, what's a good default swiotlb size? Apparently we don't really need 64MB. Signed-off-by: Alex Williamson Signed-off-by: Tony Luck commit f27ecacc54cc0e5397c9b35f6c25065f07c4448d Author: Russell King Date: Thu Aug 18 21:31:00 2005 +0100 [ARM] Add support for ARM GIC Add support for the ARM Generic Interrupt Controller. Signed-off-by: Russell King commit 323cdfc191b7c1597dc748175062c368568d6af4 Author: Russell King Date: Thu Aug 18 10:10:46 2005 +0100 [MFD] Add SA11x0 MCP platform device support Add platform device data for the SA11x0 MCP device. This allows platforms to customise the configuration of the SA11x0 MCP device according to their needs. Signed-off-by: Russell King commit 5e742ad66b4a8ba6f9d729660f822676d9e405d4 Author: Russell King Date: Thu Aug 18 10:08:15 2005 +0100 [MFD] Add SA11x0 MCP support This adds support for the MCP interface found on SA11x0 devices. Signed-off-by: Russell King commit a4e137ab1447fc5009f21e257971aa60a9ec98fb Author: Russell King Date: Thu Aug 18 10:06:59 2005 +0100 [MFD] Add multimedia communication port core support Add support for the core of the multimedia communication port framework. This is a port used to communicate with devices with two DMA paths and a control path. Signed-off-by: Russell King commit 8c8b83854ea973ee7f37db6612d10d3acc5531d9 Author: Dave Jones Date: Wed Aug 17 23:08:11 2005 -0700 Fix up various printk levels and whitespace corrections. Signed-off-by: Andrew Morton Signed-off-by: Dave Jones commit 470ceb05d9a2b4d61c19fac615a79e56e8401565 Author: Jack Steiner Date: Thu Aug 11 10:28:00 2005 -0700 [IA64-SGI] - New SN hardware support - ptc_fixes Shub2 provides a much improved mechanism for issuing internode TLB purges. Add code to support the newer mechanism. There is also some debug code (disabled) that is useful for testing. Collect statistics on the number, type & duration of TLB purges. This data will be useful for making future improvements in the algorithms. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 68b9753f47953930cb94de0223c163f289399091 Author: Jack Steiner Date: Thu Aug 11 10:28:00 2005 -0700 [IA64-SGI] - New SN hardware support - cpu_relax Add a few missing calls to "hint @pause". Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 7e95b9d6e21eda23bac1ff024d465d2072c8996d Author: Jack Steiner Date: Thu Aug 11 10:27:00 2005 -0700 [IA64-SGI] - New SN hardware support - bte_fixes Change the BTE driver so that it works for both shub1 and shub2. Most of the changes are related to the number of cores that use the BTE engine, to the MMR addresses of various shub registers, and to using the correct processor or network physical address. Signed-off-by: Russ Anderson Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 1007d02160974a46cc4fd3b1737c183c0471b88f Author: Jack Steiner Date: Thu Aug 11 10:27:00 2005 -0700 [IA64-SGI] - New SN hardware support - no_wars Disable some shub1-specific code when running on systems with shub2. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 2fdbb590e4f9b346e5d06cf7f85dcb7a9f2e0a48 Author: Jack Steiner Date: Thu Aug 11 10:26:00 2005 -0700 [IA64-SGI] - New SN hardware support - boot_init_shub2 Update the addresses of the pio_write_status_addr so that they are correct for newer processors. Shub2 did not number the threads in the order that I had expected. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 0aa2c72e59cf1d09a0b321e4e6292af78a51b8b3 Author: Jack Steiner Date: Thu Aug 11 10:26:00 2005 -0700 [IA64-SGI] - New SN hardware support - use_alias_space Use local SHUB alias space when referencing MMRs that are known to be node local. There is a slight performance benefit & code simplification. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 3d14487b2677cc44b5d1ef115d9d4301ec046591 Author: Jack Steiner Date: Thu Aug 11 10:25:00 2005 -0700 [IA64-SGI] - New SN hardware support - addr_macros Update the SN address macros so that they work on both shub1 and shub2. Most of the code to support shub2 was added last year but this patch fixes a few bugs and adds macros to help generate both processor-specific physical addresses & numalink physical addresses. More cleanup & optimization will be done later. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 686762c8049457a6255ad5caf9275c100fbaceb6 Author: Dave Kleikamp Date: Wed Aug 17 13:53:13 2005 -0500 JFS: Initialize dentry->d_op for negative dentries too Signed-off-by: Dave Kleikamp commit 54cfb5aa0f4859bd38706eabe0118175780a542f Author: Stephen Hemminger Date: Tue Aug 16 14:01:05 2005 -0700 [PATCH] skge: turn on link status LED Turn on the link status LED when link comes up. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit c59230818f7a8969c2f9d3b601745679127a4016 Author: Stephen Hemminger Date: Tue Aug 16 14:01:02 2005 -0700 [PATCH] skge: increase receive flush threshold default The flush threshold in the MAC chip should be increased. Found while reviewing vendor version of sk98lin driver. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 5e1705ddc83f77da4b29a6d687da14e971912e41 Author: Stephen Hemminger Date: Tue Aug 16 14:00:58 2005 -0700 [PATCH] skge: fibre vs copper detection cleanup Cleanup the code that handles fibre vs copper detection. Signed-off-by: Stephen Hemminger drivers/net/skge.c | 26 ++++++++++++-------------- drivers/net/skge.h | 11 ++--------- 2 files changed, 14 insertions(+), 23 deletions(-) Signed-off-by: Jeff Garzik commit 050ec18a35f3106437da8e9c55e441c076c7b93e Author: Stephen Hemminger Date: Tue Aug 16 14:00:54 2005 -0700 [PATCH] skge: stop bogus sensor messages Some versions of the Marvell yukon generate bogus sensor warning interrupts. The driver would flood log with these messages. Handle this situation cleanly by masking away at boot time. Fixes: http://bugs.gentoo.org/show_bug.cgi?id=87182 Signed-off-by: Stephen Hemminger drivers/net/skge.c | 24 ++++++++++-------------- drivers/net/skge.h | 8 ++++++-- 2 files changed, 16 insertions(+), 16 deletions(-) Signed-off-by: Jeff Garzik commit c8b432dc0c8d635254010513ca1a3a10a77037a1 Author: Dave Airlie Date: Tue Aug 16 20:54:18 2005 +1000 drm: update pci ids for savage and via Fixup savage and via pci ids From: Dave Airlie commit 414ed537995617f4cbcab65e193f26a2b2dcfa5e Author: Dave Airlie Date: Tue Aug 16 20:43:16 2005 +1000 drm: add initial r300 3D support. This adds initial r300 3D support to the radeon DRM. From: Nicolai Haehnle, Vladimir Dergachev, and others. Signed-off-by: David Airlie commit 702c7e7626deeabb057b6f529167b65ec2eefbdb Author: MAEDA Naoaki Date: Mon Aug 8 01:09:00 2005 -0400 [ACPI] fix ia64 build issues resulting from Lindent and merge Signed-off-by: MAEDA Naoaki Signed-off-by: Andrew Morton Signed-off-by: Brown, Len commit 1a402aaca51b7d56e62348f50a426c531b6bc29e Author: Greg Howard Date: Mon Aug 15 13:00:00 2005 -0700 [IA64-SGI] fix unaligned memory access in snsc_event.c It's been pointed out that environmental events from the system controllers on Altix machines cause the kernel to complain about unaligned memory accesses. This turns out to be because "be32_to_cpup()" didn't do everything I thought/hoped it did. I've added calls to pull the offending integers out of the buffers using get_unaligned() before feeding them to be32_to_cpup(). Signed-off-by: Greg Howard Signed-off-by: Tony Luck commit 975f24bdc7d3833875309509abbc7da2b2a28234 Author: Christoph Hellwig Date: Mon Aug 15 13:29:55 2005 +0200 [SCSI] aiclib remove dead remove lots of completely dead code from aiclib, there's not a lot left and even what's left is rather useless. Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit 85a46523ff68aa0e4d2477c51075ffd9fc7e7a14 Author: Christoph Hellwig Date: Mon Aug 15 13:28:46 2005 +0200 [SCSI] aic79xx: sane pci probing remove ahd_tailq and do sane pci probing. ported over from aic7xxx. Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit d46b1d549e1414d673e0ec18219f4f5e30d5f3f5 Author: Christoph Hellwig Date: Mon Aug 15 13:27:39 2005 +0200 [SCSI] aic79xx: remove some dead code remove some dead cruft, as done already in aic7xxx Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit 1b5cca3a88b7682d538d129c25f0e3092613a243 Author: Jeff Garzik Date: Mon Aug 15 00:32:15 2005 -0400 ieee80211: remove last uses of compat define WLAN_CAPABILITY_BSS commit b2f4a2e3b1620667da9654f9e220c92ea52bdbe4 Author: Jouni Malinen Date: Sun Aug 14 21:00:01 2005 -0700 [PATCH] hostap: Replace WLAN_FC_ defines with ieee80211 ones Replace remaining WLAN_FC_* defines with the ones used in ieee80211 header file. This completes the move from hostap version of frame control field processing to ieee80211 version. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit e313087e42da177df00652d03be9afccf25f9545 Author: Jouni Malinen Date: Sun Aug 14 21:00:00 2005 -0700 [PATCH] hostap: Capability field is called ESS, not BSS Remove backwards compatibility define for WLAN_CAPABILITY_ESS now that net/ieee80211.h defines this. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 2474385e5b623fc46cf172a921d94f9f03a9a704 Author: Jouni Malinen Date: Sun Aug 14 20:59:59 2005 -0700 [PATCH] ieee80211: Capability field is called ESS, not BSS IEEE 802.11 has a capability field flag called ESS, but ieee80211 had renamed this to BSS for some reason. hostap has been using WLAN_CAPABILITY_ESS and since that matches with the standard, lets use it as the name for this define. Add WLAN_CAPABILITY_BSS as a backwards compatibility name for the same bit since ieee80211 and ipw2200 are using this and there are versions outside kernel tree that expect to find this define name. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit f241be74b803dcf9d70c9978292946370654320f Author: Jouni Malinen Date: Sun Aug 14 19:08:45 2005 -0700 [PATCH] ieee80211: Fix frame control pver mask IEEE 802.11 frame control has two bits reserved for protocol version. IEEE80211_FCTL_VERS was not used anywhere, but I would assume it was supposed to be a mask for the protocol field and as such, it should be 0x0003, not 0x0002. This matches with WLAN_FC_PVER definition in hostap. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 4339d328631aa815fe2181b9164b3690ca2db4da Author: Jouni Malinen Date: Sun Aug 14 19:08:44 2005 -0700 [PATCH] hostap: Use ieee80211 WLAN_FC_GET_{TYPE,STYPE} Replace temporary HOSTAP_FC_GET_{TYPE,STYPE} macros with the ieee80211 version of WLAN_FC_GET_{TYPE,STYPE}. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit c0f72ca8e4f1b459b5582c1c8dcaf7e53151f069 Author: Jouni Malinen Date: Sun Aug 14 19:08:43 2005 -0700 [PATCH] hostap: Replace hostap_ieee80211_hdr with ieee80211_hdr Replace hostap-specific struct hostap_ieee80211_hdr with struct ieee80211_hdr from net/ieee80211.h. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 3ec0f4857df4c3dd0d0455ce5b2470b4be77fc77 Author: Jouni Malinen Date: Sun Aug 14 19:08:42 2005 -0700 [PATCH] hostap: Remove extra defines Remove unused defines that are already available from generic kernel header files. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 67e0e473fb54e7657f6604236e42ef07fd7a2768 Author: Jouni Malinen Date: Sun Aug 14 19:08:41 2005 -0700 [PATCH] hostap: Use void *hw_priv instead of #ifdef in local data Replace hardware model specific #ifdef's in struct local_info with void *hw_priv that is pointing to cs/pci/plx specific data structure. This removes unneeded #ifdef's and as such, is a step towards making it possible to share objects for hostap_hw.c and hostap_download.c with cs/pci/plx drivers without having to compile and link the same code separately for each one. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit ea3f1865f33bd328bf043f47492f401a42de5edb Author: Jouni Malinen Date: Sun Aug 14 19:08:40 2005 -0700 [PATCH] hostap: Remove experimental PCI bus master/DMA code PCI version of Prism2.5/3 has undocumented DMA support for TX/RX data, but this seems to have some hardware bugs that prevent it from being used properly for TX. RX side could possibly be made to work reliably. Even though DMA support would be very useful for saving host CPU (from about 40% to 5-10% when operating at maximum throughput), it seems to be best to just remove this code finally. The implementation has always been commented out by default and has received very limited testing. The code may have already been broken number of times and I don't have much interested in trying to verify whether it works or not. Getting this out makes it easier to maintain the driver and allows some cleanups that have been partly postponed because of this experimental bus master/DMA code. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 5bee720fd7fa5ed4eade96058acd3a684da30932 Author: Jouni Malinen Date: Sun Aug 14 19:08:39 2005 -0700 [PATCH] hostap: Fix skb->cb use for TX meta data Old AP mode code for power saving was using skb->cb for couple of flags before the more generic 802.11 TX code started using the same buffer for struct hostap_skb_tx_data. This resulted in the power save code corrupting the magic value in beginning of the buffer and TX code dropping the power saved packets because of this for the case where STAs send PS-Poll frames with PwrMgmt flag set. This patch modifies the power save code to use the same struct hostap_skb_tx_data as rest of the TX path in order to avoid corrupting the data in skb->cb. In addition, this patch reorders fields in the structure and makes them use smaller types in order to make the structure fit in skb->cb on 64-bit hosts. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit d0a7e574007fd547d72ec693bfa35778623d0738 Author: James Bottomley Date: Sun Aug 14 17:09:01 2005 -0500 [SCSI] correct transport class abstraction to work outside SCSI I recently tried to construct a totally generic transport class and found there were certain features missing from the current abstract transport class. Most notable is that you have to hang the data on the class_device but most of the API is framed in terms of the generic device, not the class_device. These changes are two fold - Provide the class_device to all of the setup and configure APIs - Provide and extra API to take the device and the attribute class and return the corresponding class_device Signed-off-by: James Bottomley commit 10c1b88987d618f4f89c10e11e574c76de73b5e7 Author: James Bottomley Date: Sun Aug 14 14:34:06 2005 -0500 [SCSI] add ability to deny binding to SPI transport class This patch is necessary if we begin exposing underlying physical disks (which can attach to the SPI transport class) of the hardware RAID cards, since we don't want any SPI parameters binding to the RAID devices. Signed-off-by: James Bottomley commit 3a4f5c60dbe1978580ea03c1aff353d1e63d1638 Author: James Bottomley Date: Sat Aug 13 09:42:45 2005 -0500 [SCSI] aic7xxx: lost multifunction flags handling From: Christoph Hellwig Multi-function cards need to inherit the PCI flags from the master PCI device. Signed-off-by: James Bottomley commit badea125d7cbd93f1678a95cf009b3bdfe6065cd Author: David Mosberger-Tang Date: Mon Jul 25 22:23:00 2005 -0700 [IA64] Fix race in mm-context wrap-around logic. The patch below should fix a race which could cause stale TLB entries. Specifically, when 2 CPUs ended up racing for entrance to wrap_mmu_context(). The losing CPU would find that by the time it acquired ctx.lock, mm->context already had a valid value, but then it failed to (re-)check the delayed TLB flushing logic and hence could end up using a context number when there were still stale entries in its TLB. The fix is to check for delayed TLB flushes only after mm->context is valid (non-zero). The patch also makes GCC v4.x happier by defining a non-volatile variant of mm_context_t called nv_mm_context_t. Signed-off-by: David Mosberger-Tang Signed-off-by: Tony Luck commit 0336ee5aed1f9a5a6a04e3deabd7797dc193ccd3 Author: akpm@osdl.org Date: Mon Aug 8 21:49:48 2005 -0700 [SCSI] fix warning in aic7770.c From: "Martin J. Bligh" drivers/scsi/aic7xxx/aic7770.c: In function `aic7770_config': drivers/scsi/aic7xxx/aic7770.c:129: warning: unused variable `l' Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 6becdff3bcaff1b89c392cf0630dcb5759704492 Author: akpm@osdl.org Date: Tue Aug 9 00:17:03 2005 -0700 [SCSI] fix warning in scsi_softirq From: Andrew Morton drivers/scsi/scsi.c: In function `scsi_softirq': drivers/scsi/scsi.c:814: warning: int format, long int arg (arg 4) Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 3a1c1d446b7cac6ddd8f6b1f3254ccffe87f1751 Author: James.Smart@Emulex.Com Date: Thu Aug 11 13:42:35 2005 -0400 [SCSI] Add Emulex as maintainer of lpfc SCSI driver Signed-off-by: James Bottomley commit 9909b79e3d533b422c6c72945da35aef124dbce1 Author: James.Smart@Emulex.Com Date: Wed Aug 10 15:03:17 2005 -0400 [SCSI] lpfc driver 8.0.30 : update version to 8.0.30 Signed-off-by: James Smart Signed-off-by: James Bottomley commit 918865230e55b1fece2d8edec39d46c00626590b Author: James.Smart@Emulex.Com Date: Wed Aug 10 15:03:09 2005 -0400 [SCSI] lpfc driver 8.0.30 : convert to use of int_to_scsilun() Replace use of lpfc_put_lun with midlayer's int_to_scsilun Remove driver's local definition of lpfc_put_lun (which converts an int back to a 64-bit LUN) and replace it's use with the recently added int_to_scsilun function provided by the midlayer. Note: Embedding midlayer structure in our structure caused need for more files to include midlayer headers. Signed-off-by: James Smart Signed-off-by: James Bottomley commit ea84c3f74df646a0897e95c78147190517a751a9 Author: James.Smart@Emulex.Com Date: Wed Aug 10 15:02:30 2005 -0400 [SCSI] lpfc driver 8.0.30 : dev_loss and nodev timeouts Fix handling of the dev_loss and nodev timeouts. Symptoms: when remote port disappears for a period of time longer then either nodev_tmo or dev_loss_tmo, the lpfc driver worker thread will stall removing that remote port. Cause: removing remote port involves un-blocking and sync-ing corresponding block device queue. But corresponding node in the lpfc driver is still in the NPR(?node port recovery?) state and mid-layer gets SCSI_MLQUEUE_HOST_BUSY as a return value when it is trying to call queuecommand() with command for that node (AKA remote port) Fix: Instead of returning SCSI_MLQUEUE_HOST_BUS from queuecommand() for nodes in NPR states complete it with retry-able error code DID_BUS_BUSY Signed-off-by: James Smart Signed-off-by: James Bottomley commit f888ba3ce77c66bece3d804caf7d559838209a4a Author: James.Smart@Emulex.Com Date: Wed Aug 10 15:03:01 2005 -0400 [SCSI] lpfc driver 8.0.30 : fix get_stats panic Fix panic in lpfc_get_stats() Symptoms: Panic on sysfs stats access Cause: In lpfc_get_stats() we are writing to memory that we do not own. Fix: Fix our stats structure allocation. Embed phba->link_stats in struct lpfc_hba and stop treating it like rogue structure. Note: Embedding midlayer/transport structure in our structure caused need for more files to include midlayer/transport headers. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 69859dc47744430ecda16522b0791b6d17e3fa93 Author: James.Smart@Emulex.Com Date: Wed Aug 10 15:02:37 2005 -0400 [SCSI] lpfc driver 8.0.30 : task mgmt bit clearing Clear task management bits when preparing SCSI commands In lpfc_scsi_prep_cmnd, clear the task management bits (fcpCntl2 member in the fcp_cmd structure) when preparing regular SCSI commands. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 8cbdc5fffa15d5c573e2531c6f533822d08b6b0f Author: James.Smart@Emulex.Com Date: Wed Aug 10 15:02:50 2005 -0400 [SCSI] lpfc driver 8.0.30 : fix lip/cablepull panic Fix panic on lip and cable pull Symptoms: Panic on lip or cable pull Cause: Use after free of nlp in lpfc_nlp_remove() Fix: Do not make FC transport calls after a node is removed. Transport calls are disabled by ignoring the initial delete transition. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 483f05f0134e60b724bc3678507c1def860c56d5 Author: James.Smart@Emulex.Com Date: Wed Aug 10 15:02:45 2005 -0400 [SCSI] lpfc driver 8.0.30 : fix iocb reuse initialization IOCB BDE not getting fully initialized during reuse Symptoms: Driver gets Status 3 and Reason 0x13 on IOCB completions. Cause: The IOCB bpl.bdeSize and bdeFlags are not getting initialized on reuse. Fix: Reinitialize these fields in prep_dma each time an IOCB is used. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 507caac75e86bd041c5462e5e988fb7138e21d79 Author: James Bottomley Date: Tue Aug 9 12:57:11 2005 -0500 [SCSI] Make the HSG80 a REPORTLUN2 device From: Steve Wilcox In order to properly report LUN's > 7, the DEC HSG80 definition in scsi_devinfo.c needs to include BLIST_REPORTLUN2 rather than BLIST_SPARSELUN. I've tested this change with several HSG firmware revisions and with both Emulex and Qlogic HBA's. Signed-off-by: James Bottomley commit 563a6e1fb0af58433beec1ab418e1fafbd100b56 Author: Albert Lee Date: Fri Aug 12 14:17:50 2005 +0800 [PATCH] libata handle the case when device returns/needs extra data PATCH 2/2: handle the case when device returns/needs extra data Description: Sometimes the device returns/needs extra data than expected. Changes: Modify __atapi_pio_bytes() to handle the case where device returns/needs extra data. - for read case, discard trailing data from the device - for write case, padding zero data to the device Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 6ae4cfb5711b6f2878c9e384617971d98c34a7f5 Author: Albert Lee Date: Fri Aug 12 14:15:34 2005 +0800 [PATCH] libata ata_data_xfer() fix PATCH 1/2: ata_data_xfer() fix Changes: - Modify ata_mmio_data_xfer() and ata_pio_data_xfer() to handle odd-lengthed buffer. - Add some function comments This patch does not reuse ap->pad as alignment buffer since using local variable seems good enough. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 1dadb3dadfaa01890fc10df03f0dd03a9f8774b2 Author: Bjorn Helgaas Date: Wed Jul 27 18:32:00 2005 -0400 [ACPI] don't complain about PCI root bridges without _SEG There are lots of single-PCI-segment machines that don't supply _SEG for the root bridges. The PCI root bridge driver silently assumes the segment to be zero in this case, so glue.c shouldn't complain either. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit 46acac3b4fd8ef66eec63b51de8d556a17c7d4f7 Author: Dave Jones Date: Thu Aug 11 20:28:56 2005 -0700 [AGPGART] Drop duplicate setting of info->mode in agp_copy_info() Spotted by Jeremy Fitzhardinge, this change crept in with the multiple backend support. It's clearly incorrect to overwrite info->mode after we just went to lengths to determine which bits to mask out. Signed-off-by: Dave Jones commit c9221da9f2796f082642c3498edb2c8783ad4774 Author: Mark Maule Date: Wed Aug 3 14:07:00 2005 -0700 [IA64-SGI] sn pci provider for TIOCE (pci Altix patch to add an SN pci provider for TIOCE, which is SGI's PCI Express implementation. Signed-off-by: Mark Maule Signed-off-by: Tony Luck commit 5b53ed1f2ed6c85e2b1c39d97cc112ea32004609 Author: Mark Maule Date: Wed Aug 3 14:06:00 2005 -0700 [IA64-SGI] add support for TIO huge-window Altix patch to add TIO "huge-window" address support to sn_dma_flush(). Update copyright in affected files. Signed-off-by: Mark Maule Signed-off-by: Tony Luck commit 735e60f4c67823a3e01655c990296e2e56574885 Author: Mark Maule Date: Wed Aug 3 14:06:00 2005 -0700 [IA64-SGI] abstract force_interrupt() mechanism Altix patch to abstract the force_interrupt() mechanism away from the pcibr provider. Signed-off-by: Mark Maule Signed-off-by: Tony Luck commit 89963d16dc50a5d91ed09914a1232d59e6461fd6 Author: Mark Maule Date: Wed Aug 3 14:06:00 2005 -0700 [IA64-SGI] altix: cosmetic rename of SGI_PCIBR_ERROR Cosmetic altix patch to rename SGI_PCIBR_ERROR to something more generic and remove a duplicate #define. Signed-off-by: Mark Maule Signed-off-by: Tony Luck commit 674c6479b7bdc78528ea83dd43897e3161558b8b Author: Colin Ngam Date: Wed Aug 3 13:35:00 2005 -0700 [IA64-SGI] Altix only: Add PCI Domain number support. This patch enables PCI Domain numbering on Altix. Signed-off-by: Colin Ngam Signed-off-by: Tony Luck commit 50526df605e7c3e22168664acf726269eae10171 Author: Len Brown Date: Thu Aug 11 17:32:05 2005 -0400 [ACPI] Lindent drivers/acpi/ec.c necessary for clean merge from acpi-2.6.12 to-akpm Signed-off-by: Len Brown commit 716e084edb0230910b174000dc3490f9e91652e3 Author: Luming Yu Date: Wed Aug 10 01:40:00 2005 -0400 [ACPI] Fix "ec_burst=1" mode latency issue http://bugzilla.kernel.org/show_bug.cgi?id=3851 Signed-off-by: Luming Yu Signed-off-by: Len Brown commit ab707da7cf0a1a1d27c6021356cfb3692cf1bd26 Author: Malli Chilakala Date: Thu Aug 11 13:59:59 2005 -0700 [PATCH] ixgb: Driver version, white space, comments Driver version, white space, comments & added Module_version Patch from linville Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit b40a1f06c062d5fb2dc11fcb826d97b28918524f Author: Malli Chilakala Date: Thu Aug 11 13:59:44 2005 -0700 [PATCH] ixgb: Redefined buffer_info-dma to be dma_addr_t instead of uint64 Redefined buffer_info-dma to be dma_addr_t instead of uint64 Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit fcb01756e8e95e8d4e423377bc435e8856194328 Author: Malli Chilakala Date: Thu Aug 11 13:59:31 2005 -0700 [PATCH] ixgb: Remove unused functions Remove unused functions, render some variable static instead of global - based on patch from Adrian Bunk Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit db0bacaa8313e00bb571e2d1102dc9f567353a24 Author: Malli Chilakala Date: Thu Aug 11 13:59:20 2005 -0700 [PATCH] ixgb: Ethtool cleanup patch from Stephen Hemminger Ethtool cleanup patch from Stephen Hemminger * use ADVERTISED_xxx fields when setting advertised fields Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 9ef2eec39383f8fe2bd7c9fac4dfdd4fdf7173e6 Author: Malli Chilakala Date: Thu Aug 11 13:59:07 2005 -0700 [PATCH] ixgb: Fix data output by ethtool -d Fix data output by ethtool -d Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 7b89178d1d803c854dfd6f4e81633109a1238884 Author: Malli Chilakala Date: Thu Aug 11 13:58:55 2005 -0700 [PATCH] ixgb: Fix Broadcast/Multicast packets received statistics Fix Broadcast/Multicast packets received statistics Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 8908c6cd1d6889850148aeb50bb14301959adaa7 Author: Malli Chilakala Date: Thu Aug 11 13:58:40 2005 -0700 [PATCH] ixgb: Use netdev_priv() instead of netdev->priv Use netdev_priv() instead of netdev->priv Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 51b54b512cd26c4477ccd57b8d3736b99ccef7a0 Author: Malli Chilakala Date: Thu Aug 11 13:58:23 2005 -0700 [PATCH] ixgb: Fix unnecessary link state messages Fix unnecessary link state messages Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 9c15d24f2420c2155eccd32d7ab909a9c0e63c2b Author: Malli Chilakala Date: Thu Aug 11 13:58:02 2005 -0700 [PATCH] ixgb: Set RXDCTL:PTHRESH/HTHRESH to zero Set RXDCTL:PTHRESH/HTHRESH to zero Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit ea8f400c98ec9ae0604bc5a6721174ef68635815 Author: Peer Chen Date: Thu Aug 11 15:09:23 2005 -0400 [netdrvr tulip] Remove ULi-specific code from generic tulip driver It has a separate driver now, 'uli526x'. commit 972dcafb6d743a6c7611a2e4681ed814e30d6230 Author: Douglas Gilbert Date: Thu Aug 11 03:35:53 2005 -0400 [libata scsi] add START STOP UNIT translation commit 2bf69b5fe90b3246ab50064c5a690a363e8c53e2 Author: Jeff Garzik Date: Thu Aug 11 02:47:54 2005 -0400 phy subsystem: more cleanups - unexport symbols never used outside of home module - remove dead code - remove CONFIG_PHYCONTROL, make it unconditionally enabled commit 67c4f3fa25502ce7ed82fb0307e09cf36f1f81da Author: Jeff Garzik Date: Thu Aug 11 02:07:25 2005 -0400 Fix numerous minor problems with new phy subsystem. Includes fixes for problems noted by Adrian Bunk, Andrew Morton, and one other person lost in the annals of history (and email folders). commit 1e4adbdb3f0348dcf4fce92f1acc7c8386982c17 Author: Richard Purdie Date: Thu Aug 4 00:16:27 2005 +0100 [PATCH] hostap update Add the device ID of the Buffalo AirStation WLI-CF-S11G Signed-off-by: Richard Purdie Signed-off-by: Jeff Garzik commit 303bcb4b675d7284a1097dd1c18c995c0179883a Author: raghavendra.koushik@neterion.com Date: Wed Aug 3 12:41:38 2005 -0700 [PATCH] S2io: Errors found during review Hi, This is a patch to incorporate comments from earlier 12 patches. It also fixes a few issues we found during this time. Following is a list of changes in this patch. Item 1 incorporates earlier comments. Issues addressed in items 2 to 4 were discovered recently. 1. wmb() call in s2io_xmit() replaced with mmiowb(). 2. The dtx_control register was earlier programmed incorrectly for Xframe II adapter. 3. As suggested by hardware team, after a reset, in case of Xframe II adapter, we clear certain spurious errors by clearing PCI-X ECC status register, "detected parity error" bit in PCI_STATUS register and PCI_STATUS bit in txpic_int register. 4. On IBM PPC platforms, we found that in the Rx buffer replenish function, two memory writes(one to the the descriptor length and another to the ownership) were getting reordered. This was causing the adapter to see the ownership transfered to it before the length was updated. One solution was to add a wmb() but since this would turnout expensive on some platforms if called for every descriptor, we set the ownership bit and other fields of '2' to 'N' Rx descriptors followed by a wmb() and then set the ownership of first descriptor ('1'). Here the value 'N' is configurable by making it a module loadable parameter (rxsync_frequency). (NOTE: This parameter is a power of 2). 5. Bumped up the driver version no. to 2.0.2.1 Signed-off-by: Ravinandan Arakali Signed-off-by: Raghavendra Koushik Signed-off-by: Jeff Garzik commit 0b1f7ebe455ba4f1f46e7024150eeddbbf08addc Author: raghavendra.koushik@neterion.com Date: Wed Aug 3 12:39:56 2005 -0700 [PATCH] S2io: Miscellaneous fixes Hi, The last patch in this series fixes the following issues found during testing. 1. Ensure we don't pass zero sized buffers to the card(which can lockup) 2. Restore the PCI-X parameters(in case of Xframe I adapter) after a reset. 3. Make sure total size of all FIFOs does not exceed 8192. Signed-off-by: Ravinandan Arakali Signed-off-by: Raghavendra Koushik Signed-off-by: Jeff Garzik commit a371a07de9bce837ea4e84569a2b390a42e360ef Author: raghavendra.koushik@neterion.com Date: Wed Aug 3 12:38:59 2005 -0700 [PATCH] S2io: New link handling scheme for Xframe II Hi, The below patch implements a new "Link state change handling" scheme supported by the Xframe II adapter. It also bumps up the driver version to 2.0.2.0. Signed-off-by: Ravinandan Arakali Signed-off-by: Raghavendra Koushik Signed-off-by: Jeff Garzik commit b6e3f9828b9dc188cfe80364365cc68bf45df949 Author: raghavendra.koushik@neterion.com Date: Wed Aug 3 12:38:01 2005 -0700 [PATCH] S2io: Support for bimodal interrupts Hi, This is a patch to provide bimodal interrupt moderation support for Xframe II adapter. Basically, in this moderation scheme, the adapter raises a traffic interrupt if the no. of packets transmitted and/or received reaches a programmable threshold. Signed-off-by: Ravinandan Arakali Signed-off-by: Raghavendra Koushik Signed-off-by: Jeff Garzik commit 541ae68f6ddf1c27aa6879935ce541f110484202 Author: raghavendra.koushik@neterion.com Date: Wed Aug 3 12:36:55 2005 -0700 [PATCH] S2io: Support for Xframe II NIC Hi, This patch provides basic support for the Xframe II adapter. Includes the following changes: 1. New values to program XAUI interface. 2. Print the PCI/PCI-X mode(bus frequency, width). 3. Remove EOI from reset during intialization. 4. Enable all 8 PCCs if Xframe II adapter. 5. Programs the RLDRAM size depending on the device. (Note: RLDRAM size on XFARME-I is 64Mb whereas on XFRAME-II it's 32 Mb). 6. Enable extended(64-bit) statistics counters. 7. Program timer interrupt duration based on PCI/PCI-X clock speed. 8. Not required to save/restore PCI config space before/after reset. Signed-off-by: Ravinandan Arakali Signed-off-by: Raghavendra Koushik Signed-off-by: Jeff Garzik commit be3a6b02eb68a4d47397b771b6e4aa1f7f0f7ffb Author: raghavendra.koushik@neterion.com Date: Wed Aug 3 12:35:55 2005 -0700 [PATCH] S2io: VLAN support Hi, Patch below adds VLAN support to the driver. Signed-off-by: Ravinandan Arakali Signed-off-by: Raghavendra Koushik Signed-off-by: Jeff Garzik commit 25fff88eb7dbc63e03f1766e130515900d440dbb Author: raghavendra.koushik@neterion.com Date: Wed Aug 3 12:34:11 2005 -0700 [PATCH] S2io: Timer based slowpath handling Hi, This patch implements the slow-path handling functions(link state change, hardware errors) as a timer. It is not handled in interrupt handler as was done previously. Signed-off-by: Ravinandan Arakali Signed-off-by: Raghavendra Koushik Signed-off-by: Jeff Garzik commit d8892c6ee39614bc6d282dbef0ff9fa461a6467c Author: raghavendra.koushik@neterion.com Date: Wed Aug 3 12:33:12 2005 -0700 [PATCH] S2io: Support for runtime MTU change Hi, Patch below supports MTU change on-the-fly(without bringing interface down) Signed-off-by: Ravinandan Arakali Signed-off-by: Raghavendra Koushik Signed-off-by: Jeff Garzik commit fe113638328995b69d8797e6466b29661b1602d1 Author: raghavendra.koushik@neterion.com Date: Wed Aug 3 12:32:00 2005 -0700 [PATCH] S2io: Performance improvements Hi, This patch relates to mostly performance related changes. 1. Fixed incorrect computation of PANIC level in rx_buffer_level(). 2. Removed unnecessary PIOs(read/write of tx_traffic_int and rx_traffic_int) from interrupt handler and removed read of general_int_status register from xmit routine. 3. Enable two-buffer mode(for Rx path) automatically for SGI systems. This improves Rx performance dramatically on SGI systems. Signed-off-by: Ravinandan Arakali Signed-off-by: Raghavendra Koushik Signed-off-by: Jeff Garzik commit 1ddc50d40a19b3524d302d1d6bfd52ac7bc6b6f7 Author: raghavendra.koushik@neterion.com Date: Wed Aug 3 12:30:43 2005 -0700 [PATCH] S2io: Removed memory leaks Hi, This patch fixes certain memory leaks discovered in free_tx_buffers() and rx_osm_handler() Signed-off-by: Ravinandan Arakali Signed-off-by: Raghavendra Koushik Signed-off-by: Jeff Garzik commit 7ba013ac029513eb4b70cfcd4b86e37c5f16c483 Author: raghavendra.koushik@neterion.com Date: Wed Aug 3 12:29:20 2005 -0700 [PATCH] S2io: Software fixes Hi, Below patch includes fixes for few purely software bugs identified since last release. 1. Keep track and display(as part of ethtool command output) the no. of single-bit and double-bit ECC errors. 2. Handle race condition between intr handler and "interface down" routine. 3. Initial link state setting modified so that the link state displayed after "interface Up" is correct. 4. Fix for "Incorrect Tx packet count when TSO is enabled". 5. Disable periodic DMA of statistics and schedule one-shot DMA only when required. Signed-off-by: Ravinandan Arakali Signed-off-by: Raghavendra Koushik Signed-off-by: Jeff Garzik commit 5e25b9ddb6683fe225a2266b53d73c57381a0c18 Author: raghavendra.koushik@neterion.com Date: Wed Aug 3 12:27:09 2005 -0700 [PATCH] S2io: Hardware fixes Hi, Below patch addresses few h/w specific issues. 1. Check for additional ownership bit on Rx path before starting Rx processing. 2. Enable only 4 PCCs(Per Context Controller) for Xframe I revisions less than 4. 3. Program Rx and Tx round robin registers depending on no. of rings/FIFOs. 4. Tx continous interrupts is now a loadable parameter. 5. Reset the card if we get double-bit ECC errors. 6. A soft reset of XGXS being done to force a link state change has been eliminated. 7. After a reset, clear "parity error detected" bit, PCI-X ECC status register, and PCI_STATUS bit in tx_pic_int register. 8. The error in the disabling allmulticast implementation has been rectified. 9. Leave the PCI-X parameters MMRBC, OST etc. at their BIOS/system defaults. Signed-off-by: Ravinandan Arakali Signed-off-by: Raghavendra Koushik Signed-off-by: Jeff Garzik commit 20346722ec474245446bcbf460594a935a5c0512 Author: raghavendra.koushik@neterion.com Date: Wed Aug 3 12:24:33 2005 -0700 [PATCH] S2io: Code cleanup Hi, We are submitting a series of 13 patches to support our Xframe I and Xframe II line of products. The patches can be categorized as follows: Patches 1-8 : Changes applicable to both Xframe I and II Patches 9-11: Xframe II specific features Patch 12: Addresses issues found during testing cycle. Patch 13: Incorpoates mostly the review comments from community and some last moment bug fixes. Please review the patches and let us know your comments. Starting with patch 1 below. This patch involves cosmetic changes(tabs and indentation, regrouping of transmit and receive data structures, typecasting, code cleanup). Signed-off-by: Ravinandan Arakali Signed-off-by: Raghavendra Koushik Signed-off-by: Jeff Garzik commit f521089158cd48a81b4d72e8e39da006dd79779b Author: Christoph Lameter Date: Fri Aug 5 08:02:00 2005 -0700 [IA64] Spinlock optimizations 1. Nontemporal store for spin unlock. A nontemporal store will not update the LRU setting for the cacheline. The cacheline with the lock may therefore be evicted faster from the cpu caches. Doing so may be useful since it increases the chance that the exclusive cache line has been evicted when another cpu is trying to acquire the lock. The time between dropping and reacquiring a lock on the same cpu is typically very small so the danger of the cacheline being evicted is negligible. 2. Avoid semaphore operation in write_unlock and use nontemporal store write_lock uses a cmpxchg like the regular spin_lock but write_unlock uses clear_bit which requires a load and then a loop over a cmpxchg. The following patch makes write_unlock simply use a nontemporal store to clear the highest 8 bits. We will then still have the lower 3 bytes (24 bits) left to count the readers. Doing the byte store will reduce the number of possible readers from 2^31 to 2^24 = 16 million. These patches were discussed already: http://marc.theaimsgroup.com/?t=111472054400001&r=1&w=2 http://marc.theaimsgroup.com/?l=linux-ia64&m=111401837707849&w=2 The nontemporal stores will only work using GCC. If a compiler is used that does not support inline asm then fallback C code is used. This will preserve the byte store but not be able to do the nontemporal stores. Signed-off-by: Christoph Lameter Signed-off-by: Tony Luck commit aaebf4332018980fef4e601d1b5a6e52dd9e9ae4 Author: Ryan Anderson Date: Sun Jul 31 04:57:49 2005 -0400 [PATCH] kbuild: automatically append a short string to the version based upon the git commit If CONFIG_AUTO_LOCALVERSION is set, the user is using a git-based tree, and the current HEAD is not referred to by any tags in .git/refs/tags/, append -g and the first 8 characters of the commit to the version string. This makes it easier to use git-bisect, and/or to do a daily build, without trampling on your older, working builds, or accidentally setting up conflicting sets of modules. Signed-off-by: Ryan Anderson Signed-off-by: Sam Ravnborg commit dbec486632d2303f5c0e75af7a8473fa4c4a145a Author: Sam Ravnborg Date: Wed Aug 10 20:44:50 2005 +0200 kconfig: move initramfs options to General Setup Move initramfs options from Device Drivers | Block Drivers to General Setup This is a more natural place for this option. Furthermore separate out intramfs options to usr/Kconfig Signed-off-by: Sam Ravnborg commit 3db368f71a91f08c5a93a5bfb6ca1e2de2668e04 Author: Jason Gaston Date: Wed Aug 10 06:18:43 2005 -0700 [PATCH] ahci: AHCI mode SATA patch for Intel ICH7-M DH Hello, This patch adds the Intel ICH7-M DH DID to the ahci.c file for AHCI mode SATA support.  This patch was built against the 2.6.13-rc6 kernel.   If acceptable, please apply. Thanks, Jason Gaston Signed-off-by:  Jason Gaston Signed-off-by: Jeff Garzik commit a80b3424d9fde3c4b6d62adaf6dda78128dc5c27 Author: James Bottomley Date: Mon Aug 8 19:06:50 2005 -0500 [SCSI] aic79xx: fix boot panic with no hardware There's a spurious (and illegal since it's marked __exit) call to ahc_linux_exit() in ahc_linux_init() which causes a double list deletion of the transport class; remove it. Signed-off-by: James Bottomley commit 0d7323c865608dffb1ed39ec2f3841697ec3e009 Author: Dave Jones Date: Mon Aug 8 19:01:43 2005 -0400 [SCSI] blacklist addition. When run on a kernel that scans all LUNs, a certain crappy scsi scanner reports the same LUN over and over.. https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=155457 Aparently they were so shamed by this, they chose to remain anonymous. Though it seems the blacklist code handles anonymous vendors just fine. Signed-off-by: Dave Jones Signed-off-by: James Bottomley commit 8e87c2f118d40d2dc2f5d0140818e8cd023b13e1 Author: Mark Haverkamp Date: Mon Aug 8 14:20:43 2005 -0700 [SCSI] aacraid: adapter support update Received from Mark Salyzyn This patch adds the product ID for the ICP9067MA adapter. The entries for the ICP9085LI, ICP5085BR, IBM8k & ASR4810SAS were incorrect and would not initialize the adapters correctly. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit b21a41385118f9a6af3cd96ce71090c5ada52eb5 Author: James Bottomley Date: Fri Aug 5 21:45:40 2005 -0500 [SCSI] add global timeout to the scsi mid-layer There are certain rogue devices (and the aic7xxx driver) that return BUSY or QUEUE_FULL forever. This code will apply a global timeout (of the total number of retries times the per command timer) to a given command. If it is exceeded, the command is completed regardless of its state. The patch also removes the unused field in the command: timeout and timeout_total. This solves the problem of detecting an endless loop in the mid-layer because of BUSY/QUEUE_FULL bouncing, but will not recover the device. In the aic7xxx case, the driver can be recovered by sending a bus reset, so possibly this should be tied into the error handler? Signed-off-by: James Bottomley commit f03a567054fea4f9d43c50ec91338266c0bd588d Author: Kai Makisara Date: Tue Aug 2 13:40:47 2005 +0300 [SCSI] drivers/scsi/st.c: add reference count and related fixes I have rediffed the patch against 2.6.13-rc5, done a couple of cosmetic cleanups, and run some tests. Brian King has acknowledged that it fixes the problems he has seen. Seems mature enough for inclusion into 2.6.14 (or later)? Nate's explanation of the changes: I've attached patches against 2.6.13rc2. These are basically identical to my earlier patches, as I found that all issues I'd seen in earlier kernels still existed in this kernel. To summarize, the changes are: (more details in my original email) - add a kref to the scsi_tape structure, and associate reference counting stuff - set sr_request->end_io = blk_end_sync_rq so we get notified when an IO is rejected when the device goes away - check rq_status when IOs complete, else we don't know that IOs rejected for a dead device in fact did not complete - change last_SRpnt so it's set before an async IO is issued (in case st_sleep_done is bypassed) - fix a bogus use of last_SRpnt in st_chk_result Signed-off-by: Nate Dailey Signed-off-by: Kai Makisara Signed-off-by: James Bottomley commit 5262d0851cc6692390ee1aa2c55f57f3bfd0a7c7 Author: James Bottomley Date: Fri Aug 5 16:31:35 2005 -0500 [SCSI] aacraid: correct use of cmd->timeout field The cmd->timeout field has been obsolete for a while now. While looking to remove it, I came across this use in the aacraid driver. It looks like you want to initialise the firmware with the current timeout of the command (in seconds), so the value I think you should be using is cmd->timeout_per_command. Acked by: Mark Haverkamp Acked by: Mark Salyzyn Signed-off-by: James Bottomley commit 541e316aed6f7d6efeb427a88645c2a8f61418d6 Author: Stephen Evanchik Date: Mon Aug 8 01:26:18 2005 -0500 Input: psmouse - add support for IBM TrackPoint devices. Signed-off-by: Dmitry Torokhov commit a2ae85df80a5b996a05d6d2ffc9bf97797e93ec6 Author: akpm@osdl.org Date: Sat Aug 6 23:32:07 2005 -0700 [SCSI] aic79xx: needs to select SPI_TRANSPORT_ATTRS without it you get this failure: drivers/built-in.o(.text+0xdcccd): In function `ahd_linux_slave_configure': drivers/scsi/aic7xxx/aic79xx_osm.c:636: undefined reference to `spi_dv_device' drivers/built-in.o(.text+0xdd7b1): In function `ahd_send_async': drivers/scsi/aic7xxx/aic79xx_osm.c:1652: undefined reference to `spi_display_xfer_agreement' drivers/built-in.o(.init.text+0x7b4d): In function `ahd_linux_init': drivers/scsi/aic7xxx/aic79xx_osm.c:2765: undefined reference to `spi_attach_transport' drivers/built-in.o(.init.text+0x7c94):drivers/scsi/aic7xxx/aic79xx_osm.c:2774: undefined reference to `spi_release_transport' drivers/built-in.o(.exit.text+0x72c): In function `ahd_linux_exit': drivers/scsi/aic7xxx/aic79xx_osm.c:2783: undefined reference to `spi_release_transport' Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 282a16749ba63256bcdce2766817f46aaac4dc20 Author: Dave Airlie Date: Sun Aug 7 15:43:54 2005 +1000 drm: add savage driver Add driver for savage chipsets. From: Felix Kuehling Signed-off-by: Dave Airlie commit d27c9b548ad79c14830c57355dbe3a35f970532a Author: Dave Airlie Date: Sun Aug 7 15:19:58 2005 +1000 drm: remove version.h and any version checks.. This patch removes all the drm kernel conditionals from the kernel DRM tree. Signed-off-by: Dave Airlie commit 0e68c00373f61fcdee453f6c9878e3390fc0f0ce Author: Mark Haverkamp Date: Wed Aug 3 15:39:49 2005 -0700 [SCSI] aacraid: sgraw command support Received from Mark Salyzyn from Adaptec: This patch adds support for the new raw io command. This new command offers much larger io commands, is more friendly to the internal firmware structure requiring less translation efforts by the firmware and offers support for targets greater than 2TB (patch to support >2TB will be sent in the future). Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 12a26d0879d8a4502425037e9013b1f64ed669b7 Author: Mark Haverkamp Date: Wed Aug 3 15:39:25 2005 -0700 [SCSI] aacraid: aif registration timeout fix Received from Mark Salyzyn from Adaptec: If the Adapter is quiet and does not produce an AIF event packets to be picked up by the management applications for longer than the timeout interval of two minutes, the cleanup code that deals with aging out registrants could erroneously drop the registration. The timeout is there to clean up should the management application die and fail to poll for updated AIF event packets. Moving the timer update from the ioctl code that delivers an AIF to the polling registrant to the bottom of the ioctl means the timeout is reset with any management application polling activity regardless if an AIF is delivered or not removing the erroneous timeout cleanups. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit e53cb35aaefb83de695e3fd305b9cfabd5bf8c86 Author: Mark Haverkamp Date: Wed Aug 3 15:39:09 2005 -0700 [SCSI] aacraid: remove duplicate io callback code Received from Mark Salyzyn from Adaptec: This patch removes the duplicate code in the write_callback command completion handler, and renames read_callback to io_callback. Optimized the lba calculation into the debug print routine macro to optimize the i/o code path. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit bd1aac809ddbcf7772cfd809d8cfb29c729c6cf9 Author: Mark Haverkamp Date: Wed Aug 3 15:39:01 2005 -0700 [SCSI] aacraid: driver shutdown method Add in pci shutdown method so that the adapter shuts down correctly and flushes its cache. Shutdown should also disable the adapter's interrupt when shutdown (in particularly if the driver is rmmod'd) to prevent spurious hardware activities. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit c7f476023f57145357df32346b7de9202ce47d5f Author: Mark Haverkamp Date: Wed Aug 3 15:38:55 2005 -0700 [SCSI] aacraid: driver version update Received from Mark Salyzyn from Adaptec. Fixes a bug in check_revision. It should return the driver version not the firmware version. Update driver version number. Update driver version string. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit bed30de47b034b5f28fb7db2fae4860b9d9c0622 Author: Mark Haverkamp Date: Wed Aug 3 15:38:51 2005 -0700 [SCSI] aacraid: interupt mitigation Received from Mark Salyzyn from Adaptec: If more than two commands are outstanding to the controller, there is no need to notify the adapter via a PCI bus transaction of additional commands added into the queue; it will get to them when it works through the produce/consumer indexes. This reduced the PCI traffic in the driver to submit a command to the queue to near zero allowing a significant number of commands to be turned around with no need to block for the PCI bridge to flush the notify request to the adapter. Interrupt mitigation has always been present in the driver; it was turned off because of a bug that prevented one from realizing the usefulness of the feature. This bug is fixed in this patch. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit fc789a93994858b5e5a46afb96d0dcf6cc1b6f08 Author: James Bottomley Date: Fri Aug 5 16:24:54 2005 -0500 [SCSI] aic7xxx/79xx: fix another potential panic due to a non existent target I ran into this one sending bus resets across the hardware. Signed-off-by: James Bottomley commit aa0ca6b4bb818406d4769edb9ff115500c8e4090 Author: Dave Airlie Date: Fri Aug 5 23:09:14 2005 +1000 drm: fix warning in drm_pci.c Signed-off-by: Adrian Bunk Signed-off-by: Dave Airlie commit 1fad99499afdd2730adb1d53413b91580b1f0662 Author: Dave Airlie Date: Fri Aug 5 22:40:34 2005 +1000 drm: remove the gamma driver The gamma driver has been broken for quite a while, it doesn't build, we don't have a userspace, mine is in Ireland etc... Signed-off-by: Dave Airlie commit db215327c62c2db533afb322761fa04ea6244164 Author: Dave Airlie Date: Fri Aug 5 22:13:15 2005 +1000 drm: switch drm_handle_t to unsigned int This converts the drm_handle_t to unsigned int. This is currently safe to do as we don't pass these across the kernel/user boundary, but userspace does use these, but no-one builds userspace against the kernel headers at present so it is okay to switch over the kernel copy of drm.h at this point. (The CVS tree will switch over soon in sync with some Mesa changes) From: Egbert Eich Signed-off-by: Dave Airlie commit d1f2b55ad2c11f46e30547a9f7754e99b478348e Author: Dave Airlie Date: Fri Aug 5 22:11:22 2005 +1000 drm: updated DRM map patch for 32/64 bit systems I basically combined Paul's patches with additions that I had made for PCI scatter gather. I also tried more carefully to avoid problems with the same token assigned multiple times while trying to use the base address in the token if possible to gain as much backward compatibility as possible for broken DRI clients. From: Paul Mackerras and Egbert Eich Signed-off-by: Dave Airlie commit c73681e77b40697d16ada777adf2c6dc4db05917 Author: Dave Airlie Date: Fri Aug 5 22:02:48 2005 +1000 drm: copy the right data back to userspace for getreserved contexts ioctl This fixes the information copied back to userspace by the get reserved contexts ioctl. From: Egbert Eich Signed-off-by: Dave Airlie commit 24d109422787119337cd83732feef930d6a23f5c Author: Dave Airlie Date: Fri Aug 5 21:52:18 2005 +1000 drm: fix ioctl direction in r128 getparam Set the IOWR correctly for r128 getparam. From: Egbert Eich Signed-off-by: Dave Airlie commit 1f3a730117ceda2a7c917d687921fe3c82283968 Author: Len Brown Date: Fri Aug 5 03:33:14 2005 -0400 [ACPI] Lindent created a syntax error that broke the build Signed-off-by: Len Brown commit 4be44fcd3bf648b782f4460fd06dfae6c42ded4b Author: Len Brown Date: Fri Aug 5 00:44:28 2005 -0400 [ACPI] Lindent all ACPI files Signed-off-by: Len Brown commit c65ade4dc8b486e8c8b9b0a6399789a5428e2039 Author: Pavel Machek Date: Fri Aug 5 00:37:45 2005 -0400 [ACPI] whitespace Signed-off-by: Pavel Machek Signed-off-by: Len Brown commit cbfc1bae55bbd053308ef0fa6b6448cd1ddf3e67 Author: Adrian Bunk Date: Sat Jul 30 04:18:00 2005 -0400 [ACPI] ACPI_HOTPLUG_CPU Kconfig dependency update prevent: HOTPLUG_CPU=y ACPI_PROCESSOR=y ACPI_HOTPLUG_CPU=n Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 4fdcf0804598f44b0f48da9e5281af48a4db393f Author: Andrew Morton Date: Sat Jul 30 04:18:00 2005 -0400 [ACPI] lint: irqrouter_suspend() takes a pm_message_t, not a u32 Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 031ec77bf67e4bda994ef8ceba267be3295ffdb7 Author: Karol Kozimor Date: Sat Jul 30 04:18:00 2005 -0400 [ACPI] acpi_remove_notify_handler() on video driver unload The video driver doesn't properly remove all the notify handlers on module unload. This has a side effect of subdevices failing to register on module reload, but sudden death looms if the handlers trigger after the module is unloaded. Signed-off-by: Karol Kozimor Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit e92310a930462c6e1611f35453f57357c42bde14 Author: Andrew Morton Date: Sat Jul 30 04:18:00 2005 -0400 [ACPI] fix IA64 build warning Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 53de49f52e305e96143375d1741f15acff7bf34b Author: Andrew Morton Date: Sat Jul 30 04:18:00 2005 -0400 [ACPI] CONFIG_ACPI=n build fix Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 14454a1b3ff8d1d15fbe7cc77f27373777184ddf Author: Kenji Kaneshige Date: Thu Jul 28 14:42:00 2005 -0400 [ACPI] iosapic_register_intr() now returns error instead of panic error condition is passed along by acpi_register_gsi(). Signed-off-by: Kenji Kaneshige Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 58e0276245f6c60119f0384e7eca576b08aa89e2 Author: Kenji Kaneshige Date: Thu Jul 28 14:42:00 2005 -0400 [ACPI] 8250 driver now checks for acpi_register_gsi() errors Signed-off-by: Kenji Kaneshige Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 71df30f8e3e97fde573c41df063c2d66c1ad01b0 Author: Kenji Kaneshige Date: Thu Jul 28 14:42:00 2005 -0400 [ACPI] PNPACPI driver now checks for acpi_register_gsi() errors Signed-off-by: Kenji Kaneshige Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit a9bd53bc49ee8984633e57c1d9d45111c58e9457 Author: Kenji Kaneshige Date: Thu Jul 28 14:42:00 2005 -0400 [ACPI] HPET driver now checks for acpi_register_gsi() errors Signed-off-by: Kenji Kaneshige Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 349f0d5640c18db09a646f9da51a97f1da908660 Author: Kenji Kaneshige Date: Thu Jul 28 14:42:00 2005 -0400 [ACPI] acpi_pci_enable_irq() now checks for acpi_register_gsi() errors Signed-off-by: Kenji Kaneshige Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 1f3a6a15771ed70d3b2581663dcc6b9bc134baa5 Author: Kenji Kaneshige Date: Thu Jul 28 14:42:00 2005 -0400 [ACPI] acpi_register_gsi() can return error Current acpi_register_gsi() function has no way to indicate errors to its callers even though acpi_register_gsi() can fail to register gsi because of some reasons (out of memory, lack of interrupt vectors, incorrect BIOS, and so on). As a result, caller of acpi_register_gsi() cannot handle the case that acpi_register_gsi() fails. I think failure of acpi_register_gsi() should be handled properly. This series of patches changes acpi_register_gsi() to return negative value on error, and also changes callers of acpi_register_gsi() to handle failure of acpi_register_gsi(). This patch changes the type of return value of acpi_register_gsi() from "unsigned int" to "int" to indicate an error. If acpi_register_gsi() fails to register gsi, it returns negative value. Signed-off-by: Kenji Kaneshige Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 79778a27be4c704552a18cf2a3e8b9e30623acd1 Author: James Bottomley Date: Thu Aug 4 17:33:22 2005 -0500 [SCSI] aic7xxx: upport all sequencer and core fixes from adaptec version 6.3.9 This patch upports all relevant code fixes and bumps the driver version to 7.0 to signify starting a new tree. Signed-off-by: James Bottomley commit 52b5cfb355b2b3274979d25490f190d478ab1fad Author: Hannes Reinecke Date: Thu Aug 4 09:16:59 2005 +0200 [SCSI] aic79xx: fixup DT setting this patch is just a cross-port of the fixup for aic7xxx DT settings. As the same restrictions apply for aic79xx also (DT requires wide transfers) the dt setting routine should be modified equivalently. And an invalid period setting will be caught by ahd_find_syncrate() anyway. Signed-off-by: James Bottomley commit 88ff29a4a5a8c4e0ecf375f783be071d1e7e264d Author: James Bottomley Date: Wed Aug 3 15:59:04 2005 -0500 [SCSI] aic79xx: add hold_mcs to the transport parameters since this card can support the setting, add it to the parameter list. Signed-off-by: James Bottomley commit d872ebe4549576e7aab60ed7c746193196381dd0 Author: James Bottomley Date: Wed Aug 3 15:43:52 2005 -0500 [SCSI] add missing hold_mcs parameter to the spi transport class This parameter is important only to people who take the time to tune the margin control settings, otherwise it's completely irrelevant. However, just in case anyone should want to do this, it's appropriate to include the parameter. I don't do anything with it in DV by design, so the parameter will come up as off by default, so if anyone actually wants to play with the margin control settings they'll have to enable it under the spi_transport class first. I also updated the transfer settings display to report all of the PPR settings instead of only DT, IU and QAS Signed-off-by: James Bottomley commit 3f40d7d6eaadecd48f6d1c0c4a5ad414b992260e Author: James Bottomley Date: Wed Aug 3 13:25:10 2005 -0500 [SCSI] aic79xx: fix up transport settings There's a slight problem in the way you've done the transport parameters; reading from the variables actually produces the current settings, not the ones you just set (and there's usually a lag because devices don't renegotiate until the next command goes over the bus). If you set the bit immediately, you get into the situation where the transport parameters report something as being set even if the drive cannot support it. I patched the driver to do it this way and also corrected a panic in the proc routines. Signed-off-by: James Bottomley commit a4b53a11806f5c0824eb4115b1de8206ed7bb89a Author: Hannes Reinecke Date: Mon Aug 1 09:52:56 2005 +0200 [SCSI] aic79xx: DV parameter settings This patch updates various scsi_transport_spi parameters with the actual parameters used by the driver internally. Domain Validation for all devices should now work properly. Signed-off-by: James Bottomley commit 73a25462100772b72a5d62fd66dff01b53018618 Author: Hannes Reinecke Date: Fri Jul 22 16:44:04 2005 +0200 [SCSI] aic79xx: update to use scsi_transport_spi This patch updates the aic79xx driver to take advantage of the scsi_transport_spi infrastructure. Patch is quite a mess as some procedures have been reshuffled to be closer to the aic7xxx driver. Rejections fixed and Signed-off-by: James Bottomley commit 60a13213840296b1e32d6781653a0eaa83d04382 Author: Hannes Reinecke Date: Fri Jul 22 16:42:28 2005 +0200 [SCSI] aic79xx: Remove busyq From: Jeff Garzik This patch removes the busyq in aic79xx and uses the command-queue from the midlayer instead. Additionally some dead code is removed. Signed-off-by: Hannes Reinecke Fixed rejections Signed-off-by: James Bottomley commit 8d6810d33e5e43b11675190318a81303c601a568 Author: Christoph Hellwig Date: Mon Jul 4 17:49:26 2005 +0200 [SCSI] qla1280: endianess annotations Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit 7a34766fdcec0c619aa68ace203b934dd7cf9dbc Author: Christoph Hellwig Date: Mon Jul 4 17:49:22 2005 +0200 [SCSI] qla1280: don't use bitfields for hardware access, parameters Signed-off-by: Christoph Hellwig Signed-off-by: Thiemo Seufer Signed-off-by: James Bottomley commit 0888f4c3312847eec4814a6d7cdcaaaa9fbd3345 Author: Christoph Hellwig Date: Mon Jul 4 17:48:55 2005 +0200 [SCSI] qla1280: don't use bitfields for hardware access in isp_config Signed-off-by: Christoph Hellwig Signed-off-by: Thiemo Seufer Signed-off-by: James Bottomley commit 5c79d6154f335543ea4c4a555f645a1f76b5d117 Author: Christoph Hellwig Date: Mon Jul 4 17:48:46 2005 +0200 [SCSI] qla1280: always load microcode we have the most recent microcode, make sure to always load it. Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit 748422d92a55faadf3184e5aa8487da88c1ee849 Author: Christoph Hellwig Date: Mon Jul 4 17:48:41 2005 +0200 [SCSI] qla1280: remove SG_SEGMENTS Signed-off-by: Christoph Hellwig Signed-off-by: Thiemo Seufer Signed-off-by: James Bottomley commit d6db3e8d5fe3178776d0a0314e612c3f55e55fb4 Author: Christoph Hellwig Date: Mon Jul 4 17:48:36 2005 +0200 [SCSI] qla1280: use SAM_ constants Signed-off-by: Christoph Hellwig Signed-off-by: Thiemo Seufer Signed-off-by: James Bottomley commit 2b55cac3d2d9f545c141748d00eae86e2c042ca5 Author: Christoph Hellwig Date: Mon Jul 4 17:48:30 2005 +0200 [SCSI] qla1280: misc cleanups print message tidy ups and some excess brace removal. Signed-off-by: Christoph Hellwig Signed-off-by: Thiemo Seufer Signed-off-by: James Bottomley commit 8af50dcd22aa0a5840f18276ff10a6977abc3853 Author: Christoph Hellwig Date: Mon Jul 4 17:48:19 2005 +0200 [SCSI] qla1280: interupt posting for irq disabling/enabling Signed-off-by: Christoph Hellwig Signed-off-by: Thiemo Seufer Signed-off-by: James Bottomley commit a6c42741ace2fee235b6902e76f3c86a01d32146 Author: Christoph Hellwig Date: Mon Jul 4 17:48:13 2005 +0200 [SCSI] qla1280: remove dead per-host flag variables Signed-off-by: Christoph Hellwig Signed-off-by: Thiemo Seufer Signed-off-by: James Bottomley commit 8a60a07129fad60bba779a2a4038c7518b167fc7 Author: Jeff Garzik Date: Sun Jul 31 13:13:24 2005 -0400 libata: trim trailing whitespace. Also, fixup a tabs-to-spaces block of code in ata_piix. commit 74fae82c8bd5dd78365abe25506a9ba388d4a889 Author: Jeff Garzik Date: Sun Jul 31 13:08:32 2005 -0400 [wireless hostap] trim trailing whitespace commit bf79451ec5862510b402c112c039698e68d0c250 Author: Jeff Garzik Date: Sun Jul 31 13:07:26 2005 -0400 [wireless ipw2200] trim trailing whitespace commit 2ff55fefc32bc8ead7eb46287e4daf0c2d83dafa Author: Jeff Garzik Date: Sun Jul 31 13:05:43 2005 -0400 ieee80211: trim trailing whitespace commit b3df9f813bc7b9db62ae0c90b8990b1cebf97345 Author: Manfred Spraul Date: Sun Jul 31 18:38:58 2005 +0200 [PATCH] forcedeth: write back original mac address during ifdown This is a multi-part message in MIME format. Signed-off-by: Jeff Garzik commit 72b317825728942383b0c2e35016d29bbfb4df00 Author: Manfred Spraul Date: Sun Jul 31 18:33:34 2005 +0200 [PATCH] forcedeth: Add set_mac_address support This is a multi-part message in MIME format. Signed-off-by: Jeff Garzik commit ee73362cdd7d9b8166424f5f9e3176c629ac5cb2 Author: Manfred Spraul Date: Sun Jul 31 18:32:26 2005 +0200 [PATCH] forcedeth: 64-bit DMA support This is a multi-part message in MIME format. Signed-off-by: Jeff Garzik commit c2dba06dae7d6c4d15b83ea12d8c601cffd0aee9 Author: Manfred Spraul Date: Sun Jul 31 18:29:47 2005 +0200 [PATCH] forcedeth: rewritten tx irq handling This is a multi-part message in MIME format. Signed-off-by: Jeff Garzik commit dc8216c192795b62f30ca34299fb79e897438372 Author: Manfred Spraul Date: Sun Jul 31 18:26:05 2005 +0200 [PATCH] forcedeth: Improve ethtool support This is a multi-part message in MIME format. Signed-off-by: Jeff Garzik commit d81c0983de80c956cf37835b0d35adb3ab4bb03a Author: Manfred Spraul Date: Sun Jul 31 18:20:30 2005 +0200 [PATCH] forcedeth: Jumbo Frame Support This is a multi-part message in MIME format. Signed-off-by: Jeff Garzik commit 0e920bfb0395fb16909fb98cb6e2782a1c6b73c7 Author: Chuck Ebbert <76306.1226@compuserve.com> Date: Sat Jul 2 21:28:23 2005 -0400 [PATCH] loopback: whitespace cleanup Whitespace cleanup for loopback driver. Hopefully it fixes the last few annoyances. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Jeff Garzik commit 18c16c696e8b2323a306af455c686df15c717206 Author: Chuck Ebbert <76306.1226@compuserve.com> Date: Sat Jul 2 21:28:22 2005 -0400 [PATCH] loopback: optimize stats This patch slightly optimizes the loopback driver's stats update. Saves two loads, one add and one increment per packet sent. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Jeff Garzik commit d2ae1d2ff9282ca061b6f5244eee4c28ee2b3ffa Author: Chuck Ebbert <76306.1226@compuserve.com> Date: Sat Jul 2 21:28:21 2005 -0400 [PATCH] loopback: #ifdef the TSO code This patch #ifdefs the TSO code in the loopback driver. Saves ~800 bytes of text on i386 and avoids a conditional in the fast path. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Jeff Garzik commit 541134cfe7af179f45458b68421ee1da7bab9cba Author: Daniel Drake Date: Sun Jul 3 13:44:39 2005 +0100 [PATCH] sata_nv: Support MCP51/MCP55 device IDs This is a multi-part message in MIME format. Signed-off-by: Jeff Garzik commit 2f761478a2b436efa23659b4d5c826e53b11f91a Author: Victor Fusco Date: Fri Jul 1 00:03:12 2005 +0200 [PATCH] drivers/net/pci-skeleton.c: MODULE_PARM -> module_param Use module_param() instead of the old MODULE_PARM() Signed-off-by: Victor Fusco Signed-off-by: Domen Puncer Signed-off-by: Jeff Garzik commit cd8749b4aa6b7502e234d72cb53c00a3bc27ed1b Author: Marcelo Feitoza Parisi Date: Fri Jul 15 11:16:42 2005 +0100 [PATCH] Use time_before in hamradio drivers Use of time_before() macro, defined at linux/jiffies.h, which deal with wrapping correctly and are nicer to read. Signed-off-by: Marcelo Feitoza Parisi Signed-off-by: Domen Puncer Signed-off-by: Ralf Baechle DL5RB baycom_epp.c | 3 ++- baycom_par.c | 3 ++- baycom_ser_fdx.c | 3 ++- baycom_ser_hdx.c | 3 ++- mkiss.c | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) Signed-off-by: Jeff Garzik commit b7721ff96fa15459c7c5de59323bedd61f1bcbd7 Author: Adrian Bunk Date: Fri Jul 22 23:39:12 2005 +0200 [PATCH] include/net/ieee80211.h must #include -Wundef found an (although perhaps harmless) bug: <-- snip --> ... CC net/ieee80211/ieee80211_crypt.o In file included from net/ieee80211/ieee80211_crypt.c:21: include/net/ieee80211.h:26:5: warning: "WIRELESS_EXT" is not defined CC net/ieee80211/ieee80211_crypt_wep.o In file included from net/ieee80211/ieee80211_crypt_wep.c:20: include/net/ieee80211.h:26:5: warning: "WIRELESS_EXT" is not defined CC net/ieee80211/ieee80211_crypt_ccmp.o CC net/ieee80211/ieee80211_crypt_tkip.o In file included from net/ieee80211/ieee80211_crypt_tkip.c:23: include/net/ieee80211.h:26:5: warning: "WIRELESS_EXT" is not defined ... <-- snip --> Signed-off-by: Adrian Bunk Signed-off-by: Jeff Garzik commit 6b9b97ce70b789014515f808b1b64c8e29e300d1 Author: Peter Hagervall Date: Wed Jul 27 01:14:46 2005 -0700 [PATCH] orinoco: Sparse fixes A few sparse cleanups for orinoco.c Signed-off-by: Peter Hagervall Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 504ff16cecf2a788181eddc9d6e47d94ce50a9f6 Author: Jochen Friedrich Date: Wed Jul 27 01:14:50 2005 -0700 [PATCH] tms380tr: move to DMA API This patch makes tms380tr use the new DMA API. Now that on Alpha, this API also supports bus master DMA for ISA (platform) devices, i changed the driver to use this new API. This also works around a bug in the firmware loader: The example provided in Documentation/firmware_class no longer works, as the firmware loader now calls get_kobj_path_length() and the kernel promptly oopses, as the home-grown device doesn't have a parent. Of course, this doesn't happen with a "real" device which has its bus (or pseudo bus in the case of platform) as parent. Converted tms380tr to use new DMA API: - proteon.c, skisa.c: use platform pseudo bus to create a struct device - Space.c: delete init hooks - abyss.c, tmspci.c: pass struct device to tms380tr.c - tms380tr.c, tms380tr.h: new DMA API, use real device fo firmware loader Signed-off-by: Jochen Friedrich Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 6b38aefe924daf2e4fdd73b384f21c913f31b668 Author: John W. Linville Date: Thu Jul 28 15:00:15 2005 -0400 [PATCH] bonding: ALB -- allow slave to use bond's MAC address if its own MAC address conflicts In ALB mode, allow new slave to use bond's MAC address if the new slave's MAC address is being used within the bond and no other slave is using the bond's MAC address. Signed-off-by: John W. Linville Signed-off-by: Jeff Garzik commit 62fe7e378109537ff80971c5208e12d40bf88bee Author: Jouni Malinen Date: Sat Jul 30 20:43:20 2005 -0700 [PATCH] hostap: Replace crypto code with net/ieee80211 version Replace Host AP version of WEP, TKIP, CCMP implementation with net/ieee80211 that has more or less identical implementation (since it is based on the Host AP implementation). Remove Host AP specific implementation and modules from drivers/net/wireless/hostap. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit ebed67d2847a9d299b47eeb5d82744671ab2b198 Author: Jouni Malinen Date: Sat Jul 30 20:43:19 2005 -0700 [PATCH] hostap: Start using net/ieee80211.h Preparations for starting to use net/ieee80211 instead of private IEEE 802.11 implementation. Include net/ieee80211.h and net/ieee80211_crypt.h into files that will be needed these in the future. Remove duplicate definitions from hostap_common.h and rename WLAN_FC_GET_{TYPE,STYPE} macros for now sinc net/ieee80211.h is using incompatible definitions. This will be resolved in the future by updating Host AP to use the versions that do not shift type/stype. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 00db8189d984d6c51226dafbbe4a667ce9b7d5da Author: Andy Fleming Date: Sat Jul 30 19:31:23 2005 -0400 This patch adds a PHY Abstraction Layer to the Linux Kernel, enabling ethernet drivers to remain as ignorant as is reasonable of the connected PHY's design and operation details. Signed-off-by: Andy Fleming Signed-off-by: Jeff Garzik commit 8348b4db5f56d2c0d3849db06055225ec15b255a Author: Francois Romieu Date: Sat Jul 30 13:16:14 2005 +0200 [PATCH] sis190: compare the lpa to the local advertisement The station control register must depend on both the advertisement and the lpa The link partner ability has better be intersected with the current advertised value before it is feed to the station control register. Sight-catched-by: Lars Vahlenberg Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 560d3d521decc6d05dc0d6e007f1d2e1d3048102 Author: Francois Romieu Date: Sat Jul 30 13:15:51 2005 +0200 [PATCH] sis190: PHY identifier for the K8S-MX motherboard. Added PHY identifier for the Asus K8S-MX motherboard Note: the same ID appears in the sis900 driver. Signed-off-by: Lars Vahlenberg Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit fcb9821d3dd62ede360e7991734ac22b79e9a4f0 Author: Francois Romieu Date: Sat Jul 30 13:15:22 2005 +0200 [PATCH] sis190: new PHY detection code. New PHY detection code. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit fc10c39d7920b1db9ad2d80fa845896e529355dc Author: Francois Romieu Date: Sat Jul 30 13:15:01 2005 +0200 [PATCH] sis190: dummy read is required by the status register Add a dummy read before accessing the status register SiS driver suggests it. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 9ede109bbe93d5bbe4271e346106847fbfea95a1 Author: Francois Romieu Date: Sat Jul 30 13:14:38 2005 +0200 [PATCH] sis190: allow a non-hardcoded ID for the PHY. Allow a non-hardcoded ID for the PHY This is the first step before the driver probes for the PHY address. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 3cec93c7124c3037dbff826d6c08e9758a301cd7 Author: Francois Romieu Date: Sat Jul 30 13:14:18 2005 +0200 [PATCH] sis190: add endian annotations. Add endian annotations. Signed-off-by: Alexey Dobriyan Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit bcad5e537840ef6fa28b2f1e126fefb4c39a7248 Author: Francois Romieu Date: Sat Jul 30 13:13:47 2005 +0200 [PATCH] sis190: extract bits definition from SiS driver. extract bits definition from SiS driver - fix the Rx stats; - minor pieces of documentation. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 8b5641d4f1f7376257783b79f121a19ccd86b56b Author: Francois Romieu Date: Sat Jul 30 13:13:03 2005 +0200 [PATCH] sis190: the size of the Rx buffer is constrained Add a restriction to the size of the Rx buffer SiS driver forces the size of any Rx buffer to be a multiple of 64 bit. I would not be surprized that it goes along with some alignment issues which have been experienced before. So far it does not make much of a difference (both drivers use 1536 bytes buffer). Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 830fb7d23217ae748df0b16d4d419110810036b7 Author: Francois Romieu Date: Sat Jul 30 13:12:37 2005 +0200 [PATCH] sis190: initialisation of MAC address. Extract some mac addr code from SiS's driver. Some magic may hide beyond the isa bridge. The Rx mac control register is now set without condition. Note: good or bad, this part of the code is quite close to sis900.c. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 40292fb0f041362bca2f6ad975acedce4f6e3f3e Author: Francois Romieu Date: Sat Jul 30 13:12:06 2005 +0200 [PATCH] sis190: remove hardcoded constants. Replace hardcoded constants by enumerated values in sis190_read_eeprom The names of the enumerated values have been extracted from SiS'official driver (v1.00.00 published on 2005/07/11). Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 188f23ba94a618b12cc205306f02b4f5036c4fa7 Author: Francois Romieu Date: Sat Jul 30 13:11:43 2005 +0200 [PATCH] sis190: merge some register related information from SiS driver. Merge some register related information from SiS driver. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 92aab3c08eca4770228715d26c8234cca4fae9af Author: Francois Romieu Date: Sat Jul 30 13:11:18 2005 +0200 [PATCH] sis190: add MAINTAINER entry. add MAINTAINER entry Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 43afb949a955a7d88f4baf43d5c676bf4c31ff6c Author: Francois Romieu Date: Sat Jul 30 13:10:21 2005 +0200 [PATCH] sis190: ethtool/mii support. ethtool/mii support Bug: disabling autonegotiation and setting the link parameters at the same time does not provide the expected result. More investigation is needed. Note: past the initial probe/open time, the link is managed from user-space or accessed through sis190_phy_task, i.e. in a usermode context. Whence the very limited locking needs. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 4405d3b5ef0a870e8d70ee4a3d050c89fcc40a86 Author: Francois Romieu Date: Sat Jul 30 13:09:20 2005 +0200 [PATCH] sis190: netconsole support. netconsole support. This stuff should be factored out of every driver. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 890e8d0a3ded0b1dee9020bbef7e9908e2228ffb Author: Francois Romieu Date: Sat Jul 30 13:08:43 2005 +0200 [PATCH] sis190: resurrection Raise the sis190 driver from the dead The driver handles the integrated network device found on SiS 965L chipset. It follows the classical (non-napi) interrupt-driven model and provides minimal ethtool support. The code comes from a heavy cleanup/rewrite of the original code which was removed from the kernel on 14/04/2004. Since the r8169 driver does not work too bad and there will probably be (at least) a few months of improvements/testing/fixing, I made the code as close as possible to the r8169 one. Pascal Chapperon deserves some special credit for testing and bug-catching. Many thanks to Lars Vahlenberg as well. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit f3b10e1636dec053f4874d593e3de5d46da48a5f Author: Jouni Malinen Date: Sat Jul 30 12:50:06 2005 -0700 [PATCH] hostap update Fixed beacon frame when moving from monitor mode to master mode (workaround for firmware bug that left IBSS IE in the Beacon frames). This is using the same workaround that was previously used when moving from adhoc mode to master mode. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit b15eff2632be3fcea68e01ba7f12e26a731e3157 Author: Pavel Roskin Date: Sat Jul 30 12:50:05 2005 -0700 [PATCH] hostap update Warning fix for 64-bit platforms Hello! The patch fixes following warning seen on 64-bit platforms (in my case - x86_64, gcc-4.0): In file included from /usr/local/src/hostap/driver/modules/hostap_cs.c:203: /usr/local/src/hostap/driver/modules/hostap_hw.c: In function ?prism2_transmit_cb?: /usr/local/src/hostap/driver/modules/hostap_hw.c:1674: warning: cast from pointer to integer of different size /usr/local/src/hostap/driver/modules/hostap_hw.c: In function ?prism2_transmit?: /usr/local/src/hostap/driver/modules/hostap_hw.c:1758: warning: cast to pointer from integer of different size prism2_transmit_cb uses a (void *) argument to get an integer. A simple fix would be to use double cast from pointer to long and then to int (and vice versa when int is passed as a pointer). But I prefer a slightly longer patch. I believe that whenever an argument can hold both a pointer and an integer, it should be declared long. long can hold both pointers and integers (except win64, but we are not coding for Windows), it can be cast to both of them and it's never assumed to be a valid pointer, which could be useful for some automatic code checkers. Signed-off-by: Pavel Roskin Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 3e1d393240880e3d7ae580c46f1ba265643fcd15 Author: Brandon Enochs Date: Sat Jul 30 12:50:04 2005 -0700 [PATCH] hostap update line 129 of hostap_80211_rx.c should read: LWNG_SETVAL(mactime, 2, 0, 4, rx_stats->mac_time); not: LWNG_SETVAL(mactime, 2, 0, 0, rx_stats->mac_time); The length field is incorrect. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 0c629a69fd8ec7b67566cfc052a9b1c4b927805a Author: Jouni Malinen Date: Sat Jul 30 12:50:03 2005 -0700 [PATCH] hostap update Firmware seems to be getting into odd state in host_roaming mode 2 when hostscan is used without join command, so try to fix this by re-joining the current AP. This does not actually trigger a new association if the current AP is still in the scan results. This makes background scans (iwlist wlan0 scan) not to break data connection when in host_roaming 2 mode, e.g., when using wpa_supplicant. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 2e4fd068e7e25e654a454ed4a425f239c0f6407a Author: Jouni Malinen Date: Sat Jul 30 12:50:02 2005 -0700 [PATCH] hostap update Cleaned up scan result processing by converting struct hfa384x_scan_result into struct hfa384x_hostscan_result. This removes special cases from result processing since the results are only used in one, hostscan, format. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 72ca9c61cddb82a8596cee8141656d50aba42be5 Author: Jouni Malinen Date: Sat Jul 30 12:50:01 2005 -0700 [PATCH] hostap update Added support for setting channel mask for scan requests ('iwpriv wlan0 scan_channels 0x00ff' masks scans to use channels 1-8). Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit f06ac319c05c6822f878f201ae80e54fbbe8be8c Author: Jouni Malinen Date: Sat Jul 30 12:50:00 2005 -0700 [PATCH] hostap update Add MODULE_VERSION information for the Host AP kernel modules and update the version string to indicate which version of the external Host AP driver is included in the kernel tree. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 093853c395df33104ee12c3df4398820d665d107 Author: Henrik Brix Andersen Date: Sat Jul 30 12:49:59 2005 -0700 [PATCH] hostap update pcmcia id_table for hostap_cs.c Hi Jouni, Here's a patch for adding a pcmcia id_table to hostap_cs.c as introduced by the PCMCIA subsystem changes in linux-2.6.13-rc1. The id_table allows hotplug (along with pcmciautils [1]) to load the driver without the need for the pcmcia-cs cardmgr daemon. The id_table was generated from the CVS version of hostap_cs.conf using a script borrowed from Dominik Brodowski. I have removed any duplicate entries, but I have only been able to test the functionality of the patch with a Linksys WPC11v3. Sincerely, Brix [1]: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/ Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 0cd545d6ba0e0138782eb0ec287d0eb3db529b69 Author: Dave Hansen Date: Sat Jul 30 12:49:58 2005 -0700 [PATCH] hostap update Create sysfs "device" files for hostap I was writing some scripts to automatically build kismet source lines, and I noticed that hostap devices don't have device files, unlike my prism54 and ipw2200 cards: $ ls -l /sys/class/net/eth0/device /sys/class/net/eth0/device -> ../../../devices/pci0000:00/0000:00:1e.0/0000:02:01.0 $ ls -l /sys/class/net/wifi0 ls: /sys/class/net/wifi0/device: No such file or directory $ ls -l /sys/class/net/wlan0 ls: /sys/class/net/wlan0/device: No such file or directory The following (quite small) patch makes sure that both the wlan and wifi net devices have that pointer to the bus device. This way, I can do things like for i in /sys/class/net/*; do if ! [ -e $i/device/drive ]; then continue; fi; driver=$(basename $(readlink $i/device/driver)) case $driver in hostap*) echo -- hostap,$i,$i-$driver break; ipw2?00) echo -- $driver,$i,$i-$driver break; prism54) echo prism54g,$i esac done Which should generate a working set of source lines for kismet no matter what order I plug the cards in. It might also be handy to have a link between the two net devices, but that's a patch for another day. That patch is against 2.6.13-rc1-mm1. -- Dave Signed-off-by: Dave Hansen Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 0ef79ee22cf5c1b177184c18b6525889bcc6681f Author: Jar Date: Sat Jul 30 12:49:57 2005 -0700 [PATCH] hostap update hostap_cs: Remove irq_list, irq_mask and pcmcia/version.h Remove irq_list, irq_mask and pcmcia/version.h as suggested in http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 1fad810473423bbf0626fab2fbeb27a4663fa2d5 Author: Adrian Bunk Date: Sat Jul 30 12:49:56 2005 -0700 [PATCH] hostap update EXPORT_SYMTAB does nothing. There's no need to define something if it doesn't have any effect. Signed-off-by: Adrian Bunk Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 47e362cf6942de8b3a227929bf8bab578d92ad49 Author: Jouni Malinen Date: Sat Jul 30 12:49:55 2005 -0700 [PATCH] hostap update Update hostap_cs to use new PCMCIA event callback registration. Signed-off-by: Jouni Malinen Signed-off-by: Jeff Garzik commit 47ba39eead9f4495cd6a3eca39d7c73d0f0d61c9 Author: James Bottomley Date: Sat Jul 30 11:39:53 2005 -0500 [SCSI] add template for scsi_host_set_state() Fixes up some warnings in the tree. Signed-off-by: James Bottomley commit 82f29467a025f6a2192d281e97fca0be46e905cc Author: Mike Anderson Date: Thu Jun 16 11:14:33 2005 -0700 [SCSI] host state model update: mediate host add/remove race Add support to not allow additions to a host when it is being removed. Signed-off-by: Mike Anderson Signed-off-by: James Bottomley commit d2c9d9eafa03dbd08a8a439e6c5addb8b1f03b9b Author: Mike Anderson Date: Thu Jun 16 11:13:42 2005 -0700 [SCSI] host state model update: reimplement scsi_host_cancel Remove the old scsi_host_cancel function as it has not been working for sometime do to the device list possibly being empty when it is called and possible race issues. Add setting of SHOST_CANCEL at the state of beginning of scsi_remove_host. Signed-off-by: Mike Anderson Signed-off-by: James Bottomley commit d3301874083874f8a0ac88aa1bb7da6b62df34d2 Author: Mike Anderson Date: Thu Jun 16 11:12:38 2005 -0700 [SCSI] host state model update: replace old host bitmap state Migrate the current SCSI host state model to a model like SCSI device is using. Signed-off-by: Mike Anderson Rejections fixed up and Signed-off-by: James Bottomley commit 5dbffcd83d826a9b42a10afb89b13156dc5b9539 Author: Adrian Bunk Date: Wed Jul 27 01:07:42 2005 -0700 [SCSI] git-scsi-misc: drivers/scsi/ch.c: remove devfs stuff It seems very unlikely that this driver will go into any stable kernel before devfs will be removed. Signed-off-by: Adrian Bunk Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 0a637a2cec724eeb4649f6d1c07026b72c39ad84 Author: Olaf Hering Date: Tue Jul 19 22:04:24 2005 +0200 [SCSI] aic byteorder fixes after recent cleanup aic doesnt work anymore after this change which appeared int 2.6.13-rc1: [SCSI] aic7xxx/aic79xx: remove useless byte order macro cruft 2 files did not include byteorder.h, aic died with panic "Unknown opcode encountered in seq program" This patch fixes it for me. Signed-off-by: Olaf Hering Signed-off-by: James Bottomley commit 0c9938cc75057c0fca1af55a55dcfc2842436695 Author: Robert Moore Date: Fri Jul 29 15:15:00 2005 -0700 [ACPI] ACPICA 20050729 from Bob Moore Implemented support to ignore an attempt to install/load a particular ACPI table more than once. Apparently there exists BIOS code that repeatedly attempts to load the same SSDT upon certain events. Thanks to Venkatesh Pallipadi. Restructured the main interface to the AML parser in order to correctly handle all exceptional conditions. This will prevent leakage of the OwnerId resource and should eliminate the AE_OWNER_ID_LIMIT exceptions seen on some machines. Thanks to Alexey Starikovskiy. Support for "module level code" has been disabled in this version due to a number of issues that have appeared on various machines. The support can be enabled by defining ACPI_ENABLE_MODULE_LEVEL_CODE during subsystem compilation. When the issues are fully resolved, the code will be enabled by default again. Modified the internal functions for debug print support to define the FunctionName parameter as a (const char *) for compatibility with compiler built-in macros such as __FUNCTION__, etc. Linted the entire ACPICA source tree for both 32-bit and 64-bit. Signed-off-by: Robert Moore Signed-off-by: Len Brown commit c2c2e03409f5f5405e79d9d9156202b75cb5b35b Author: Iacopo Spalletti Date: Sun Jul 17 02:06:00 2005 -0400 [ACPI] update hotkey documentation http://bugzilla.kernel.org/show_bug.cgi?id=4903 Signed-off-by: Iacopo Spalletti Signed-off-by: Len Brown commit 4689ced99b18937e28c0f6c190394ccc3c61d651 Author: Peer Chen Date: Fri Jul 29 15:33:58 2005 -0400 [netdrvr] add 'uli526x' driver (a tulip clone) We want to extract our LAN card driver from tulip core driver and make a new file uli526x.c at tulip folder, because we have added some ethtool interface support and non-eprom support in our driver and may be other change in the futher. If our controllers support are still contained in the tulip core driver, I think it'll increase the complexity of maintenance, you know, tulip core driver include several files and support so many other controllers. Furthermore, I tested the newest kernel 2.6.12 and I found the tulip driver can not work on our lan controller, and I no time to debug it, so I aspired want to make a single uli526x.c file just for our controllers. Could you help us remove the ULi m5261/m5263 lan controller support from tulip core driver and add the new single uli526x.c file for us? Signed-off-by: Peer Chen Signed-off-by: Jeff Garzik commit 670fac79b9dcf16549a4c1f4c0b73c457e53bd7e Author: Len Brown Date: Fri Jul 29 00:16:54 2005 -0400 [ACPI] disable module level AML code (for now) It is important that we support module level code -- BIOS's implement it. But this implementation needs more testing. Signed-off-by: Len Brown commit 5d75ab45594c78d2d976a3248ea1ca281c9d7056 Author: Len Brown Date: Fri Jul 29 00:03:55 2005 -0400 [ACPI] handle const char * __FUNCTION__ in debug code build warning: discards qualifiers from pointer target type when mixing "const char *" and "char *" We should probably update the routines to expect const, but easier for now to shut up the warning with 1 cast. Signed-off-by: Len Brown commit feee9570753645f9f6888937ff9aee426b7afe55 Author: Len Brown Date: Fri Jul 29 00:01:00 2005 -0400 [ACPI] comment out prototypes for new unused debug routines Signed-off-by: Len Brown commit fb7f6ff614f3ead2ca41bb4a348b9ea431d95176 Author: blaisorblade@yahoo.it Date: Thu Jul 28 17:56:25 2005 +0200 [PATCH] kconfig: trivial cleanup Replace all menu_add_prop mimicking menu_add_prompt with the latter func. I've had to add a return value to menu_add_prompt for one usage. I've rebuilt scripts/kconfig/zconf.tab.c_shipped by hand to reflect changes in the source (I've not the same Bison version so regenerating it wouldn't have been not a good idea), and compared it with what Roman itself did some time ago, and it's the same. So I guess this can be finally merged. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Sam Ravnborg commit 66d609ec8a4464b5fbe7a0723e3958b98c95991a Author: Sam Ravnborg Date: Thu Jul 28 23:11:34 2005 +0200 kbuild: fix make TAGS (for emacs use) From: bongiojp@clarkson.edu make TAGS does not make source code tags for emacs. It instead returns an error than "etags -" isn't valid. The problem is easily remedied. Signed-off-by: Sam Ravnborg commit 49490571bcfe24d279a66ba24198e8ba299fe58f Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Jul 28 17:56:17 2005 +0200 [PATCH] kbuild: describe Kbuild pitfall Whitespace is significant for make, and I just fought against this... so please apply this patch. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Sam Ravnborg commit 61d9cdf2a9ccb9e4770d7723db8b18b8952778ce Author: J.A. Magallon Date: Fri Jul 15 22:14:43 2005 +0000 [PATCH] kbuild: signed char fixes for scripts This time I did not break anything... and they shut up gcc4 ;) Signed-off-by: Sam Ravnborg commit 84c2a2eb348f3bd85ec8eb3bb95ba04f65f4e217 Author: Keenan Pepper Date: Wed Jul 27 14:14:00 2005 -0400 [PATCH] kbuild: signed/unsigned char fix for make menuconfig Quiet some silly warnings. Signed-off-by: Sam Ravnborg commit db8c1a7b2ca25f37b1429c00e82d6568f86caec1 Author: Sam Ravnborg Date: Wed Jul 27 22:11:01 2005 +0200 kbuild: fix building external modules kbuild failed to locate Makefile for external modules. This brought to my attention how the variables for directories have different values in different usage scenarios. Different kbuild usage scenarios: make - plain make in same directory where kernel source lives make O= - kbuild is told to store output files in another directory make M= - building an external module make O= M= - building an external module with kernel output seperate from src Value assigned to the different variables: |$(src) |$(obj) |$(srctree) |$(objtree) make |reldir to k src |as src |abs path to k src |abs path to k src make O= |reldir to k src |as src |abs path to k src |abs path to output dir make M= |abs path to src |as src |abs path to k src |abs path to k src make O= M= |abs path to src |as src |abs path to k src |abs path to k output path to kbuild file: make | $(srctree)/$(src), $(src) make O= | $(srctree)/$(src) make M= | $(src) make O= M= | $(src) From the table above it can be seen that the only good way to find the home directory of the kbuild file is to locate the one of the two variants that is an absolute path. If $(src) is an absolute path (starts with /) then use it, otherwise prefix $(src) with $(srctree). Signed-off-by: Sam Ravnborg commit 05caac585f8abd6c0113856bc8858e3ef214d8a6 Author: Russell King Date: Wed Jul 27 11:41:18 2005 +0100 [SERIAL] Convert parport_serial to use new 8250_pci interfaces Convert parport_serial to use the new 8250_pci interface, converting the table to a pciserial_board table. This also unuses the SPCI_* definitions in serialP.h, which can now be removed. Signed-off-by: Russell King commit 241fc4367b3ca5d407b043599ed980304a70b91f Author: Russell King Date: Wed Jul 27 11:35:54 2005 +0100 [SERIAL] Expose 8250_pci setup/removal/suspend/resume functions Re-jig the setup/removal/suspend/resume of 8250 pci ports so that they know slightly less about how they're attached to a PCI device. Expose this as the new interface for registering PCI serial ports, as well as the pciserial_board structure and associated flag definitions. Signed-off-by: Russell King commit 70db3d91a5228c98603c55fa06c87184a1f9f6db Author: Russell King Date: Wed Jul 27 11:34:27 2005 +0100 [SERIAL] Pass around serial_private instead of pci_dev Pass the serial_private structure via the setup method instead of the pci_dev. We don't want to assume that the pci_dev's driver data is a pointer to serial_private. Instead, put the pci_dev inside serial_private. Signed-off-by: Russell King commit 67d74b870725448e0108984eec551609771e6b73 Author: Russell King Date: Wed Jul 27 11:33:03 2005 +0100 [SERIAL] Collapse the SIIG quirk entries Collapse all the SIIG quirk entries into one. SIIG10x cards all have PCI device IDs of 0x10xx, SIIG20x cards all have PCI device IDs of 0x20xx. Signed-off-by: Russell King commit 72ce9a83331afdd4df944f210a5210bf5acb7d6a Author: Russell King Date: Wed Jul 27 11:32:04 2005 +0100 [SERIAL] Factor out the common setup from the per-serial port loop. Signed-off-by: Russell King commit 1c7c1fe51629d82e1dff22b2c4d409b252fb2b05 Author: Russell King Date: Wed Jul 27 11:31:19 2005 +0100 [SERIAL] Rename pci_board to pciserial_board. Signed-off-by: Russell King commit 72ba47c1b293ae78f7d798b458bb9d3db65c7551 Author: Sam Ravnborg Date: Wed Jul 27 11:39:37 2005 +0200 kbuild: silence mystery message During last phase of the build the following message were displayed: /bin/sh: +@: command not found This message appears due to slightly changed semantics of cmd and if_changed_rule. The easy fix was to insert a dummy command first in rule_ksym_ld. The alternative was to redo part of this processing in the top-level Makefile - a volatile area that I try to avoid. Signed-off-by: Sam Ravnborg --- commit 23a45e2c0a16bfd80eba853b44717d21c37bcf30 Author: Sam Ravnborg Date: Wed Jul 27 09:12:07 2005 +0200 kbuild: pass less variables to second make invocation when using make O=... make exports all variables assigned on the command-line, so no need to pass them explicit. This fixes http://bugzilla.kernel.org/show_bug.cgi?id=4725 Signed-off-by: Sam Ravnborg --- commit e579d351b4bcea0038f5df08fff7160352b2c365 Author: Sam Ravnborg Date: Wed Jul 27 08:10:10 2005 +0200 kbuild: KBUILD_VERBOSE was exported twice This fixes http://bugzilla.kernel.org/show_bug.cgi?id=4727 Signed-off-by: Sam Ravnborg --- commit f9f97bc014d7402cd2d135e20bcd25dfec93257b Author: Jesper Juhl Date: Wed Jul 20 05:43:05 2005 +0200 [PATCH] kallsyms: clarify KALLSYMS_ALL help text Clarify the KALLSYMS_ALL help text slightly. Signed-off-by: Jesper Juhl commit 2315c6e42278152360470124ce903ecb8c97270a Author: Sam Ravnborg Date: Mon Jul 25 22:41:12 2005 +0000 kbuild: define clean before including kbuild file Defining clean before including the kbuild file give us knowledge when the kbuild file is included for cleaning. This is rarey usefull - but in a corner case in klibc this proved necessary. Signed-off-by: Sam Ravnborg --- commit 2a691470345a0024dd7ffaf47ad3d0f5f4f41924 Author: Sam Ravnborg Date: Mon Jul 25 20:26:04 2005 +0000 kbuild: fix make O=... kbuild failed to locate Kbuild.include. Teach kbuild how to find Kbuild files when using make O=... Signed-off-by: Sam Ravnborg --- commit 8ec4b4ff1c89bb280e662b84eba503ca44abe836 Author: Sam Ravnborg Date: Mon Jul 25 20:10:36 2005 +0000 kbuild: introduce Kbuild.include Kbuild.include is a placeholder for definitions originally present in both the top-level Makefile and scripts/Makefile.build. There were a slight difference in the filechk definition, so the most videly used version was kept and usr/Makefile was adopted for this syntax. Signed-off-by: Sam Ravnborg --- commit 7c6b155fb49fbc63e0b30a1d49552693c0b45be7 Author: Sam Ravnborg Date: Mon Jul 25 12:51:08 2005 +0000 kbuild: drop descend - converting existing users There was only two users left of descend. Fix them so they use $(clean)= and $(build)=. Drop definition of descend. Signed-off-by: Sam Ravnborg --- commit 43af5f23354dbd67d2fd2d523eefad8053ac388b Author: Sam Ravnborg Date: Mon Jul 25 12:40:34 2005 +0000 kbuild: drop -Wundef from HOSTCFLAGS for now -Wundef caused warnings in the bison generated code in kconfig. Updating to a newer bison (1.875d) did not fix it. The alternatives was to correct the autogenerated code or drop -Wundef. For now -Wundef is dropped from HOSTCFLAGS. Signed-off-by: Sam Ravnborg --- commit d178817803d95e4e3ca270bccd1ae2bed4780977 Author: Coywolf Qi Hunt Date: Tue Jul 19 09:42:54 2005 -0500 [PATCH] kbuild: make help binrpm-pkg fix This fixes kbuild make help binrpm-pkg missing `''. Signed-off-by: Coywolf Qi Hunt Signed-off-by: Sam Ravnborg commit 3c521e06fad4b4b7fe4811fb8363d12cf49f40a2 Author: Olaf Hering Date: Thu Jul 21 21:02:09 2005 +0200 [PATCH] kbuild: add -Wundef to global CFLAGS A recent change to the aic scsi driver removed two defines to detect endianness. cpp handles undefined strings as 0. As a result, the test turned into #if 0 == 0 and the wrong code was selected. Adding -Wundef to global CFLAGS will catch such errors. Signed-off-by: Olaf Hering Signed-off-by: Sam Ravnborg commit ce454d4d7278b815dcee957653ce388146484f5f Author: Tom Rini Date: Fri Jul 15 07:56:36 2005 -0700 [PATCH] kbuild: When checking depmod version, redirect stderr When running depmod to check for the correct version number, extra output we don't need to see, such as "depmod: QM_MODULES: Function not implemented" may show up. Redirect stderr to /dev/null as the version information that we do care about comes to stdout. Signed-off-by: Tom Rini Signed-off-by: Sam Ravnborg commit 946dc121d7d1c606f6bbeb8ae778963a1e2ff59c Author: Sam Ravnborg Date: Thu Jul 14 20:28:49 2005 +0000 kbuild: fix make O=... build It fixes the following error: make[1]: *** No rule to make target `include/asm', needed by `arch/alpha/kernel/asm-offsets.s'. Stop. Reported by: From: Jan Dittmer Signed-off-by: Sam Ravnborg commit a91f98a284321ffc9eb28ccfbf4329f7aa422f97 Author: Sam Ravnborg Date: Thu Jul 14 20:26:09 2005 +0000 kbuild: Fix bug in make deb-pkg when using seperate source and output directories From: Ryan Anderson When running "make O=something deb-pkg", I get a failure that claims I haven't configured my kernel (I have). Running it a second time tells me to run "make mrproper" (include/linux/version.h got built on the first run) Original patch from: From: Ajay Patel With modifications from: Signed-off-By: Ryan Anderson Signed-off-by: Sam Ravnborg commit dc5962fdf13f4d10a5fb8d0b0ae6f406ee8aed49 Author: Sam Ravnborg Date: Thu Jul 14 20:24:56 2005 +0000 uml: Restore proper descriptions in make deb-pkg target From: Ryan Anderson This pulls the description from the Debian user-mode-linux package, and puts $version back in the appropriate places for both descriptions. Signed-off-by: Ryan Anderson Signed-off-by: Sam Ravnborg commit 687c3dac59f1746a1cf877eb52e93046a4998e03 Author: Sam Ravnborg Date: Thu Jul 14 20:24:00 2005 +0000 uml: Make deb-pkg build target build a Debian-style user-mode-linux package From: Ryan Anderson Make the deb-pkg build target understand the "um" arch and set up the package and directory structure to match a mainline-Debian style user-mode-linux package. This is primarily so that it stops matching, exactly, the naming convention used by normal, non-UML kernels generated by this command. Installing "linux-2.6.11" and "linux-2.6.11", where one is a UML kernel doesn't do the right thing. This fixes that. Signed-off-by: Ryan Anderson Signed-off-by: Sam Ravnborg commit d80e22460968ec7986c82fd7d207ebe3de59e03d Author: Sam Ravnborg Date: Thu Jul 14 20:22:39 2005 +0000 kbuild: Don't fail if include/asm symlink exists From: Andreas Gruenbacher We're having the following situation: There are user-space applications that include kernel headers directly. With a completely unconfigured /usr/src/linux tree, including most headers fails because essential files are not there: include/asm include/linux/autoconf.h include/linux/version.h So we create these files. On the other hand, we want to use /usr/src/linux as read-only source for building kernels or additional modules. Now when building a kernel with a separate output directory (O=), there is a check in the main makefile for the include/asm symlink. There is no real need for this check: if we ensure that $(objdir)/include/asm is always created as the patch does, $(srctree)/include/asm becomes irrelevant. Signed-off-by: Sam Ravnborg commit c5f75eca120de6587e67a1951ce3e6912e2c6879 Author: Sam Ravnborg Date: Thu Jul 14 20:20:13 2005 +0000 kbuild: fix buildcheck From: Randy Dunlap I should not have added init.text test here; it's more than useless, it actually degrades the output. Signed-off-by: Randy Dunlap Signed-off-by: Sam Ravnborg commit 33bc25eae40c100238a5abe8472cef0cd40226f1 Author: Sam Ravnborg Date: Thu Jul 14 20:19:08 2005 +0000 kbuild: Add target debug_kallsyms From: Keith Owens Make it easier to generate maps for debugging kallsyms problems. debug_kallsyms is only a debugging target so no help or silent mode. Signed-off-by: Keith Owens Signed-off-by: Sam Ravnborg commit bd5bdd875b29e882f80d2cd6dd1da468641dad2a Author: Sam Ravnborg Date: Thu Jul 14 20:18:07 2005 +0000 kbuild: "PREEMPT" in UTS_VERSION From: Matt Mackall Add PREEMPT to UTS_VERSION where enabled as is done for SMP to make preempt kernels easily identifiable. Added SMP PREEMPT as comment in compile.h to force it to be updated when they change (sam). Signed-off-by: Matt Mackall Signed-off-by: Sam Ravnborg commit 6d30e3a8995c9fa9e8471bb1dff8e070638df5ea Author: Sam Ravnborg Date: Thu Jul 14 20:15:44 2005 +0000 kbuild: Avoid inconsistent kallsyms data Several reports on inconsistent kallsyms data has been caused by the aliased symbols __sched_text_start and __down to shift places in the output of nm. The root cause was that on second pass ld aligned __sched_text_start to a 4 byte boundary which is the function alignment on i386. sched.text and spinlock.text is now aligned to an 8 byte boundary to make sure they are aligned to a function alignemnt on most (all?) archs. Tested by: Paulo Marques Tested by: Alexander Stohr Signed-off-by: Sam Ravnborg commit 53e88e03e63621a15ec7fbccaaaca1a0f1616ed4 Author: Sam Ravnborg Date: Thu Jul 14 20:14:42 2005 +0000 buildcheck: reduce DEBUG_INFO noise from reference* scripts From: Randy Dunlap Reduce noise in 'make buildcheck' that is caused by CONFIG_DEBUG_INFO=y. Signed-off-by: Randy Dunlap Signed-off-by: Sam Ravnborg commit cfca82f2179dd1aee84a5bf3b14710e4d7487aed Author: Sam Ravnborg Date: Thu Jul 14 20:12:40 2005 +0000 kbuild: Fix build as root then user From: Matthew Wilcox I inadvertently built a tree as root and then rebuilt it as a user. I got a lot of prompts ... mv: overwrite `drivers/char/drm/drm_auth.o', overriding mode 0644? Using mv -f fixes that. Signed-off-by: Matthew Wilcox Signed-off-by: Sam Ravnborg commit f9f4601f331aa1226d7a798a01950efbb388f07f Author: Robert Moore Date: Fri Jul 8 00:00:00 2005 -0400 ACPICA 20050708 from Bob Moore The use of the CPU stack in the debug version of the subsystem has been considerably reduced. Previously, a debug structure was declared in every function that used the debug macros. This structure has been removed in favor of declaring the individual elements as parameters to the debug functions. This reduces the cumulative stack use during nested execution of ACPI function calls at the cost of a small increase in the code size of the debug version of the subsystem. With assistance from Alexey Starikovskiy and Len Brown. Added the ACPI_GET_FUNCTION_NAME macro to enable the compiler-dependent headers to define a macro that will return the current function name at runtime (such as __FUNCTION__ or _func_, etc.) The function name is used by the debug trace output. If ACPI_GET_FUNCTION_NAME is not defined in the compiler-dependent header, the function name is saved on the CPU stack (one pointer per function.) This mechanism is used because apparently there exists no standard ANSI-C defined macro that that returns the function name. Alexey Starikovskiy redesigned and reimplemented the "Owner ID" mechanism used to track namespace objects created/deleted by ACPI tables and control method execution. A bitmap is now used to allocate and free the IDs, thus solving the wraparound problem present in the previous implementation. The size of the namespace node descriptor was reduced by 2 bytes as a result. Removed the UINT32_BIT and UINT16_BIT types that were used for the bitfield flag definitions within the headers for the predefined ACPI tables. These have been replaced by UINT8_BIT in order to increase the code portability of the subsystem. If the use of UINT8 remains a problem, we may be forced to eliminate bitfields entirely because of a lack of portability. Alexey Starikovksiy enhanced the performance of acpi_ut_update_object_reference. This is a frequently used function and this improvement increases the performance of the entire subsystem. Alexey Starikovskiy fixed several possible memory leaks and the inverse - premature object deletion. Signed-off-by: Len Brown commit 4c3ffbd79529b680b3c3ef2b6f42f0c89c694ec5 Author: David Shaohua Li Date: Thu Jul 14 00:00:00 2005 -0400 [ACPI] revert R40 workaround Should not be necessary... http://bugme.osdl.org/show_bug.cgi?id=1038 Signed-off-by: Len Brown commit 73459f73e5d1602c59ebec114fc45185521353c1 Author: Robert Moore Date: Fri Jun 24 00:00:00 2005 -0400 ACPICA 20050617-0624 from Bob Moore ACPICA 20050617: Moved the object cache operations into the OS interface layer (OSL) to allow the host OS to handle these operations if desired (for example, the Linux OSL will invoke the slab allocator). This support is optional; the compile time define ACPI_USE_LOCAL_CACHE may be used to utilize the original cache code in the ACPI CA core. The new OSL interfaces are shown below. See utalloc.c for an example implementation, and acpiosxf.h for the exact interface definitions. Thanks to Alexey Starikovskiy. acpi_os_create_cache acpi_os_delete_cache acpi_os_purge_cache acpi_os_acquire_object acpi_os_release_object Modified the interfaces to acpi_os_acquire_lock and acpi_os_release_lock to return and restore a flags parameter. This fits better with many OS lock models. Note: the current execution state (interrupt handler or not) is no longer passed to these interfaces. If necessary, the OSL must determine this state by itself, a simple and fast operation. Thanks to Alexey Starikovskiy. Fixed a problem in the ACPI table handling where a valid XSDT was assumed present if the revision of the RSDP was 2 or greater. According to the ACPI specification, the XSDT is optional in all cases, and the table manager therefore now checks for both an RSDP >=2 and a valid XSDT pointer. Otherwise, the RSDT pointer is used. Some ACPI 2.0 compliant BIOSs contain only the RSDT. Fixed an interpreter problem with the Mid() operator in the case of an input string where the resulting output string is of zero length. It now correctly returns a valid, null terminated string object instead of a string object with a null pointer. Fixed a problem with the control method argument handling to allow a store to an Arg object that already contains an object of type Device. The Device object is now correctly overwritten. Previously, an error was returned. ACPICA 20050624: Modified the new OSL cache interfaces to use ACPI_CACHE_T as the type for the host-defined cache object. This allows the OSL implementation to define and type this object in any manner desired, simplifying the OSL implementation. For example, ACPI_CACHE_T is defined as kmem_cache_t for Linux, and should be defined in the OS-specific header file for other operating systems as required. Changed the interface to AcpiOsAcquireObject to directly return the requested object as the function return (instead of ACPI_STATUS.) This change was made for performance reasons, since this is the purpose of the interface in the first place. acpi_os_acquire_object is now similar to the acpi_os_allocate interface. Thanks to Alexey Starikovskiy. Modified the initialization sequence in acpi_initialize_subsystem to call the OSL interface acpi_osl_initialize first, before any local initialization. This change was required because the global initialization now calls OSL interfaces. Restructured the code base to split some files because of size and/or because the code logically belonged in a separate file. New files are listed below. utilities/utcache.c /* Local cache interfaces */ utilities/utmutex.c /* Local mutex support */ utilities/utstate.c /* State object support */ parser/psloop.c /* Main AML parse loop */ Signed-off-by: Len Brown commit 2283a117f65650352f2a9fd6b9af4cdbf5478d14 Author: Randy Dunlap Date: Thu Jul 7 15:39:26 2005 -0700 [PATCH] scripts/kernel-doc: don't use uninitialized SRCTREE Current kernel-doc (perl) script generates this warning: Use of uninitialized value in concatenation (.) or string at scripts/kernel-doc line 1668. So explicitly check for SRCTREE in the ENV before using it, and then if it is set, append a '/' to the end of it, otherwise the SRCTREE + filename can (will) be missing the intermediate '/'. Signed-off-by: Randy Dunlap Signed-off-by: Sam Ravnborg commit 66da665ca36b07728acf35881f918a89a2c9fbb2 Author: Jeff Mahoney Date: Wed Jul 13 11:55:42 2005 -0400 [PATCH] Lindent: ignore .indent.pro When I recently submitted a Lindent patch, it turned out that my .indent.pro options were also applied to the tree. This patch directs indent(1) to ignore the .indent.pro directives and only use options specified on the command line. Signed-off-by: Jeff Mahoney Signed-off-by: Sam Ravnborg commit be3cef986f7c44593d6d112584fbdf4618b6569e Author: Yum Rayan Date: Wed Jun 8 22:04:32 2005 -0700 [PATCH] kbuild: restrain output of "make help" to 80 columns This patch fixes the output of "make help" to fit in a 80 column screen. Please push upstream as part of your other patches. Signed-off-by: Yum Rayan Signed-off-by: Sam Ravnborg commit e0af0d85f55ea800a2e38bf782d68b83e9942611 Author: Matthias Urlichs Date: Fri Feb 18 10:23:41 2005 +0100 [PATCH] kbuild: obey HOSTLOADLIBES_programname for single-file compilation Single-file HOSTCC calls added the libraries from $(HOSTLOADLIBES), but not from $(HOSTLOADLIBES_programname). Multi-file HOSTCC calls do both. This patch fixes that inconsistency. Signed-Off-By: Matthias Urlichs Signed-off-by: Sam Ravnborg commit a0674e88d9c150e016a69e78e735f48772314c53 Author: Ian Campbell Date: Thu Jun 23 11:25:54 2005 +0100 [PATCH] kbuild: allow cscope to index multiple architectures I have a single source tree which I cross compile for a couple of different architectures using ARHC=foo O=blah etc. The existing cscope target is very handy but only indexes the current $(ARCH), which is a pain since inevitably I'm interested in the other one at any given time ;-). This patch allows me to pass a list of architectures for cscope to index. e.g. make ALLSOURCE_ARCHS="i386 arm" cscope This change also works for etags etc, and I presume it is just as useful there. Signed-off-by: Ian Campbell Signed-off-by: Sam Ravnborg commit acbef459a663a8349ceb46b5a11ede50fa7909c7 Author: Karl Hegbloom Date: Sun Jun 19 00:50:47 2005 -0700 [PATCH] kbuild: make 'cscope -q' play well with cscope.el I tried the Linux Makefile 'make cscope' target, and found that the generated database is not compatible with 'cscope.el' under XEmacs. The thing is that 'cscope.el' does not allow setting the command line options to the 'cscope' commands it runs, and it errors with a message about the options not matching the ones used to generate the index. It turns out the cscope designers already thought of this. The options can be written into the "cscope.files". The included patch moves the "-q" and "-k" options from the 'cmd_cscope' to the 'cmd_cscope-file', echoing them into the top of the files listing. Now the index is generated with the "-q" option, and when 'cscope.el' performs it's search, it uses that argument as well. Lookups are fast and everyone is happy. Signed-off-by: Sam Ravnborg commit d2cb1a95c5fa4d1691c90a4f530955b4ea3cfa24 Author: Greg Edwards Date: Thu Jul 29 13:07:32 2004 -0500 [PATCH] kbuild: add ia64 support to rpm Makefile target On ia64, only the EFI (fat) partition is available to boot from. The rpm needs to install the kernel under /boot/efi to be useable on ia64. Signed-off-by: Greg Edwards Signed-off-by: Sam Ravnborg commit 88ac00f5a841dcfc5c682000f4a6add0add8caac Author: Robert Moore Date: Thu May 26 00:00:00 2005 -0400 ACPICA 20050526 from Bob Moore Implemented support to execute Type 1 and Type 2 AML opcodes appearing at the module level (not within a control method.) These opcodes are executed exactly once at the time the table is loaded. This type of code was legal up until the release of ACPI 2.0B (2002) and is now supported within ACPI CA in order to provide backwards compatibility with earlier BIOS implementations. This eliminates the "Encountered executable code at module level" warning that was previously generated upon detection of such code. Fixed a problem in the interpreter where an AE_NOT_FOUND exception could inadvertently be generated during the lookup of namespace objects in the second pass parse of ACPI tables and control methods. It appears that this problem could occur during the resolution of forward references to namespace objects. Added the ACPI_MUTEX_DEBUG #ifdef to the acpi_ut_release_mutex function, corresponding to the same the deadlock detection debug code to be compiled out in the normal case, improving mutex performance (and overall subsystem performance) considerably. As suggested by Alexey Starikovskiy. Implemented a handful of miscellaneous fixes for possible memory leaks on error conditions and error handling control paths. These fixes were suggested by FreeBSD and the Coverity Prevent source code analysis tool. Added a check for a null RSDT pointer in acpi_get_firmware_table (tbxfroot.c) to prevent a fault in this error case. Signed-off-by Len Brown commit 6f42ccf2fc50ecee8ea170040627f268430c1648 Author: Robert Moore Date: Fri May 13 00:00:00 2005 -0400 ACPICA from Bob Moore Implemented support for PCI Express root bridges -- added support for device PNP0A08 in the root bridge search within AcpiEvPciConfigRegionSetup. acpi_ev_pci_config_region_setup(). The interpreter now automatically truncates incoming 64-bit constants to 32 bits if currently executing out of a 32-bit ACPI table (Revision < 2). This also affects the iASL compiler constant folding. (Note: as per below, the iASL compiler no longer allows 64-bit constants within 32-bit tables.) Fixed a problem where string and buffer objects with "static" pointers (pointers to initialization data within an ACPI table) were not handled consistently. The internal object copy operation now always copies the data to a newly allocated buffer, regardless of whether the source object is static or not. Fixed a problem with the FromBCD operator where an implicit result conversion was improperly performed while storing the result to the target operand. Since this is an "explicit conversion" operator, the implicit conversion should never be performed on the output. Fixed a problem with the CopyObject operator where a copy to an existing named object did not always completely overwrite the existing object stored at name. Specifically, a buffer-to-buffer copy did not delete the existing buffer. Replaced "interrupt_level" with "interrupt_number" in all GPE interfaces and structs for consistency. Signed-off-by: Len Brown commit b95d4fec89c1f503ebad4c704ac08c3c6761329b Author: Fabio Massimo Di Nitto Date: Wed Jul 13 08:25:49 2005 +0200 [PATCH] kbuild: modpost needs to cope with new glibc elf header on sparc Recently a change in the glibc elf.h header has been introduced causing modpost to spawn tons of warnings (like the one below) building the kernel on sparc: [SNIP] *** Warning: "current_thread_info_reg" [net/sunrpc/auth_gss/auth_rpcgss.ko] undefined! *** Warning: "" [net/sunrpc/auth_gss/auth_rpcgss.ko] undefined! *** Warning: "" [net/sunrpc/auth_gss/auth_rpcgss.ko] undefined! [SNIP] Ben Collins discovered that the STT_REGISTERED definition in glibc did change and that this change needs to be propagated to modpost. glibc change: -#define STT_REGISTER 13 /* Global register reserved to app. */ +#define STT_SPARC_REGISTER 13 /* Global register reserved to app. */ I did and tested this simple patch to maintain compatibility with newer (>= 2.3.4) and older (<= 2.3.2) glibc. Signed-off-by: Fabio M. Di Nitto Signed-off-by: Sam Ravnborg commit 6d983feab80948cdd0e3920c40d453a6436eeb23 Author: Jan-Benedict Glaw Date: Tue May 24 11:27:37 2005 +0200 [PATCH] kbuild: create tarballs It adds tarball packaging, which I prefer for distribution. Also one of the two blanks after @echo is removed. One seems to be enough :) Signed-off-by: Jan-Benedict Glaw Signed-off-by: Sam Ravnborg commit 836cf0465c422ee6d654060edd7c620d9cf0c09c Author: Dave Airlie Date: Sun Jul 10 19:27:04 2005 +1000 drm: cleanup buffer/map code This is a patch from DRM CVS that cleans up some code that was in CVS that I never moved to the kernel, this patch produces the result of the cleanups and puts it into the kernel drm. From: Eric Anholt , Jon Smirl, Dave Airlie Signed-off-by: Dave Airlie commit d01cff408057fa925b2f766fa1fd5a305fd1acbf Author: Dave Airlie Date: Sun Jul 10 19:24:35 2005 +1000 drm: add mga driver callbacks Add some missing driver callback for the PCI support Signed-off-by: Dave Airlie commit 6795c985a648d1e90b367cc1387c18205ecca4b8 Author: Dave Airlie Date: Sun Jul 10 18:20:09 2005 +1000 Add support for PCI MGA cards to MGA DRM. This patch adds serveral new ioctls and a new query to get_param query to support PCI MGA cards. Two ioctls were added to implement interrupt based waiting. With this change, the client-side driver no longer needs to map the primary DMA region or the MMIO region. Previously, end-of-frame waiting was done by busy waiting in the client-side driver until one of the MMIO registers (the current DMA pointer) matched a pointer to the end of primary DMA space. By using interrupts, the busy waiting and the extra mappings are removed. A third ioctl was added to bootstrap DMA. This ioctl, which is used by the X-server, moves a *LOT* of code from the X-server into the kernel. This allows the kernel to do whatever needs to be done to setup DMA buffers. The entire process and the locations of the buffers are hidden from user-mode. Additionally, a get_param query was added to differentiate between G4x0 cards and G550 cards. A gap was left in the numbering sequence so that, if needed, G450 cards could be distinguished from G400 cards. According to Ville Syrjälä, the G4x0 cards and the G550 cards handle anisotropic filtering differently. This seems the most compatible way to let the client-side driver know which card it's own. Doing this very small change now eliminates the need to bump the DRM minor version twice. http://marc.theaimsgroup.com/?l=dri-devel&m=106625815319773&w=2 (airlied - this may not work at this point, I think the follow on buffer cleanup patches will be needed) From: Ian Romanick Signed-off-by: Dave Airlie commit b5d499cfdeebcb71f00f3513045796ccae718140 Author: Dave Airlie Date: Sun Jul 10 18:17:42 2005 +1000 drm: make drm_alloc_agp take a dev arg. Signed-off-by: Dave Airlie commit 93f453f3ffd8f4dbb0311b58b854e7655da3d601 Author: Dave Airlie Date: Sun Jul 10 17:45:34 2005 +1000 drm: add new mga ids and types From: Ian Romanick Signed-off-by: Dave Airlie commit cda173806644d2af22ffd9896eed8ef99b97d356 Author: Dave Airlie Date: Sun Jul 10 17:31:26 2005 +1000 drm: add test for AGP devices and driver override for it. Added device_is_agp callback to drm_driver. This function is called by the platform-specific drm_device_is_agp function. Added implementation of this function the the Linux-specific portion of the MGA driver to detect PCI G450 cards. Added code to the Linux-specific portion of the generic DRM layer to not initialize AGP infrastructure if the card is not AGP (this matches what already existed in BSD). Fix up i810/i830 and i915 drivers to always return AGP as they don't always report the capability. Fix the MGA to not report AGP for a card that has an AGP chip behind a PCI bridge. From: Ian Romanick, Dave Airlie, Alan Hourihane Signed-off-by: Dave Airlie commit ceb9c27aa7d61c70f4c75f017d9fbc9de50034f1 Author: Dave Airlie Date: Sun Jul 10 17:07:23 2005 +1000 drm: destatic exported function. Signed-off-by: Dave Airlie commit d84f76d37c5eebb94c48337958d5a2ff2965c02d Author: Dave Airlie Date: Sun Jul 10 17:04:22 2005 +1000 drm: export symbols for use by drivers This just exports symbols for use in drivers. From: Ian Romanick Signed-off-by: Dave Airlie commit aff138ab8ec340c23e7c6e1a95c1518ee832a8c6 Author: Dave Airlie Date: Sun Jul 10 16:58:40 2005 +1000 drm: fix minor function header issue From: Ian Romanick Signed-off-by: Dave Airlie commit 7ab984012a879a53abb56abfe03b0c686f42b281 Author: Dave Airlie Date: Sun Jul 10 16:56:52 2005 +1000 drm: update some function so a driver can call them This patch splits some ioctl functions so that they can be called in-kernel by a DRM driver. The driver will use them later. From: Ian Romanick Signed-off-by: Dave Airlie commit 9c8da5ebbf6f87293cf8555182da271449889a69 Author: Dave Airlie Date: Sun Jul 10 15:38:56 2005 +1000 drm: update support for drm pci buffers The DRM needs to change the drm_pci interface for FreeBSD compatiblity, this patch introduces the drm_dma_handle_t and uses it in the Linux code. From: Tonnerre Lombard, Eric Anholt, and Sergey Vlasov Signed-off-by: David Airlie commit d59431bf96d1e8a3d6d240343f559f5e2ace7f1d Author: Dave Airlie Date: Sun Jul 10 15:00:06 2005 +1000 Refactor common, boilerplate ioctl code from drm_addbufs_* functions into drm_addbufs. This makes the code more like the BSD code, and makes the drm_addbufs_* functions callable in-kernel. From: Ian Romanick Signed-off-by: Dave Airlie commit b84397d6390ef04e8080d66bf528418ab5e75dc0 Author: Dave Airlie Date: Sun Jul 10 14:46:12 2005 +1000 drm: add framebuffer maps The patch makes drmAddBufs/drmMapBufs can handle buffers in video memory The attached patch adds a new buffer type DRM_FB_BUFFER. It works like AGP memory but uses video memory. From: Austin Yuan Signed-off-by: Dave Airlie commit 2d0f9eaff8e1d08b9707f5d24fe6b0ac95d231e3 Author: Dave Airlie Date: Sun Jul 10 14:34:13 2005 +1000 drm: add _DRM_CONSISTENT map type Added a new DRM map type _DRM_CONSISTENT for consistent PCI memory. It uses drm_pci_alloc/free for allocating/freeing the memory. From: Felix Kuhling Signed-off-by: David Airlie commit 9bd481f85940726bf66aae5cd03c5b912ad0ae4c Author: Jeff Garzik Date: Tue Jun 28 01:46:35 2005 -0400 wireless: fix ipw warning; add is_broadcast_ether_addr() to linux/etherdevice.h commit ad3fee560bc508008b3b2cf6358105c4c7081921 Author: Andrew Morton Date: Mon Jun 20 14:30:36 2005 -0700 [PATCH] wireless-device-attr-fixes-2 More fixes for greg depredations. Also nuke lots of pointless typecasts. All this new wireless code adds near-infinite amounts of trailing whitespace. Cc: Jeff Garzik Cc: Greg KH Signed-off-by: Andrew Morton commit edfc43f2ec542c17c479d8ec7e4b0cee7b20f578 Author: Andrew Morton Date: Mon Jun 20 14:30:35 2005 -0700 [PATCH] wireless-device-attr-fixes Repair Jeff's stuff after gregkh depredations. Cc: Jeff Garzik Cc: Greg KH Signed-off-by: Andrew Morton commit 011fe95a3b25ff124486fc27dc0395904ecf5852 Author: Andrew Morton Date: Mon Jun 20 14:30:36 2005 -0700 [PATCH] ipw2100 old gcc fix drivers/net/wireless/ipw2100.c: In function `ipw2100_set_key_index': drivers/net/wireless/ipw2100.c:5326: array index in non-array initializer drivers/net/wireless/ipw2100.c:5326: (near initialization for `cmd') drivers/net/wireless/ipw2100.c:5326: warning: missing braces around initializer drivers/net/wireless/ipw2100.c:5326: warning: (near initialization for `cmd.host_command_parameters') Cc: Jeff Garzik Signed-off-by: Andrew Morton commit 8724a118031a4eb62174b3e12745e4d35d4b03fe Author: Pavel Machek Date: Mon Jun 20 14:28:43 2005 -0700 [PATCH] ipw2100: small cleanups Fix few typos/thinkos in ipw, remove ugly macro (it is commented around, anyway), and fix types passed to pci_set_power_state. Signed-off-by: Andrew Morton commit 5dc54a65b6981d327a84c7651bbfeef0c0aff977 Author: Pavel Machek Date: Mon Jun 20 14:28:43 2005 -0700 [PATCH] ipw2100: kill dead macros There are several never used macros in ipw2100. This removes them. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton commit 4663663f1d91aa0b84526841e47f401598bfa2f4 Author: Pavel Machek Date: Mon Jun 20 14:28:42 2005 -0700 [PATCH] ipw2100: assume recent kernel ipw2100 still has support for old kernels. Thats considered bad for patch in mainline... this fixes few instances. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton commit 0e08b44eedacb7824c88678d9a9ea7db25b5401c Author: Tobias Klauser Date: Mon Jun 20 14:28:41 2005 -0700 [PATCH] drivers/net/wireless/ipw2200: Use the DMA_32BIT_MASK constant Use the DMA_32BIT_MASK constant from dma-mapping.h when calling pci_set_dma_mask() or pci_set_consistent_dma_mask() instead of custom macros. This patch includes dma-mapping.h explicitly because it caused errors on some architectures otherwise. See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details Signed-off-by: Tobias Klauser Cc: Jeff Garzik Signed-off-by: Andrew Morton commit 05743d165be9f0293b4ff67f4e1cf3724eb13e1f Author: Tobias Klauser Date: Mon Jun 20 14:28:40 2005 -0700 [PATCH] drivers/net/wireless/ipw2100: Use the DMA_32BIT_MASK constant Use the DMA_32BIT_MASK constant from dma-mapping.h when calling pci_set_dma_mask() or pci_set_consistent_dma_mask() instead of custom macros. This patch includes dma-mapping.h explicitly because it caused errors on some architectures otherwise. See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details Signed-off-by: Tobias Klauser Cc: Jeff Garzik Signed-off-by: Andrew Morton commit 070d01651296d3c87bca94f3b1313447e9e06c2f Author: Pavel Machek Date: Mon Jun 20 13:33:07 2005 +0200 [PATCH] ipw2100: remove commented-out code This removes up various code/defines that was just commented out instead of being deleted. commit aaa4d308a8cbc4ccfd870ee556def2e481557274 Author: Jiri Benc Date: Tue Jun 7 14:58:41 2005 +0200 [PATCH] ieee80211: fix ipw 64bit compilation warnings On Mon, 06 Jun 2005 14:29:52 +0800, Zhu Yi wrote: > ("%zd", sizeof()) should be better. Thanks. This is a corrected version of the patch. This patch fixes warnings when compiling ipw2100 and ipw2200 on x86_64. Signed-off-by: Jiri Benc Signed-off-by: Jirka Bohac commit e19b813e0c9c5995423dc95b01379c89f188ae70 Author: Adrian Bunk Date: Fri Jun 3 18:29:20 2005 +0200 [PATCH] ieee80211: fix recursive ipw2200 dependencies This results in recursive dependencies: - IPW2200 depends on NET_RADIO - IPW2200 selects IEEE80211 - IEEE80211 selects NET_RADIO This patch fixes the IPW2200 dependencies in a way that they are similar to the IPW2100 dependencies. Signed-off-by: Adrian Bunk Signed-off-by: Jiri Benc commit 7c9d4c70b20e165eb11d8aed2b6374377d17f43a Author: Adrian Bunk Date: Fri Jun 3 18:28:19 2005 +0200 [PATCH] ieee80211: remove pci.h #include's I was wondering why editing pci.h triggered the rebuild of three files under net/, and as far as I can see, there's no reason for these three files to #include pci.h . Signed-off-by: Adrian Bunk Signed-off-by: Jiri Benc commit 559fb51ba7e66fe298b8355fabde1275b7def35f Author: Scott Bardone Date: Thu Jun 23 01:40:19 2005 -0400 Update Chelsio gige net driver. - Use extern prefix for functions required. - Removed a lot of wrappers, including t1_read/write_reg_4. - Removed various macros, using native kernel calls now. - Enumerated various #defines. - Removed a lot of shared code which is not currently used in "NIC only" mode. - Removed dead code. Documentation/networking/cxgb.txt: - Updated release notes for version 2.1.1 drivers/net/chelsio/ch_ethtool.h - removed file, no longer using ETHTOOL namespace. drivers/net/chelsio/common.h - moved code from osdep.h to common.h - added comment to #endif indicating which symbol it closes. drivers/net/chelsio/cphy.h - removed dead code. - added comment to #endif indicating which symbol it closes. drivers/net/chelsio/cxgb2.c - use DMA_{32,64}BIT_MASK in include/linux/dma-mapping.h. - removed unused code. - use printk message for link info resembling drivers/net/mii.c. - no longer using the MODULE_xxx namespace. - no longer using "pci_" namespace. - no longer using ETHTOOL namespace. drivers/net/chelsio/cxgb2.h - removed file, merged into common.h drivers/net/chelsio/elmer0.h - removed dead code. - added various enums. - added comment to #endif indicating which symbol it closes. drivers/net/chelsio/espi.c - removed various macros, using native kernel calls now. - removed a lot of wrappers, including t1_read/write_reg_4. drivers/net/chelsio/espi.h - added comment to #endif indicating which symbol it closes. drivers/net/chelsio/gmac.h - added comment to #endif indicating which symbol it closes. drivers/net/chelsio/mv88x201x.c - changes to sync with Chelsio TOT. drivers/net/chelsio/osdep.h - removed file, consolidation. osdep was used to translate wrapper functions since our code supports multiple OSs. removed wrappers. drivers/net/chelsio/pm3393.c - removed various macros, using native kernel calls now. - removed a lot of wrappers, including t1_read/write_reg_4. - removed unused code. drivers/net/chelsio/regs.h - added a few register entries for future and current feature support. - added comment to #endif indicating which symbol it closes. drivers/net/chelsio/sge.c - rewrote large portion of scatter-gather engine to stabilize performance. - using u8/u16/u32 kernel types instead of __u8/__u16/__u32 compiler types. drivers/net/chelsio/sge.h - rewrote large portion of scatter-gather engine to stabilize performance. - added comment to #endif indicating which symbol it closes. drivers/net/chelsio/subr.c - merged tp.c into subr.c - removed various macros, using native kernel calls now. - removed a lot of wrappers, including t1_read/write_reg_4. - removed unused code. drivers/net/chelsio/suni1x10gexp_regs.h - modified copyright and authorship of file. - added comment to #endif indicating which symbol it closes. drivers/net/chelsio/tp.c - removed file, merged into subr.c. drivers/net/chelsio/tp.h - removed file. include/linux/pci_ids.h - patched to include PCI_VENDOR_ID_CHELSIO 0x1425, removed define from our code. commit 73747aed04d3b3fb694961d025f81863b99c6898 Author: Christoph Hellwig Date: Mon Jun 20 14:21:01 2005 +0200 [PATCH] ll_rw_blk.c kerneldoc updates The recent mapping changes didn't update the kerneldoc appropriately. Original from Christoph Hellwig Signed-off-by: Jens Axboe commit 994ca9a19616f0d4161a9e825f0835925d522426 Author: James Bottomley Date: Mon Jun 20 14:11:09 2005 +0200 [PATCH] update blk_execute_rq to take an at_head parameter Original From: Mike Christie Modified to split out block changes (this patch) and SCSI pieces. Signed-off-by: Jens Axboe Signed-off-by: James Bottomley commit f63eb21b4f32028755b6b9d47e5eb13c18ba0cae Author: Jens Axboe Date: Mon Jun 20 14:10:25 2005 +0200 [PATCH] kill 'reading' variable in sg_io(), it isn't used anymore. Signed-off-by: Jens Axboe commit e1f546e185e9d8cb9303d74d1cd5bc704f265384 Author: James Bottomley Date: Mon Jun 20 14:07:17 2005 +0200 [PATCH] The blk_rq_map_user() change missed an update in scsi_ioctl.c Signed-off-by: Jens Axboe commit f1970baf6d74e03bd32072ab453f2fc01bc1b8d3 Author: James Bottomley Date: Mon Jun 20 14:06:52 2005 +0200 [PATCH] Add scatter-gather support for the block layer SG_IO Signed-off-by: Jens Axboe commit dd1cab95f356f1395278633565f198463cf6bd24 Author: Jens Axboe Date: Mon Jun 20 14:06:01 2005 +0200 [PATCH] Cleanup blk_rq_map_* interfaces Change the blk_rq_map_user() and blk_rq_map_kern() interface to require a previously allocated request to be passed in. This is both more efficient for multiple iterations of mapping data to the same request, and it is also a much nicer API. Signed-off-by: Jens Axboe commit b823825e8e09aac6dc1ca362cd5639a87329d636 Author: Jens Axboe Date: Mon Jun 20 14:05:27 2005 +0200 [PATCH] Keep the bio end_io parts inside of bio.c for blk_rq_map_kern() Signed-off-by: Jens Axboe commit df46b9a44ceb5af2ea2351ce8e28ae7bd840b00f Author: Mike Christie Date: Mon Jun 20 14:04:44 2005 +0200 [PATCH] Add blk_rq_map_kern() Add blk_rq_map_kern which takes a kernel buffer and maps it into a request and bio. This can be used by the dm hw_handlers, old sg_scsi_ioctl, and one day scsi special requests so all requests comming into scsi will have bios. All requests having bios should allow scsi to use scatter lists for all IO and allow it to use block layer functions. Signed-off-by: Jens Axboe commit b652b438fcad4c9c079d0774e9d45ee58fae22e2 Author: Russell King Date: Wed Jun 15 12:38:14 2005 +0100 [PATCH] I2C: Add PXA I2C driver Add support for the I2C PXA driver. Signed-off-by: Russell King commit 66b04a80eea60cabf9d89fd34deb3234a740052f Author: Jeff Garzik Date: Fri May 27 22:53:55 2005 -0400 [wireless] ipw2100: fix build after applying SuSE cleanups s/ieee80211_header_data/ieee80211_hdr_3addr/ commit 286d974797705ae7ceedc846666ef98bdeee3646 Author: Jiri Benc Date: Tue May 24 15:10:18 2005 +0200 [PATCH] ieee80211: cleanup Cleanup of unused and duplicated constants and structures in the ieee80211 header. Signed-off-by: Jiri Benc Signed-off-by: Jirka Bohac commit 76fe1b0e4c093f985c66a062c9c10370b4985796 Author: Adrian Bunk Date: Sat May 7 00:54:49 2005 +0200 [PATCH] fix IEEE80211_CRYPT_* selects Some of the options didn't obey the most important rule of select If you select something, you have to ensure that the dependencies of what you do select are fulfilled. resulting in the following compile error: <-- snip --> ... LD .tmp_vmlinux1 crypto/built-in.o(.init.text+0x31b): In function `aes_init': : undefined reference to `crypto_register_alg' crypto/built-in.o(.init.text+0x326): In function `michael_mic_init': : undefined reference to `crypto_register_alg' crypto/built-in.o(.exit.text+0x6): In function `aes_fini': : undefined reference to `crypto_unregister_alg' crypto/built-in.o(.exit.text+0x16): In function `michael_mic_exit': : undefined reference to `crypto_unregister_alg' net/built-in.o(.text+0x5ba52): In function `ieee80211_ccmp_init': : undefined reference to `crypto_alloc_tfm' net/built-in.o(.text+0x5ba94): In function `ieee80211_ccmp_init': : undefined reference to `crypto_free_tfm' net/built-in.o(.text+0x5bab7): In function `ieee80211_ccmp_deinit': : undefined reference to `crypto_free_tfm' net/built-in.o(.text+0x5c5c2): In function `ieee80211_tkip_init': : undefined reference to `crypto_alloc_tfm' net/built-in.o(.text+0x5c5d5): In function `ieee80211_tkip_init': : undefined reference to `crypto_alloc_tfm' net/built-in.o(.text+0x5c623): In function `ieee80211_tkip_init': : undefined reference to `crypto_free_tfm' net/built-in.o(.text+0x5c62a): In function `ieee80211_tkip_init': : undefined reference to `crypto_free_tfm' net/built-in.o(.text+0x5c65e): In function `ieee80211_tkip_deinit': : undefined reference to `crypto_free_tfm' net/built-in.o(.text+0x5c665): In function `ieee80211_tkip_deinit': : undefined reference to `crypto_free_tfm' make: *** [.tmp_vmlinux1] Error 1 <-- snip --> This patch adds the missing selects of CRYPTO (similar to how IEEE80211_CRYPT_WEP already does it). Yes, you could argue whether CRYPTO should be select'ed by the CRYPTO_* options, but with the current CRYPTO* dependencies this patch is required. commit e157249d948bf0c5da10ce8610e2b4b36d0a3c4c Author: Adrian Bunk Date: Fri May 6 23:32:39 2005 +0200 [PATCH] net/ieee80211/: make two functions static This patch makes two needlessly global functions static. Signed-off-by: Adrian Bunk commit 3dcefbc9d6bd8b5ff0fc4bdbe3df938be5460f79 Author: Al Viro Date: Tue Apr 26 18:43:05 2005 +0100 [PATCH] zd1201 fixes In netdev-2.6 we need to update zd1201.c since we don't have driver/net/wireless/ieee802_11.h anymore. Signed-off-by: Al Viro commit 695b5bc3ecfc7da0a29360a6c2ee0849ffdb300a Author: Al Viro Date: Sun Apr 3 09:15:52 2005 +0100 [PATCH] ieee80211_module.c::store_debug_level() cleanup * trivial __user annotations * store_debug_level() sanitized a bit Signed-off-by: Al Viro commit 43f66a6ce8da299344cf1bc2ac2311889cc88555 Author: James Ketrenos Date: Fri Mar 25 12:31:53 2005 -0600 Add ipw2200 wireless driver. commit 2c86c275015c880e810830304a3a4ab94803b38b Author: James Ketrenos Date: Wed Mar 23 17:32:29 2005 -0600 Add ipw2100 wireless driver. commit 0a989b24fd59e8867274246587b46f5595fa0baa Author: Adrian Bunk Date: Mon Apr 11 16:52:15 2005 -0700 [PATCH] net/ieee80211/ieee80211_tx.c: swapped memset arguments Fix swapped memset() arguments in net/ieee80211/ieee80211_tx.c found by Maciej Soltysiak. Patch by Jesper Juhl. Signed-off-by: Jesper Juhl Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton commit 8199d3a79c224bbe5943fa08684e1f93a17881b0 Author: Christoph Lameter Date: Wed Mar 30 13:34:31 2005 -0800 [PATCH] A new 10GB Ethernet Driver by Chelsio Communications A Linux driver for the Chelsio 10Gb Ethernet Network Controller by Chelsio (http://www.chelsio.com). This driver supports the Chelsio N210 NIC and is backward compatible with the Chelsio N110 model 10Gb NICs. It supports AMD64, EM64T and x86 systems. Signed-off-by: Tina Yang Signed-off-by: Scott Bardone Signed-off-by: Christoph Lameter Adrian said: - my3126.c is unused (because t1_my3126_ops isn't used anywhere) - what are the EXTRA_CFLAGS in drivers/net/chelsio/Makefile for? - $(cxgb-y) in drivers/net/chelsio/Makefile seems to be unneeded - completely unused global functions: - espi.c: t1_espi_get_intr_counts - sge.c: t1_sge_get_intr_counts - the following functions can be made static: - sge.c: t1_espi_workaround - sge.c: t1_sge_tx - subr.c: __t1_tpi_read - subr.c: __t1_tpi_write - subr.c: t1_wait_op_done shemminger said: The performance recommendations in cxgb.txt are common to all fast devices, and should be in one file rather than just for this device. I would rather see ip-sysctl.txt updated or a new file on tuning recommendations started. Some of them have consequences that aren't documented well. For example, turning off TCP timestamps risks data corruption from sequence wrap. A new driver shouldn't need so may #ifdef's unless you want to putit on older vendor versions of 2.4 Some accessor and wrapper functions like: t1_pci_read_config_4 adapter_name t1_malloc are just annoying noise. Why have useless dead code like: /* Interrupt handler */ +static int pm3393_interrupt_handler(struct cmac *cmac) +{ + u32 master_intr_status; +/* + 1. Read master interrupt register. + 2. Read BLOCK's interrupt status registers. + 3. Handle BLOCK interrupts. +*/ Jeff said: step 1: kill all the OS wrappers. And do you really need hooks for multiple MACs, when only one MAC is really supported? Typically these hooks are at a higher level anyway -- struct net_device. From: Christoph Lameter Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton diff -puN /dev/null Documentation/networking/cxgb.txt commit ff1d2767d5a43c85f944e86a45284b721f66196c Author: Jouni Malinen Date: Thu May 12 22:54:16 2005 -0400 Add HostAP wireless driver. Includes minor cleanups from Adrian Bunk . commit b453872c35cfcbdbf5a794737817f7d4e7b1b579 Author: Jeff Garzik Date: Thu May 12 22:48:20 2005 -0400 [NET] ieee80211 subsystem Contributors: Host AP contributors James Ketrenos Francois Romieu Adrian Bunk Matthew Galgoci