commit 4598c95514f9a50b49626e1e5d1f292180b643fa Merge: 641e22e... 575c3e2... Author: Linus Torvalds Date: Wed May 23 08:16:24 2007 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [RTNETLINK]: Remove remains of wireless extensions over rtnetlink [RTNETLINK]: Allow changing of subsets of netdevice flags in rtnl_setlink [AF_RXRPC]: Make call state names available if CONFIG_PROC_FS=n [AF_RXRPC]: AF_RXRPC depends on IPv4 [IPSEC]: Fix warnings with casting int to pointer commit 641e22e04c48af5d813f119c55336e02a22756f5 Merge: 31f6e1b... fa91d43... Author: Linus Torvalds Date: Wed May 23 08:12:54 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (29 commits) USB: Add support for Olimex arm-usb-ocd JTAG interface serial port USB: Add support for Sierra Wireless Aircard 595U USB: ldusb bugfix USB: ftdi_sio: Add USB Product Id for OpenDCC USB: fix ratelimit call semantics USB: handle errors in power/level attribute USB: make the autosuspend workqueue thread freezable USB: Fix USB OHCI Subvendor for Toshiba Portege 4000 USB: usblp: Use correct DMA address in case of probe error USB: Fix debug output of ark3116 USB: Onetouch - switch to using input_dev->dev.parent USB: don't try to kzalloc 0 bytes USB: remove short initial timeout for device descriptor fetch USB: Deref URB after usbmon is done with it USB: Remove duplicate IDs from option card driver USB: auerswald: fix file release handler USB: fsl_usb2_udc: Fix UMTI_WIDE support and a compile warning USB: set the correct Interrupt interval in usb_bulk_msg USB: New device PID for ftdi_sio driver USB: remove unneeded WARN_ON ... commit 31f6e1bd3b58c9a67e5ea0c2d372fbf5fc9e326d Merge: ad9ddd6... 230ffc8... Author: Linus Torvalds Date: Wed May 23 08:11:43 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: ads7846 - SPI_CPHA mode bugfix Input: ads7846 - document that it handles tsc2046 too Input: input-polldev - add module info Input: ucb1x00-ts - remove commented out code Input: ucb1400_ts - use sched_setscheduler() Input: ALPS - force stream mode Input: iforce - minor clean-ups Input: iforce - fix force feedback not working Input: adbhid - do not access input_dev->private directly Input: logips2pp - add type 72 (PS/2 TrackMan Marble) commit fa91d43b914b77637653d984416e17e182f7b807 Author: Tony Lindgren Date: Fri May 4 18:23:24 2007 -0700 USB: Add support for Olimex arm-usb-ocd JTAG interface serial port This patch adds support for the serial port on Olimex arm-usb-ocd JTAG interface. The device appears as two serial ports, but the first one is reserved for the JTAG interface. The JTAG interface can be used with OpenOCD from userspace. For more information, please see: http://openocd.berlios.de/web/ http://www.olimex.com/dev/arm-usb-ocd.html Signed-off-by: Tony Lindgren Signed-off-by: Greg Kroah-Hartman commit 5b7da8f6ff1aaf5a500dc798f4d1c2d6e98420a5 Author: Danny Budik Date: Fri May 4 16:09:37 2007 -0400 USB: Add support for Sierra Wireless Aircard 595U This patch adds support for the newly released Aircard 595U EVDO modem to the Sierra Wireless driver (sierra.c) in kernel 2.6.21. I suspect that my mailer may be mangling patches so let me know and I'll try to resend it. From: Danny Budik Signed-off-by: Greg Kroah-Hartman commit 9d33efd9a791041bbe3a9e879925ef8fbb94d812 Author: Oliver Neukum Date: Fri May 4 09:23:40 2007 +0200 USB: ldusb bugfix This patch fixes a problem reported with consecutive reads in the ldusb driver. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 2adb80e9c52f35a4d63783b98d48386c38c90484 Author: Guido Scholz Date: Tue May 8 19:52:41 2007 +0200 USB: ftdi_sio: Add USB Product Id for OpenDCC USB product id registration for the OpenDCC (www.opendcc.de) model railway central unit. Applies to 2.6.21.1. Signed-off-by: Guido Scholz Signed-off-by: Greg Kroah-Hartman commit d4b7d8e8024a33d9d1f916379eaee7aa945a7c48 Author: Alan Stern Date: Tue May 22 11:48:17 2007 -0400 USB: fix ratelimit call semantics This patch (as910) fixes a ratelimit modification so that the original error-handling path will be followed even when the log-rate limitation kicks in. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit dd865571d7af06ba1285c2db85083649193cceab Author: Alan Stern Date: Tue May 22 11:38:19 2007 -0400 USB: handle errors in power/level attribute This patch (as906) improves the error handling for the USB power/level attribute file. If an error occurs, the original power-level settings will be restored. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 7ed92f1a149dddc3cb537ccd7441e98adac12c3e Author: Alan Stern Date: Tue May 22 09:38:39 2007 -0400 USB: make the autosuspend workqueue thread freezable This patch (as881b) makes the ksuspend_usb_wq workqueue freezable. We don't want a rogue workqueue thread running around, unexpectedly suspending or resuming USB devices in the middle of a system sleep transition. This fixes Bugzilla #8498. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 8ab5e8c0ca55c4b40d254f7043a9052345fcd343 Author: Andrey Borzenkov Date: Sat May 19 14:23:28 2007 -0700 USB: Fix USB OHCI Subvendor for Toshiba Portege 4000 This fixes a bug in an OHCI quirk handler for Portege 4000; the Subvendor is 0x1179 (PCI_VENDOR_ID_TOSHIBA) not 0x102f (PCI_VENDOR_ID_TOSHIBA_2) bugid 8510 00:02.0 USB Controller [0c03]: ALi Corporation USB 1.1 Controller [10b9:5237] (rev 03) (prog-if 10 [OHCI]) Subsystem: Toshiba America Info Systems Unknown device [1179:0004] Flags: bus master, medium devsel, latency 64, IRQ 11 Memory at f7eff000 (32-bit, non-prefetchable) [size=4K] Capabilities: Signed-off-by: Andrey Borzenkov Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit bdc4abdd0960e7ca946f4ec93b4cf7a2b826b24f Author: Pete Zaitcev Date: Mon May 21 20:52:44 2007 -0700 USB: usblp: Use correct DMA address in case of probe error Looks like the error path had a copy-paste error. The normal exit path uses correct URB already. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit b268f484f9d7ce91301091e0fb2c80e9e8caa3df Author: Jan Engelhardt Date: Thu May 17 17:16:44 2007 +0200 USB: Fix debug output of ark3116 Fix debug output. Previously, it would output "0xFFFFFFB0" on 32-bit archs (and probably "0xFFFFFFFFFFFFFFB0" on 64-bits), because buf is taken as signed char, which is promoted to signed int, while %x always expects an unsigned int. Signed-off-by: Jan Engelhardt Signed-off-by: Greg Kroah-Hartman commit 09b7002d68cfa1c45cc413a0c7cca399c25a57c6 Author: Dmitry Torokhov Date: Tue May 8 00:31:30 2007 -0400 USB: Onetouch - switch to using input_dev->dev.parent In preparation for struct class_device -> struct device input core conversion, switch to using input_dev->dev.parent when specifying device position in sysfs tree. Also, do not access input_dev->private directly, use helpers. Signed-off-by: Dmitry Torokhov Signed-off-by: Matthew Dharm Signed-off-by: Greg Kroah-Hartman commit 57a21c1b929450b1e020c0a03cca6fa7448f4222 Author: Alan Stern Date: Tue May 15 17:40:37 2007 -0400 USB: don't try to kzalloc 0 bytes This patch (as907) prevents us from trying to allocate 0 bytes when an interface has no endpoint descriptors. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit b89ee19ae6c0b5a0d9facca780b53959fbadd123 Author: Alan Stern Date: Fri May 11 10:19:04 2007 -0400 USB: remove short initial timeout for device descriptor fetch This patch (as905) removes a micro-optimization from the hub port initialization code. Previously we had been using a short timeout on the first attempt the read the device descriptor; now we will use the standard timeout length. It's not clear that the short timeout ever provided any benefit. And now we know of one case where it actually hurts: The device can't meet the short timeout and then it gets terminally confused. This fixes Bugzilla #8444. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit d984abc97e400d68a09729b80060fe0ec591eb16 Author: Pete Zaitcev Date: Fri May 11 22:00:29 2007 -0700 USB: Deref URB after usbmon is done with it I haven't personally run across an oops because of this, but I feel safer with this fix in place. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 9a03095831e839959175379bfdd88e6e1a93b9ea Author: Ben Collins Date: Wed May 16 16:49:54 2007 -0400 USB: Remove duplicate IDs from option card driver Cc: Matthias Urlichs Signed-off-by: Ben Collins Signed-off-by: Greg Kroah-Hartman commit be23edf848b14d1b426c12f2f58e4949c4fbd695 Author: Andrew Morton Date: Thu May 10 23:04:14 2007 -0700 USB: auerswald: fix file release handler If this down_interruptible() does fail due to signal_pending() then the state of the driver will get trashed in interesting ways, because userspace cannot and will not retry the close(). Cc: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit fcbd963912acc0c5d51bb27f8654f2a91fcff322 Author: Li Yang Date: Sat Apr 28 14:07:32 2007 +0800 USB: fsl_usb2_udc: Fix UMTI_WIDE support and a compile warning Change PORT_WIDTH bit for UMTI_WIDE mode and fix a compile warning introduced in last revision. Signed-off-by: Li Yang Signed-off-by: Greg Kroah-Hartman commit 8d062b9a3516c6fbcf749bcc864fdb8b3def1caa Author: Alan Stern Date: Mon Apr 23 17:30:32 2007 -0400 USB: set the correct Interrupt interval in usb_bulk_msg This patch (as902) fixes a mistake I introduced into usb_bulk_msg(). usb_fill_int_urb() already does the bit-shifting calculation for high-speed Interrupt intervals; it shouldn't be done twice. Signed-off-by: Alan Stern commit 762e92fa1742007dedd90ff6b1ea74842f0cd34b Author: Neil \"Superna\" ARMSTRONG Date: Wed Apr 25 20:34:28 2007 +0200 USB: New device PID for ftdi_sio driver Hello, I need to use MaxStream's PKG-U modules which includes a ftdi sio chipset for usb2serial communication, here are the patches for handling Maxstream's modules. The VID & PID to use with the open-source driver are provided on the CD-ROM bundled with the modules. From: Neil Superna ARMSTRONG Signed-off-by: Greg Kroah-Hartman commit bf87ce5a06ed2cb13ad04f065706cf36ab021549 Author: Alan Stern Date: Thu Apr 5 16:07:44 2007 -0400 USB: remove unneeded WARN_ON This patch (as883) removes an out-of-date WARN_ON from the main HCD endpoint-disable routine. The warning is triggered whenever an endpoint is disabled while the root hub is suspended. In the past that may not have been legal, but it definitely is legal now. Merely unbinding a USB driver will do it. Furthermore, I've never seen any occurrences of this warning that really did signal an actual bug or error condition. At this point it has outlived its purpose. Signed-off-by: Alan Stern Signed-off-by: David Brownell commit ef7f6c7084b333c7524dcd297e0578d43733a2a2 Author: Alan Stern Date: Thu Apr 5 16:03:49 2007 -0400 USB: more autosuspend timer stuff This patch (as879) ties up some loose ends from an earlier patch. These are things I didn't think to include at the time but which clearly belonged there. If an autosuspend fails because driver activity races with the autosuspend call, restart the autosuspend timer. When a device is resumed by an external request, it counts as device activity and should update the last_busy time so that the next autoresume won't occur immediately. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 4fe5354f61cad4c0550285283c83c66c070c198e Author: Alan Stern Date: Thu Apr 5 16:06:53 2007 -0400 EHCI: fix problem with BIOS handoff This patch (as882) fixes a problem with the EHCI BIOS handoff. On my machine, the BIOS configures the controller and the handoff fails, leaving the controller configured. During resume-from-disk, this confuses ehci-hcd into thinking that the controller has not been tampered with. The problem is fixed by turning off the Configured Flag whenever a BIOS handoff is attempted, whether it succeeds or not. Signed-off-by: Alan Stern Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 36433127ae7a842482ba857f5ad3c431817a9542 Author: Oliver Neukum Date: Mon Apr 30 01:37:44 2007 -0700 USB: address FIXME in usbnet w.r.t drivers claiming multiple interfaces This fixes the issue of drivers claiming multiple interfaces. Operations are stopped as soon as an interface is suspend and resumed only as all interfaces have been resumed. Signed-off-by: Oliver Neukum Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 741ec4e6d0b7780d29a63f908d6d21df425be365 Author: David Brownell Date: Sun Apr 29 19:51:05 2007 -0700 USB: remove usb DocBook warnings This just removes some warnings generated by the Docbook tools when turning USB (host and peripheral side) kerneldoc into HTML; they're all about missing ID attributes. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 4149b72eaa74583c361e3aaf5804eb74b72c51f1 Author: David Brownell Date: Sun Apr 29 10:09:47 2007 -0700 USB: handle more rndis_host oddities Workaround another device firmware bug, wherein CDC descriptors get placed in a wrong place never previously observed in the wild. Fix a bug where a seeming RNDIS device returns a bogus response during device initialization. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 47f8468e6008a1d62f7dacbcff4ec3e115a500c8 Author: David Brownell Date: Sun Apr 29 10:21:14 2007 -0700 USB: fix more ftdi-elan/u132-hcd #include lossage Partial fix for bogosity in the ftdi-elan and u132-hcd drivers ... these have no business including with the internals of other drivers, much less doing so in a broken way!! A previous patch resolved one build fix, this resolves another... Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 64902cbaf17a5c81a2ed0cca51bf57227086df65 Author: Matthew Davidson Date: Tue May 1 01:15:01 2007 +0100 usb-storage: ignore Sitecom WL-117 USB-WLAN The Sitecom WL-117 is another "driverless" ZD1211 device where the virtual windows driver CD must be ejected before the WLAN device appears. zd1211rw takes care of the ejecting, but usb-storage must be told not to claim the device. From: Matthew Davidson Signed-off-by: Daniel Drake Signed-off-by: Greg Kroah-Hartman commit deb3d7fff0b7c21c5a80b2fdfb93d7fb1abcf21f Author: Oliver Neukum Date: Wed May 2 10:17:50 2007 +0200 USB: remove useless check in mos7840 found by coverity this useless check should be removed. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 5ac43d1fbbfd1b89f83c1a907c58d558d262e441 Author: Oliver Neukum Date: Wed May 2 10:33:10 2007 +0200 USB: fix omninet memory leak found by coverity the transfer of allocating the descriptor in attach and no longer in open was incomplete resulting in a memory leak coverity spotted. This fix is against the patch set you posted. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 230ffc8e348e7841b79fd7c659d16aa5d7ec8a69 Author: Semih Hazar Date: Tue May 22 23:35:12 2007 -0400 Input: ads7846 - SPI_CPHA mode bugfix In commit [1] the SPI mode is set to 1, but it should be 0. As stated in the commit, ads784x samples the data on the rising edge. SPI mode 1 samples on the falling edge [2] though. The root cause of this is a bug in the omap_uwire code, which treats CPHA=1 incorrectly; so these two bugs cancel each other out on one of the main regression test platforms for this driver. [1] kernel.org GIT 7937e86a70235e1584486654687dc9908a11e00a [2] http://en.wikipedia.org/wiki/Serial_Peripheral_Interface_Bus Signed-off-by: David Brownell Signed-off-by: Dmitry Torokhov commit bff0de5f59ff935138eb41c397a7e50468028b83 Author: David Brownell Date: Tue May 22 23:28:40 2007 -0400 Input: ads7846 - document that it handles tsc2046 too The TSC2046 is an updated version of the ADS7846 ... mention that in the Kconfig helptext and driver source. Signed-off-by: David Brownell Acked-by: Kevin Hilman Signed-off-by: Dmitry Torokhov commit 36bd52a49b790a71f3d353cdddf2f22e1e6f84ff Author: Eric Piel Date: Tue May 22 23:28:03 2007 -0400 Input: input-polldev - add module info This is required to load it as a module, as GPL-compatible license is necessary to use workqueues. Signed-off-by: Eric Piel Signed-off-by: Dmitry Torokhov commit 1124d5ca7b7296035c1cc5fc00fdbfa44603b2ac Author: Dmitry Torokhov Date: Mon May 14 23:52:22 2007 -0400 Input: ucb1x00-ts - remove commented out code Signed-off-by: Dmitry Torokhov commit c130bdba585cff185919cc5c82c126fc58aab7a6 Author: Satoru Takeuchi Date: Mon May 14 23:52:07 2007 -0400 Input: ucb1400_ts - use sched_setscheduler() Fix Philips UCB1400 driver to use sched_setscheduler() instead of setting the fields of task_struct directly. Signed-off-by: Satoru Takeuchi Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit 1e0c5b1275a0e59747349745da8778523a9dcd18 Author: Dmitry Torokhov Date: Mon May 14 23:51:54 2007 -0400 Input: ALPS - force stream mode ALPS appears to need SETSTREAM command after reset, otherwise it does not produce any data. Now that we do not request stream mode by default individual drivers need to take care of it. [Jason Riedy - fix oops] Signed-off-by: Dmitry Torokhov commit c0338c15973c1b6de2b42808a071bf3af948d595 Author: Johann Deneux Date: Mon May 14 00:09:33 2007 -0400 Input: iforce - minor clean-ups Signed-off-by: Johann Deneux Signed-off-by: Dmitry Torokhov commit b8691fd2258d2ae5941c5e5f8bf3dfdaa8951b81 Author: Johann Deneux Date: Mon May 14 00:09:28 2007 -0400 Input: iforce - fix force feedback not working Use an interrupt URB to send force-feedback data to the device instead of a bulk URB. This was broken since 2.6.18. Signed-off-by: Johann Deneux Signed-off-by: Dmitry Torokhov commit ad9ddd66c6e8a79630a975ff0bb8d45a11abe630 Merge: cdb7532... a1ba158... Author: Linus Torvalds Date: Tue May 22 18:15:14 2007 -0700 Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: i2c-s3c2410: Fix build warning i2c-tiny-usb: Fix truncated adapter name i2c: Legacy i2c drivers shouldn't issue uevents commit cdb7532f7be35c3675b1aed54d10e378014618b6 Merge: 7992018... 31d106c... Author: Linus Torvalds Date: Tue May 22 17:26:18 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: Fix dreamcast build for IRQ changes. sh: Fix clock multiplier on SH7722. sh: Wire up kdump crash kernel exec in die(). sh: sr.bl toggling around idle sleep. sh: disable genrtc support. fs: Kill sh dependency for binfmt_flat. sh: Disable psw support for R7785RP. sh: Fix page size alignment in __copy_user_page(). sh: Fix up various compile warnings for SE boards. sh: Wire up signalfd/timerfd/eventfd syscalls. sh: revert addition of page fault notifiers spelling fixes: arch/sh/ input: hp680_ts compile fixes. sh: landisk: Header cleanups. sh: landisk: rtc-rs5c313 support. sh: Kill off pmb slab cache destructor. sh: Fix up psw build rules for r7780rp. sh: Shut up compiler warnings in __do_page_fault(). commit 575c3e2a041c08ad39b5d4535539a9a7d4c63aa6 Author: Patrick McHardy Date: Tue May 22 17:00:49 2007 -0700 [RTNETLINK]: Remove remains of wireless extensions over rtnetlink Remove some unused variables and function arguments related to the recently removed wireless extensions over rtnetlink. Signed-off-by: Patrick McHardy Acked-by: Johannes Berg Signed-off-by: David S. Miller commit 83b496e928dbd38104bfb107230cc88751b09d89 Author: Patrick McHardy Date: Tue May 22 17:00:01 2007 -0700 [RTNETLINK]: Allow changing of subsets of netdevice flags in rtnl_setlink rtnl_setlink doesn't allow to change subsets of the flags, just to override the set entirely by a new one. This means that for simply setting a device up or down userspace first needs to query the current flags, change it and send the changed flags back, which is racy and needlessly complicated. Mask the flags using ifi_change since this is what it is intended for. For backwards compatibility treat ifi_change == 0 as ~0 (even though it seems quite unlikely that anyone has been using this so far). Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 7992018d979460af59fbae8a48f9641305aea438 Merge: 5fd5220... edd75ed... Author: Linus Torvalds Date: Tue May 22 16:47:51 2007 -0700 Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb * 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (5691): Ov7670: reset clkrc in rgb565 mode V4L/DVB (5690): Cafe_ccic: Properly power down the sensor V4L/DVB (5680): Tuner-simple.c fix suport for SECAM with FI1216MF V4L/DVB (5630): Dvb-core: Handle failures to create devices V4L/DVB (5639a): Fix dst usage count V4L/DVB (5670): Adding new fields to v4l2_pix_format broke the ABI, reverted that change V4L/DVB (5640): Fix: em28xx shouldn't be selecting VIDEO_BUF V4L/DVB (5639): Fix Kconfig dependencies for ivtv commit 5fd52203e1856ad925b1a6adae9a22e533da94e2 Merge: 5453e77... a66aa70... Author: Linus Torvalds Date: Tue May 22 16:46:29 2007 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] fix kmalloc(0) in arch/ia64/pci/pci.c [IA64] Only unwind non-running tasks. [IA64] Improve unwind checking. [IA64] Yet another section mismatch warning [IA64] Fix bogus messages about system calls not implemented. commit 1f8481d19af005c469ee50cf972486240905585e Author: David Howells Date: Tue May 22 16:14:24 2007 -0700 [AF_RXRPC]: Make call state names available if CONFIG_PROC_FS=n Make the call state names array available even if CONFIG_PROC_FS is disabled as it's used in other places (such as debugging statements) too. Signed-off-by: David Howells Signed-off-by: David S. Miller commit 71a904bf49582f1866e2d6f9ce0a186af9a50b39 Author: David Howells Date: Tue May 22 16:13:49 2007 -0700 [AF_RXRPC]: AF_RXRPC depends on IPv4 Add a dependency for CONFIG_AF_RXRPC on CONFIG_INET. This fixes this error: net/built-in.o: In function `rxrpc_get_peer': (.text+0x42824): undefined reference to `ip_route_output_key' Signed-off-by: David Howells Signed-off-by: David S. Miller commit 26b8e51e98ae09cfc770b918577c004a376de4b8 Author: Herbert Xu Date: Tue May 22 16:12:26 2007 -0700 [IPSEC]: Fix warnings with casting int to pointer This patch adds some casts to shut up the warnings introduced by my last patch that added a common interator function for xfrm algorightms. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit edd75ede2d40eadb98e07d87e88fa970f86ffe9e Author: Jonathan Corbet Date: Tue May 22 00:39:00 2007 -0300 V4L/DVB (5691): Ov7670: reset clkrc in rgb565 mode A bug in the ov7670 sensor causes it to introduce noise unless the CLKRC register is rewritten *after* setting the image mode. Naturally, resetting CLKRC in this way will cause other modes to fail. So carefully poke the register only when indicated. Signed-off-by: Jonathan Corbet Signed-off-by: Mauro Carvalho Chehab commit 7acf90c70c6ee063f7465b2f10e2083bc49f355b Author: Jonathan Corbet Date: Tue May 22 00:37:58 2007 -0300 V4L/DVB (5690): Cafe_ccic: Properly power down the sensor The proper method for powering down the sensor on OLPC systems has changed somewhat; in particular, the sensor must be powered down completely (rather than simply told to power down) or the associated "camera active" LED will stay on. Signed-off-by: Jonathan Corbet Signed-off-by: Mauro Carvalho Chehab commit 82c01d3d5a26f82aea1fb2e9a357dfb6404f44db Author: matthieu castet Date: Mon May 21 11:15:09 2007 -0300 V4L/DVB (5680): Tuner-simple.c fix suport for SECAM with FI1216MF Allow to use SECAM-BG with the FI1216MF tuner. The selection is done with the secam=B module argument. The default behaviour should be the same as before. Signed-off-by: Matthieu CASTET Signed-off-by: Andrew Morton Acked-by: Hartmut Hackmann Signed-off-by: Mauro Carvalho Chehab commit 4abdcf933f647763592db6bef001d1fae61a5527 Author: Simon Arlott Date: Sun May 6 20:56:14 2007 -0300 V4L/DVB (5630): Dvb-core: Handle failures to create devices dvb-core is not started early enough when device drivers that use dvb are compiled in so dvb_register_device fails (silently) since dvb_class is NULL, this runs dvb_init using subsys_initcall instead of module_init. dvb_register_device will now check the return value of class_device_create. Signed-off-by: Simon Arlott Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit a6d7613226c4e159b12fbaad707ddadf47b38ccf Author: Manu Abraham Date: Sun May 13 12:23:43 2007 -0300 V4L/DVB (5639a): Fix dst usage count Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit c74e83a8632fd88560a533980a0d4c3922325326 Author: Hans Verkuil Date: Thu May 17 06:41:44 2007 -0300 V4L/DVB (5670): Adding new fields to v4l2_pix_format broke the ABI, reverted that change Reverted the change to struct v4l2_pix_format. I completely missed that this struct was used by existing ioctls so that changing it broke the ABI. I will have to think of another way of setting the top/left coordinates but for now this change is reverted to preserve compatibility. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit bf57ab7ae74591973265ebd8e18bd0e785dbfb33 Author: Mauro Carvalho Chehab Date: Mon May 21 07:10:27 2007 -0300 V4L/DVB (5640): Fix: em28xx shouldn't be selecting VIDEO_BUF Signed-off-by: Mauro Carvalho Chehab commit d460f857a5332fe892d88ddfb5efa827dc3b25e6 Author: Mauro Carvalho Chehab Date: Mon May 21 07:10:09 2007 -0300 V4L/DVB (5639): Fix Kconfig dependencies for ivtv ivtv were wrongly marked as dependent of USB. Signed-off-by: Mauro Carvalho Chehab commit a1ba15832c8f6ac2d5d193a6dbb91bcf7705b732 Author: Arnaud Patard Date: Tue May 22 19:49:16 2007 +0200 i2c-s3c2410: Fix build warning Fix for the following build warning: CC drivers/i2c/busses/i2c-s3c2410.o drivers/i2c/busses/i2c-s3c2410.c: In function 's3c24xx_i2c_probe': drivers/i2c/busses/i2c-s3c2410.c:839: warning: format '%ld' expects type 'long int', but argument 4 has type 'resource_size_t' Signed-off-by: Arnaud Patard Signed-off-by: Jean Delvare commit 6a7ce82f02e8ce7391e40018749d93762abf6ee0 Author: Jean Delvare Date: Tue May 22 19:49:16 2007 +0200 i2c-tiny-usb: Fix truncated adapter name Signed-off-by: Jean Delvare Cc: Till Harbaum commit de81d2aaebc8e5e5167cb93f674c57705898e45e Author: David Brownell Date: Tue May 22 19:49:16 2007 +0200 i2c: Legacy i2c drivers shouldn't issue uevents Prevent legacy drivers from issuing uevents for device creation/removal, so that userspace can't cause modprobing loops for them. This became a problem for some legacy PC drivers. I can't easily see it becoming an issue with I2C legacy drivers, but consistency-in-paranoia seems likely to be a good thing here. For usable i2c-level driver model uevents, just switch to a new-style driver. Signed-off-by: David Brownell Signed-off-by: Jean Delvare commit a66aa704d6f332b001dfb0e787c92b2c61c75081 Author: Kenji Kaneshige Date: Tue May 22 10:20:36 2007 -0700 [IA64] fix kmalloc(0) in arch/ia64/pci/pci.c Hiroyuki Kamezawa reported the problem that pci_acpi_scan_root() of ia64 might call kmalloc_node() with zero size. Currently ia64's pci_acpi_scan_root() assumes that _CRS method of root bridge has at least one resource window. But, the root bridges that has no resource window must be taken into account. Signed-off-by: Kenji Kaneshige Signed-off-by: Andrew Morton Signed-off-by: Tony Luck commit 6ae384884d936cb39ab20238af34689933e44525 Author: Robin Holt Date: Fri May 18 13:46:52 2007 -0500 [IA64] Only unwind non-running tasks. Unwinding a running task has proven problematic. In one instance, the running task was attempting to unwind itself and received an interrupt between when get_wchan allocated local variables on the stack and when unw_init_from_blocked_task was called which resulted in unw_init_frame_info to place this tasks task_struct pointer over the switch stack's ar_bspstore entry. Signed-off-by: Robin Holt Signed-off-by: Tony Luck commit e2e6fe7bb6e30621ad4e8a3acb1e711815c239bd Author: Robin Holt Date: Fri May 18 13:46:23 2007 -0500 [IA64] Improve unwind checking. This patch adds some sanity checks to keep register and memory stack pointers in the unw_frame_info structure within the tasks stack address range. Signed-off-by: Robin Holt Signed-off-by: Tony Luck commit 5453e7723b95958f4591b2e0063573d8d53e7699 Author: Benjamin Herrenschmidt Date: Tue May 22 16:25:51 2007 +1000 [POWERPC] Fix warning in 32-bit builds with CONFIG_HIGHMEM Some missing fixup for the removal of 4 level fixup header. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 832a791c580a86cbeea5bb12a984d95b1f458539 Author: Benjamin Herrenschmidt Date: Tue May 22 14:33:05 2007 +1000 [POWERPC] Fix powerpc vmlinux.lds.S Sam's recent change in 7664709b44a13e2e0b545e2dd8e7b8797a1748dc broke things for us because we ended up with *(.text.*) before *(.text), whereas previously *(.text) was first. This was important because the start of the text section contains the kernel entry point. In fact, we don't need that *(.text.*) thing anymore and it incorrectly matched .text.init.refok, thus putting it before .text. .. ouch ! Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 177e9ea49deea238f59bb0b1708cfc60b75828fb Author: Anton Blanchard Date: Sun May 20 03:13:43 2007 +1000 [POWERPC] Fix typo: MMCR0_PMA0 != MMCR0_PMAO pmc.c has: #ifndef MMCR0_PMA0 #define MMCR0_PMA0 0 This one took a while to find. Unfortunately its the wrong define (number 0 vs letter O). Its probably worth removing this override, since if our includes get screwed up we will have the same (hard to debug) failure. Fix it simply for now, so that we can backport to stable. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 2fae4985a135ca5d7d9bba17d45d674c099621b4 Author: Anton Blanchard Date: Sat May 19 15:22:41 2007 +1000 [POWERPC] Add missing pmc_type fields in cpu_table A number of cpu_table entries were missing the pmc_type field, which means that the sysfs entries for the performance monitor counters don't get created. This adds them. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit d3fdaed9e973687f088c9c156a6e20870386e0b7 Author: Hugh Dickins Date: Sat May 19 02:47:01 2007 +1000 [POWERPC] Fix smp_call_function to be preempt-safe smp_call_function_map() was not safe against preemption to another cpu: its test for removing self from map was outside the spinlock. Rearrange it a little to fix that. smp_call_function_single() was also wrong: now get_cpu() before excluding self, as other architectures do. Signed-off-by: Hugh Dickins Signed-off-by: Paul Mackerras commit d25790532370e7448e3d3bd25a17e1e9f1299816 Author: Stephen Rothwell Date: Tue May 22 11:10:19 2007 +1000 Fix headers check fallout commit e8edc6e03a5c8562dc70a6d969f732bdb355a7e7 added an include of linux/jiffies.h in linux/smb_fs.h outside the ifdef __KERNEL__. Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit df5f6311f171cc249e39ccd06321b68823ac68f0 Author: David Woodhouse Date: Mon May 21 19:53:35 2007 -0400 Make 'headerscheck' stop immediately on an error This should make it stop immediately after printing the _helpful_ error message, rather than continuing to spit out many pages more of 'CHECK include/linux/foo.h' before eventually coming to a halt with something less obvious. Now I get this... CHECK include/linux/smb_fs.h /shiny/git/linux-2.6/usr/include/linux/smb_fs.h requires linux/jiffies.h, which does not exist in exported headers make[2]: *** [/shiny/git/linux-2.6/usr/include/linux/.check.smb_fs.h] Error 1 make[1]: *** [linux] Error 2 make: *** [headers_check] Error 2 Signed-off-by-if-Sam-says-so: David Woodhouse [ Sam had better say so! This made me waste way too much time. - Linus] Signed-off-by: Linus Torvalds commit 72dd9ca59944f117c719a1cc3fc9010bce0486f2 Author: Jeff Garzik Date: Tue May 22 00:28:11 2007 -0400 partitions/LDM: build fix This from a "tested" patch... Signed-off-by: Jeff Garzik Cc: Anton Altaparmakov Signed-off-by: Linus Torvalds commit efa5bf1dd2cf3cdee0bfe97cfd76ff2296179ae4 Author: Linus Torvalds Date: Mon May 21 18:41:17 2007 -0700 Revert "kbuild: make better section mismatch reports on i386, arm and mips" This reverts commit f892b7d480eec809a5dfbd6e65742b3f3155e50e, which totally broke the build on x86 with CONFIG_RELOCATABLE (which, as far as I can tell, is the only case where it should even matter!) due to a SIGSEGV in modpost. Cc: Sam Ravnborg Cc: Atsushi Nemoto Signed-off-by: Linus Torvalds commit d6f2fe98ebc2dd8f3e9926673e0d8acd2c764e71 Merge: 04fc5fd... 2053ed0... Author: Linus Torvalds Date: Mon May 21 17:45:25 2007 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: Add constant for FCS/CRC length (frame check sequence) declance: Remove a dangling spin_unlock_irq() thingy e1000: Don't enable polling in open() (was: e1000: assertion hit in e1000_clean(), kernel 2.6.21.1) commit 04fc5fd39e09c460fd478ea84b34c445dd376759 Merge: 8aee74c... 8bc3fc4... Author: Linus Torvalds Date: Mon May 21 17:44:34 2007 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata: bump versions libata: Trim trailing whitespace libata: Kiss post_set_mode goodbye ata_piix: clean up pata_hpt366: Enable bits are unreliable so don't use them libata: Add Seagate STT20000A to DMA blacklist. ahci: disable 64bit dma on sb600 commit 8bc3fc470eb25af4d70c72485cbcb130cc657691 Author: Jeff Garzik Date: Mon May 21 20:26:38 2007 -0400 libata: bump versions Signed-off-by: Jeff Garzik commit a617c09f6d646b60f31efc8afd9f81b752bf21b7 Author: Jeff Garzik Date: Mon May 21 20:14:23 2007 -0400 libata: Trim trailing whitespace Signed-off-by: Jeff Garzik commit bc9a8a7eaa58d802a2b26c75edcc95cb92835db3 Author: Alan Cox Date: Mon May 21 15:20:33 2007 +0100 libata: Kiss post_set_mode goodbye As of the -mm tree we don't have post_set_mode users any more. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 2f91d81db3060f6d218e32d935b9a18ffca4dde2 Author: Alan Cox Date: Mon May 21 15:15:51 2007 +0100 ata_piix: clean up With cable methods in place we don't need a custom error handler for SATA so get rid of it Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 4349eebf67b2b06eab36f3dad651ac36619ae986 Author: Alan Cox Date: Mon May 21 14:52:49 2007 +0100 pata_hpt366: Enable bits are unreliable so don't use them Various people had problems with both old and new IDE when hpt366 enable bits started getting honoured. It turns out they are not reliable so don't rely on them Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 39f198868dfd4216ff221d741c72a009d995a7ba Author: Dave Jones Date: Mon May 21 14:31:03 2007 -0400 libata: Add Seagate STT20000A to DMA blacklist. http://bugzilla.kernel.org/show_bug.cgi?id=1044 points out an additional hard disk that doesn't handle DMA transfers correctly. This patch is the libata variant of the earlier patch to drivers/ide/ Signed-off-by: Dave Jones Signed-off-by: Jeff Garzik commit c7a42156d99bcea7f8173ba7a6034bbaa2ecb77c Author: Tejun Heo Date: Fri May 18 16:23:19 2007 +0200 ahci: disable 64bit dma on sb600 SB600 claims it can do 64bit DMA but it can't. Disable it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 2053ed02a62f2c66d9cb9b51aea0836a7d8dbabf Author: Auke Kok Date: Tue May 15 15:29:16 2007 -0700 Add constant for FCS/CRC length (frame check sequence) About a dozen drivers that have some form of crc checksumming or offloading use this constant, warranting a global define for it. Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit f1e9a4eaea5c22cfb557e58a8cd0ca3bde5160a5 Author: Maciej W. Rozycki Date: Mon May 21 14:33:21 2007 +0100 declance: Remove a dangling spin_unlock_irq() thingy The spin_unlock_irq() invocation in lance_start_xmit() has no matching locking request. The call is already protected by netif_tx_lock, so remove the statement. Signed-off-by: Maciej W. Rozycki Signed-off-by: Jeff Garzik commit 3e1657c8ef53e1cd541cc1e420f3230dc075949b Author: Auke Kok Date: Mon May 21 14:51:35 2007 -0700 e1000: Don't enable polling in open() (was: e1000: assertion hit in e1000_clean(), kernel 2.6.21.1) Herbert Xu wrote: "netif_poll_enable can only be called if you've previously called netif_poll_disable. Otherwise a poll might already be in action and you may get a crash like this." Removing the call to netif_poll_enable in e1000_open should fix this issue, the only other call to netif_poll_enable is in e1000_up() which is only reached after a device reset or resume. Bugzilla: http://bugzilla.kernel.org/show_bug.cgi?id=8455 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=240339 Tested by Doug Chapman Signed-off-by: Auke Kok Acked-by: Herbert Xu Signed-off-by: Jeff Garzik commit 8aee74c8ee875448cc6d1cf995c9469eb60ae515 Merge: 080e892... 9f81036... Author: Linus Torvalds Date: Mon May 21 16:19:32 2007 -0700 Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: IB/cm: Improve local id allocation IPoIB/cm: Fix SRQ WR leak IB/ipoib: Fix typos in error messages IB/mlx4: Check if SRQ is full when posting receive IB/mlx4: Pass send queue sizes from userspace to kernel IB/mlx4: Fix check of opcode in mlx4_ib_post_send() mlx4_core: Fix array overrun in dump_dev_cap_flags() IB/mlx4: Fix RESET to RESET and RESET to ERROR transitions IB/mthca: Fix RESET to ERROR transition IB/mlx4: Set GRH:HopLimit when sending globally routed MADs IB/mthca: Set GRH:HopLimit when building MLX headers IB/mlx4: Fix check of max_qp_dest_rdma in modify QP IB/mthca: Fix use-after-free on device restart IB/ehca: Return proper error code if register_mr fails IPoIB: Handle P_Key table reordering IB/core: Use start_port() and end_port() IB/core: Add helpers for uncached GID and P_Key searches IB/ipath: Fix potential deadlock with multicast spinlocks IB/core: Free umem when mm is already gone commit 9f81036c54ed1f860d2807c5a6aa4f2b30c21204 Author: Michael S. Tsirkin Date: Mon May 21 19:06:54 2007 +0300 IB/cm: Improve local id allocation The IB CM uses an idr for local id allocations, with a running counter as start_id. This fails to generate distinct ids if 1. An id is constantly created and destroyed 2. A chunk of ids just beyond the current next_id value is occupied This in turn leads to an increased chance of connection request being mis-detected as a duplicate, sometimes for several retries, until next_id gets past the block of allocated ids. This has been observed in practice. As a fix, remember the last id allocated and start immediately above it. This also fixes a problem with the old code, where next_id might overflow and become negative. Signed-off-by: Michael S. Tsirkin Acked-by: Sean Hefty Signed-off-by: Roland Dreier commit 518b1646f8a31904ca637b8df0c1e31c34a7a3c2 Author: Michael S. Tsirkin Date: Mon May 21 15:04:59 2007 +0300 IPoIB/cm: Fix SRQ WR leak SRQ WR leakage has been observed with IPoIB/CM: e.g. flipping ports on and off will, with time, leak out all WRs and then all connections will start getting RNR NAKs. Fix this in the way suggested by spec: move the QP being destroyed to the error state, wait for "Last WQE Reached" event and then post WR on a "drain QP" connected to the same CQ. Once we observe a completion on the drain QP, it's safe to call ib_destroy_qp. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 24bd1e4e32e88cd3d0675482d15bea498a922ca8 Author: Michael S. Tsirkin Date: Fri May 18 16:12:54 2007 +0300 IB/ipoib: Fix typos in error messages Trivial error message fixups. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 080e89270a7bfb7d01fac9a67050f8ac6d6cdd11 Merge: 4b85df0... 38bdc32... Author: Linus Torvalds Date: Mon May 21 12:03:04 2007 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fix * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fix: mm/slab: fix section mismatch warning mm: fix section mismatch warnings init/main: use __init_refok to fix section mismatch kbuild: introduce __init_refok/__initdata_refok to supress section mismatch warnings all-archs: consolidate .data section definition in asm-generic all-archs: consolidate .text section definition in asm-generic kbuild: add "Section mismatch" warning whitelist for powerpc kbuild: make better section mismatch reports on i386, arm and mips kbuild: make modpost section warnings clearer kconfig: search harder for curses library in check-lxdialog.sh kbuild: include limits.h in sumversion.c for PATH_MAX powerpc: Fix the MODALIAS generation in modpost for of devices commit 4b85df0419d1fb135d9d845876e8c7ee1393f83c Merge: 6044ab3... be2864b... Author: Linus Torvalds Date: Mon May 21 10:01:36 2007 -0700 Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] More verbose show_mem() like other architectures. [S390] Make use of kretprobe_assert. [S390] Wire up signald, timerfd and eventfd syscalls. [S390] Wire up sys_utimensat. [S390] cio: Update documentation. commit 6044ab324ce4c180bce17aa9be00157c611d7d48 Merge: d07b3c2... 9093bbb... Author: Linus Torvalds Date: Mon May 21 10:00:57 2007 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [NET]: Fix race condition about network device name allocation. [IPV4]: icmp: fix crash with sysctl_icmp_errors_use_inbound_ifaddr [NETFILTER]: nf_conntrack_ipv4: fix incorrect #ifdef config name [NETFILTER]: nf_conntrack: fix use-after-free in helper destroy callback invocation [IPSEC] pfkey: Load specific algorithm in pfkey_add rather than all [TCP] FRTO: Prevent state inconsistency in corner cases [TCP] FRTO: Add missing ECN CWR sending to one of the responses [NET]: Fix net/core/skbuff.c gcc-3.2.3 compilation error [RFKILL]: Fix check for correct rfkill allocation [IPV6]: Add ip6_tunnel.h to headers_install commit d07b3c25327c5ae3792d0ed0c135dee4727200a1 Merge: dde3334... 6cbdc8c... Author: Linus Torvalds Date: Mon May 21 10:00:22 2007 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: (22 commits) [ARM] spelling fixes [ARM] at91_adc parenthesis balance [ARM] 4400/1: S3C24XX: Add high-speed MMC device definition [ARM] 4399/2: S3C2443: Fix SMDK2443 nand timings [ARM] 4398/1: S3C2443: Fix watchdog IRQ number [ARM] 4397/1: S3C2443: remove SDI0/1 IRQ ambiguity [ARM] 4396/1: S3C2443: Add missing HCLK clocks [ARM] 4395/1: S3C24XX: add include of to relevant machines [ARM] 4388/1: no need for arm/mm mmap range checks for non-mmu [ARM] 4387/1: fix /proc/cpuinfo formatting for pre-ARM7 parts [ARM] ARMv6: add CPU_HAS_ASID configuration [ARM] integrator: fix pci_v3 compile error with DEBUG_LL [ARM] gic: Fix gic cascade irq handling [ARM] Silence OMAP kernel configuration warning [ARM] Update ARM syscalls [ARM] 4384/1: S3C2412/13 SPI registers offset correction [ARM] 4383/1: iop: fix usage of '__init' and 'inline' in iop files [ARM] 4382/1: iop13xx: fix msi support [ARM] Remove Integrator/CP SMP platform support [ARM] 4378/1: KS8695: Serial driver fix ... commit dde33348e53ecab687a9768bf5262f0b8f79b7f2 Author: Anton Altaparmakov Date: Mon May 21 09:37:42 2007 +0100 LDM: Fix for Windows Vista dynamic disks This fixes the LDM driver so that it works with Windows Vista dynamic disks which are subtly different to Windows 2000/XP ones. The patch was needed to get a Vista formatted dynamic disk to be recognized and parsed successfully. Thanks go to Chris Teachworth for the report and testing. Cc: Richard Russon Signed-off-by: Anton Altaparmakov Signed-off-by: Linus Torvalds commit 17304383ebc1ce68a88030ac4d18ea549d9578c7 Author: Brian Gerst Date: Mon May 21 14:31:53 2007 +0200 i386: fix PGE mask cr4 is a 32-bit register, so casting the mask to an unsigned char is wrong, as it clears more than the PGE bit. Signed-off-by: Brian Gerst Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d0aff6e6f4e54f79f9c89d147d371bad384454e9 Author: john stultz Date: Mon May 21 14:31:52 2007 +0200 x86_64: vsyscall time() fix The vsyscall time() function basically returns the second portion of xtime directly. This however means that there is about a ticks worth of time each second where time() will return a second value less then what gettimeofday() does. Additionally, this window where vtime() is behind vgettimeofday() grows when dynticks is enabled, so its probably good to get this in before dynticks lands. Big thanks to Sripathi for noticing this issue and creating a test case to work with! This patch changes the vtime() implemenation to call vgettimeofday(), much as syscall time() implementation calls gettimeofday(). 2.6.21 stable candidate too Signed-off-by: John Stultz Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d8902bfcacde6001e1b11bb06137c3bae3ae52d0 Author: Yinghai Lu Date: Mon May 21 14:31:51 2007 +0200 x86_64: early_print kernel console should send CRLF not LFCR In commit d358788f3f30113e49882187d794832905e42592 Author: Russell King Date: Mon Mar 20 20:00:09 2006 +0000 Glen Turner reported that writing LFCR rather than the more traditional CRLF causes issues with some terminals. Since this afflicts many serial drivers, extract the common code to a library function (uart_console_write) and arrange for each driver to supply a "putchar" function. but early_printk is left out. Signed-off-by: Yinghai Lu Cc: Russell King Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 39427d6e595ebee38fdd77bcf55d6b13d7a4324a Author: Andi Kleen Date: Mon May 21 14:31:50 2007 +0200 i386: Enable CX8/PGE CPUID bits early on VIA C3 Fix boot failures with the early CPUID checking on VIA C3 Includes fixes from Christian Volkmann Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 4c1f59d8be7e5da75d9380da23671005b363c45c Author: Christian Volkmann Date: Mon May 21 14:31:48 2007 +0200 i386: Fix wrong CPU error message in early boot path - boot/setup.S did not print "PANIC: CPU too old for this kernel" ( not visible, also the message did not match ) - I add "# missed before: set ds" => somebody should check if I am right with the way to set. => seems to be a generic error in setup.S not to set "ds" for error messages. AK: extracted patch out of other changes AK: also couldn't find any other case where ds is wrong Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit c12ceb766eb5ac975c1145d51236fcdcf81a6578 Author: Andi Kleen Date: Mon May 21 14:31:47 2007 +0200 i386: Clear MCE flag on AMD K6 It reports machine check capability in CPUID, but doesn't actually implement all the necessary MSRs of the standard Intel machine check architecture. This fixes a boot failure on K6s recently introduced. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 21124a82bb82e100369846ff2044dd5ea65fc934 Author: Andi Kleen Date: Mon May 21 14:31:46 2007 +0200 x86_64: Support gcc 5 properly The ifdef tests were broken. Assume it acts like gcc 4 Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 6c977aad03a18019015035958c65b6729cd0574c Author: Andi Kleen Date: Mon May 21 14:31:45 2007 +0200 i386: Fix K8/core2 oprofile on multiple CPUs Only try to allocate MSRs once instead of for every CPU. This assumes the MSRs are the same on all CPUs which is currently true. P4-HT is a special case for different SMT threads, but the code always saves/restores all MSRs so it works identical. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 4c87b948b258829f0bdffe51baa72fba5c42d359 Author: Andi Kleen Date: Mon May 21 14:31:44 2007 +0200 x86_64: Support x86_64 in make buildtar Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 20c3a3d0dd5a91ee8986b94071da0cae8c057af5 Author: Andi Kleen Date: Mon May 21 14:31:43 2007 +0200 i386: Update defconfig Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 5e200c28955802b26d831f098a67402fa9d20ffc Author: Andi Kleen Date: Mon May 21 14:31:42 2007 +0200 x86_64: Update defconfig Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 88b4036934b5a6d8cda810487503d2fc4c46d448 Author: Bryan Wu Date: Mon May 21 18:32:16 2007 +0800 Blackfin SPI: cleanup according to David Brownell's review a) platorm_driver_probe(...) instead of platform_driver_register(&driver); b) set bfin_spi_enable and bfin_spi_disable static c) Why is the width flag a u32? d) maybe use dev_dbg() instead of pr_debug() Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 2ac5ee4738cbd9c146ccda53f02006eaf6a43352 Author: Mike Frysinger Date: Mon May 21 18:09:39 2007 +0800 Blackfin serial driver: implement support for ignoring parity/break errors properly setting up and respecting the read_status_mask / ignore_status_mask fields of the serial core Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 5c4e472b0af57553f9584e0b33c491b168ac1dff Author: Aubrey Li Date: Mon May 21 18:09:38 2007 +0800 Blackfin serial driver: fix overhead issue Signed-off-by: Aubrey Li Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 9d7b6677ac35fdfee93e8f50589e04bcc95649c1 Author: Bryan Wu Date: Mon May 21 18:09:37 2007 +0800 Blackfin arch: update pm.c according to power management API change. Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit c4d1889f7be0a7f34d29e5c4ce00a2b4b78ebb26 Author: Bryan Wu Date: Mon May 21 18:09:36 2007 +0800 Blackfin arch: update defconfig files Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit ca9cb6fd4405a1e2276e17c895297004dd81734d Author: Mike Frysinger Date: Mon May 21 18:09:35 2007 +0800 Blackfin arch: add board default configs to blackfin arch Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit bde7db8608cab31c6d92982b00e8064bd492a85b Author: Sonic Zhang Date: Mon May 21 18:09:34 2007 +0800 Blackfin arch: Change NO_ACCESS_CHECK to ACCESS_CHECK Signed-off-by: Sonic Zhang Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit c824498db47285aeff430c007685a193b673c949 Author: Bernd Schmidt Date: Mon May 21 18:09:33 2007 +0800 Blackfin arch: fix signal handling bug There's a forum thread at https://blackfin.uclinux.org/gf/project/uclinux-dist/forum/?action=ForumBrowse&_forum_action=MessageReply&message_id=24741 which has a testcase involving signal handling that crashes quite readily. Inspecting the code I believe what happens is that signal handling can become confused when it is invoked on return from an interrupt, if the contents of P0 and R0 at the time of the interrupt happen to be such that P0 is larger than zero (indicating to the signal code that we're in a syscall), and R0 happens to have a value of something like -EINTR or -ERESTARTSYS. Fixed by setting orig_p0 to -1 if we're returning from an interrupt. The testcase now seems to run without problems. Signed-off-by: Bernd Schmidt Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit a9c59c2746c7e773839d51027c0e16ccf41f8fef Author: Mike Frysinger Date: Mon May 21 18:09:32 2007 +0800 Blackfin arch: cache SWRST value at bootup so other things like watchdog can non-destructively query it Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 19381f024b01413d83cec1655c3fc4c9c09ae274 Author: Bryan Wu Date: Mon May 21 18:09:31 2007 +0800 Blackfin arch: update blackfin header files to latest one in VDSP. a) add new processor BF52x/BF54x header files b) update blackfin BF533/BF537/BF561 header files to latest one in VDSP. c) scrub watchdog/rtc masks from headers as we dont need/want them (too generic and the drivers dont use them) Signed-off-by: Mike Frysinger Signed-off-by: Roy Huang Signed-off-by: Sonic Zhang Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit c09c4e006590210001ced90d59e62182bfd396f9 Author: Mike Frysinger Date: Mon May 21 18:09:30 2007 +0800 Blackfin arch: make sure we use local labels Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit ac57ac39e4f92f327451ad4084c4d5f60bcfa999 Author: Mike Frysinger Date: Mon May 21 18:09:29 2007 +0800 Blackfin arch: dont clear the bit that tells coreb to start booting Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 5f9a3e899897201a49965cd9e1bb2570b3bde2b5 Author: Aubrey Li Date: Mon May 21 18:09:28 2007 +0800 Blackfin arch: dma_memcpy borken for > 64K Signed-off-by: Aubrey Li Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 5079df993c3ab45af10dc9a45b3b9e712fd56f23 Author: Mike Frysinger Date: Mon May 21 18:09:27 2007 +0800 Blackfin arch: document why we have to touch the UART peripheral in our boot up code Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit ef9256d2831df0896566c3823cd2bdf0e55df984 Author: Mike Frysinger Date: Mon May 21 18:09:26 2007 +0800 Blackfin arch: issue reset via SWRST so we dont clobber the watchdog state Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit c0fc525dcc407a516132fc11af82375319ebdadb Author: Mike Frysinger Date: Mon May 21 18:09:25 2007 +0800 Blackfin arch: move board specific setup out of common init code and into the board specific init code Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 95e493c00ac0d2371c3f627fdb99d776d29a8166 Author: Mike Frysinger Date: Mon May 21 18:09:24 2007 +0800 Blackfin arch: finish removing p* volatile defines for MMRs Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 30870b93cd76bdfa7385f8d471345f5f6269fb00 Author: Mike Frysinger Date: Mon May 21 18:09:23 2007 +0800 Blackfin arch: dont clear status register bits in SWRST so we can actually use it Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit eb8d5f6c0322e641ec32ed632dd3b02586205673 Author: Mike Frysinger Date: Mon May 21 18:09:22 2007 +0800 Blackfin arch: make sure we declare the revid functions as pure (since they are) Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 0a290593a053752d9629fb1276392ce35c26b348 Author: Mike Frysinger Date: Mon May 21 18:09:21 2007 +0800 Blackfin arch: initial tepla-bf561 board support Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 6e537e9329d133526a576b741f85b3d48edc4ac1 Author: Michael Hennerich Date: Mon May 21 18:09:20 2007 +0800 Blackfin arch: Fix bug using usb keyboard crashes kernel Without conswitchp preset, we have the following situation: - During initcalls: con_init is called, and returns because of !display_desc. - At this point there is no memory allocated for vc_cons[].d A bit later vty_init calls kbd_init. - From now on events are passed to kbd_event which will then call kbd_keycode. - kbd_keycode will oops on a NULL pointer dereference on vc->vc_tty Signed-off-by: Michael Hennerich Cc: Pekka Enberg Signed-off-by: Bryan Wu [ Added commit description based on email thread. - Linus ] Signed-off-by: Linus Torvalds commit 8a0e6656030ffe9bcb81b725e956917bafc7522d Author: Mike Frysinger Date: Mon May 21 18:09:19 2007 +0800 Blackfin arch: fix trace output for FLAT binaries Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 678402709602a5e62bb79454f0f41bd952373300 Author: Michael Hennerich Date: Mon May 21 18:09:18 2007 +0800 Blackfin arch: GPIO fix some defines Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 23ee968d96ef5ad564c0f0b8a30412fb93137ebb Author: Michael Hennerich Date: Mon May 21 18:09:17 2007 +0800 Blackfin arch: DMA operation cleanup 1) Disable Interrupts during DMA memcpy to avoid raise conditions. 2) Mark MDMA channel 0 as reserved, since were using it internally. 3) Add DMA based equivalents for insX and outsX. 4) Our insX and outsX only handles len <= 2^16. Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit d1b945fdb62f3e6852fea5a8779c0151ac1e55a8 Author: Michael Hennerich Date: Mon May 21 18:09:16 2007 +0800 Blackfin arch: Move write to VR_CTL closer to IDLE Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 9ae246cd85e05d3fb31b9770588c1fe0914872fe Author: Michael Hennerich Date: Mon May 21 18:09:15 2007 +0800 Blackfin arch: Fix reserved map after we changed PORT_H definition Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit a161bb0510d793a450127c12160309907af3d3f7 Author: Mike Frysinger Date: Mon May 21 18:09:14 2007 +0800 Blackfin arch: mark a bunch of local functions as static Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 140a9aec22f454120d1953f24cd2b5338b6141e2 Author: Michael Hennerich Date: Mon May 21 18:09:13 2007 +0800 Blackfin arch: Add configuration data for ISP176x on BF561 Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 6dae211411448dd9a12895b802bdedca8296f23d Author: Mike Frysinger Date: Mon May 21 18:09:12 2007 +0800 Blackfin arch: fix a few random warnings Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit e3defffe915961cf9c6e1f16486ae83fb7212f29 Author: Aubrey Li Date: Mon May 21 18:09:11 2007 +0800 Blackfin arch: ISP1761 doesn't work for USB flash disk ZONE_DMA is required for some drivers subsystem, such as USB/SCSI. Signed-off-by: Aubrey Li Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit ed2fbf57ea8d2ec1c0f6758bd5f9f98cef519049 Author: Bryan Wu Date: Mon May 21 18:09:10 2007 +0800 Blackfin arch: add SPI MMC driver support on bf533-stamp, tested on STAMP-BF533 Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 8af10b79877ff5dfd5c7b1928d57cf38483e819d Author: Michael Hennerich Date: Mon May 21 18:09:09 2007 +0800 Blackfin arch: Add Workaround for ANOMALY 05000257 Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit e8edc6e03a5c8562dc70a6d969f732bdb355a7e7 Author: Alexey Dobriyan Date: Mon May 21 01:22:52 2007 +0400 Detach sched.h from mm.h First thing mm.h does is including sched.h solely for can_do_mlock() inline function which has "current" dereference inside. By dealing with can_do_mlock() mm.h can be detached from sched.h which is good. See below, why. This patch a) removes unconditional inclusion of sched.h from mm.h b) makes can_do_mlock() normal function in mm/mlock.c c) exports can_do_mlock() to not break compilation d) adds sched.h inclusions back to files that were getting it indirectly. e) adds less bloated headers to some files (asm/signal.h, jiffies.h) that were getting them indirectly Net result is: a) mm.h users would get less code to open, read, preprocess, parse, ... if they don't need sched.h b) sched.h stops being dependency for significant number of files: on x86_64 allmodconfig touching sched.h results in recompile of 4083 files, after patch it's only 3744 (-8.3%). Cross-compile tested on all arm defconfigs, all mips defconfigs, all powerpc defconfigs, alpha alpha-up arm i386 i386-up i386-defconfig i386-allnoconfig ia64 ia64-up m68k mips parisc parisc-up powerpc powerpc-up s390 s390-up sparc sparc-up sparc64 sparc64-up um-x86_64 x86_64 x86_64-up x86_64-defconfig x86_64-allnoconfig as well as my two usual configs. Signed-off-by: Alexey Dobriyan Signed-off-by: Linus Torvalds commit ff1be9ad61e3e17ba83702d8ed0b534e5b8ee15c Author: OGAWA Hirofumi Date: Sun May 20 23:39:40 2007 +0900 Fix "fs: convert core functions to zero_user_page" The bug was introduced by 01f2705daf5a36208e69d7cf95db9c330f843af6. It misses to convert the first argument, it should be "new_page". This became a cause of fatfs corruption. Cc: Nate Diller Signed-off-by: OGAWA Hirofumi Signed-off-by: Linus Torvalds commit 5f663404b27fa72546a592c5c932b0605b9c93a6 Merge: 55b637c... da7cd59... Author: Linus Torvalds Date: Mon May 21 09:00:25 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6: [CRYPTO] api: Read module pointer before freeing algorithm commit be2864b5ee46e0d5ed626de6cbfeb9abbd9c2e6f Author: Heiko Carstens Date: Mon May 21 11:25:23 2007 +0200 [S390] More verbose show_mem() like other architectures. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit a5a60a2beea07c23e242ad8e7398e761935d669a Author: Heiko Carstens Date: Mon May 21 11:25:22 2007 +0200 [S390] Make use of kretprobe_assert. s390 change for git commit 0f95b7fc839bc3272b1bf2325d8748a649bd3534. That is print kprobes debug data before BUG(). Cc: Ananth N Mavinakayanahalli Cc: Maneesh Soni Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 913f11ee48edfa78b531e0db9385b640fbf9f6d7 Author: Heiko Carstens Date: Mon May 21 11:25:21 2007 +0200 [S390] Wire up signald, timerfd and eventfd syscalls. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit fd5d8bf03a9843ec3cdb10c820f409aa04048b52 Author: Heiko Carstens Date: Mon May 21 11:25:20 2007 +0200 [S390] Wire up sys_utimensat. Wire up sys_utimensat, reserve syscall number for sys_fallocate and add a couple of syscalls to the ignore list to get rid of warings. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 85ee32d02901bfd2e287ac669709758e04d73c4d Author: Cornelia Huck Date: Mon May 21 11:25:19 2007 +0200 [S390] cio: Update documentation. - read_dev_chars()/read_conf_data() are deprecated. Don't document them, but advise to issue the channel program from the driver itself. - Remove some really obsolete and incorrect stuff. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 31d106c68b1af88835a474556052d6efbfec99c5 Author: Paul Mundt Date: Mon May 21 15:10:04 2007 +0900 sh: Fix dreamcast build for IRQ changes. When the irq.h changes went in, the dreamcast code was still referencing an old value. Switch it back to the IRQ number, which fixes this: arch/sh/boards/dreamcast/irq.c: In function `disable_systemasic_irq': arch/sh/boards/dreamcast/irq.c:59: error: `OFFCHIP_IRQ_BASE' undeclared (first use in this function) arch/sh/boards/dreamcast/irq.c:59: error: (Each undeclared identifier is reported only once arch/sh/boards/dreamcast/irq.c:59: error: for each function it appears in.) Reported-by: Adrian McMenamin Signed-off-by: Paul Mundt commit dfbbbe92956b849a6704dbd5352348d6ba1165da Author: dmitry pervushin Date: Tue May 15 08:42:22 2007 +0900 sh: Fix clock multiplier on SH7722. This fixes up the master clock multiplier and initial rate propagation for the SH7722 clocks. Signed-off-by: dmitry pervushin Signed-off-by: Paul Mundt commit e113276624104d9c3b25f333d8dd999b804d980a Author: Paul Mundt Date: Tue May 15 08:36:36 2007 +0900 sh: Wire up kdump crash kernel exec in die(). Now that we have the basic kdump support in place, add it in to die() so we can enter the crash kernel automatically. Signed-off-by: Paul Mundt commit f3a9022fd187de41a04de9c5b44ff40e68c6d661 Author: Paul Mundt Date: Mon May 14 19:39:48 2007 +0900 sh: sr.bl toggling around idle sleep. As pointed out by Saito-san, without the sr.bl manipulation we can occasionally hit delays in the idle loop due to interrupt handling, so ensure that interrupts are blocked before going to sleep. At the same time, we throw in TIF_POLLING_NRFLAG for the !hlt_counter case (primarily used by the ST-40 parts). Signed-off-by: Paul Mundt commit 69d87daa18aced7f494bc1d5a977b063bbbdffbd Author: Paul Mundt Date: Mon May 14 17:00:31 2007 +0900 sh: disable genrtc support. sh never had support for this, so remove the option entirely. Signed-off-by: Paul Mundt commit 1d4be747a8077d90e10e1e0b0f8994abb4adacb4 Author: Paul Mundt Date: Mon May 14 16:58:35 2007 +0900 fs: Kill sh dependency for binfmt_flat. Not really sure where this bogosity came from, but there's certainly nothing special about sh that lets us use flat files with the MMU on. Kill the dependency, and leave it as !MMU, like it is for all of the other nommu-wielding ports. Signed-off-by: Paul Mundt commit 9af9a413d21f7a113f4fd909fb9962fea36b6cfa Author: Paul Mundt Date: Mon May 14 12:48:09 2007 +0900 sh: Disable psw support for R7785RP. While R7780RP and R7780MP support this, R7785RP does not. Signed-off-by: Paul Mundt commit 0d08b5fb37835988952d190b4540a71d60a4d198 Author: Paul Mundt Date: Mon May 14 10:49:40 2007 +0900 sh: Fix page size alignment in __copy_user_page(). SH-3 comes up with the PAGE_SIZE on a misaligned boundary: arch/sh/mm/copy_page.S: Assembler messages: arch/sh/mm/copy_page.S:132: Warning: misaligned data fix it up with explicit alignment. Signed-off-by: Paul Mundt commit 27641dee99e0d0c25f224cdfbd11486bd2f131ee Author: Paul Mundt Date: Mon May 14 10:48:01 2007 +0900 sh: Fix up various compile warnings for SE boards. - setup-sh7750.c only defines the sh7751_ipr_map when building with SH7751 support. - 7722 Solution Engine was missing a mach-type entry, causing the macro in cf-enabler to be undefined. - arch/sh/mm/init.c needs linux/pagemap.h. Signed-off-by: Paul Mundt commit 26bbfda8b1a4d491a86c60b3a97948a4f49fb86a Author: Paul Mundt Date: Mon May 14 09:29:55 2007 +0900 sh: Wire up signalfd/timerfd/eventfd syscalls. Signed-off-by: Paul Mundt commit fce692e7986f9689a8f414a74e58c4a6d35d5551 Author: Christoph Hellwig Date: Mon May 14 08:18:14 2007 +0900 sh: revert addition of page fault notifiers Just at the time you added them on sh we're removing them from other architectures. As there's no user yet this patch just removes them completely. Once you actually have a kprobes patch it should follow the direct call to kprobes_fault_handler model that powerpc, s390 and sparc64 employ in 2.6.22-rc1 and that I'm updating other architectures to. Signed-off-by: Christoph Hellwig Signed-off-by: Paul Mundt commit e868d61272caa648214046a096e5a6bfc068dc8c Author: Simon Arlott Date: Mon May 14 08:15:10 2007 +0900 spelling fixes: arch/sh/ Spelling fixes in arch/sh/. Signed-off-by: Simon Arlott Signed-off-by: Paul Mundt commit 56a8c8b6ac4d6edba5153d17730aaf96ba8f1f8c Author: Roland Dreier Date: Sun May 20 20:19:24 2007 -0700 IB/mlx4: Check if SRQ is full when posting receive Make mlx4_post_srq_recv() fail if the SRQ is full (head == tail). Signed-off-by: Roland Dreier commit 6cbdc8c5357276307a77deeada3f04626ff17da6 Author: Simon Arlott Date: Fri May 11 20:40:30 2007 +0100 [ARM] spelling fixes Spelling fixes in arch/arm/. Signed-off-by: Simon Arlott Signed-off-by: Russell King commit fc432e1952a3899ce35e84b417e5d60f74cb901b Author: Mariusz Kozlowski Date: Sat May 19 00:39:36 2007 +0200 [ARM] at91_adc parenthesis balance Trivial unbalanced parenthesis macro fix. Signed-off-by: Mariusz Kozlowski Signed-off-by: Russell King commit 69e9c93d0d7d9dfa6bdf5144274dbe65a627b63a Author: Ben Dooks Date: Sun May 20 18:13:32 2007 +0100 [ARM] 4400/1: S3C24XX: Add high-speed MMC device definition Add definition for high-speed MMC/SD device and add to SMDK2443 device list. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 42482e3c77bcb310affdf13e92b93f077d44a7fc Author: Ben Dooks Date: Sun May 20 19:58:10 2007 +0100 [ARM] 4399/2: S3C2443: Fix SMDK2443 nand timings Reduce the Twrph0 timing slightly to fit on an SMDK2443. This should still produce valid timings for the NAND devices as it is still over the smallest device fitted to these boards. Signed-off-by: Ben Dooks <(address hidden)> Signed-off-by: Russell King commit 7e966f3c392ffb5297a6ba0ea701d6a20d1d7292 Author: Ben Dooks Date: Sun May 20 18:02:50 2007 +0100 [ARM] 4398/1: S3C2443: Fix watchdog IRQ number Fix the IRQ number for watchdog on S3C2443 Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 5f2ef21703564d3e6f18fd92f2e72f723a5c3402 Author: Ben Dooks Date: Sun May 20 17:32:39 2007 +0100 [ARM] 4397/1: S3C2443: remove SDI0/1 IRQ ambiguity Change the name of the S3C2443_SDI1 to S3C2443_HSMMC to ensure that it is correctly identified. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 67364334681503655fbff6c2f2dacfb17f04cadc Author: Ben Dooks Date: Sun May 20 17:17:32 2007 +0100 [ARM] 4396/1: S3C2443: Add missing HCLK clocks Add the clocks missing form HCLKCON back into the set of clocks being registered at initalisation time. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 333a42e1f4c5c5c2ed7c652254c35b9e98d5c789 Author: Ben Dooks Date: Sun May 20 11:55:53 2007 +0100 [ARM] 4395/1: S3C24XX: add include of to relevant machines Include in any machines that use the PM functions which require struct sys_device. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 95ba71f76f1cce550cb2e2b345a204d4a926d29c Author: Greg Ungerer Date: Thu May 17 06:22:41 2007 +0100 [ARM] 4388/1: no need for arm/mm mmap range checks for non-mmu We don't need valid_phys_addr_range() or valid_mmap_phys_addr_range() for the !CONFIG_MMU case. Signed-off-by: Greg Ungerer Signed-off-by: Russell King commit 1d28bff7c4ea138032b44d514351b7caceb9fba5 Author: Greg Ungerer Date: Thu May 17 06:12:22 2007 +0100 [ARM] 4387/1: fix /proc/cpuinfo formatting for pre-ARM7 parts Fix the formating of the "CPU part" field to be consistent with the other fields for pre-ARM7 parts. One tab to many for them to all line up. Signed-off-by: Greg Ungerer Signed-off-by: Russell King commit 2446304dd687488c054d0437f2aeef1ef2bfbd02 Author: Eli Cohen Date: Thu May 17 10:32:41 2007 +0300 IB/mlx4: Pass send queue sizes from userspace to kernel Pass the number of WQEs for the send queue and their size from userspace to the kernel to avoid having to keep the QP size calculations in sync between the kernel driver and libmlx4. This fixes a bug seen with the current mlx4_ib driver and current libmlx4 caused by a difference in the calculated sizes for SQ WQEs. Also, this gives more flexibility for userspace to experiment with using multiple WQE BBs for a single SQ WQE. Signed-off-by: Eli Cohen Signed-off-by: Roland Dreier commit 9093bbb2d96d0184f037cea9b4e952a44ebe7c32 Author: Stephen Hemminger Date: Sat May 19 15:39:25 2007 -0700 [NET]: Fix race condition about network device name allocation. Kenji Kaneshige found this race between device removal and registration. On unregister it is possible for the old device to exist, because sysfs file is still open. A new device with 'eth%d' will select the same name, but sysfs kobject register will fial. The following changes the shutdown order slightly. It hold a removes the sysfs entries earlier (on unregister_netdevice), but holds a kobject reference. Then when todo runs the actual last put free happens. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit d8cf27287ac7fb5cbfcc4139917a997c39d841ca Author: Patrick McHardy Date: Sat May 19 14:44:15 2007 -0700 [IPV4]: icmp: fix crash with sysctl_icmp_errors_use_inbound_ifaddr When icmp_send is called on the local output path before the packet hits ip_output, skb->dev is not set, causing a crash when sysctl_icmp_errors_use_inbound_ifaddr is set. This can happen with the netfilter REJECT target or IPsec tunnels. Let routing decide the ICMP source address in that case, since the packet is locally generated there is no inbound interface and the sysctl should not apply. The option actually seems to be unfixable broken, on the path after ip_output() skb->dev points to the outgoing device and we don't know the incoming device anymore, so its going to do the absolute wrong thing and pick the address of the outgoing interface. Add a comment about this. Reported by Curtis Doty . Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 3ad2a6fb6bcc2f464cdde093a76b76b90b90c66c Author: Patrick McHardy Date: Sat May 19 14:24:16 2007 -0700 [NETFILTER]: nf_conntrack_ipv4: fix incorrect #ifdef config name The option is named CONFIG_NF_NAT not CONFIG_IP_NF_NAT. Remove the ifdef completely since helpers also expect defragmented packet even without NAT. Noticed by Robert P. J. Day Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 5397e97d7533a03b28a7b8aeee648cbb36a8afc6 Author: Patrick McHardy Date: Sat May 19 14:23:52 2007 -0700 [NETFILTER]: nf_conntrack: fix use-after-free in helper destroy callback invocation When the helper module is removed for a master connection that has a fulfilled expectation, but has already timed out and got removed from the hash tables, nf_conntrack_helper_unregister can't find the master connection to unset the helper, causing a use-after-free when the expected connection is destroyed and releases the last reference to the master. The helper destroy callback was introduced for the PPtP helper to clean up expectations and expected connections when the master connection times out, but doing this from destroy_conntrack only works for unfulfilled expectations since expected connections hold a reference to the master, preventing its destruction. Move the destroy callback to the timeout function, which fixes both problems. Reported/tested by Gabor Burjan . Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit c92b3a2f1f11655ecf6774b745017a414241d07c Author: Herbert Xu Date: Sat May 19 14:21:18 2007 -0700 [IPSEC] pfkey: Load specific algorithm in pfkey_add rather than all This is a natural extension of the changeset [XFRM]: Probe selected algorithm only. which only removed the probe call for xfrm_user. This patch does exactly the same thing for af_key. In other words, we load the algorithm requested by the user rather than everything when adding xfrm states in af_key. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 580e572a4a1bfea2f42af63ba4785ac7dfbcb45d Author: Ilpo Järvinen Date: Sat May 19 13:56:57 2007 -0700 [TCP] FRTO: Prevent state inconsistency in corner cases State could become inconsistent in two cases: 1) Userspace disabled FRTO by tuning sysctl when one of the TCP flows was in the middle of FRTO algorithm (and then RTO is again triggered) 2) SACK reneging occurs during FRTO algorithm A simple solution is just to abort the previous FRTO when such obscure condition occurs... Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit 463236557db4b5d4de9eb3fafa2e7d7905ac65ab Author: Ilpo Järvinen Date: Sat May 19 13:56:23 2007 -0700 [TCP] FRTO: Add missing ECN CWR sending to one of the responses The conservative spurious RTO response did not queue CWR even though the sending rate was lowered. Whenever reduction happens regardless of reason, CWR should be sent (forgetting to send it is not very fatal though). A better approach would be to queue CWR when one of the sending rate reducing responses (rate-halving one or this conservative response) is used already at RTO. Doing that would allow CWR to be sent along with the two new data segments that are sent during FRTO. However, it's a bit "racy" because userland could tune the response sysctl to a more aggressive one in between. Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit b6ccc67d8e42e38936df330b26ee6d022dda8a64 Author: Mikael Pettersson Date: Sat May 19 13:55:25 2007 -0700 [NET]: Fix net/core/skbuff.c gcc-3.2.3 compilation error Compiling 2.6.22-rc1 with gcc-3.2.3 for i486 fails with: gcc -m32 -Wp,-MD,net/core/.skbuff.o.d -nostdinc -isystem /home/mikpe/pkgs/linux-x86/gnu/lib/gcc-lib/i486-pc-linux-gnu/3.2.3/include -D__KERNEL__ -Iinclude -include include/linux/autoconf.h -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -O2 -pipe -msoft-float -mregparm=3 -freg-struct-return -mpreferred-stack-boundary=4 -march=i486 -ffreestanding -maccumulate-outgoing-args -DCONFIG_AS_CFI=1 -Iinclude/asm-i386/mach-default -fomit-frame-pointer -D"KBUILD_STR(s)=#s" -D"KBUILD_BASENAME=KBUILD_STR(skbuff)" -D"KBUILD_MODNAME=KBUILD_STR(skbuff)" -c -o net/core/skbuff.o net/core/skbuff.c net/core/skbuff.c:648:1: directives may not be used inside a macro argument net/core/skbuff.c:647:39: unterminated argument list invoking macro "memcpy" net/core/skbuff.c: In function `pskb_expand_head': net/core/skbuff.c:651: `memcpy' undeclared (first use in this function) net/core/skbuff.c:651: (Each undeclared identifier is reported only once net/core/skbuff.c:651: for each function it appears in.) net/core/skbuff.c:651: syntax error before "skb" make[2]: *** [net/core/skbuff.o] Error 1 make[1]: *** [net/core] Error 2 make: *** [net] Error 2 The patch below implements a simple workaround which is to clone the offending memcpy() call and specialise it for the two different scenarios. Other workarounds are of course possible: e.g. bind the varying parameter in a local variable, or use a macro or inline function to perform the varying computation. Signed-off-by: Mikael Pettersson Signed-off-by: David S. Miller commit d007da1fa6f0ad5e01ceae4a1f60cdbb23ecd706 Author: Ivo van Doorn Date: Sat May 19 12:24:39 2007 -0700 [RFKILL]: Fix check for correct rfkill allocation coverity has spotted a bug in rfkill.c (bug id #1627), in rfkill_allocate() NULL was returns if the kzalloc() works, and deref the NULL pointer if it fails, Signed-off-by: Ivo van Doorn Signed-off-by: David S. Miller commit c34b19fb4e243b26fa90a322bf32238356493674 Author: Deepak Saxena Date: Sat May 19 12:00:11 2007 -0700 [IPV6]: Add ip6_tunnel.h to headers_install The Mobile IPv6 package (http://www.mobile-ipv6.org/software/) needs this header file to build the tunnelctl component. The header already looks sanitized so is safe to export. Signed-off-by: Deepak Saxena Signed-off-by: David S. Miller commit 59b0ed121297b57abb2352bdc8313959e7cb5635 Author: Roland Dreier Date: Sat May 19 08:51:58 2007 -0700 IB/mlx4: Fix check of opcode in mlx4_ib_post_send() wr->opcode is invalid if it's >= ARRAY_SIZE(mlx4_ib_opcode), not just strictly >. This was spotted by the Coverity checker (CID 1643). Signed-off-by: Roland Dreier commit 23c15c21d34a4b4b4d7b9a95ce498991c5339c77 Author: Roland Dreier Date: Sat May 19 08:51:57 2007 -0700 mlx4_core: Fix array overrun in dump_dev_cap_flags() Don't overrun fname[] array when decoding device flags. This was spotted by the Coverity checker (CID 1642). Signed-off-by: Roland Dreier commit 65adfa911a3522c1e40e55afd472dd571dc2431b Author: Michael S. Tsirkin Date: Mon May 14 07:26:51 2007 +0300 IB/mlx4: Fix RESET to RESET and RESET to ERROR transitions According to the IB spec, a QP can be moved from RESET back to RESET or to the ERROR state, but mlx4 firmware does not support this and returns an error if we try. Fix the RESET to RESET transition by just returning 0 without doing anything, and fix RESET to ERROR by moving the QP from RESET to INIT with dummy parameters and then transitioning from INIT to ERROR. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit b18aad7150c85cc86a66be8a1c744b63b41b36e0 Author: Michael S. Tsirkin Date: Mon May 14 07:26:51 2007 +0300 IB/mthca: Fix RESET to ERROR transition According to the IB spec, a QP can be moved from RESET to the ERROR state, but mthca firmware does not support this and returns an error if we try. Work around this FW limitation by moving the QP from RESET to INIT with dummy parameters and then transitioning from INIT to ERROR. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 1526130351b31c792ced90c6c5ee08df955696c1 Author: Roland Dreier Date: Sat May 19 08:51:57 2007 -0700 IB/mlx4: Set GRH:HopLimit when sending globally routed MADs This is the same issue discovered in mthca by Rolf Manderscheid . Signed-off-by: Roland Dreier commit 3f37cae6944de9d380c83f717f73d91ec6255d98 Author: Rolf Manderscheid Date: Thu May 17 09:45:48 2007 -0600 IB/mthca: Set GRH:HopLimit when building MLX headers Global CM packets used by rmda_cm were being sent with a GRH:hopLimit of zero, causing them to be dropped by the router. The problem is a missing initialization of the hop_limit field in mthca_read_ah(), which was called by build_mlx_header() when sending a MAD on QP1. Signed-off-by: Rolf Manderscheid Signed-off-by: Roland Dreier commit 1f8f7b7a7b885a0041a21b3d93c507269baf57c8 Author: Eli Cohen Date: Thu May 17 16:32:39 2007 +0300 IB/mlx4: Fix check of max_qp_dest_rdma in modify QP max_qp_dest_rdma is already in natural units - no need to shift. This was discovered by a test that deliberately requests more outstanding atomic operation than the device supports. Found by Sagi Rotem at Mellanox. Signed-off-by: Eli Cohen Signed-off-by: Roland Dreier commit de57c9f102ad7bdc8afa5a1560748cf4f1c18b8e Author: Ali Ayoub Date: Thu May 17 20:58:30 2007 +0300 IB/mthca: Fix use-after-free on device restart Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit bd5a6ccc0e6d8eed3047b4af0e5c1e7168869cd8 Author: Hoang-Nam Nguyen Date: Wed May 16 14:50:55 2007 +0200 IB/ehca: Return proper error code if register_mr fails Set the return code of ehca_register_mr() to ENOMEM if the corresponding firmware call fails due to out of resources. Some other error codes were explicitly mapped to EINVAL -- just remove those cases so they get mapped to the default case, which already returns EINVAL anyway. Signed-off-by: Hoang-Nam Nguyen Signed-off-by: Roland Dreier commit 26bbf13ce1ca21ec69175bcc4b995cb8ffdf8593 Author: Yosef Etigin Date: Sat May 19 08:51:54 2007 -0700 IPoIB: Handle P_Key table reordering SM reconfiguration or failover possibly causes a shuffling of the values in the P_Key table. Right now, IPoIB only queries for the P_Key index once when it creates the device QP, and hence there are problems if the index of a P_Key value changes. Fix this by using the PKEY_CHANGE event to trigger a recheck of the P_Key index. Signed-off-by: Yosef Etigin Acked-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 1af4c435f3ab9cdf72ce86c35a455c8bef1d6536 Author: Roland Dreier Date: Sat May 19 08:51:54 2007 -0700 IB/core: Use start_port() and end_port() Clean up ib_query_port() and ib_modify_port() slightly by using the just-added start_port() and end_port() helpers. Signed-off-by: Roland Dreier commit 5eb620c81ce35aa0c533131bf4d06c4c8c2bfadf Author: Yosef Etigin Date: Mon May 14 07:26:51 2007 +0300 IB/core: Add helpers for uncached GID and P_Key searches Add ib_find_gid() and ib_find_pkey() functions that use uncached device queries. The calls might block but the returns are always up-to-date. Cache P_Key and GID table lengths in core to avoid extra port info queries. Signed-off-by: Yosef Etigin Acked-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 8b8c8bca3a63073bac20f0fca178e00fdf7f5a09 Author: Roland Dreier Date: Sat May 19 08:51:53 2007 -0700 IB/ipath: Fix potential deadlock with multicast spinlocks Lockdep found the following potential deadlock between mcast_lock and n_mcast_grps_lock: mcast_lock is taken from both interrupt context and process context, so spin_lock_irqsave() must be used to take it. n_mcast_grps_lock is only taken from process context, so at first it seems safe to take it with plain spin_lock(); however, it also nests inside mcast_lock, and hence we could deadlock: cpu A cpu B ipath_mcast_add(): spin_lock_irq(&mcast_lock); ipath_mcast_detach(): spin_lock(&n_mcast_grps_lock); ipath_mcast_find(): spin_lock_irqsave(&mcast_lock); spin_lock(&n_mcast_grps_lock); Fix this by using spin_lock_irq() to take n_mcast_grps_lock. Signed-off-by: Roland Dreier commit 7b82cd8ee7374f803a3daf9a6cbc6eb4bbb10a63 Author: Eli Cohen Date: Mon May 14 11:35:43 2007 +0300 IB/core: Free umem when mm is already gone Free umem when task's mm is already destroyed by the time ib_umem_release gets called. Found by Dotan Barak at Mellanox. Signed-off-by: Eli Cohen Signed-off-by: Roland Dreier commit 38bdc32af442b6ab09ed61b8b669072098c95dd2 Author: Sam Ravnborg Date: Thu May 17 23:48:19 2007 +0200 mm/slab: fix section mismatch warning Use the new __init_refok marker to avoid the section mismatch warning from slab.c Signed-off-by: Sam Ravnborg commit 577a32f620271416d05f852477151fb51c790bc6 Author: Sam Ravnborg Date: Thu May 17 23:29:25 2007 +0200 mm: fix section mismatch warnings modpost had two cases hardcoded for mm/ Shift over to __init_refok and kill the hardcoded function names in modpost. This has the drawback that the functions will always be kept no matter configuration. With previous code the function were placed in init section if configuration allowed it. Signed-off-by: Sam Ravnborg commit 92080309df1975729a9f8b45fd56528817e34db8 Author: Sam Ravnborg Date: Thu May 17 20:43:54 2007 +0200 init/main: use __init_refok to fix section mismatch Kill a special case in modpost by introducing the __init_refok marker. Signed-off-by: Sam Ravnborg commit 0e0d314e6a01bb14d303e35e6f7ba24b17020044 Author: Sam Ravnborg Date: Thu May 17 20:14:48 2007 +0200 kbuild: introduce __init_refok/__initdata_refok to supress section mismatch warnings Throughout the kernel there are a few legitimite references to init or exit sections. Most of these are covered by the patterns included in modpost but a few nees special attention. To avoid hardcoding a lot of function names in modpost introduce a marker so relevant function/data can be marked. When modpost see a reference to a init/exit function from a function/data marked no warning will be issued. Idea from: Andrew Morton Signed-off-by: Sam Ravnborg Cc: Andrew Morton commit ca967258b69eb65dcb07bbab90fdf964c6d2ec45 Author: Sam Ravnborg Date: Thu May 17 13:38:44 2007 +0200 all-archs: consolidate .data section definition in asm-generic With this consolidation we can now modify the .data section definition in one spot for all archs. Signed-off-by: Sam Ravnborg commit 7664709b44a13e2e0b545e2dd8e7b8797a1748dc Author: Sam Ravnborg Date: Sun May 13 00:31:33 2007 +0200 all-archs: consolidate .text section definition in asm-generic Move definition of .text section to asm-generic. Signed-off-by: Sam Ravnborg commit cd5477911fc9f5cc64678e2b95cdd606c59a11b5 Author: Li Yang Date: Mon May 14 18:04:28 2007 +0800 kbuild: add "Section mismatch" warning whitelist for powerpc This patch fixes the following class of "Section mismatch" warnings when building powerpc platforms. WARNING: arch/powerpc/kernel/built-in.o - Section mismatch: reference to .init.data:.got2 from prom_entry (offset 0x0) WARNING: arch/powerpc/platforms/built-in.o - Section mismatch: reference to .init.text:mpc8313_rdb_probe from .machine.desc after 'mach_mpc8313_rdb' (at offset 0x4) .... Signed-off-by: Li Yang Signed-off-by: Sam Ravnborg commit f892b7d480eec809a5dfbd6e65742b3f3155e50e Author: Atsushi Nemoto Date: Thu May 17 01:14:38 2007 +0900 kbuild: make better section mismatch reports on i386, arm and mips On i386, ARM and MIPS, warn_sec_mismatch() sometimes fails to show usefull symbol name. This is because empty 'refsym' due to 0 r_addend value. This patch is to adjust r_addend value, consulting with apply_relocate() routine in kernel code. Without this patch: MODPOST vmlinux WARNING: init/built-in.o - Section mismatch: reference to .init.text: from .text between 'rest_init' (at offset 0xf4) and 'try_name' WARNING: mm/built-in.o - Section mismatch: reference to .init.text: from .text between 'kmem_cache_create' (at offset 0x18a39) and 'cache_reap' WARNING: mm/built-in.o - Section mismatch: reference to .init.text: from .text between 'kmem_cache_create' (at offset 0x18a6b) and 'cache_reap' With this patch: MODPOST vmlinux WARNING: mm/built-in.o - Section mismatch: reference to .init.text:set_up_list3s from .text between 'kmem_cache_create' (at offset 0x18a39) and 'cache_reap' WARNING: mm/built-in.o - Section mismatch: reference to .init.text:set_up_list3s from .text between 'kmem_cache_create' (at offset 0x18a6b) and 'cache_reap' Now modpost can detect "kernel_init" name (and whitelist it) and show "set_up_list3s" name. Signed-off-by: Atsushi Nemoto Signed-off-by: Sam Ravnborg commit 2560120997403581dd824e5bd2389c719edcbf12 Author: Russell King Date: Thu May 10 23:03:25 2007 +0100 kbuild: make modpost section warnings clearer Change modpost section mismatch warnings to be less confusing; model them on the binutils linker warnings which we all know how to interpret. Also, fix the wrong ordering of arguments for the final case - fromsec and refsymname were reversed. Signed-off-by: Russell King Acked-by: Acked-by: David S. Miller Signed-off-by: Sam Ravnborg commit 03c9587d752669a12fd553b0cbd835f77b176607 Author: Mike Frysinger Date: Thu May 17 15:06:31 2007 -0400 kconfig: search harder for curses library in check-lxdialog.sh The check-lxdialog.sh script searches for "libFOO.so" which fails on OS X, due to their special naming of libraries like "libfoo.dylib". This patch turns the curses lib search into extensible loops and adds dylib as a valid extension. Signed-off-by: Mike Frysinger Signed-off-by: Sam Ravnborg commit fc31c7716355a226b8ed4e16f4581e5c8fa53570 Author: Mike Frysinger Date: Thu May 17 14:57:20 2007 -0400 kbuild: include limits.h in sumversion.c for PATH_MAX POSIX says limits.h defines PATH_MAX so we should include it (which fixes compiling on some systems like OS X). Signed-off-by: Mike Frysinger Signed-off-by: Sam Ravnborg commit d1ab423502e787e264b4797a5fa200d804c4fd63 Author: Sylvain Munaut Date: Tue May 8 19:59:29 2007 +1000 powerpc: Fix the MODALIAS generation in modpost for of devices Since the devices may have multiple (or none) compatible properties, the uevent generated internally by the kernel may have multiple "C..." entries. So the MODALIAS stored in the module must have wilcard before and after the compatible entry. Also, if the 'compatible' field is not used for matching, there will be no 'C' and that must handled as well. The previous code handled all those case incorrectly and it "mostly" worked ... but not always. Signed-off-by: Sylvain Munaut Signed-off-by: Paul Mackerras Signed-off-by: Sam Ravnborg commit da7cd59ab9c8ed233df4809f6c8c90c636f676c7 Author: Herbert Xu Date: Sat May 19 14:51:00 2007 +1000 [CRYPTO] api: Read module pointer before freeing algorithm The function crypto_mod_put first frees the algorithm and then drops the reference to its module. Unfortunately we read the module pointer which after freeing the algorithm and that pointer sits inside the object that we just freed. So this patch reads the module pointer out before we free the object. Thanks to Luca Tettamanti for reporting this. Signed-off-by: Herbert Xu commit a8c8be08e023cf65f103442d1c71710fad7a0905 Author: Tony Luck Date: Fri May 18 15:11:34 2007 -0700 [IA64] Yet another section mismatch warning reference to .init.data: from .text between 'sn_cpu_init' (at offset 0x1411) and 'nasid_slice_to_cpuid' reference to .init.data: from .text between 'sn_cpu_init' (at offset 0x1420) and 'nasid_slice_to_cpuid' The offending .init.data object is shub_1_1_found which should be declared in __cpuinitdata, not in __initdata Signed-off-by: Tony Luck commit 9f57195b2db94488999c9cb8a1e0a6332644d5de Author: Tony Luck Date: Fri May 18 14:15:58 2007 -0700 [IA64] Fix bogus messages about system calls not implemented. There are seven legacy system calls that ia64 doesn't implement, but glibc provides equivalent functionality by using more modern system calls. Stop checksyscalls.sh from complaining about these seven. Signed-off-by: Tony Luck commit 516793c61b3db1f60e0b0d0e3c382bcca9ae84fd Author: Russell King Date: Thu May 17 10:19:23 2007 +0100 [ARM] ARMv6: add CPU_HAS_ASID configuration Presently, we check for the minimum ARM architecture that we're building for to determine whether we need ASID support. This is wrong - if we're going to support a range of CPUs which include ARMv6 or higher, we need the ASID. Convert the checks to use a new configuration symbol, and arrange for ARMv6 and higher CPU entries to select it. Signed-off-by: Russell King commit c6af66b9fe93990c70aaee53ce3ce7e53a83676a Author: Russell King Date: Thu May 17 10:16:55 2007 +0100 [ARM] integrator: fix pci_v3 compile error with DEBUG_LL If DEBUG_LL is enabled, we want to use get_irq_regs(), but this causes a build error due to the inline function missing. Add the necessary header file. Signed-off-by: Russell King commit 0f347bb9136f55ff575d55441a29e92c16e87fb0 Author: Russell King Date: Thu May 17 10:11:34 2007 +0100 [ARM] gic: Fix gic cascade irq handling No need for the cascade irq function to have a "fastcall" annotation. Fix the range checking for valid IRQ numbers - comparing the value returned by the GIC with NR_IRQS is meaningless since we translate the GIC irq number to a Linux IRQ number afterwards. Check the GIC returned IRQ number is within limits first, then add the IRQ offset, and only then compare with NR_IRQS. Signed-off-by: Russell King commit f3270f6ef7d60251617f9d4c08f76ec01c647aa4 Author: Russell King Date: Wed May 16 17:36:17 2007 +0100 [ARM] Silence OMAP kernel configuration warning arch/arm/mach-omap1/Kconfig:41:warning: 'select' used by config symbol 'MACH_OMAP_H3' refers to undefined symbol 'GPIOEXPANDER_OMAP' Signed-off-by: Russell King commit c05107911a38235fec87892d83dc54aba9aaf3bd Author: Russell King Date: Wed May 16 12:41:15 2007 +0100 [ARM] Update ARM syscalls Add utimensat, signalfd, timerfd, eventfd syscalls. Add ignore defines for sync_file_range and fadvise64_64 which we implement differently. Signed-off-by: Russell King commit e903382ceae1dd85e650ffc7e98facdd59cc7a3f Author: Sandeep Sanjay Patil Date: Wed May 16 10:51:45 2007 +0100 [ARM] 4384/1: S3C2412/13 SPI registers offset correction Change the SPI Channel 1 register offset in s3c_spi1_resource[], and s3c2412_dma_mappings[]. Offset has to be 0x100 in s3c2412/13's case. Also, total SPI memory resource size changed to 0x24 for s3c2412/13. Signed-off-by: Sandeep Patil Signed-off-by: Ben Dooks Signed-off-by: Russell King commit d73d8011779292788def2cd2520d6f39d9b406de Author: Dan Williams Date: Tue May 15 01:03:36 2007 +0100 [ARM] 4383/1: iop: fix usage of '__init' and 'inline' in iop files WARNING: arch/arm/mach-iop13xx/built-in.o - Section mismatch: reference to .init.text:iop13xx_pcie_map_irq from .text between 'iop13xx_pci_setup' (at offset 0x7fc) and 'iop13xx_map_pci_memory' While fixing this warning I also recalled Adrian Bunk's recommendation to not use inline in .c files, as 'iop13xx_map_pci_memory' is needlessly inlined. Removing 'inline' uncovered some dead code so that is cleaned up as well. Signed-off-by: Dan Williams Signed-off-by: Russell King commit e702a7155d14a6e11645e17d829217ae98fd45bb Author: Dan Williams Date: Tue May 15 01:03:31 2007 +0100 [ARM] 4382/1: iop13xx: fix msi support updates iop13xx msi support for a msi api change in 2.6.22 rev7: * update for Michael Ellerman's "MSI: arch must connect the irq and the msi_desc" patch Signed-off-by: Dan Williams Signed-off-by: Russell King commit 06ba255571b0a2f1fb7e49e7406364e4194f4e10 Author: Russell King Date: Mon May 14 22:56:32 2007 +0100 [ARM] Remove Integrator/CP SMP platform support The Integrator/CP SMP platform support was never fully merged, and now it's causing build breakage. Remove it. Signed-off-by: Russell King commit e45c7a43825b0feb161ef2ebe5324cd517dd4388 Author: Andrew Victor Date: Mon May 14 14:32:43 2007 +0100 [ARM] 4378/1: KS8695: Serial driver fix A fix for a really stupid typo in the KS8695 serial driver. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 8858e9afdf31bab05247b1680b16c65fe7edbbe1 Author: Milan Svoboda Date: Mon May 14 07:50:42 2007 +0100 [ARM] 4376/1: Selects GENERIC_GPIO for ARCH_IXP4XX in Kconfig Selects GENERIC_GPIO for ARCH_IXP4XX in Kconfig. IXP4XX has generic GPIO support; however, ARCH_IXP4XX Kconfig entry currently does not select GENERIC_GPIO like other arch entries. Signed-off-by: Milan Svoboda Signed-off-by: Russell King commit aceb6f0b6da20a86516d59f73ecdc7ea3c4a23da Author: Richard Purdie Date: Sun May 13 13:32:23 2007 +0100 [ARM] 4375/1: sharpsl_pm: Fix compile warnings Fix compile warnings from sharpsl_pm.c. Attribute registration failure doesn't stop the driver working so just warn about it. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 049fa57ce3b22d9f5acb251070941b630ee71d6e Author: Kristoffer Ericson Date: Sat May 12 20:28:05 2007 +0900 input: hp680_ts compile fixes. Trivial fix to follow the DECLARE_WORK changes, this makes the HD64461 touchscreen driver work properly again. As pointed out by David Howells. Signed-off-by: Kristoffer Ericson Signed-off-by: Paul Mundt commit ad05acd6e95e99f56da304ec3566d81061ab67f9 Author: kogiidena Date: Sat May 12 20:25:11 2007 +0900 sh: landisk: Header cleanups. Signed-off-by: kogiidena Signed-off-by: Paul Mundt commit ad47c12b3596269b975c21fba8f3cf09befdc1f2 Author: kogiidena Date: Sat May 12 20:24:15 2007 +0900 sh: landisk: rtc-rs5c313 support. Add the rs5c313 platform device to the landisk setup code. Signed-off-by: kogiidena Signed-off-by: Paul Mundt commit 38c425f69c8d949620384f917e00652eaf390ec9 Author: Paul Mundt Date: Fri May 11 11:26:10 2007 +0900 sh: Kill off pmb slab cache destructor. This is the last remaining slab destructor in the kernel, which we kill off and move the resultant list tracking logic up to the pmb_alloc()/pmb_free() paths. As Christoph Lameter pointed out, it's potentially unsafe to be taking the list lock in the destructor anyways, so this is also more fundamentally correct. With this in place, we're all set for killing off slab destructors from the kernel entirely. Signed-off-by: Paul Mundt commit 0facbe3a34556bbc30333971e32c5430b087fcb1 Author: Paul Mundt Date: Fri May 11 11:23:05 2007 +0900 sh: Fix up psw build rules for r7780rp. When reordering the Makefile rules, the psw support was being clobbered. Fix it up so it's linked in again. Signed-off-by: Paul Mundt commit b8947444a738c6407466244c60e9e4a2999af555 Author: Paul Mundt Date: Thu May 10 14:25:01 2007 +0900 sh: Shut up compiler warnings in __do_page_fault(). GCC doesn't seem to be able to figure this one out for itself, so just shut it up.. CC arch/sh/mm/fault.o arch/sh/mm/fault.c: In function '__do_page_fault': arch/sh/mm/fault.c:288: warning: 'ptl' may be used uninitialized in this function Signed-off-by: Paul Mundt commit 7d7b33d6d558ea43018c3b2a94c6d52e78128cbe Author: Dmitry Torokhov Date: Tue May 8 23:34:30 2007 -0400 Input: adbhid - do not access input_dev->private directly Use input_get_drvdata() and input_set_drvdata() helpers to do that. Signed-off-by: Dmitry Torokhov commit 18cc6757532e3b0e7a569b1631869c812b777196 Author: Peter Samuelson Date: Tue May 8 23:34:18 2007 -0400 Input: logips2pp - add type 72 (PS/2 TrackMan Marble) This is purely cosmetic: this is standard 3-button, no wheel or other such features, so it already _worked_ just fine. This patch suppresses a warning about the unknown model, and changes the printk from "Mouse" to "TrackMan". Signed-off-by: Peter Samuelson Signed-off-by: Dmitry Torokhov