commit 1a4c6be4aca5ad6b300932efed1e2729fdc25af9 Merge: a62f735... 5216a8e... Author: Linus Torvalds Date: Thu Feb 21 17:19:48 2008 -0800 Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 * 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: Wrap buffers used for rpc debug printks into RPC_IFDEBUG nfs: fix sparse warnings NFS: flush signals before taking down callback thread commit a62f735cbb1a0937ab6a9196dadf752694ef0b7f Author: David Howells Date: Thu Feb 21 16:12:45 2008 +0000 MM: Fix macro argument substitution in PageHead() and PageTail() Fix macro argument substitution in PageHead() and PageTail() - 'page' should have brackets surrounding it (commit 6d7779538f765963ced45a3fa4bed7ba8d2c277d). Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 5e45bb2ebac937f2eb62138b5d734f3ac7ce8e2f Author: Maciej Sosnowski Date: Thu Feb 21 13:44:31 2008 +0100 MAINTAINERS: ioatdma, dmaengine and async_tx maintainers change Shannon Nelson replaced by Maciej Sosnowski in maintanance of INTEL I/OAT DMA DRIVER, DMA GENERIC ENGINE SUBSYSTEM and ASYNCHRONOUS TRANSFERS/TRANSFORMS API. Signed-off-by: Maciej Sosnowski Signed-off-by: Shannon Nelson Signed-off-by: Linus Torvalds commit bfe38ccf8d0b541f387f65267f6f3794be59233a Merge: 20f8d2a... 25e9c86... Author: Linus Torvalds Date: Thu Feb 21 16:37:42 2008 -0800 Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6 * 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6: hwmon: normal_i2c arrays should be const hwmon: New driver for Analog Devices ADT7473 sensor chip hwmon: (coretemp) Add Penryn CPU to coretemp hwmon: (coretemp) Add TjMax detection for mobile CPUs hwmon: (applesmc) sensors set for MacBook2 hwmon: (thmc50) Storage class should be before const qualifier hwmon: (coretemp) fix section mismatch warning hwmon: (coretemp) Add maximum cooling temperature readout hwmon: (adm1026) Properly terminate sysfs groups hwmon: (vt8231) Update maintainer email address hwmon: (vt8231) Add individual alarm files hwmon: (via686a) Add individual alarm files hwmon: (smsc47m1) Add individual alarm files hwmon: (max1619) Add individual alarm and fault files hwmon: (lm92) Add individual alarm files commit 20f8d2a49360980f1dc0afe2ea227e3ba887e575 Merge: e6364cd... 1f1519e... Author: Linus Torvalds Date: Thu Feb 21 16:33:19 2008 -0800 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (26 commits) PM: Make suspend_device() static PCI ACPI: Fix comment describing acpi_pci_choose_state Hibernation: Handle DEBUG_PAGEALLOC on x86 ACPI: fix build warning ACPI: TSC breaks atkbd suspend ACPI: remove is_processor_present prototype acer-wmi: Add DMI match for mail LED on Acer TravelMate 4200 series ACPI: sparse fix, replace macro with static function ACPI: thinkpad-acpi: add tablet-mode reporting ACPI: thinkpad-acpi: minor hotkey_radio_sw fixes ACPI: thinkpad-acpi: improve thinkpad-acpi input device documentation ACPI: thinkpad-acpi: issue input events for tablet swivel events ACPI: thinkpad-acpi: make the video output feature optional ACPI: thinkpad-acpi: synchronize input device switches ACPI: thinkpad-acpi: always track input device open/close ACPI: thinkpad-acpi: trivial fix to documentation ACPI: thinkpad-acpi: trivial fix to module_desc typo intel_menlo: extract return values using PTR_ERR ACPI video: check for error from thermal_cooling_device_register ACPI thermal: extract return values using PTR_ERR ... commit e6364cd3a1a3e7c3e9a80bad15698afe6cc7ee75 Merge: b8967d8... 120fc3d... Author: Linus Torvalds Date: Thu Feb 21 16:21:52 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6: modules: do not try to add sysfs attributes if !CONFIG_SYSFS POWERPC: fix typo in pseries/power.c PM: Remove unbalanced mutex_unlock() from dpm_resume() UIO: fix Greg's stupid changes stable_kernel_rules: fix must already be in mainline ide: mark "ide=reverse" option as obsolete Driver core: Fix error handling in bus_add_driver(). driver-core: fix kernel-doc function parameters cpufreq: fix kobject reference count handling slabinfo: fall back from /sys/kernel/slab to /sys/slab Fix broken utf-8 encodings in ja_JP translation of stable_kernel_rules.txt commit b8967d8883aadf36351b568c1f1301ad3f46fc3d Merge: c6b0834... 79df4c6... Author: Linus Torvalds Date: Thu Feb 21 16:21:08 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6: PCI: Fix wrong reference counter check for proc_dir_entry PCI: fix up setup-bus.c #ifdef PCI: don't load acpi_php when acpi is disabled PCI: quirks: set 'En' bit of MSI Mapping for devices onHT-based nvidia platform PCI: kernel-doc: fix pci-acpi warning PCI: irq: patch for Intel ICH10 DeviceID's PCI: pci_ids: patch for Intel ICH10 DeviceID's PCI: AMD SATA IDE mode quirk PCI: drivers/pcmcia/i82092.c: fix up after pci_bus_region changes PCI: hotplug: acpiphp_ibm: Remove get device information commit c6b083466818e674d479cfeb847061a57658bcba Merge: 5d637c4... b5937a4... Author: Linus Torvalds Date: Thu Feb 21 16:20:22 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (23 commits) ehci-fsl: add PPC_MPC837x to default y USB: POWERPC: ehci: fix ppc build USB: usb-storage: don't access beyond the end of the sg buffer USB: quirks and unusual_devs entry for Actions flash drive USB: usb-storage: unusual_devs entry for Oracom MP3 player USB: serial: move zte MF330 from sierra to option USB: add new vernier product id to ldusb.c USB: gadget: queue usb USB_CDC_GET_ENCAPSULATED_RESPONSE message USB: Add another Novatel U727 ID to the device table for usbserial USB: storage: Nikon D80 new FW still needs Fixup USB: usb-storage: don't clear-halt when Get-Max-LUN stalls USB: option: Added vendor id for Dell 5720 broadband modem USB: option: Add Kyocera KPC680 ids USB: quirks for known quirky audio devices USB: fix previous sparse fix which was incorrect USB: fix error handling in trancevibrator USB: g_printer, fix empty if statement USB: ehci-fsl: mpc834x config symbol is PPC_MPC834x, not MPC834x USB: fix usb open suspend race in cdc-acm USB: usb: yet another Dell wireless CDMA/EVDO modem ... commit 5d637c4a5146f803a872275c139fc11914056d74 Merge: 0616575... d7c2fea... Author: Linus Torvalds Date: Thu Feb 21 16:19:50 2008 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm: dlm: update git tree in MAINTAINERS dlm: fix rcom_names message to self commit 06165752c8dfd7c6a3f3186bd6dec86a70895c72 Merge: 597592d... 717a54a... Author: Linus Torvalds Date: Thu Feb 21 16:19:34 2008 -0800 Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 4835/1: Fix stale comment in struct machine_desc description [ARM] 4829/1: add .get method to pxa-cpufreq to silence a warning [ARM] 4828/1: fix 3 warnings in drivers/video/pxafb.c [ARM] 4827/1: fix two warnings in drivers/i2c/busses/i2c-pxa.c [ARM] 4826/1: Orion: Register the RTC interrupt on the TS-209 [ARM] pxa: fix clock lookup to find specific device clocks commit 597592d951cdca8e5edb29f7e8174f633a69685a Author: Ian Campbell Date: Thu Feb 21 13:03:45 2008 -0800 xen: Implement getgeo for Xen virtual block device. The below implements the getgeo hook for Xen block devices. Extracted from the xen-unstable tree where it has been used for ages. It is useful to have because it allows things like grub2 (used by the Debian installer images) to work in a guest domain without having to sprinkle Xen specific hacks around the place. Signed-off-by: Ian Campbell Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Linus Torvalds commit 0f151e8b214c1df3f571020b849382933f2cdce7 Merge: e80af3a... a8b87f6... Author: Linus Torvalds Date: Thu Feb 21 16:18:05 2008 -0800 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] pasemi: Remove warning in mpic_pasemi_msi.c [POWERPC] pasemi: Register i2c devices at boot [POWERPC] cell: fix spurious false return from spu_trap_data_{map,seg} [POWERPC] Fix warning in pseries/power.c [POWERPC] Fix bootwrapper builds with older gcc versions [POWERPC] Fix dt_mem_next_cell() to read the full address [POWERPC] Kill sparse warnings in kprobes [POWERPC] spufs: fix scheduler starvation by idle contexts [POWERPC] 44x: Add multiplatform defconfig [POWERPC] 44x: Fix Kconfig formatting [POWERPC] 4xx: Update defconfigs for 2.6.25 [POWERPC] 4xx: Remove "i2c" and "xxmii-interface" device_types from dts [POWERPC] PPC440EP Interrupt Triggering and Level Settings [POWERPC] net: NEWEMAC: Remove "rgmii-interface" from rgmii matching table commit 5216a8e70e25b01cbd2915cd0442fb96deb2c262 Author: Pavel Emelyanov Date: Thu Feb 21 10:57:45 2008 +0300 Wrap buffers used for rpc debug printks into RPC_IFDEBUG Sorry for the noise, but here's the v3 of this compilation fix :) There are some places, which declare the char buf[...] on the stack to push it later into dprintk(). Since the dprintk sometimes (if the CONFIG_SYSCTL=n) becomes an empty do { } while (0) stub, these buffers cause gcc to produce appropriate warnings. Wrap these buffers with RPC_IFDEBUG macro, as Trond proposed, to compile them out when not needed. Signed-off-by: Pavel Emelyanov Acked-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit b5937a415fc0387c18c40d618c7e98d1e2f65b42 Author: Anton Vorontsov Date: Thu Feb 21 23:30:58 2008 +0300 ehci-fsl: add PPC_MPC837x to default y This patch converts USB_EHCI_FSL config option into the verbose bool, so we'll able to select it for other freescale processors with built-in EHCI controller. Signed-off-by: Anton Vorontsov Cc: Kumar Gala Signed-off-by: Greg Kroah-Hartman commit c6dd2e61d35e0fbd516c0169decc08e56619f0c6 Author: Anton Vorontsov Date: Thu Feb 21 22:49:13 2008 +0300 USB: POWERPC: ehci: fix ppc build Currently, this setup: CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD_PPC_OF=y Will fail to build: CC drivers/usb/host/ehci-hcd.o drivers/usb/host/ehci-hcd.c:1018:2: error: #error "missing bus glue for ehci-hcd" make[3]: *** [drivers/usb/host/ehci-hcd.o] Error 1 ehci-hcd.c actually contains OF_PLATFORM_DRIVER glue, so error is bogus. Signed-off-by: Anton Vorontsov Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 7084191d53b224b953c8e1db525ea6c31aca5fc7 Author: Alan Stern Date: Wed Feb 20 14:15:58 2008 -0500 USB: usb-storage: don't access beyond the end of the sg buffer This patch (as1035) fixes a bug in usb_stor_access_xfer_buf() (the bug was originally found by Boaz Harrosh): The routine must not attempt to write beyond the end of a scatter-gather list or beyond the number of bytes requested. It also fixes up the formatting of a few comments and similar whitespace issues. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 274399d14f121d7676ecb75a461cfed6cf9e4cdb Author: Alan Stern Date: Wed Feb 20 12:10:04 2008 -0500 USB: quirks and unusual_devs entry for Actions flash drive This patch (as1033) adds a quirks entry and an unusual_devs entry for the Actions Semiconductor flash drive. This device has a 64-byte string descriptor, which it doesn't terminate with a 0-length packet. Oddly enough, the reporter's logs show that when the device was plugged in at boot time, it changes its behavior completely -- it uses a different product ID, product string descriptor, and bDeviceClass. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 4e58407d5c31827de0225ea927420192a71daccd Author: Robert Spitzenpfeil Date: Wed Feb 20 12:11:22 2008 -0500 USB: usb-storage: unusual_devs entry for Oracom MP3 player This patch (as1034) was written by Leonid Petrov, reported by Robert Spitzenpfeil, and updated by me. It adds an unusual_devs entry with the IGNORE_RESIDUE flag for the Oracom MP3 player. Together with the change to the Get-Max-LUN routine in as1032, it makes the player usable. Signed-off-by: Alan Stern Signed-off-by: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman commit d726fb757722a3907356830a0b8d976267596d5c Author: Kevin Lloyd Date: Thu Feb 14 13:35:16 2008 -0800 USB: serial: move zte MF330 from sierra to option Move the Onda H600/ZTE MF33 device from the sierra driver to the option driver. The reason it was moved is because the sierra driver is starting to support more and more sierra proprietary features, so it makes more sense to keep sierra only devices in there. Signed-off-by: Kevin Lloyd Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 5b0a4d66a11df34b632e48ce80ebe81da94bdb65 Author: Stephen Ware Date: Sun Feb 17 11:01:58 2008 -0800 USB: add new vernier product id to ldusb.c I have a new ldusb device to go into the device table. Jiri has merged the change for hiddev quirks already. From: Stephen Ware Signed-off-by: Greg Kroah-Hartman commit 41566bcf35a8b23ce4715dadb5acfd1098c1d3e4 Author: Jan Altenberg Date: Tue Feb 19 01:44:50 2008 +0100 USB: gadget: queue usb USB_CDC_GET_ENCAPSULATED_RESPONSE message commit 0cf4f2de0a0f4100795f38ef894d4910678c74f8 introduced a bug, which prevents sending an USB_CDC_GET_ENCAPSULATED_RESPONSE message. This breaks the RNDIS initialization (especially / only Windoze machines dislike this behavior...). Signed-off-by: Benedikt Spranger Signed-off-by: Jan Altenberg Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 7f4a9e8750bb904d94f37778821afd021e875c51 Author: Warren Turkal Date: Thu Feb 14 14:01:46 2008 -0800 USB: Add another Novatel U727 ID to the device table for usbserial Signed-off-by: Warren Turkal Signed-off-by: Greg Kroah-Hartman commit 9232951ada7ec2f2c1424e4c024dc8540ae97e91 Author: Konstantin Kletschke Date: Tue Feb 19 02:15:32 2008 -0800 USB: storage: Nikon D80 new FW still needs Fixup Add new BCD numbers for Nikon D80 Firmware revision v1.10 to the unusual_devs.h file. Signed-off-by: Konstantin Kletschke Signed-off-by: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman commit a462549b6ad6d4de19a7702c13fbb954d9a10f29 Author: Alan Stern Date: Wed Feb 13 10:45:28 2008 -0500 USB: usb-storage: don't clear-halt when Get-Max-LUN stalls This patch (as1032) removes the Clear-Halt calls in usb_stor_Bulk_max_lun(). Evidently some devices (such as the Oracom MP3 player) really don't like to receive these requests when their bulk endpoints aren't halted. The only reason for adding them originally was to get an ancient ZIP-100 drive to work. But since this device has only a single LUN, we don't need to send it a Get-Max-LUN request at all. Adding an unusual_devs entry for the ZIP-100 with the SINGLE_LUN flag set will cause this step to be skipped. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit aa59e053da08336e7def83e83c86369cd9fdaf8b Author: Stefan Bader Date: Tue Feb 5 15:25:35 2008 -0500 USB: option: Added vendor id for Dell 5720 broadband modem this is a small patch to add support for a rebranded Novatel modem (see http://ubuntuforums.org/archive/index.php/t-608388.html for details). Signed-off-by: Stefan Bader Signed-off-by: Greg Kroah-Hartman commit 564d61d30effcc727f9519538143a6c6aeb92e46 Author: Dan Williams Date: Tue Feb 19 13:15:30 2008 -0500 USB: option: Add Kyocera KPC680 ids Signed-off-by: Dan Williams Signed-off-by: Greg Kroah-Hartman commit b68a42b1d98f66c70a536a540f73dba07ddd5d36 Author: Oliver Neukum Date: Mon Feb 4 16:34:11 2008 +0100 USB: quirks for known quirky audio devices RESET_RESUME entries for some sound devices that need it. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit e1a491429e7f9b6fb608d9f173e5807fba053d5b Author: David Brownell Date: Sat Feb 2 02:36:53 2008 -0800 USB: fix previous sparse fix which was incorrect The previous fix for a "sparse" warning in ehci_urb_dequeue() was incorrect. After rescheduling interrupt transfers it returned the URB's completion status, not status for the dequeue operation itself. This patch resolves that issue, cleans up the code in the reschedule path, and shrinks the object code by a dozen bytes. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 0cc5e2e7c3edd8b45775f50c74738d61b43ac5e8 Author: Oliver Neukum Date: Wed Jan 30 16:06:03 2008 +0100 USB: fix error handling in trancevibrator trancevibrator should not pretend success if it returns an error. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit efa66f14e2d1aaad8ad7e1664d768de74ffb665b Author: Adrian Bunk Date: Sat Feb 9 03:16:03 2008 -0800 USB: g_printer, fix empty if statement A bug every C programmer makes at some point in time... Signed-off-by: Adrian Bunk Signed-off-by: Craig W. Nadler Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 618b88670573020920a52e8754f4d5f216f74fdb Author: Peter Korsgaard Date: Mon Feb 11 13:16:26 2008 +0100 USB: ehci-fsl: mpc834x config symbol is PPC_MPC834x, not MPC834x The config symbol for mpc834x processors is CONFIG_PPC_MPC834x, not CONFIG_MPC834x. Signed-off-by: Peter Korsgaard Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 94409cc1e507b157f8442dad80ff5e560c3205e5 Author: Oliver Neukum Date: Mon Feb 11 15:22:29 2008 +0100 USB: fix usb open suspend race in cdc-acm this fixes a race between open and disconnect in the CDC ACM driver. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 59036e94732edc2fb957465008c68bbcfc6736fa Author: Andy Shevchenko Date: Mon Feb 4 23:57:49 2008 -0800 USB: usb: yet another Dell wireless CDMA/EVDO modem Add native support of the Dell wireless CDMA/EVDO modem. # modprobe usbserial vendor=0x413c product=0x8129 Following seesion lines describe modem itself at OK ati3 Manufacturer: NOVATEL WIRELESS INCORPORATED Model: EXPEDITE ET620 Revision: M6500C-BBIRD_TLS_MINI_DELL-Q40306.166 [Aug 25 2006 14:00:00] ESN: 0x5B39071D +GCAP: +CIS707-A, CIS-856, +MS, +ES, +DS, +FCLASS OK Signed-off-by: Andy Shevchenko Cc: Matthias Urlichs Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 1902869019918411c148c18cc3a22aade569ac9a Author: Oliver Neukum Date: Tue Feb 12 19:08:30 2008 +0100 USB: fix pm counter leak in usblp if you fail in open() you must decrement the pm counter again. Signed-off-by: Oliver Neukum Cc: stable Signed-off-by: Pete Zaitcev commit 2129c4e1b4469e1f9711a54e97e8ddf8b26bb62d Author: Oliver Neukum Date: Fri Feb 1 13:58:52 2008 +0100 USB: Sane memory allocation in option driver The option driver - violates DMA coherency rules - allocates ~16500 bytes in one chunk This patch splits out the buffers and uses __get_free_page() to avoid higher order allocations. Signed-off-by: Oliver Neukum Acked-By: Matthias Urlichs Signed-off-by: Greg Kroah-Hartman commit bbc5d276ec1e24d48f794dae1c4bdfc1512f65d5 Author: Roel Kluin <12o3l@tiscali.nl> Date: Thu Feb 7 01:06:07 2008 +0100 USB: ftdi_sio.c add missing '|' add missing '|' Signed-off-by: Roel Kluin <12o3l@tiscali.nl> Signed-off-by: Greg Kroah-Hartman commit 79df4c60c5b24ebc90f591d5991b22782813fcfe Author: Kenji Kaneshige Date: Thu Feb 21 15:24:16 2008 +0900 PCI: Fix wrong reference counter check for proc_dir_entry Fix wrong counter check for proc_dir_entry in pci_proc_detach_device(). The pci_proc_detach_device() returns with -EBUSY before calling remove_proc_entry() if the reference counter of proc_dir_entry is not 0. But this check is wrong and pci_proc_detach_device() always fails because the reference counter of proc_dir_entry is initialized with 1 at creating time and decremented in remove_proc_entry(). This bug cause strange behaviour as followings: - Accessing /proc/bus/pci/XXXX/YY file after hot-removing pci adapter card causes kernel panic. - Repeating hot-add/hot-remove of pci adapter card increases files with the same name under /proc/bus/pci/XXXX/ directory. For example: # pwd /proc/bus/pci/0002:09 # ls 01.0 # for i in `seq 5` > do > echo 0 > /sys/bus/pci/slots/0009_0032/power > echo 1 > /sys/bus/pci/slots/0009_0032/power > done # ls 01.0 01.0 01.0 01.0 01.0 01.0 The pci_proc_detach_device() should check if the reference counter is not larger than 1 instead. Signed-off-by: Kenji Kaneshige Signed-off-by: Greg Kroah-Hartman commit 13d36c248379ca09c269f5dbed6dce1e3a326a48 Author: Andrew Morton Date: Mon Feb 4 23:50:12 2008 -0800 PCI: fix up setup-bus.c #ifdef Use upper_32_bits(): no code changes, one less ifdef. Acked-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 6e4be1ff2e767fc3a34c5e8d67c3cba107c02099 Author: Yinghai Lu Date: Tue Feb 5 00:01:48 2008 -0800 PCI: don't load acpi_php when acpi is disabled When acpi=off and pci=nomsi, don't load acpiphp. Fixes this: pci_hotplug: PCI Hot Plug PCI Core version: 0.5 acpiphp: ACPI Hot Plug PCI Controller Driver version: 0.5 ACPI Exception (utmutex-0263): AE_BAD_PARAMETER, Thread FFFF81103CC54000 could not acquire Mutex [1] [20070126] [akpm@linux-foundation.org: export acpi_pci_disabled for acpiphp.ko] [akpm@linux-foundation.org: fix return statement] Signed-off-by: Yinghai Lu Cc: Kristen Carlson Accardi Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 9dc625e72309e1c919ea3e7f51d0ffca96123787 Author: Peer Chen Date: Mon Feb 4 23:50:13 2008 -0800 PCI: quirks: set 'En' bit of MSI Mapping for devices onHT-based nvidia platform According to HT spec, to get message interrupt from devices mapped to HT interrupt message, the 'En' bit of MSI Mapping capability need to be set. The patch do this setting in quirks code for the devices on HT-based nvidia platform. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Andy Currid Signed-off-by: Peer Chen Cc: "Eric W. Biederman" Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 8b3c7622057266d77222a7b54ea7c529270b8901 Author: Randy Dunlap Date: Sun Feb 3 15:06:25 2008 -0800 PCI: kernel-doc: fix pci-acpi warning Fix PCI kernel-doc warning: Warning(linux-2.6.24-git12//drivers/pci/pci-acpi.c:166): No description found for parameter 'hid' Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit cc09c5bcf130f7c6e17b824a06cbc9f2c1fbb060 Author: Jason Gaston Date: Mon Jan 28 17:24:37 2008 -0800 PCI: irq: patch for Intel ICH10 DeviceID's This patch adds the Intel ICH10 LPC Controller DeviceID's. Signed-off-by: Jason Gaston Signed-off-by: Greg Kroah-Hartman commit eb87f65f78bb4fc6dc532e6d7082d90ba0890cb8 Author: Jason Gaston Date: Mon Jan 28 17:20:36 2008 -0800 PCI: pci_ids: patch for Intel ICH10 DeviceID's This patch adds the Intel ICH10 LPC and SMBus Controller DeviceID's. Signed-off-by: Jason Gaston Cc: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 05a7d22b9f02e7fe8fb5ff972b46743948139b3c Author: Crane Cai Date: Sat Feb 2 13:56:56 2008 +0800 PCI: AMD SATA IDE mode quirk PCI: modify SATA IDE mode quirk When initialize and resume, SB600/700/800 need to set SATA mode correctly. Signed-off-by: Crane Cai Acked-by: Jeff Garzik Signed-off-by: Greg Kroah-Hartman commit f96ee7a41ed93ce5962961eb07c2afe8cddb6603 Author: Andrew Morton Date: Mon Feb 4 23:35:48 2008 -0800 PCI: drivers/pcmcia/i82092.c: fix up after pci_bus_region changes drivers/pcmcia/i82092.c: In function 'i82092aa_set_mem_map': drivers/pcmcia/i82092.c:650: warning: format '%lx' expects type 'long unsigned int', but argument 3 has type 'resource_size_t' drivers/pcmcia/i82092.c:650: warning: format '%lx' expects type 'long unsigned int', but argument 4 has type 'resource_size_t' Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 498fbb5d411fc8f6207c210796c9308bf54a51a5 Author: Gary Hade Date: Wed Feb 6 15:43:05 2008 -0800 PCI: hotplug: acpiphp_ibm: Remove get device information drivers/pci/hotplug/acpiphp_ibm.c:ibm_find_acpi_device() is not large enough to accommodate data returned by the _CID method executed from acpi_get_object_info(). This patch eliminates the problem by letting ACPI code (instead of driver code) determine and obtain a correctly sized buffer. Signed-off-by: Gary Hade Signed-off-by: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman commit 120fc3d77acfd91f3521737a440d42839c475982 Author: Kay Sievers Date: Thu Feb 21 00:33:20 2008 +0100 modules: do not try to add sysfs attributes if !CONFIG_SYSFS Thanks to Alexey for the testing and the fix of the fix. Cc: Alexey Dobriyan Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 58dc3232ff77158460f79e3c1932b81e8a2a0194 Author: Stephen Rothwell Date: Wed Feb 20 11:27:04 2008 +1100 POWERPC: fix typo in pseries/power.c Introduced by commit 79393fc46ede43451a500a132e5de9856f5a4c83 ("kobject: convert pseries/power.c to kobj_attr interface"). sys_create_file takes a "struct attrbute *" not a "struct kobj_addribute *". arch/powerpc/platforms/pseries/power.c: In function 'apo_pm_init': arch/powerpc/platforms/pseries/power.c:78: warning: passing argument 2 of 'sysfs_create_file' from incompatible pointer type Signed-off-by: Stephen Rothwell Cc: Paul Mackerras Signed-off-by: Greg Kroah-Hartman commit ec5a42465abc585a7f8117be5eecc361490e48ce Author: Rafael J. Wysocki Date: Wed Feb 20 02:01:41 2008 +0100 PM: Remove unbalanced mutex_unlock() from dpm_resume() Remove an unnecessary unlocking of dpm_list_mtx in the error path in drivers/base/power/main.c:dpm_suspend() . Signed-off-by: Rafael J. Wysocki Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 4f808bcdf8dcf1f1ecd028f6d5c5347db4cddc54 Author: Brandon Philips Date: Tue Feb 19 01:55:05 2008 -0800 UIO: fix Greg's stupid changes This fixes two bugs with UIO that cropped up recently in -rc1 1) WARNING: at fs/sysfs/file.c:334 sysfs_open_file when trying to open a map addr/size file - complaining about missing sysfs_ops for ktype 2) Permission denied when reading uio/uio0/maps/map0/{addr,size} when files are mode S_IRUGO Also fix a typo: attr_attribute -> addr_attribute Signed-off-by: Brandon Philips Signed-off-by: Hans J. Koch Signed-off-by: Greg Kroah-Hartman commit 46cdf871d9970b9252469531f9efd4a17243bb0b Author: Stefan Richter Date: Fri Feb 8 23:26:02 2008 +0100 stable_kernel_rules: fix must already be in mainline stable_kernel_rules: fix must already be in mainline Signed-off-by: Stefan Richter Signed-off-by: Greg Kroah-Hartman commit 2952755ce364b81f904b49397f6b0004dead2c9f Author: Bartlomiej Zolnierkiewicz Date: Wed Feb 13 23:20:36 2008 +0100 ide: mark "ide=reverse" option as obsolete - it is valid only if "Probe IDE PCI devices in the PCI bus order (DEPRECATED)" config option is used - Greg needs to remove pci_get_device_reverse() for PCI core changes Cc: Alan Cox Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Greg Kroah-Hartman commit 0763446429e46fd973f507f79900b95eb8aae2e4 Author: Cornelia Huck Date: Mon Feb 18 17:04:25 2008 +0100 Driver core: Fix error handling in bus_add_driver(). - If the allocation of ->priv fails, the reference on the bus must be dropped. - If adding the kobject fails, kobject_put must be called to clean things up. Signed-off-by: Cornelia Huck Signed-off-by: Greg Kroah-Hartman commit 7199677d2e919edc75d1fb8856c98cd0c1bbcfc5 Author: Randy Dunlap Date: Mon Feb 18 13:09:03 2008 -0800 driver-core: fix kernel-doc function parameters Fix drivers/base/ missing kernel-doc parameters: Warning(linux-2.6.24-git12//drivers/base/driver.c:133): No description found for parameter 'drv' Warning(linux-2.6.24-git12//drivers/base/driver.c:133): No description found for parameter 'kobj' Warning(linux-2.6.24-git12//drivers/base/driver.c:133): No description found for parameter 'fmt' Warning(linux-2.6.24-git12//drivers/base/power/main.c:530): No description found for parameter 'state' Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 7ab47050453c10da13940114dea9c7f1c6ad323f Author: Balaji Rao Date: Sat Feb 9 00:52:40 2008 +0530 cpufreq: fix kobject reference count handling The cpufreq core should not take an extra kobject reference count for no reason, and then refuse to release it. This has been reported as keeping machines from properly powering down all the way. Signed-off-by: Balaji Rao Cc: Dave Jones Cc: Yi Yang Cc: Alan Stern Cc: Frans Pop Cc: Yinghai Lu Cc: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit b6c24de77cbe9afe4962f0738e6444e709e83c81 Author: Christoph Lameter Date: Mon Feb 4 23:35:48 2008 -0800 slabinfo: fall back from /sys/kernel/slab to /sys/slab I keep running upstream and mm kernels and the location of the slab directory is different since upstream still uses /sys/slab. This patch makes slabinfo check /sys/slab if /sys/kernel/slab is not there. Makes slabinfo work on any kernel. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 82bd3f17f4600fd374524c015826c175819f15ea Author: Tsugikazu Shibata Date: Thu Feb 14 14:21:34 2008 +0900 Fix broken utf-8 encodings in ja_JP translation of stable_kernel_rules.txt Fix the UTF-8 broken encodings in the ja_JP version of stable_kernel_rules.txt From: Tsugikazu Shibata Signed-off-by: Greg Kroah-Hartman commit d7c2feaf88df39124e278b9e775b245b057ac99e Author: David Teigland Date: Thu Feb 21 15:27:09 2008 -0600 dlm: update git tree in MAINTAINERS Signed-off-by: David Teigland commit 599e0f584de8ff16b1428e2e16118757619f1d1b Author: David Teigland Date: Thu Feb 21 13:39:57 2008 -0600 dlm: fix rcom_names message to self The recent patch to validate data lengths in rcom_names messages failed to account for fake messages a node directs to itself before ever sending it. In this case we need to fill in the message length in the header for the validation code to use. Signed-off-by: David Teigland commit 717a54ad6cb4b1782a26ae0eaebc8bd49c56c66e Author: Leonid Evdokimov Date: Thu Feb 21 13:46:59 2008 +0100 [ARM] 4835/1: Fix stale comment in struct machine_desc description This patch updates stale comment that pointed to nonexistent file. Signed-off-by: Leonid Evdokimov Signed-off-by: Russell King commit a8b87f609d1332216e683b473d33342c86f21ac3 Merge: 9c03385... 61b36fc... Author: Paul Mackerras Date: Thu Feb 21 21:49:13 2008 +1100 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jk/spufs into merge commit 9c0338522896c54b79ad7918638175bf58d7c551 Author: Olof Johansson Date: Thu Feb 21 13:34:43 2008 +1100 [POWERPC] pasemi: Remove warning in mpic_pasemi_msi.c Remove warning: arch/powerpc/sysdev/mpic_pasemi_msi.c: In function 'pasemi_msi_setup_msi_irqs': arch/powerpc/sysdev/mpic_pasemi_msi.c:135: warning: 'addr' is used uninitialized in this function Turns out addr wasn't even used, it's a leftover from the u3msi code. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit be2553ffb5773e9a689c94bb85326c5b5f00577f Author: Olof Johansson Date: Thu Feb 21 13:25:54 2008 +1100 [POWERPC] pasemi: Register i2c devices at boot Setup i2c_board_info based on device tree contents. This has to be a device_initcall since we need PCI to be probed by the time we run it, but before the actual driver is initialized. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit 1f1519ef597ae4628dbd47244f0f68d700231523 Merge: 208c70a... f28bb45... 1186974... e85ff4b... 19e20c9... 69f6b8d... 6c231bd... 6133116... Author: Len Brown Date: Thu Feb 21 02:41:58 2008 -0500 Merge branches 'release', 'bugzilla-9916', 'bugzilla-9982', 'bugzilla-9989', 'misc', 'suspend', 'thermal', 'thinkpad' and 'tsc' into release commit 19e20c913bae2dd458b9fc42afab0c53f16562d1 Author: Adrian Bunk Date: Sun Feb 3 22:55:18 2008 +0100 PM: Make suspend_device() static suspend_device() can become static. Signed-off-by: Adrian Bunk Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Signed-off-by: Len Brown commit c6868ea00bdebe5762fa59e54b74b4cd4e3b4e6e Author: Rafael J. Wysocki Date: Sun Feb 3 22:53:31 2008 +0100 PCI ACPI: Fix comment describing acpi_pci_choose_state The last line of the comment preceding the definition of acpi_pci_choose_state() is incorrect. Remove it. Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Signed-off-by: Len Brown commit 8a235efad548abd2ab5ebea45a9ffa750c814375 Author: Rafael J. Wysocki Date: Wed Feb 20 01:47:44 2008 +0100 Hibernation: Handle DEBUG_PAGEALLOC on x86 Make hibernation work with CONFIG_DEBUG_PAGEALLOC set on x86, by checking if the pages to be copied are marked as present in the kernel mapping and temporarily marking them as present if that's not the case. No functional modifications are introduced if CONFIG_DEBUG_PAGEALLOC is unset. Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 1186974f3ffe3c1796e5efce7afffefcfda9a6f0 Author: Ming Lin Date: Thu Feb 21 02:01:30 2008 -0500 ACPI: fix build warning CC drivers/acpi/executer/exregion.o drivers/acpi/executer/exregion.c: In function ‘acpi_ex_pci_config_space_handler’: drivers/acpi/executer/exregion.c:369: attention : passing argument 3 of ‘acpi_os_read_pci_configuration’ from incompatible pointer type exposed by 10270d4838bdc493781f5a1cf2e90e9c34c9142f http://bugzilla.kernel.org/show_bug.cgi?id=9989 Signed-off-by: Ming Lin Signed-off-by: Len Brown commit e80af3a8dbbbf431b2070cc760699f01c5a6ac69 Author: David Howells Date: Wed Feb 20 18:11:44 2008 +0000 FRV: Change the timerfd syscalls to be the same as i386 Change the FRV timerfd syscalls to be the same as i386 timerfd syscalls. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 2d0e2baa25966cff9bcd0a6e8204e676c2bc54e1 Author: David Howells Date: Wed Feb 20 18:11:39 2008 +0000 FRV: Drop the .data.idt section for FRV There is no .data.idt section for FRV, so drop it from the linker script. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 7be5cb14611945044306ecb7444678c43df21135 Merge: 1803f33... 73fd8b6... Author: Linus Torvalds Date: Wed Feb 20 19:56:23 2008 -0800 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata: fix kernel-doc parameter warning sata_mv: remove iounmap in mv_platform_remove and use devm_iomap ata: fix sparse warning in libata.h libata: implement libata.force module parameter sata_mv: use hpriv->base instead of the host->iomap sata_mv: Define module alias for platform device ata: fix sparse warnings in pata_legacy.c commit 1803f3389b7ac9ed33ea561b3b94e22e2864a95d Author: Linus Torvalds Date: Wed Feb 20 19:55:09 2008 -0800 Remove empty file remnants that were left in the tree by mistake Noted by various people (Sam, Jeff, Roland..) Commit 58b7983d15a422d9616bdc4e245d5c31dfaefbe2 intended to remove the xfs "Makefile-linux-2.6" file, but it was mistakenly still left in the tree as a empty file, and would cause git to correctly complain about a tracked file being removed after a "make distclean" (which removes empty files as garbage). And the asm-x86/desc_64.h file was supposed to be removed by commit c81c6ca45a69478c7877b729af1942d2b80ef582, but instead stayed around containing just a single newline. Get rid of them both properly. Signed-off-by: Linus Torvalds commit 90dc7d2796edf94a9eaa838321a9734c8513e717 Author: Harvey Harrison Date: Wed Feb 20 13:03:05 2008 -0800 nfs: fix sparse warnings fs/nfs/nfs4state.c:788:34: warning: Using plain integer as NULL pointer fs/nfs/delegation.c:52:34: warning: Using plain integer as NULL pointer fs/nfs/idmap.c:312:12: warning: Using plain integer as NULL pointer fs/nfs/callback_xdr.c:257:6: warning: Using plain integer as NULL pointer fs/nfs/callback_xdr.c:270:6: warning: Using plain integer as NULL pointer fs/nfs/callback_xdr.c:281:6: warning: Using plain integer as NULL pointer Signed-off-by: Harvey Harrison Signed-off-by: Trond Myklebust commit 1227a74e2e0217a4ca155d1677bdbf5f69e32bed Author: Jeff Layton Date: Tue Feb 19 12:51:35 2008 -0500 NFS: flush signals before taking down callback thread Now that the reference counting on the callback thread is working as expected, it uncovers another problem. Peter Staubach noticed while testing that patch on an older kernel that he would occasionally see this printk in rpc_register fire: "RPC: failed to contact portmap (errno -512). The NFSv4 callback thread is signaled by nfs_callback_down(), but never flushes that signal. All of the shutdown processing is done with that signal pending. This makes it fail the call to unregister the port with the portmapper. In actuality, this rpc_register call isn't necessary at all since the port isn't actually registered with the portmapper anymore. Regardless, there doesn't seem to be any reason to leave the signal pending while the thread is being shut down and flushing it should generally silence that printk. Signed-off-by: Jeff Layton Signed-off-by: Trond Myklebust commit 73fd8b6d310196ae878767200786503fcff57bd5 Author: Randy Dunlap Date: Tue Feb 19 13:43:21 2008 -0800 libata: fix kernel-doc parameter warning Fix libata kernel-doc parameter: Warning(linux-2.6.25-rc2-git3//drivers/ata/libata-scsi.c:845): No description found for parameter 'rq' Signed-off-by: Randy Dunlap Signed-off-by: Jeff Garzik commit f1cb0ea12fee23018ad1865bf789cbd463f13747 Author: Saeed Bishara Date: Mon Feb 18 07:42:28 2008 -1100 sata_mv: remove iounmap in mv_platform_remove and use devm_iomap this will fix crash bug when doing rmmod to the driver, this is because the port_stop function get called later and it could access the device's registers. Signed-off-by: Saeed Bishara Acked-by: Mark Lord Acked-by: Tejun Heo Signed-off-by: Jeff Garzik commit 5d44b414daa8c1d8551aed6130d86d54175db43f Author: Harvey Harrison Date: Fri Feb 15 13:41:32 2008 -0800 ata: fix sparse warning in libata.h Avoids lots of these, also is more readable. include/linux/libata.h:1210:13: warning: potentially expensive pointer subtraction Change the subtraction to addition on the other side of the comparison. Thanks to Christer Weinigel for the suggestion. Signed-off-by: Harvey Harrison Acked-by: Tejun Heo Signed-off-by: Jeff Garzik commit 332673257056d8be8a69d759eda90a799af5472d Author: Tejun Heo Date: Wed Feb 13 09:15:09 2008 +0900 libata: implement libata.force module parameter This patch implements libata.force module parameter which can selectively override ATA port, link and device configurations including cable type, SATA PHY SPD limit, transfer mode and NCQ. For example, you can say "use 1.5Gbps for all fan-out ports attached to the second port but allow 3.0Gbps for the PMP device itself, oh, the device attached to the third fan-out port chokes on NCQ and shouldn't go over UDMA4" by the following. libata.force=2:1.5g,2.15:3.0g,2.03:noncq,udma4 Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 0fca0d6f2ce3336022a22bc7fc2e009e599e63a4 Author: Saeed Bishara Date: Wed Feb 13 10:09:09 2008 -1100 sata_mv: use hpriv->base instead of the host->iomap this fixes crash bug as the iomap table is not valid for integrated controllers. Signed-off-by: Saeed Bishara Acked-by: Mark Lord Signed-off-by: Jeff Garzik commit 2e7e1214defe7783c8187962bacdd0a87a7dbeee Author: Martin Michlmayr Date: Sat Feb 16 18:15:27 2008 +0100 sata_mv: Define module alias for platform device The sata_mv driver can be loaded as a platform device, as is done by various Orion (ARM) based devices. The driver needs to define a module alias for the platform driver so udev will load it automatically. Tested with Debian on a QNAP TS-209. Signed-off-by: Martin Michlmayr Acked-by: Mark Lord Signed-off-by: Jeff Garzik commit cb616dd5bb6ddadf3e0607696b18055065ce4c3d Author: Harvey Harrison Date: Thu Feb 14 09:36:32 2008 -0800 ata: fix sparse warnings in pata_legacy.c Use ld_qdi and ld_winbond to avoid shadowing static int variables qdi and winbond. The ld_ prefix refers to legacy_data. drivers/ata/pata_legacy.c:777:21: warning: symbol 'qdi' shadows an earlier one drivers/ata/pata_legacy.c:128:12: originally declared here drivers/ata/pata_legacy.c:811:21: warning: symbol 'qdi' shadows an earlier one drivers/ata/pata_legacy.c:128:12: originally declared here drivers/ata/pata_legacy.c:848:21: warning: symbol 'qdi' shadows an earlier one drivers/ata/pata_legacy.c:128:12: originally declared here drivers/ata/pata_legacy.c:882:21: warning: symbol 'qdi' shadows an earlier one drivers/ata/pata_legacy.c:128:12: originally declared here drivers/ata/pata_legacy.c:1040:21: warning: symbol 'winbond' shadows an earlier one drivers/ata/pata_legacy.c:129:12: originally declared here Signed-off-by: Harvey Harrison Signed-off-by: Jeff Garzik commit 61b36fc1f7d511132b1dd1422c29c7a8f26d77db Author: Andre Detsch Date: Tue Feb 19 10:06:15 2008 -0300 [POWERPC] cell: fix spurious false return from spu_trap_data_{map,seg} At present, the __spufs_trap_data_map and __spu_trap_data_seq functions exit if spu->flags has the SPU_CONTEXT_SWITCH_ACTIVE set. This was resulting in suprious returns from these functions, as they may be legitimately called when we have this bit set. We only use it in these two sanity checks, so this change removes the flag completely. This fixes hangs in the page-fault path of SPE apps. Signed-off-by: Andre Detsch Signed-off-by: Jeremy Kerr commit 3d5d27c40fb38a51eae96a55f51b5a306ed3668d Author: Stephen Rothwell Date: Wed Feb 20 11:27:04 2008 +1100 [POWERPC] Fix warning in pseries/power.c Introduced by commit 79393fc46ede43451a500a132e5de9856f5a4c83 ("kobject: convert pseries/power.c to kobj_attr interface"). sys_create_file takes a "struct attrbute *" not a "struct kobj_addribute *". arch/powerpc/platforms/pseries/power.c: In function 'apo_pm_init': arch/powerpc/platforms/pseries/power.c:78: warning: passing argument 2 of 'sysfs_create_file' from incompatible pointer type Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit bf2e70ac654060bcb2a06bbcb62701ba2451d79d Author: Josh Boyer Date: Tue Feb 19 13:52:48 2008 +1100 [POWERPC] Fix bootwrapper builds with older gcc versions GCC versions before 3.4 did not support the -mcpu=440 option. Use -mcpu=405 for the 4xx specific bootwrapper files, as that has been around for much longer. Signed-off-by: Josh Boyer Signed-off-by: Paul Mackerras commit abe768858a54e96f0b2c0585db397107ed1bd213 Author: Becky Bruce Date: Sat Feb 16 05:17:14 2008 +1100 [POWERPC] Fix dt_mem_next_cell() to read the full address dt_mem_next_cell() currently does of_read_ulong(). This does not allow for the case where #size-cells and/or #address-cells = 2 on a 32-bit system, as it will end up reading 32 bits instead of the expected 64. Change it to use of_read_number instead and always return a u64. Signed-off-by: Becky Bruce Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 66200ea2228da6aaf317d21e67b1157aae7168e7 Author: Ananth N Mavinakayanahalli Date: Fri Feb 15 21:59:17 2008 +1100 [POWERPC] Kill sparse warnings in kprobes Fix sparse warnings in powerpc kprobes: CHECK arch/powerpc/kernel/kprobes.c arch/powerpc/kernel/kprobes.c:277:6: warning: symbol 'kretprobe_trampoline_holder' was not declared. Should it be static? arch/powerpc/kernel/kprobes.c:287:15: warning: symbol 'trampoline_probe_handler' was not declared. Should it be static? arch/powerpc/kernel/kprobes.c:525:16: warning: symbol 'jprobe_return_end' was not declared. Should it be static? Fix along the same lines as http://lkml.org/lkml/2008/2/13/642 Signed-off-by: Ananth N Mavinakayanahalli Signed-off-by: Paul Mackerras commit 5d9c4a7de64d398604a978d267a6987f1f4025b7 Merge: 3a93dc4... 44a207f... Author: Linus Torvalds Date: Tue Feb 19 18:29:57 2008 -0800 Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6 * 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6: agp: fix missing casts that produced a warning. agp: add support for 662/671 to agp driver fix historic ioremap() abuse in AGP agp/sis: Suspend support for SiS AGP agp/sis: Clear bit 2 from aperture size byte as well commit 3a93dc42f56c507d1034273d1e1d6f9b3ad94bb1 Merge: cf8c0d1... feac7af... Author: Linus Torvalds Date: Tue Feb 19 17:48:51 2008 -0800 Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/sis: add pciid for SiS 662/671 chipset drm: add new rv380 pciid drm: add support for passing state into the suspend hooks. drm/i915: Fix hibernate save/restore of VGA attribute regs drm/i915 more registers for S3 (DSPCLK_GATE_D, CACHE_MODE_0, MI_ARB_STATE) drm/i915: restore pipeconf regs unconditionally drm/i915: save/restore interrupt state drm: convert drm from nopage to fault. i915: wrap chipset types requiring hw status set ioctl drm/radeon: add initial rs690 support to drm. commit 6133116849219f4e657ead39c7ac3922583f5a6e Author: Pavel Machek Date: Tue Feb 19 11:00:29 2008 +0100 ACPI: TSC breaks atkbd suspend TSC is used even on machines when CONFIG_X86_TSC is not set (X86_TSC means _require_ TSC), but it is not properly disabled when it is unusable, because ACPI code understood the config switch as "may use TSC". This actually fixes suspend problems on my x60. Signed-off-by: Pavel Machek Signed-off-by: Len Brown commit 44a207fc66c13c82f627178f9f858b8f3e76028f Author: Dave Airlie Date: Wed Feb 20 10:37:08 2008 +1000 agp: fix missing casts that produced a warning. Signed-off-by: Dave Airlie commit 2e374748c73f34e018a1c13a86a96a15fc55a65a Author: Chaoyu Chen Date: Wed Feb 20 10:18:46 2008 +1000 agp: add support for 662/671 to agp driver Signed-off-by: Dave Airlie commit feac7af508ebdfe1db9920d4e45d0ffd286abe75 Author: Chaoyu Chen Date: Wed Feb 20 10:12:39 2008 +1000 drm/sis: add pciid for SiS 662/671 chipset Signed-off-by: Dave Airlie commit f9e9716a67fbea4594749bf1022fdfd0b96099db Author: Mirko Date: Wed Feb 20 10:07:57 2008 +1000 drm: add new rv380 pciid Signed-off-by: Dave Airlie commit b932ccb5674eb649133b5c33950405c37d17aab3 Author: Dave Airlie Date: Wed Feb 20 10:02:20 2008 +1000 drm: add support for passing state into the suspend hooks. fix i915 driver to use state for hibernate save avoidance. Signed-off-by: Dave Airlie commit cf8c0d1dbcfaba56adde85b63190a8bceda0cd04 Merge: d5c67ba... 156fbc3... Author: Linus Torvalds Date: Tue Feb 19 15:56:05 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 * git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: (32 commits) x86: fix page_is_ram() thinko x86: fix WARN_ON() message: teach page_is_ram() about the special 4Kb bios data page x86: i8259A: remove redundant irq_descinitialization x86: fix vdso_install breaks user "make install" x86: change IO delay back to 0x80 x86: lds - Use THREAD_SIZE instead of numeric constant x86: lds - Use PAGE_SIZE instead of numeric constant x86 cleanup: suspend_asm_64.S - use X86_CR4_PGE instead of numeric value x86: docs fixes to Documentation/i386/IO-APIC.txt x86: fix printout ugliness in cpu info printk x86: clean up csum-wrappers_64.c some more x86: coding style fixes in arch/x86/lib/csum-wrappers_64.c x86: coding style fixes in arch/x86/lib/io_64.c x86: exclude vsyscall files from stackprotect x86: add pgd_large() on 64-bit, for consistency x86: minor cleanup of comments in processor.h x86: annotate pci/common.s:pci_scan_bus_with_sysdata with __devinit x86: fix section mismatch in head_64.S:initial_code x86: fix section mismatch in srat_64.c:reserve_hotadd x86: fix section mismatch warning in topology.c:arch_register_cpu ... commit d5c67bac833c6c9cc713f6a27daa77dcba898dd8 Merge: 989b0b9... cc2d6f7... Author: Linus Torvalds Date: Tue Feb 19 15:54:22 2008 -0800 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] BCM47XX: Use new SSB SPROM data structure [MIPS] WGT634U: Register MTD as platform device. [MIPS] BCM47xx: Add defconfig file. [MIPS] RM: fix EISA=n compilation [MIPS] PCI: Coding style fixes for pcibios_enable_resources. [MIPS] PCI: Port i386 PCI fixes. [MIPS] Qemu: finish platform removal [MIPS] Wire up the timerfd_*() o32 system calls [MIPS] IP28: Add defconfig file [MIPS] SB1: Fix CONFIG_SIBYTE_DMA_PAGEOPS build failure. [MIPS] BCM1480: Remove stray function call resulting in infinite recursion [MIPS] Fix buggy invocations of kmap_coherent() [MIPS] Fix broken rm7000/rm9000 interrupt handling [MIPS] Handle I-cache coherency in flush_cache_range() [MIPS] IP27: Add missing ~ in DMA code. [MIPS] Use find_task_by_vpid in system calls commit 989b0b930218661b504bbb056b309e2c7bcdfb86 Merge: e03f1a8... 42086ce... Author: Linus Torvalds Date: Tue Feb 19 15:53:02 2008 -0800 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6: (29 commits) [XTENSA] Allow debugger to modify the WINDOWBASE register. [XTENSA] Fix makefile to work with binutils-2.18. [XTENSA] Fix register corruption for certain processor configurations [XTENSA] Fix cache flush macro for D$/I$ aliasing/non-aliasing [XTENSA] Exclude thread-global registers from the xtregs structures. [XTENSA] Add support for the sa_restorer function [XTENSA] Add support for configurable registers and coprocessors [XTENSA] Clean up stat structs. [XTENSA] Use preprocessor to generate the linker script for the ELF boot image [XTENSA] Add missing RELOCATE_ENTRY for debug vector [XTENSA] Add volatile keyword to asm statements accessing counter registers [XTENSA] Remove unused code [XTENSA] Fix modules for non-exec processor configurations [XTENSA] Add missing cast in elf.h ELF_CORE_COPY_REGS() [XTENSA] Fix comments regarding the number of frames to save [XTENSA] Add missing a2 register restore in register spill routine [XTENSA] adjust boot linker script start addresses [XTENSA] Remove oldmask from sigcontext and fix register flush [XTENSA] Clean up elf-gregset. [XTENSA] Fix icache flush for cache aliasing ... commit e03f1a842287480aa03732612148c0d333baca61 Author: Adrian Bunk Date: Tue Feb 19 19:44:19 2008 +0000 dm-raid1.c: fix NULL dereferences This patch fixes two NULL dereferences introduced by commit 06386bbfd2441416875d0403d405c56822f6ebac and spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: Alasdair G Kergon Signed-off-by: Linus Torvalds commit ae5e1b6cc511b278ad52b2d42afb44780e5d4cb2 Author: David Howells Date: Tue Feb 19 18:59:04 2008 +0000 MN10300: Update asb2303_defconfig Update the ASB2303 default configuration. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit aa409e028c41137a659c02d0081ba57b701e7446 Author: David Howells Date: Tue Feb 19 18:58:59 2008 +0000 MN10300: Make the kernel jump into gdbstub on a BUG Make the kernel jump into gdbstub (if configured) on a BUG with the register set from the BUG rather than interpolating another illegal instruction and leaving gdbstub's idea of the process counter in unsupported_syscall() where the original BUG was detected. With this patch, gdbstub reports a SIGABRT to the compiler and reports the program counter at the original BUG, allowing the execution state at the time of the BUG to be examined with GDB. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 5efe92c68045817b97927b748f369d407c1d89ab Author: David Howells Date: Tue Feb 19 18:58:54 2008 +0000 MN10300: Introduce barriers to replace removed volatiles in gdbstub Introduce into the MN10300 gdbstub a couple of barrier() calls to replace the removed volatility of the input/output index variables for the Rx ring buffer. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 2b79aac9038ee52fd8d89216b1a3ec9bd8285fac Author: David Howells Date: Tue Feb 19 18:58:49 2008 +0000 MN10300: Call update_process_times() outside of the xtime_lock Call update_process_times() outside of the xtime_lock. Somewhere somewhere inside one of the functions called by that, xtime_lock is readlocked, which ends up in a deadlock situation. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit e855e5d82edd708bcb966cf7ccda2dee1c154935 Merge: 37c514e... b7f9c11... Author: Linus Torvalds Date: Tue Feb 19 15:50:11 2008 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: IB/mthca: Free correct MPT on error exit from mthca_fmr_alloc() IPoIB/cm: Fix ipoib_cm_dev_stop() cleanup when drain times out commit da636ad6a0d72eb5cb99738056af0bcc3db9ef9d Author: Jesse Barnes Date: Mon Jan 28 21:05:22 2008 -0800 drm/i915: Fix hibernate save/restore of VGA attribute regs In hibernate, we may end up calling the VGA save regs function twice, so we need to make sure it's idempotent. That means leaving ARX in index mode after the first save operation. Fixes hibernate on 965. Signed-off-by: Dave Airlie commit 1f84e550a870bf5f5f399b611db68f3324ea7883 Author: Keith Packard Date: Sat Feb 16 19:19:29 2008 -0800 drm/i915 more registers for S3 (DSPCLK_GATE_D, CACHE_MODE_0, MI_ARB_STATE) Failing to preserve the MI_ARB_STATE register was causing FIFO underruns on the VGA output on my HP 2510p after resume. Signed-off-by: Dave Airlie commit c0c4261b6fd80f0fc5546ed67058592469a4f5b7 Author: Jesse Barnes Date: Thu Feb 7 17:33:28 2008 -0800 drm/i915: restore pipeconf regs unconditionally On many chipsets, the checks for DPLL enable or VGA mode will prevent the pipeconf regs from being restored, which could result in a blank display or X failing to come back after resume. So restore them unconditionally along with actually restoring pipe B's palette correctly. Signed-off-by: Dave Airlie commit 0da3ea12fc2607beb67c2d54d0347807ea615573 Author: Jesse Barnes Date: Wed Feb 20 09:39:58 2008 +1000 drm/i915: save/restore interrupt state On resume, if the interrupt state isn't restored correctly, we may end up with a flood of unexpected or ill-timed interrupts, which could cause the kernel to disable the interrupt or vblank events to happen at the wrong time. So save/restore them properly. Signed-off-by: Dave Airlie commit ca0b07d9a969c6561e5d6f69c861fbedf8d09e5d Author: Nick Piggin Date: Thu Feb 7 16:20:50 2008 +1000 drm: convert drm from nopage to fault. Remove redundant vma range checks. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Dave Airlie commit b39d50e53b1bb27f6c29f88a697a4af78427dffd Author: Zhenyu Wang Date: Tue Feb 19 20:59:09 2008 +1000 i915: wrap chipset types requiring hw status set ioctl Also applys to recent added new chipset. Signed-off-by: Zhenyu Wang Signed-off-by: Dave Airlie commit 60f92683943c5b7a85963b283d6f8a853aa09203 Author: Maciej Cencora Date: Tue Feb 19 21:32:45 2008 +1000 drm/radeon: add initial rs690 support to drm. This adds support for configuring the RS690 GART. Signed-off-by: Dave Airlie commit 37c514e3dfc8f55145d9c6895e2838ac31859aa4 Author: Sam Ravnborg Date: Tue Feb 19 21:00:18 2008 +0100 Add missing init section definitions When adding __devinitconst etc. the __initconst variant were missed. Add this one and proper definitions for .head.text for use in .S files. The naming .head.text is preferred over .text.head as the latter will conflict for a function named head when introducing -ffunctions-sections. Signed-off-by: Sam Ravnborg commit b1d2675a6466090b68d4ef63f9237b4d70a18857 Author: Geert Uytterhoeven Date: Sun Feb 17 14:12:10 2008 +0100 kbuild: fix reversed symbol name order in modpost XXXINIT_TO_INIT and XXXEXIT_TO_EXIT warnings use the reversed symbol name order in the suggestion, e.g.: WARNING: vmlinux.o(.meminit.text+0x36c): Section mismatch in reference from the function free_area_init_core() to the function .init.text:setup_usemap() The function __meminit free_area_init_core() references a function __init setup_usemap(). If free_area_init_core is only used by setup_usemap then annotate free_area_init_core with a matching annotation. Signed-off-by: Geert Uytterhoeven Signed-off-by: Sam Ravnborg commit b7f9c112a5e7f68d77a31c79f5942a3272ae9a3b Author: Roland Dreier Date: Tue Feb 19 10:42:50 2008 -0800 IB/mthca: Free correct MPT on error exit from mthca_fmr_alloc() When mthca_fmr_alloc() returns an error, it should free the MPT at the index key, not mr->ibmr.lkey, since the lkey has been mangled by hw_index_to_key() and no longer is the real index. This bug causes corruption of the MPT table free bitmap when mthca_fmr_alloc() fails. Signed-off-by: Roland Dreier commit ec229e5e81b3cf757e5e8b6a8bd0b4f32fe52f8c Author: Pradeep Satyanarayana Date: Tue Feb 12 15:00:59 2008 -0800 IPoIB/cm: Fix ipoib_cm_dev_stop() cleanup when drain times out Commit efcd9971 ("IPoIB/cm: Factor out ipoib_cm_free_rx_reap_list()") introduced a bug in ipoib_cm_dev_stop() when the receive drain times out. In that case, the function moves all the pending rx stuff into a private list but then calls ipoib_cm_free_rx_reap_list(), which handles a different list. Fix this by moving everything to the rx_reap_list that will actually get freed up. This fixes . Signed-off-by: Pradeep Satyanarayana Signed-off-by: Roland Dreier commit 00e962c5408b9f2d0bebd2308673fe982cb9a5fe Author: Linus Torvalds Date: Tue Feb 19 09:08:49 2008 -0800 Revert "SLUB: Alternate fast paths using cmpxchg_local" This reverts commit 1f84260c8ce3b1ce26d4c1d6dedc2f33a3a29c0c, which is suspected to be the reason for some very occasional and hard-to-trigger crashes that usually look related to memory allocation (mostly reported in networking, but since that's generally the most common source of shortlived allocations - and allocations in interrupt contexts - that in itself is not a big clue). See for example http://bugzilla.kernel.org/show_bug.cgi?id=9973 http://lkml.org/lkml/2008/2/19/278 etc. One promising suspicion for what the root cause of bug is (which also explains why it's so hard to trigger in practice) came from Eric Dumazet: "I wonder how SLUB_FASTPATH is supposed to work, since it is affected by a classical ABA problem of lockless algo. cmpxchg_local(&c->freelist, object, object[c->offset]) can succeed, while an interrupt came (on this cpu), and several allocations were done, and one free was performed at the end of this interruption, so 'object' was recycled. c->freelist can then contain the previous value (object), but object[c->offset] was changed by IRQ. We then put back in freelist an already allocated object." but another reason for the revert is simply that everybody agrees that this code was the main suspect just by virtue of the pattern of oopses. Cc: Torsten Kaiser Cc: Christoph Lameter Cc: Mathieu Desnoyers Cc: Pekka Enberg Cc: Ingo Molnar Cc: Eric Dumazet Signed-off-by: Linus Torvalds commit cc2d6f701bed8b5f120314e4df854827d8bac558 Author: Aurelien Jarno Date: Mon Feb 18 11:04:31 2008 +0100 [MIPS] BCM47XX: Use new SSB SPROM data structure Switch the BCM47XX code to the new SPROM data structure now that the old one has been removed. Signed-off-by: Aurelien Jarno Signed-off-by: Ralf Baechle commit 0788150e639623f44c5991dcd290f8cdcf7db43f Author: Aurelien Jarno Date: Thu Feb 7 03:17:16 2008 +0100 [MIPS] WGT634U: Register MTD as platform device. Signed-off-by: Aurelien Jarno Signed-off-by: Ralf Baechle commit e8248d6fe7092439b08588102ad668b7cf27ec05 Author: Aurelien Jarno Date: Mon Feb 18 12:23:27 2008 +0100 [MIPS] BCM47xx: Add defconfig file. Signed-off-by: Aurelien Jarno Signed-off-by: Ralf Baechle commit b991b590dc2e54447644d34226dc355b7b6e2337 Author: Adrian Bunk Date: Sun Feb 17 23:59:48 2008 +0200 [MIPS] RM: fix EISA=n compilation This patch fixes the following build error with CONFIG_EISA=n caused by commit 231a35d37293ab88d325a9cb94e5474c156282c0: <-- snip --> ... LD .tmp_vmlinux1 arch/mips/sni/built-in.o: In function `snirm_a20r_setup_devinit': a20r.c:(.init.text+0x42c): undefined reference to `sni_eisa_root_init' a20r.c:(.init.text+0x42c): relocation truncated to fit: R_MIPS_26 against `sni_eisa_root_init' arch/mips/sni/built-in.o: In function `snirm_setup_devinit': rm200.c:(.init.text+0x52c): undefined reference to `sni_eisa_root_init' rm200.c:(.init.text+0x52c): relocation truncated to fit: R_MIPS_26 against `sni_eisa_root_init' make[1]: *** [.tmp_vmlinux1] Error 1 <-- snip --> Signed-off-by: Adrian Bunk Acked-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit 40d7c1aa6153605b3eae23990d4c2d4e8f807cb0 Author: Ralf Baechle Date: Tue Feb 19 16:01:20 2008 +0000 [MIPS] PCI: Coding style fixes for pcibios_enable_resources. Signed-off-by: Ralf Baechle commit 986c94854e5615000f39edfc788dffff7035ec7d Author: Ralf Baechle Date: Tue Feb 19 15:59:33 2008 +0000 [MIPS] PCI: Port i386 PCI fixes. The MIPS version of pcibios_enalbe_resources did not have the fixes from ed6d14f9760857c745206c978b80352fc09cfd19 yet which under circumstances similar to x86 might result in failures. Signed-off-by: Ralf Baechle commit dc9175be76084367974732cac55d7b097c79d474 Author: Adrian Bunk Date: Sun Feb 17 22:09:51 2008 +0200 [MIPS] Qemu: finish platform removal Two files were omitted from the recent removal of the qemu platform. Signed-off-by: Adrian Bunk Signed-off-by: Ralf Baechle commit 6783fe6253045bf5cbdf25e4be296f91437c5523 Author: Dmitri Vorobiev Date: Tue Feb 19 00:02:37 2008 +0300 [MIPS] Wire up the timerfd_*() o32 system calls This patch enables the system calls timerfd_create(), timerfd_settime() and timerfd_gettime() for MIPS architecture. Please see the following Bugzilla entry for more details: http://bugzilla.kernel.org/show_bug.cgi?id=10038 This was tested using a Malta 4Kc board in both little-endian and big-endian modes. The unit test program is available from the URL above. Signed-off-by: Dmitri Vorobiev [Ralf: Added N64, N32 and O32 bits on 64-bit kernels.] Signed-off-by: Ralf Baechle commit 84502f817b0b28f37e0a7355c75f05bb489d3a01 Author: Thomas Bogendoerfer Date: Mon Feb 18 22:38:32 2008 +0100 [MIPS] IP28: Add defconfig file Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit 345599ab12729ce1df26f20a42a1ffd8eb7e8a0a Author: Thiemo Seufer Date: Thu Feb 14 16:58:25 2008 +0000 [MIPS] SB1: Fix CONFIG_SIBYTE_DMA_PAGEOPS build failure. Fix type mismatch warnings for 64-bit kernel builds which trigger -Werror. The problem affects only SB-1 kernels with CONFIG_SIBYTE_DMA_PAGEOPS enabled. Signed-off-by: Thiemo Seufer Signed-off-by: Ralf Baechle commit af0c4f649dacb62d756de0f20914b3e90a3f21c4 Author: Ralf Baechle Date: Mon Feb 18 18:49:48 2008 +0000 [MIPS] BCM1480: Remove stray function call resulting in infinite recursion Signed-off-by: Ralf Baechle commit 9a74b3eb22f2d67a5681301f52aca5b7703382c8 Author: Ralf Baechle Date: Sat Feb 16 22:34:25 2008 +0000 [MIPS] Fix buggy invocations of kmap_coherent() kmap_coherent will only work correctly if the page it is called on is not marked dirty. If it's dirty the kernel address of the page should be used instead of a temporary mapping. Signed-off-by: Ralf Baechle commit c42d95d6c49ce9c678a9d10aeb3f526c850d66dc Author: Thomas Koeller Date: Mon Feb 11 23:42:12 2008 +0100 [MIPS] Fix broken rm7000/rm9000 interrupt handling Properly acknowledge RM7K and RM9K interrupts. Before this, interrupts were permanently masked after their first occurrence, making them non-functional. Signed-off-by: Thomas Koeller Signed-off-by: Ralf Baechle commit 2eaa7ec286db54cc1a864565ed9367966743bcbd Author: Ralf Baechle Date: Mon Feb 11 14:51:40 2008 +0000 [MIPS] Handle I-cache coherency in flush_cache_range() So far flush_cache_range() did't consider the I-cache largely because it did rarely ever matter to real world code. This was working primarily because normally code and data are don't share the same pages - with the exception of MIPS16 code which uses address constants embedded between the code. The following sequence of events may break the code: o MIPS16 executable being loaded o dynamic linker relocates the address constants embedded into the code: o Uses mprotect(2) to make code pages PROT_READ|PROT_WRITE o Performs the actual relocations by writing to the pages which likely are COW. Because no PROT_EXEC is set I-cache coherence will not be considered. o Uses mprotect(2) to switch code pages back to PROT_READ|PROT_EXEC. This results in a call to flush_cache_range() which also does not consider I-caches. o => executing the page just having been relocated may now result in the I-cache getting refilled with stale data from memory. Signed-off-by: Ralf Baechle commit eaf7943cc53d9688aa10267a226165356e956ec5 Author: Ralf Baechle Date: Fri Feb 8 13:13:27 2008 +0000 [MIPS] IP27: Add missing ~ in DMA code. Harmless since this function is not being called on I/O coherent systems such as IP27. Signed-off-by: Ralf Baechle commit 0e568536d94256819f17662c26c82a42e44a7a7c Author: Pavel Emelyanov Date: Mon Feb 4 23:44:24 2008 -0800 [MIPS] Use find_task_by_vpid in system calls There are some places left in mips, that lookup task in initial namespace, while the code doing so gets the pid from the user space and thus must treat it as virtual. Signed-off-by: Pavel Emelyanov Cc: "Eric W. Biederman" Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Ralf Baechle commit aa3f98037ce3bcf850bb41f7530754d27481a792 Merge: f6c4276... e5fa443... Author: Linus Torvalds Date: Tue Feb 19 08:04:23 2008 -0800 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] qdio: FCP/SCSI write I/O stagnates on LPAR [S390] Fix futex_atomic_cmpxchg_std inline assembly. [S390] dcss: Fix Unlikely(x) != y [S390] sclp: clean up send/receive naming scheme [S390] etr: fix compile error on !SMP [S390] qdio: fix qdio_activate timeout handling. [S390] Initialize per cpu lowcores on cpu hotplug. [S390] find bit corner case. [S390] dasd: fix locking in __dasd_device_process_final_queue [S390] Make sure enabled wait psw is loaded in default_idle. [S390] Let NR_CPUS default to 32/64 on s390/s390x. [S390] cio: Do timed recovery on workqueue. [S390] cio: Remember to initialize recovery_lock. commit f6c427663a158056cd8ca71c01f30653e4b313f7 Merge: 9ef38ea... fa2fc7f... Author: Linus Torvalds Date: Tue Feb 19 08:03:02 2008 -0800 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: libata: implement drain buffers libata: eliminate the home grown dma padding in favour of block: clear drain buffer if draining for write command block: implement request_queue->dma_drain_needed block: add request->raw_data_len block: update bio according to DMA alignment padding libata: update ATAPI overflow draining elevator: make elevator_get() attempt to load the appropriate module cfq-iosched: add hlist for browsing parallel to the radix tree block: make blk_rq_map_user() clear ->bio if it unmaps it fs/block_dev.c: remove #if 0'ed code make struct def_blk_aops static make blk_settings_init() static make blk_ioc_init() static make blk-core.c:request_cachep static again commit 9ef38eaf4289a99beb3bc13d1ded220a68cc8877 Merge: cf91b82... 7f4da47... Author: Linus Torvalds Date: Tue Feb 19 08:02:04 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] HP ProLiant WatchDog driver [WATCHDOG] blackfin Watchdog driver: relocate all strings used in __init functions to __initdata [WATCHDOG] Convert mtx1 wdt to be a platform device and use generic GPIO API [WATCHDOG] Add support for SB1 hardware watchdog commit cf91b824bb2bdea8a47bf6bb94cf3a438683e5eb Merge: b694092... 89d694b... Author: Linus Torvalds Date: Tue Feb 19 07:54:02 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-genirq * git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-genirq: genirq: do not leave interupts enabled on free_irq genirq: spurious.c: use time_* macros commit b69409279c4c960fcd1575bcf80f2a0ca414ca93 Merge: 07ce198... f6d091e... Author: Linus Torvalds Date: Tue Feb 19 07:53:28 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Add regs_return_value(). [SPARC64]: Kill pcic_present(). [SPARC]: Kill 'prom_palette'. [ATYFB]: Kill 'prom_palette' sparc code. [SPARC64]: Kill 'prom_keyboard'. [SPARC]: Kill extern decl of 'panic_setup'. [SPARC64]: Delete 'boot_flags'. [SPARC64]: Kill unused function 'kernel_enter_debugger'. [SPARC64] arch/sparc64/kernel/unaligned.c: Use time_* macros [SPARC64]: Always register a PROM based early console. [SPARC64]: Update defconfig. [SPARC64]: Add -mtune=ultrasparc3 if possible. [SPARC64]: Remove Makefile code for ancient gcc and binutils. [SPARC64]: Remove DEBUG_BOOTMEM. [SPARC64]: Use shorter "get_zeroed_page" call. [SPARC]: Use shorter form of "get_zeroed_page". [SPARC]: video/cg14.c and video/sbuslib.c build fixes commit 07ce198a1eb3431d04a6d59ea9fb7b71f21e33b1 Merge: 4bc87e6... a442585... Author: Linus Torvalds Date: Tue Feb 19 07:52:45 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (60 commits) [NIU]: Bump driver version and release date. [NIU]: Fix BMAC alternate MAC address indexing. net: fix kernel-doc warnings in header files [IPV6]: Use BUG_ON instead of if + BUG in fib6_del_route. [IPV6]: dst_entry leak in ip4ip6_err. (resend) bluetooth: do not move child device other than rfcomm bluetooth: put hci dev after del conn [NET]: Elminate spurious print_mac() calls. [BLUETOOTH] hci_sysfs.c: Kill build warning. [NET]: Remove MAC_FMT net/8021q/vlan_dev.c: Use print_mac. [XFRM]: Fix ordering issue in xfrm_dst_hash_transfer(). [BLUETOOTH] net/bluetooth/hci_core.c: Use time_* macros [IPV6]: Fix hardcoded removing of old module code [NETLABEL]: Move some initialization code into __init section. [NETLABEL]: Shrink the genl-ops registration code. [AX25] ax25_out: check skb for NULL in ax25_kick() [TCP]: Fix tcp_v4_send_synack() comment [IPV4]: fix alignment of IP-Config output Documentation: fix tcp.txt ... commit 4bc87e62775052aac0be7574d5f84ff06f61c6b4 Author: Casey Schaufler Date: Fri Feb 15 15:24:25 2008 -0800 Smack: unlabeled outgoing ambient packets Smack uses CIPSO labeling, but allows for unlabeled packets by specifying an "ambient" label that is applied to incoming unlabeled packets. Because the other end of the connection may dislike IP options, and ssh is one know application that behaves thus, it is prudent to respond in kind. This patch changes the network labeling behavior such that an outgoing packet that would be given a CIPSO label that matches the ambient label is left unlabeled. An "unlbl" domain is added and the netlabel defaulting mechanism invoked rather than assuming that everything is CIPSO. Locking has been added around changes to the ambient label as the mechanisms used to do so are more involved. Signed-off-by: Casey Schaufler Acked-by: Paul Moore Signed-off-by: Linus Torvalds commit 156fbc3fbe4ab640297b1ae2092821363840aeb6 Author: Arjan van de Ven Date: Mon Feb 18 09:58:45 2008 -0800 x86: fix page_is_ram() thinko page_is_ram() has a special case for the 640k-1M bios area, however due to a thinko the special case checks the e820 table entry and not the memory the user has asked for. This patch fixes the bug. [ mingo@elte.hu: this too is better solved in the e820 space, but those fixes are too intrusive for v2.6.25. ] Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit d8a9e6a51ec58486f850e3606e3fcb86b5b7da41 Author: Arjan van de Ven Date: Mon Feb 18 09:54:33 2008 -0800 x86: fix WARN_ON() message: teach page_is_ram() about the special 4Kb bios data page This patch teaches page_is_ram() about the fact that the first 4Kb of memory are special on x86, even though the E820 table normally doesn't exclude it. This fixes the WARN_ON() reported by Laurent Riffard who was also very helpful in diagnosing the issue. [ mingo@elte.hu: we are working on doing this properly in the e820 space, but for 2.6.25 this is the better fix. ] Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 7c6357da1185d286adaa4452d829ac9b27c4d12f Author: Ahmed S. Darwish Date: Mon Feb 18 00:59:54 2008 +0200 x86: i8259A: remove redundant irq_descinitialization Remove redundant irq_desc[NR_IRQS] element initialization in init_ISA_irqs(). irq_desc[NR_IRQS] is already statically initialized with the same values in kernel/irq/handle.c . besides the clean-up value this also saves some space: text data bss dec hex filename 1389 356 14 1759 6df i8259_32.o.before 1325 356 14 1695 69f i8259_32.o.after Signed-off-by: Ahmed S. Darwish Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 3f85d63ea4ff922f6abdb509f4aaf6993b3273a3 Author: Sam Ravnborg Date: Sat Feb 16 12:36:10 2008 +0100 x86: fix vdso_install breaks user "make install" I suggest to make the vdso_install step independent as in following patch. This solves the issue at ahnd and still gives us the posibility to install the files should they be needed. Signed-off-by: Sam Ravnborg Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit fd59e9e9c8e35cd2a1834c0d1f67aedf0c5c68c2 Author: Ingo Molnar Date: Sun Feb 17 20:20:24 2008 +0100 x86: change IO delay back to 0x80 change back the IO delay to 0x80. Alan says that 0xed is known to break some older boxes, and given that the get-rid-of-outb-APIs efforts are well underway we should just let them be finished. Signed-off-by: Ingo Molnar Acked-by: Alan Cox Signed-off-by: Thomas Gleixner commit 85c42d0dbb129b6bff560dacabec753677d64081 Author: Cyrill Gorcunov Date: Sun Feb 17 18:17:18 2008 +0300 x86: lds - Use THREAD_SIZE instead of numeric constant Though we use PDA for regular task stack but that is not acceptable for init_task wich is special one. We still have to allocate init_task's stack in that manner. Signed-off-by: Cyrill Gorcunov Acked-by: Sam Ravnborg Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 3cdac41f2090ad9013dfefab7399b1debfb9275a Author: Cyrill Gorcunov Date: Sun Feb 17 18:17:17 2008 +0300 x86: lds - Use PAGE_SIZE instead of numeric constant It's much better to use PAGE_SIZE then magic 4096 (though it's almost synonym in most cases on x86 but not for *all* cases ;) Signed-off-by: Cyrill Gorcunov Acked-by: Sam Ravnborg Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit bbb1e57a1c0b732cfeb727bed7c61e80a79c6479 Author: Cyrill Gorcunov Date: Sat Feb 9 00:49:13 2008 +0300 x86 cleanup: suspend_asm_64.S - use X86_CR4_PGE instead of numeric value By including we're allowed to use X86_CR4_PGE instead of numeric constant. md5 sums of compiled files are differ due to this inclusion but .text section remains the same. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 248fb89c12228190cecea553353e16cf21a67dc3 Author: Nick Andrew Date: Sun Feb 17 18:01:42 2008 +1100 x86: docs fixes to Documentation/i386/IO-APIC.txt Clean up spelling and grammar of IO-APIC.txt Signed-off-by: Nick Andrew Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit d8ff0bbf564f7ebf6c33ef6662d8f00c7d43ba80 Author: Marcin Slusarz Date: Fri Feb 1 21:31:51 2008 +0100 x86: fix printout ugliness in cpu info printk fix print_cpu_info, because it produced on boot: CPU: <6>AMD Athlon(tm) 64 Processor 3200+ stepping 00 instead of: CPU: AMD Athlon(tm) 64 Processor 3200+ stepping 00 (broken since 04e1ba852132c9ad006affcd5b8c8606295170b0 - x86: cleanup kernel/setup_64.c) Signed-off-by: Marcin Slusarz Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit d76c1ae4d1f4f322d47e7c6e47a277384ba9d9cb Author: Ingo Molnar Date: Sun Feb 17 16:48:25 2008 +0100 x86: clean up csum-wrappers_64.c some more no code changed: arch/x86/lib/csum-wrappers_64.o: text data bss dec hex filename 839 0 0 839 347 csum-wrappers_64.o.before 839 0 0 839 347 csum-wrappers_64.o.after md5: b31994226c33e0b52bef5a0e110b84b0 csum-wrappers_64.o.before.asm b31994226c33e0b52bef5a0e110b84b0 csum-wrappers_64.o.after.asm Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 0df025b709ae09081e21545761a249ec2d969689 Author: Paolo Ciarrocchi Date: Sun Feb 17 14:56:50 2008 +0100 x86: coding style fixes in arch/x86/lib/csum-wrappers_64.c no code changed: arch/x86/lib/csum-wrappers_64.o: text data bss dec hex filename 839 0 0 839 347 csum-wrappers_64.o.before 839 0 0 839 347 csum-wrappers_64.o.after md5: b31994226c33e0b52bef5a0e110b84b0 csum-wrappers_64.o.before.asm b31994226c33e0b52bef5a0e110b84b0 csum-wrappers_64.o.after.asm Signed-off-by: Paolo Ciarrocchi Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 4b44f810166fb83ad1a817ee599006a7157ee54c Author: Paolo Ciarrocchi Date: Sun Feb 17 14:41:16 2008 +0100 x86: coding style fixes in arch/x86/lib/io_64.c This simple patch makes the file error free (according to checkpatch.pl) no code changed: arch/x86/lib/io_64.o: text data bss dec hex filename 308 0 0 308 134 io_64.o.before 308 0 0 308 134 io_64.o.after md5: 3c64f9ed83d091678e849b36ca27bee3 io_64.o.before.asm 3c64f9ed83d091678e849b36ca27bee3 io_64.o.after.asm Signed-off-by: Paolo Ciarrocchi Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit e43eb7bab6e82e1aa93ce4d39546c54347a68077 Author: Ingo Molnar Date: Thu Feb 14 08:38:49 2008 +0100 x86: exclude vsyscall files from stackprotect Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit e00fc542eb694e448249361ef63c190e74f53574 Author: H. Peter Anvin Date: Tue Feb 19 16:18:32 2008 +0100 x86: add pgd_large() on 64-bit, for consistency In order to have it at all levels, add pgd_large() which only returns 0. Signed-off-by: H. Peter Anvin Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 0fd707ef724a9e8b4a2ddfd3da4968c57e8614ff Author: Mike Travis Date: Fri Feb 8 15:37:42 2008 -0800 x86: minor cleanup of comments in processor.h Signed-off-by: Mike Travis Cc: Christoph Lameter Cc: Jack Steiner Cc: linux-mm@kvack.org Cc: Andrew Morton Cc: Andi Kleen Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 6871b76fb5197a4db28de7116baf834fa36b7bfe Author: Sam Ravnborg Date: Sun Feb 17 13:23:00 2008 +0100 x86: annotate pci/common.s:pci_scan_bus_with_sysdata with __devinit Signed-off-by: Sam Ravnborg Cc: Sam Ravnborg Cc: Andrew Morton Cc: H. Peter Anvin Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit da5968ae305ab5209ebc2502ef6a8fbf2cce536c Author: Sam Ravnborg Date: Sun Feb 17 13:22:59 2008 +0100 x86: fix section mismatch in head_64.S:initial_code initial_code are initially used to hold a function pointer from __init and later from __cpuinit. This confuses modpost and changing initial_code to REFDATA silence the warning. (But now we do not discard the variable anymore). Signed-off-by: Sam Ravnborg Cc: Sam Ravnborg Cc: Andrew Morton Cc: H. Peter Anvin Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit d01b9ad56e2cc7b6204b89ef10a53e78d70b5877 Author: Sam Ravnborg Date: Sun Feb 17 13:22:58 2008 +0100 x86: fix section mismatch in srat_64.c:reserve_hotadd reserve_hotadd() are only used by __init acpi_numa_memory_affinity_init(). Annotate reserve_hotadd() with __init is the trivial fix. Signed-off-by: Sam Ravnborg Cc: Sam Ravnborg Cc: Andrew Morton Cc: H. Peter Anvin Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 177c7715cd94a66d951fcafbacedd278a2d6fcab Author: Sam Ravnborg Date: Sun Feb 17 13:22:49 2008 +0100 x86: fix section mismatch warning in topology.c:arch_register_cpu arch_register_cpu() is only defined for HOTPLUG_CPU code so simple fix is to ignore references by annotating the function __ref. Signed-off-by: Sam Ravnborg Cc: Sam Ravnborg Cc: Andrew Morton Cc: H. Peter Anvin Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 04d733bd3588fda8934591fdb0a3d719c5ec8fa0 Author: Sam Ravnborg Date: Sun Feb 17 13:22:47 2008 +0100 x86: fix section mismatch in setup_64.c:srat_detect_node srat_detect_node() is only used by __cpuinit init_intel(). So the trivial fix is to annotate srat_detect_node() with __cpuinit. Signed-off-by: Sam Ravnborg Cc: Sam Ravnborg Cc: Andrew Morton Cc: H. Peter Anvin Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 08acb672624ece2d9234817570a0b3332cc8dae3 Author: Sam Ravnborg Date: Sun Feb 17 13:22:46 2008 +0100 x86: fix section mismatch warning in setup_64.c:nearby_node nearby_node() were only used by __cpuinit amd_detect_cmp() So annotating nearby_node() __cpuinit was the trivial fix. Signed-off-by: Sam Ravnborg Cc: Sam Ravnborg Cc: Andrew Morton Cc: H. Peter Anvin Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit a062bae9c443a8c0ab17f231eb83690dfb897524 Author: Li Zefan Date: Sun Feb 3 15:40:30 2008 +0800 x86: fix compile warning building without CONFIG_SYSCTL arch/x86/kernel/nmi_64.c:50: warning: 'unknown_nmi_panic_callback' declared 'static' but never defined This patch also fixes nmi_32.c Signed-off-by: Li Zefan Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 8e31c2ac1101b09ad6c6d3539b032d312cc3302b Author: Andi Kleen Date: Mon Feb 11 10:50:21 2008 +0100 x86: CPA: remove BUG_ON for LRU/Compound pages New implementation does not use lru for anything so there is no need to reject pages that are in the LRU. Similar for compound pages (which were checked because they also use page->lru) [ tglx@linutronix.de: removed unused variable ] Signed-off-by: Andi Kleen Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit aa65af3f92da39a686c8a3479426d15854fa27ab Author: Adrian Bunk Date: Wed Feb 13 23:29:55 2008 +0200 x86: don't make swapper_pg_fixmap global Signed-off-by: Adrian Bunk Cc: Ian Campbell Cc: hpa@zytor.com Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit f7f3d791e61d7baf8b0aee0384fdd469c0d2ac9b Author: Adrian Bunk Date: Wed Feb 13 23:29:53 2008 +0200 x86: don't make irq_return global Signed-off-by: Adrian Bunk Cc: hpa@zytor.com Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit d3cfeb4fbe2a5e88fd5f98892f4dc49dcab8a9e7 Author: Adrian Bunk Date: Wed Feb 13 23:29:42 2008 +0200 x86: unexport io_delay_type Signed-off-by: Adrian Bunk Cc: hpa@zytor.com Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 148a142495f40d3da729d62cb7127ccb26223106 Author: Adrian Bunk Date: Wed Feb 13 23:29:33 2008 +0200 x86: make mxcsr_feature_mask static again Signed-off-by: Adrian Bunk Cc: Roland McGrath Cc: hpa@zytor.com Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit ecaea42eb8507735a97a496cc5068de06542e8b2 Author: Harvey Harrison Date: Wed Feb 13 13:26:13 2008 -0800 x86: sparse warning in efi.c Yes, it should. Signed-off-by: Harvey Harrison Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit cc7e73f35dccba7503bdaf40bb5189225697664d Author: Harvey Harrison Date: Wed Feb 13 13:26:39 2008 -0800 x86: sparse error in efi_32.c arch/x86/kernel/efi_32.c:42:6: warning: symbol 'efi_call_phys_prelog' was not declared. Should it be static? arch/x86/kernel/efi_32.c:84:6: warning: symbol 'efi_call_phys_epilog' was not declared. Should it be static? Signed-off-by: Harvey Harrison Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit f1452d424dc0e079fb97af8cb8d3a0f7b5fddd46 Author: Harvey Harrison Date: Thu Feb 14 15:23:53 2008 -0800 x86, kprobes: remove sparse warnings from x86 arch/x86/kernel/kprobes.c:584:16: warning: symbol 'kretprobe_trampoline_holder' was not declared. Should it be static? arch/x86/kernel/kprobes.c:676:6: warning: symbol 'trampoline_handler' was not declared. Should it be static? Make them static and add the __used attribute, approach taken from the arm kprobes implementation. kretprobe_trampoline_holder uses inline assemly to define the global symbol kretprobe_trampoline, but nothing ever calls the holder explicitly. trampoline handler is only called from inline assembly in the same file, mark it used and static. Signed-off-by: Harvey Harrison Acked-by: Masami Hiramatsu Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 08cd93f9e11ac8c3e42c72debe7dc55a761149c2 Author: Adrian Bunk Date: Thu Feb 14 23:23:37 2008 +0200 remove mca-pentium This patch removes the mca-pentium boot option that was a noop. besides the source code cleanup factor, this saves some text as well: arch/x86/kernel/cpu/bugs.o: text data bss dec hex filename 651 77 4 732 2dc bugs.o.before 631 53 4 688 2b0 bugs.o.after Signed-off-by: Adrian Bunk Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit e5fa443ea05f71b5253818890c6d32174cbab36f Author: Ursula Braun Date: Tue Feb 19 15:29:35 2008 +0100 [S390] qdio: FCP/SCSI write I/O stagnates on LPAR If running on LPAR, qdio might overlook an incoming buffer in certain scenarios. The patch makes sure that incoming buffers are detected immediately in all situations. Signed-off-by: Ursula Braun Signed-off-by: Martin Schwidefsky commit d5b02b3ff1d9a2e1074f559c84ed378cfa6fc3c0 Author: Heiko Carstens Date: Tue Feb 19 15:29:34 2008 +0100 [S390] Fix futex_atomic_cmpxchg_std inline assembly. Add missing exception table entry so that the kernel can handle proctection exceptions as well on the cs instruction. Currently only specification exceptions are handled correctly. The missing entry allows user space to crash the kernel. Cc: stable Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 39f73b2886be3a255d8f4cd669c8c7e7957afbd9 Author: Roel Kluin <12o3l@tiscali.nl> Date: Tue Feb 19 15:29:33 2008 +0100 [S390] dcss: Fix Unlikely(x) != y Fix Unlikely(x) != y Cc: Gerald Schaefer Cc: Stefan Weinhuber Cc: Carsten Otte Signed-off-by: Roel Kluin <12o3l@tiscali.nl> Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit d082d3ce32705a92bd86c2b061d6b0827a40a5b1 Author: Peter Oberparleiter Date: Tue Feb 19 15:29:32 2008 +0100 [S390] sclp: clean up send/receive naming scheme Make state change events adjust the correct mask by cleaning up naming inconsistencies. Also remove chance for lockup by removing unnecessary mask related check before reading events. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky commit 06cb92ffe418c4a9d5a70c5dff4f283e8e8df6e4 Author: Heiko Carstens Date: Tue Feb 19 15:29:31 2008 +0100 [S390] etr: fix compile error on !SMP Since a5fbb6d1064be885d2a6b82f625186753cf74848 "KVM: fix !SMP build error" smp_call_function isn't a define anymore that folds into nothing but a define that calls up_smp_call_function with all parameters. Hence we cannot #ifdef out the unused code anymore... This seems to be the preferred method, so do this for s390 as well. arch/s390/kernel/time.c: In function 'etr_sync_clock': arch/s390/kernel/time.c:825: error: 'clock_sync_cpu_start' undeclared arch/s390/kernel/time.c:862: error: 'clock_sync_cpu_end' undeclared Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit b32ecdb7257821e5e42d9b9b2a427b02c89f85e7 Author: Heiko Carstens Date: Tue Feb 19 15:29:30 2008 +0100 [S390] qdio: fix qdio_activate timeout handling. Current code in qdio_activate waits for at least 5 seconds until it returns. It may return earlier if an error occurs, but not if everything is ok. This large timeout value became visible with commit dfa77f611ff295598e218aa0eb6efa73a5cf26d0 "qdio: set QDIO_ACTIVATE_TIMEOUT to 5s", which intended to fix the timeout value which was zero. In turn setting an FCP adapter online took 5 seconds. In practice waiting for 5ms before continuing is sufficient as pointed out by Utz Bacher and Cornelia Huck. Cc: Utz Bacher Cc: Jan Glauber Cc: Ursula Braun Cc: Martin Peschke Acked-by: Cornelia Huck Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 591bb4f637e48950d35e2ca01e6b962c519d96e5 Author: Heiko Carstens Date: Tue Feb 19 15:29:29 2008 +0100 [S390] Initialize per cpu lowcores on cpu hotplug. Just copy the first 512 read-only bytes of the current cpu lowcore if a new cpu gets onlined. The rest is zeroed out and must be explicitly initialized. Current code just copies the entire lowcore and initializes the needed fields. This should reveal bugs in future enhancements quite early. Also when the lowcore of the first cpu is replaced this is now done atomically (no interrupts, no machine checks). Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit a22fb7ff1259e6ee87d0ba3559c9f7b7d0cb20d2 Author: Martin Schwidefsky Date: Tue Feb 19 15:29:28 2008 +0100 [S390] find bit corner case. Fix [ext2_]find_first_[zero_]bit for the corner case of an all clear or all set bit field by always handling that last word of the bit field with __ffz_word/__ffs_word. Signed-off-by: Martin Schwidefsky commit 03513bccad33667ed738cfd96dc5757e539e0bdb Author: Stefan Weinhuber Date: Tue Feb 19 15:29:27 2008 +0100 [S390] dasd: fix locking in __dasd_device_process_final_queue After setting the status of the cqr and releasing the lock for the block cqr queue, we call the cqr callback function, which will usually just trigger the dasd_block_tasklet. But when the tasklet is already running the cqr might be processed before we invoke the callback function. In rare cases the callback pointer may already be invalid by the time we want to call it, which will result in a panic. Solution: Call the callback function first and then release the lock. Signed-off-by: Stefan Weinhuber Signed-off-by: Martin Schwidefsky commit 11ab244c9faead91683a12e4cb10d26b279bb4aa Author: Heiko Carstens Date: Tue Feb 19 15:29:26 2008 +0100 [S390] Make sure enabled wait psw is loaded in default_idle. If both NO_IDLE_HZ and VIRT_TIMER are disabled default_idle won't load an enabled wait psw and busy loop instead. This is because the idle_chain is empty and the return value of atomic_notifier_call_chain will be NOTIFY_DONE, which causes default_idle to return instead of loading an enabled wait psw. Fix this by calling __atomic_notifier_call_chain instead and add proper return value handling. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 057c5cb35ece6ae3a4c2cb849f3948c5ad6add32 Author: Heiko Carstens Date: Tue Feb 19 15:29:25 2008 +0100 [S390] Let NR_CPUS default to 32/64 on s390/s390x. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 4c629727cefe45abb2f7459836bfc4b41c5e55ba Author: Cornelia Huck Date: Tue Feb 19 15:29:24 2008 +0100 [S390] cio: Do timed recovery on workqueue. We can't do our recovery in softirq context, so we schedule it from our timer function. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 486d0a0079eb782cdb73f18246e26076c615a020 Author: Cornelia Huck Date: Tue Feb 19 15:29:23 2008 +0100 [S390] cio: Remember to initialize recovery_lock. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit fa2fc7f4813bfec1ae3232d49e3befbd601e8a6f Author: James Bottomley Date: Tue Feb 19 11:36:57 2008 +0100 libata: implement drain buffers This just updates the libata slave configure routine to take advantage of the block layer drain buffers. It also adjusts the size lengths in the atapi code to add the drain buffer to the DMA length so the driver knows it can rely on it. I suspect I should also be checking for AHCI as well as ATA_DEV_ATAPI, but I couldn't see how to do that easily. tj: * atapi_drain_needed() added such that draining is applied to only misc ATAPI commands. * q->bounce_gfp used when allocating drain buffer. * Now duplicate ATAPI PIO drain logic dropped. * ata_dev_printk() used instead of sdev_printk(). Signed-off-by: James Bottomley Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit dde2020754aeb14e17052d61784dcb37f252aac2 Author: James Bottomley Date: Tue Feb 19 11:36:56 2008 +0100 libata: eliminate the home grown dma padding in favour of that provided by the block layer ATA requires that all DMA transfers begin and end on word boundaries. Because of this, a large amount of machinery grew up in ide to adjust scatterlists on this basis. However, as of 2.5, the block layer has a dma_alignment variable which ensures both the beginning and length of a DMA transfer are aligned on the dma_alignment boundary. Although the block layer does adjust the beginning of the transfer to ensure this happens, it doesn't actually adjust the length, it merely makes sure that space is allocated for transfers beyond the declared length. The upshot of this is that scatterlists may be padded to any size between the actual length and the length adjusted to the dma_alignment safely knowing that memory is allocated in this region. Right at the moment, SCSI takes the default dma_aligment which is on a 512 byte boundary. Note that this aligment only applies to transfers coming in from user space. However, since all kernel allocations are automatically aligned on a minimum of 32 byte boundaries, it is safe to adjust them in this manner as well. tj: * Adjusting sg after padding is done in block layer. Make libata set queue alignment correctly for ATAPI devices and drop broken sg mangling from ata_sg_setup(). * Use request->raw_data_len for ATAPI transfer chunk size. * Killed qc->raw_nbytes. * Separated out killing qc->n_iter. Signed-off-by: James Bottomley Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit db0a2e0099be3a1cff55879225881465f16c67d3 Author: Tejun Heo Date: Tue Feb 19 11:36:55 2008 +0100 block: clear drain buffer if draining for write command Clear drain buffer before chaining if the command in question is a write. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit 2fb98e8414c42cb14698833aac640b143b9ade4f Author: Tejun Heo Date: Tue Feb 19 11:36:53 2008 +0100 block: implement request_queue->dma_drain_needed Draining shouldn't be done for commands where overflow may indicate data integrity issues. Add dma_drain_needed callback to request_queue. Drain buffer is appened iff this function returns non-zero. Signed-off-by: Tejun Heo Cc: James Bottomley Signed-off-by: Jens Axboe commit 6b00769fe1502b4ad97bb327ef7ac971b208bfb5 Author: Tejun Heo Date: Tue Feb 19 11:36:35 2008 +0100 block: add request->raw_data_len With padding and draining moved into it, block layer now may extend requests as directed by queue parameters, so now a request has two sizes - the original request size and the extended size which matches the size of area pointed to by bios and later by sgs. The latter size is what lower layers are primarily interested in when allocating, filling up DMA tables and setting up the controller. Both padding and draining extend the data area to accomodate controller characteristics. As any controller which speaks SCSI can handle underflows, feeding larger data area is safe. So, this patch makes the primary data length field, request->data_len, indicate the size of full data area and add a separate length field, request->raw_data_len, for the unmodified request size. The latter is used to report to higher layer (userland) and where the original request size should be fed to the controller or device. Signed-off-by: Tejun Heo Cc: James Bottomley Signed-off-by: Jens Axboe commit 40b01b9bbdf51ae543a04744283bf2d56c4a6afa Author: Tejun Heo Date: Tue Feb 19 11:35:38 2008 +0100 block: update bio according to DMA alignment padding DMA start address and transfer size alignment for PC requests are achieved using bio_copy_user() instead of bio_map_user(). This works because bio_copy_user() always uses full pages and block DMA alignment isn't allowed to go over PAGE_SIZE. However, the implementation didn't update the last bio of the request to make this padding visible to lower layers. This patch makes blk_rq_map_user() extend the last bio such that it includes the padding area and the size of area pointed to by the request is properly aligned. Signed-off-by: Tejun Heo Cc: James Bottomley Signed-off-by: Jens Axboe commit 56c819df77f96c3fc0c2a979e12b478403728790 Author: Tejun Heo Date: Tue Feb 19 11:35:37 2008 +0100 libata: update ATAPI overflow draining For misc ATAPI commands which transfer variable length data to the host, overflow can occur due to application or hardware bug. Such overflows can be ignored safely as long as overflow data is properly drained. libata HSM implementation has this implemented in __atapi_pio_bytes() and recently updated for 2.6.24-rc but it requires further improvements. Improve drain logic such that... * Report overflow errors using ehi desc mechanism instead of printing directly. * Properly calculate the number of bytes to be drained considering actual number of consumed bytes for partial draining. Signed-off-by: Tejun Heo Acked-by: Albert Lee Signed-off-by: Jens Axboe commit 89d694b9dbe769ca1004e01db0ca43964806a611 Author: Thomas Gleixner Date: Mon Feb 18 18:25:17 2008 +0100 genirq: do not leave interupts enabled on free_irq The default_disable() function was changed in commit: 76d2160147f43f982dfe881404cfde9fd0a9da21 genirq: do not mask interrupts by default It removed the mask function in favour of the default delayed interrupt disabling. Unfortunately this also broke the shutdown in free_irq() when the last handler is removed from the interrupt for those architectures which rely on the default implementations. Now we can end up with a enabled interrupt line after the last handler was removed, which can result in spurious interrupts. Fix this by adding a default_shutdown function, which is only installed, when the irqchip implementation does provide neither a shutdown nor a disable function. [@stable: affected versions: .21 - .24 ] Pointed-out-by: Michael Hennerich Signed-off-by: Thomas Gleixner Acked-by: Ingo Molnar Cc: stable@kernel.org Tested-by: Michael Hennerich commit 188fd89d539d899bfca2bc83534e5508e0161139 Author: S.Caglar Onur Date: Thu Feb 14 17:36:51 2008 +0200 genirq: spurious.c: use time_* macros The functions time_before, time_before_eq, time_after, and time_after_eq are more robust for comparing jiffies against other values. So following patch implements usage of the time_after() macro, defined at linux/jiffies.h, which deals with wrapping correctly Signed-off-by: S.Caglar Onur Acked-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit e164094964e6e20fe7fce418e06a9dce952bb7a4 Author: Jens Axboe Date: Tue Feb 19 10:20:37 2008 +0100 elevator: make elevator_get() attempt to load the appropriate module Currently we fail if someone requests a valid io scheduler, but it's modular and not currently loaded. That can happen from a driver init asking for a different scheduler, or online switching through sysfs as requested by a user. This patch makes elevator_get() request_module() to attempt to load the appropriate module, instead of requiring that done manually. Signed-off-by: Jens Axboe commit ffc4e7595734cf768fa60cea8a4d545dfef8231a Author: Jens Axboe Date: Tue Feb 19 10:02:29 2008 +0100 cfq-iosched: add hlist for browsing parallel to the radix tree It's cumbersome to browse a radix tree from start to finish, especially since we modify keys when a process exits. So add a hlist for the single purpose of browsing over all known cfq_io_contexts, used for exit, io prio change, etc. This fixes http://bugzilla.kernel.org/show_bug.cgi?id=9948 Signed-off-by: Jens Axboe commit 84e9e03c55c2456799ab19f1d577e72f721fdd39 Author: Jens Axboe Date: Mon Feb 18 13:51:56 2008 +0100 block: make blk_rq_map_user() clear ->bio if it unmaps it That way the interface is symmetric, and calling blk_rq_unmap_user() on the request wont oops. Signed-off-by: Jens Axboe commit 86b6c7a7f78feca58d2d8615e53aee4d59ab9dc6 Author: Adrian Bunk Date: Mon Feb 18 13:48:32 2008 +0100 fs/block_dev.c: remove #if 0'ed code Commit b2e895dbd80c420bfc0937c3729b4afe073b3848 #if 0'ed this code stating: <-- snip --> [PATCH] revert blockdev direct io back to 2.6.19 version Andrew Vasquez is reporting as-iosched oopses and a 65% throughput slowdown due to the recent special-casing of direct-io against blockdevs. We don't know why either of these things are occurring. The patch minimally reverts us back to the 2.6.19 code for a 2.6.20 release. <-- snip --> It has since been dead code, and unless someone wants to revive it now it's time to remove it. This patch also makes bio_release_pages() static again and removes the ki_bio_count member from struct kiocb, reverting changes that had been done for this dead code. Signed-off-by: Adrian Bunk Signed-off-by: Jens Axboe commit 4c54ac62dceecedd82d4a865017bba0b738e2897 Author: Adrian Bunk Date: Mon Feb 18 13:48:31 2008 +0100 make struct def_blk_aops static This patch makes the needlessly global struct def_blk_aops static. Signed-off-by: Adrian Bunk Signed-off-by: Jens Axboe commit 52ff4cae65b45dcdfa23de09619754d6f380f31e Author: Adrian Bunk Date: Mon Feb 18 13:45:55 2008 +0100 make blk_settings_init() static blk_settings_init() can become static. Signed-off-by: Adrian Bunk Signed-off-by: Jens Axboe commit 13341598263011e079386b22ea35e482f97714c0 Author: Adrian Bunk Date: Mon Feb 18 13:45:53 2008 +0100 make blk_ioc_init() static blk_ioc_init() can become static. Signed-off-by: Adrian Bunk Signed-off-by: Jens Axboe commit 5ece6c52ea52f9e94298e950a837ccff415c7687 Author: Adrian Bunk Date: Mon Feb 18 13:45:51 2008 +0100 make blk-core.c:request_cachep static again request_cachep needlessly became global. Signed-off-by: Adrian Bunk Signed-off-by: Jens Axboe commit f6d091e05199e67ba79c3ea29faa5c3b51d5daf4 Author: David S. Miller Date: Tue Feb 19 00:31:22 2008 -0800 [SPARC64]: Add regs_return_value(). Needed for kretprobes. Noticed by Ananth N Mavinakayanahalli. Signed-off-by: David S. Miller commit a442585952f137bd4cdb1f2f3166e4157d383b82 Author: David S. Miller Date: Mon Feb 18 21:30:48 2008 -0800 [NIU]: Bump driver version and release date. Signed-off-by: David S. Miller commit 3b5bcedeeb755b6e813537fcf4c32f010b490aef Author: Matheos Worku Date: Mon Feb 18 21:30:03 2008 -0800 [NIU]: Fix BMAC alternate MAC address indexing. BMAC port alternate MAC address index needs to start at 1. Index 0 is used for the main MAC address. Signed-off-by: Matheos Worku Signed-off-by: David S. Miller commit 31729363418ea25b01aa9410838c38e36792e44c Author: Randy Dunlap Date: Mon Feb 18 20:52:13 2008 -0800 net: fix kernel-doc warnings in header files Add missing structure kernel-doc descriptions to sock.h & skbuff.h to fix kernel-doc warnings. (I think that Stephen H. sent a similar patch, but I can't find it. I just want to kill the warnings, with either patch.) Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 2df96af03d97e98cbea9f9cb71fc56ea5fc544b2 Author: Pavel Emelyanov Date: Mon Feb 18 20:50:42 2008 -0800 [IPV6]: Use BUG_ON instead of if + BUG in fib6_del_route. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 9937ded8e44de8865cba1509d24eea9d350cebf0 Author: Denis V. Lunev Date: Mon Feb 18 20:49:36 2008 -0800 [IPV6]: dst_entry leak in ip4ip6_err. (resend) The result of the ip_route_output is not assigned to skb. This means that - it is leaked - possible OOPS below dereferrencing skb->dst - no ICMP message for this case Signed-off-by: Denis V. Lunev Signed-off-by: David S. Miller commit fcea424d31868a78366ad5ee0cb3cc2a4cbe689b Author: Arjan van dev Ven Date: Wed Feb 6 05:16:00 2008 +0100 fix historic ioremap() abuse in AGP Several AGP drivers right now use ioremap_nocache() on kernel ram in order to turn a page of regular memory uncached. There are two problems with this: 1) This is a total nightmare for the ioremap() implementation to keep various mappings of the same page coherent. 2) It's a total nightmare for the AGP code since it adds a ton of complexity in terms of keeping track of 2 different pointers to the same thing, in terms of error handling etc etc. This patch fixes this by making the AGP drivers use the new set_memory_XX APIs instead. Note: amd-k7-agp.c is built on Alpha too, and generic.c is built on ia64 as well, which do not yet have the set_memory_*() APIs, so for them some we have a few ugly #ifdefs - hopefully they'll be fixed soon. Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Signed-off-by: Dave Airlie commit 8ac62dc773c149d7b7124b4912b425842f905d3e Author: Dave Young Date: Mon Feb 18 20:45:41 2008 -0800 bluetooth: do not move child device other than rfcomm hci conn child devices other than rfcomm tty should not be moved here. This is my lost, thanks for Barnaby's reporting and testing. Signed-off-by: Dave Young Signed-off-by: David S. Miller commit 16469a0ea0f6b7562eac98ebb8a7c41ce902d0b1 Author: Stuart Bennett Date: Tue Jan 8 13:14:07 2008 +0000 agp/sis: Suspend support for SiS AGP Tested on M650 chipset Signed-off-by: Dave Airlie commit b7d0640f9229a9426ba9223796329c4f0cc4acb9 Author: Stuart Bennett Date: Tue Jan 8 13:13:28 2008 +0000 agp/sis: Clear bit 2 from aperture size byte as well SiS M650 has aperture size byte 0x44 Signed-off-by: Dave Airlie commit 0cd63c8089f0f6316df1393c3a93bdbc67ab314d Author: Dave Young Date: Mon Feb 18 20:44:01 2008 -0800 bluetooth: put hci dev after del conn Move hci_dev_put to del_conn to avoid hci dev going away before hci conn. Signed-off-by: Dave Young Signed-off-by: David S. Miller commit 25e9c86d5a6d82ea45eb680fc66bf73ac5e50dff Author: Mark M. Hoffman Date: Sun Feb 17 22:28:03 2008 -0500 hwmon: normal_i2c arrays should be const Signed-off-by: Mark M. Hoffman commit 57df46d6d9ccd6ced95f169020f79ae637423087 Author: Darrick J. Wong Date: Mon Feb 18 13:33:23 2008 -0800 hwmon: New driver for Analog Devices ADT7473 sensor chip This driver reports voltage, temperature and fan sensor readings on an ADT7473 chip. Signed-off-by: Darrick J. Wong Signed-off-by: Mark M. Hoffman commit 9a4c8546f3e7c893888bccc2b3416d6214f2664a Merge: b0abcfc... 14e04c3... Author: Linus Torvalds Date: Mon Feb 18 18:46:56 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: ide-cd: fix missing residual count setting in DMA mode ht6560b: force prefetch for some devices ht6560b can only do up to PIO mode 4 linux/hdsmart.h: fix goofups (take 2) via82cxxx: add new PCI id for cx700 falconide: locking bugfix MAINTAINERS: update ide-cd maintainer's email address ide/libata: ST310211A has buggy HPA too ide: Add missing base addresses for falconide and macide commit b0abcfc14605b2a8c686bd8e193ab05b01a7980b Author: Eric Paris Date: Mon Feb 18 18:23:16 2008 -0500 Audit: use == not = in if statements Clearly this was supposed to be an == not an = in the if statement. This patch also causes us to stop processing execve args once we have failed rather than continuing to loop on failure over and over and over. Signed-off-by: Eric Paris Acked-by: Al Viro Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 8f789c48448aed74fe1c07af76de8f04adacec7d Author: David S. Miller Date: Mon Feb 18 16:50:22 2008 -0800 [NET]: Elminate spurious print_mac() calls. Patrick McHardy notes that print_mac() can get invoked even if the result it unused (f.e. as an argument to pr_debug() when DEBUG is not defined). Mark this function as "__pure" to eliminate this problem. Signed-off-by: David S. Miller commit 14e04c3f6e64bac468f0aa38c6d47aa95b60c074 Author: Kiyoshi Ueda Date: Tue Feb 19 01:41:26 2008 +0100 ide-cd: fix missing residual count setting in DMA mode This patch fixes the missing residual count setting in DMA mode, which was introduced during the conversion to blk-end-request. The residual count could be used by the request submitter. So if it isn't set correctly, some upper layers does not work. (e.g. wodim for CD burning.) The bug is in only DMA mode. In PIO mode, we are setting the residual count correctly, so no need to fix. Signed-off-by: Kiyoshi Ueda Signed-off-by: Jun'ichi Nomura Reported-by: Andreas Schwab Tested-by: Andreas Schwab Tested-by: Laura Garcia Tested-by: Borislav Petkov Cc: Jens Axboe Signed-off-by: Bartlomiej Zolnierkiewicz commit 0e7d8d480259319649f7a2c230622b98758d1c83 Author: Jan Evert van Grootheest Date: Tue Feb 19 01:41:26 2008 +0100 ht6560b: force prefetch for some devices Prefetch needs to be set for some ide devices to work when connected to a ht6560b interface. This was not always done properly, causing a system with a HD and CD on the primary interface to not work properly. Or, in effect, hang hard. This patch forces prefetch on devices before checking whether it is necessary to change the settings in the interface This patch should also be applied to 2.4. I don't currently have a 2.4 tree around. (also change my email address) Signed-off-by: Jan Evert van Grootheest Cc: Sergei Shtylyov Cc: Alan Cox Signed-off-by: Bartlomiej Zolnierkiewicz commit 1a1990f5479b0c9055c133b7e0e7fedfcbe11512 Author: Jan Evert van Grootheest Date: Tue Feb 19 01:41:26 2008 +0100 ht6560b can only do up to PIO mode 4 According to the datasheet, ht6560b only supports up to PIO mode 4. [bart: manually ported it over 2.6.25-rc2] Signed-off-by: Jan Evert van Grootheest Signed-off-by: Bartlomiej Zolnierkiewicz commit f401fd55b5a9ef1a4572abaefaa6957af11ced61 Author: Bartlomiej Zolnierkiewicz Date: Tue Feb 19 01:41:26 2008 +0100 linux/hdsmart.h: fix goofups (take 2) Fix goofups of commit 76166952bbc81dda1c8a8c14e75a2aa06f6c052c (" is not used by kernel code"). Also update include/linux/Kbuild to reflect the fact that hdsmart.h uses __KERNEL__ ifdefs now. Reported-by: "Robert P. J. Day" Signed-off-by: Bartlomiej Zolnierkiewicz commit 84f7e451e9213d8c328752d0f39bc362519d53d2 Author: Andrew Smith Date: Tue Feb 19 01:41:26 2008 +0100 via82cxxx: add new PCI id for cx700 [bart: manually ported it over via82cxxx changes] From: Andrew Smith Signed-off-by: Bartlomiej Zolnierkiewicz commit d684b21f89b96af3adc06877f29fd9f5214b23c8 Author: Bartlomiej Zolnierkiewicz Date: Tue Feb 19 01:41:25 2008 +0100 falconide: locking bugfix commit 8ac4ce742c66100931b6f2d7a36b0df08bc721fe ("ide: fix host drivers depending on ide_generic to probe for interfaces (take 2)") moved probing to falconide but forgot to take care of Atari specific locking - fix it. Cc: Geert Uytterhoeven Cc: Michael Schmitz Signed-off-by: Bartlomiej Zolnierkiewicz commit ef709165d8de1ba9dd3cd5e05dbabf71dc32d883 Author: Borislav Petkov Date: Tue Feb 19 01:41:25 2008 +0100 MAINTAINERS: update ide-cd maintainer's email address Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit b152fcd34108d07a1e682786af583fd3e080cab3 Author: Mikko Rapeli Date: Tue Feb 19 01:41:25 2008 +0100 ide/libata: ST310211A has buggy HPA too Signed-off-by: Mikko Rapeli Tested-by: Bart Champagne Cc: Jeff Garzik Signed-off-by: Bartlomiej Zolnierkiewicz commit 899e1bc57340ad9acf5561b1eff7a684975ad800 Author: Geert Uytterhoeven Date: Tue Feb 19 01:41:24 2008 +0100 ide: Add missing base addresses for falconide and macide commit 29dd59755a849cc6475faa6a75f3b804e23a6fc2 ("ide: remove ide_setup_ports") forgot to take into account the base addresses for the CONTROL registers for falconide and macide, as pointed out by Michael Schmitz. Falconide was tested on Aranym. Signed-off-by: Geert Uytterhoeven Cc: Michael Schmitz Signed-off-by: Bartlomiej Zolnierkiewicz commit 8c5b4a3f43c060662d83574a4c85fbb362419ddd Author: David S. Miller Date: Mon Feb 18 16:40:10 2008 -0800 [SPARC64]: Kill pcic_present(). And also it's helper function pci_is_controller(). Both are unused. I can't remove the equivalent from sparc32 yet as some ancient bus probing code still uses that platform's version. Signed-off-by: David S. Miller commit f702c5815696bfca095cc1173fff6995c4d39844 Merge: 0165d7f... 51af33e... Author: Linus Torvalds Date: Mon Feb 18 15:52:40 2008 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: RDMA/nes: Fix possible array overrun RDMA/nes: Fix VLAN support RDMA/nes: Fix MAC interrupt erroneously masked on ifdown IB: Fix return value in ib_device_register_sysfs() commit 0165d7f476b99eb637027c2f69c365f00260f188 Merge: 20ef0f1... f6c540c... Author: Linus Torvalds Date: Mon Feb 18 15:51:40 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 * git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: x86: fix lguest build failure x86: reenable support for system without on node0 x86: CPA: avoid double checking of alias ranges x86: CPA no alias checking for _NX x86: zap invalid and unused pmds in early boot x86: CPA, fix alias checks commit 20ef0f1ad0035cd7acc6cbcbc018b2dcd891e274 Merge: 9960c90... 6165894... Author: Linus Torvalds Date: Mon Feb 18 15:49:47 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb * git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (59 commits) V4L/DVB (7219): zoran: Fix namespace conflicts with Zoran 'GPIO_MAX' enum V4L/DVB (7205): tuner-xc2028 depends on FW_LOADER V4L/DVB (7201): cx88-mpeg: Fix race condition in variable access V4L/DVB (7200): Fix FM firmware loading V4L/DVB (7198): V4L, include ioctl.h in videodev headers V4L/DVB (7197): bttv: Fix overlay divide error V4L/DVB (7195): xc5000: fix build error when built as module V4L/DVB (7194): cx88-mpeg: Allow concurrent access to cx88-mpeg devices V4L/DVB (7193): tveeprom: Add proper tuner mapping for hauppauge eeprom id 133 V4L/DVB (7192): Adds support for Genius TVGo A11MCE V4L/DVB (7189): autosuspend support V4L/DVB (7188): radio-si470x version 1.0.6 V4L/DVB (7186): tda10086: make the 22kHz tone for DISEQC a config option V4L/DVB (7183): radio-si470x: fix build warning V4L/DVB (7180): em28xx: add URB_NO_TRANSFER_DMA_MAP, since urb->transfer_dma is set V4L/DVB (7179): Allow more than one em28xx board V4L/DVB (7164): em28xx-alsa: Add a missing mutex V4L/DVB (7163): em28xx: makes audio settings more stable V4L/DVB (7162): em28xx: Fix endian and returns the correct values V4L/DVB (7161): em28xx: Fix printing debug values higher than 127 ... commit 9960c90c0cb9652f69ce794c7bf99bb3acf23552 Merge: 0eddf03... c58310b... Author: Linus Torvalds Date: Mon Feb 18 15:46:21 2008 -0800 Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6 * 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6: [XFS] Added quota targets and removed dmapi directory [XFS] Fix up xfs out-of-tree builds. (a.k.a. external modules) [XFS] Remove Makefile wrappers in XFS commit 0eddf038adc8dff78efe86b71284e3f52b7cef27 Merge: 86b7cbc... c8620c2... Author: Linus Torvalds Date: Mon Feb 18 15:46:03 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: [CRYPTO] null: Add missing Kconfig dependency on BLKCIPHER [CRYPTO] tcrypt: Add missing Kconfig dependency on BLKCIPHER [HIFN]: Fix invalid config ifdefs for RNG support commit 86b7cbc9d3f7b357dbd4f22779c5df375eb76c46 Merge: 230b548... db4315d... Author: Linus Torvalds Date: Mon Feb 18 15:45:48 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt * git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt: timer_list: print relative expiry time signed commit 230b548c15d50068f993948ef4d803f5cc033454 Merge: 1309d4e... fa2144b... Author: Linus Torvalds Date: Mon Feb 18 15:41:05 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: kbuild: explain why DEBUG_SECTION_MISMATCH is UNDEFINED kbuild: fix building vmlinux.o kbuild: allow -fstack-protector to take effect kconfig: fix select in combination with default commit 667bc389c716389795c6cfa145ab5ef6279fbb62 Author: David S. Miller Date: Mon Feb 18 15:28:16 2008 -0800 [SPARC]: Kill 'prom_palette'. The idea of this thing is we could save/restore the firmware's palette when breaking in and out of the firmware prompt. Only one driver implemented this (atyfb) and it's value is questionable. If you're just debugging you don't really care that the characters end up being purple or whatever. And we can provide better debugging and firmware command facilities with minimal in-kernel console I/O drivers. Signed-off-by: David S. Miller commit 30b3cfe1f67550bb6ec6868507a78060ef98269a Author: David S. Miller Date: Mon Feb 18 15:26:43 2008 -0800 [ATYFB]: Kill 'prom_palette' sparc code. Signed-off-by: David S. Miller commit 101788b0ab5464cf485c5d434ac30563e6f9e5fe Author: David S. Miller Date: Mon Feb 18 15:21:30 2008 -0800 [SPARC64]: Kill 'prom_keyboard'. Nothing ever sets it, so it just takes up space. Signed-off-by: David S. Miller commit 1d5509aa6985b256a426e67ae6952fd4b7664de7 Author: David S. Miller Date: Mon Feb 18 15:17:58 2008 -0800 [SPARC]: Kill extern decl of 'panic_setup'. This was made static in kernel/panic.c a long time ago. Signed-off-by: David S. Miller commit 9a2f258ad5910c478a5c98989b9a26268b2e5488 Author: David S. Miller Date: Mon Feb 18 15:16:20 2008 -0800 [SPARC64]: Delete 'boot_flags'. It is write-only, nothing tests it's value. Signed-off-by: David S. Miller commit a3d41704d4647abfc2796e9c81f71e0902f78e09 Author: David S. Miller Date: Mon Feb 18 15:13:48 2008 -0800 [SPARC64]: Kill unused function 'kernel_enter_debugger'. Signed-off-by: David S. Miller commit 4ef110141b3e0758fe30d686417b5686b87eb25b Author: Jeremy Kerr Date: Tue Feb 19 10:05:35 2008 +1100 [POWERPC] spufs: fix scheduler starvation by idle contexts 2.6.25 has a regression where we can starve the scheduler by creating (N_SPES+1) contexts, then running them one at a time. The final context will never be run, as the other contexts are loaded on the SPEs, none of which are repoted as free (ie, spu->alloc_state != SPU_FREE), so spu_get_idle() doesn't give us a spu to run on. Because all of the contexts are stopped, none are descheduled by the scheduler tick, as spusched_tick returns if spu_stopped(ctx). This change replaces the spu_stopped() check with checking for SCHED_IDLE in ctx->policy. We set a context's policy to SCHED_IDLE when we're not in spu_run(). We also favour SCHED_IDLE contexts when looking for contexts to unbind, but leave their timeslice intact for later resumption. This patch fixes the following test in the spufs-testsuite: tests/20-scheduler/02-yield-starvation Signed-off-by: Jeremy Kerr commit f6c540cdd65d4bc4eaf4dcbf652580f09f3b0c38 Author: Rusty Russell Date: Mon Feb 4 07:11:10 2008 +1100 x86: fix lguest build failure drivers/lguest/x86/switcher_32.S:(.text+0x3815f8): undefined reference to `LGUEST_PAGES_regs_trapnum' This problem was caused by asm-offsets.c only having the offsets when lguest *guest* support was set, not lguest host (host support used to imply guest support, so now they're separate these bugs come out). Lguest guest support and host support are separate config options: they used to be tied together. Sort out which parts of asm-offsets are needed for Guest and Host. Signed-off-by: Rusty Russell Cc: Linus Torvalds Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit b7ad149d62ffffaccb9f565dfe7e5bae739d6836 Author: Yinghai Lu Date: Sun Feb 17 02:02:21 2008 -0800 x86: reenable support for system without on node0 One system doesn't have RAM for node0 installed. SRAT: PXM 0 -> APIC 0 -> Node 0 SRAT: PXM 0 -> APIC 1 -> Node 0 SRAT: PXM 1 -> APIC 2 -> Node 1 SRAT: PXM 1 -> APIC 3 -> Node 1 SRAT: Node 1 PXM 1 0-a0000 SRAT: Node 1 PXM 1 0-dd000000 SRAT: Node 1 PXM 1 0-123000000 ACPI: SLIT: nodes = 2 10 13 13 10 mapped APIC to ffffffffff5fb000 ( fee00000) Bootmem setup node 1 0000000000000000-0000000123000000 NODE_DATA [000000000000e000 - 0000000000014fff] bootmap [0000000000015000 - 00000000000395ff] pages 25 Could not find start_pfn for node 0 Pid: 0, comm: swapper Not tainted 2.6.24-smp-g5a514e21-dirty #14 Call Trace: [] free_area_init_node+0x22/0x381 [] generic_swap+0x0/0x17 [] find_zone_movable_pfns_for_nodes+0x54/0x271 [] free_area_init_nodes+0x239/0x287 [] paging_init+0x46/0x4c [] setup_arch+0x3c3/0x44e [] start_kernel+0x6f/0x2c7 [] _sinittext+0x1cc/0x1d3 This happens because node 0 is not online, but the node state in mm/page_alloc.c has node 0 set. nodemask_t node_states[NR_NODE_STATES] __read_mostly = { [N_POSSIBLE] = NODE_MASK_ALL, [N_ONLINE] = { { [0] = 1UL } }, So we need to clear node_online_map before initializing the memory. Signed-off-by: Yinghai Lu Cc: Andrew Morton Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit f34b439f34c49d7de858234bab5e2dd03cfaf3c1 Author: Thomas Gleixner Date: Fri Feb 15 22:17:57 2008 +0100 x86: CPA: avoid double checking of alias ranges When the CPA code is called with an virtual address in the range of the direct mapping or the high alias then we do not need to run through the alias check for this range. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar commit af96e4438a4b34a257f5318a296e0b9e182e7ab9 Author: Thomas Gleixner Date: Fri Feb 15 21:49:46 2008 +0100 x86: CPA no alias checking for _NX NX settings are not required to be consistent across alias mappings. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar commit 31eedd823c1bf3650c450346a0d0c39431034eb9 Author: Thomas Gleixner Date: Fri Feb 15 17:29:12 2008 +0100 x86: zap invalid and unused pmds in early boot The early boot code maps KERNEL_TEXT_SIZE (currently 40MB) starting from __START_KERNEL_map. The kernel itself only needs _text to _end mapped in the high alias. On relocatible kernels the ASM setup code adjusts the compile time created high mappings to the relocation. This creates invalid pmd entries for negative offsets: 0xffffffff80000000 -> pmd entry: ffffffffff2001e3 It points outside of the physical address space and is marked present. This starts at the virtual address __START_KERNEL_map and goes up to the point where the first valid physical address (0x0) is mapped. Zap the mappings before _text and after _end right away in early boot. This removes also the invalid entries. Furthermore it simplifies the range check for high aliases. Signed-off-by: Thomas Gleixner Acked-by: H. Peter Anvin Signed-off-by: Ingo Molnar commit c31c7d4844ea4817692ae16bf70f9c96c05a50eb Author: Thomas Gleixner Date: Mon Feb 18 20:54:14 2008 +0100 x86: CPA, fix alias checks c_p_a() did not discover all aliases correctly. (such as when called on vmalloc()-ed areas or ioremap()-ed areas) Push the alias checks to the lower, physical level and consistently discover all aliases that might exist: the low direct mappings and the high linear kernel-text mappings (on 64-bit). Thanks to Andi Kleen for pointing out that this was buggy. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar commit 51af33e8e45b845d8ee85446f58e31bc4c118048 Author: Roland Dreier Date: Mon Feb 18 10:33:59 2008 -0800 RDMA/nes: Fix possible array overrun In nes_create_qp(), the test if (nesqp->mmap_sq_db_index > NES_MAX_USER_WQ_REGIONS) { is used to error out if the db_index is too large; however, if the test doesn't trigger, then the index is used as nes_ucontext->mmap_nesqp[nesqp->mmap_sq_db_index] = nesqp; and mmap_nesqp is declared as struct nes_qp *mmap_nesqp[NES_MAX_USER_WQ_REGIONS]; which leads to an array overrun if the index is exactly equal to NES_MAX_USER_WQ_REGIONS. Fix this by bailing out if the index is greater than or equal to NES_MAX_USER_WQ_REGIONS. This was spotted by the Coverity checker (CID 2162). Acked-by: Glenn Streiff Signed-off-by: Roland Dreier commit 7f4da4745c34287938ce76b92b23409adeecb5b8 Author: Thomas Mingarelli Date: Tue Dec 4 17:41:54 2007 +0000 [WATCHDOG] HP ProLiant WatchDog driver Hp is providing a Hardware WatchDog Timer driver that will only work with the specific HW Timer located in the HP ProLiant iLO 2 ASIC. The iLO 2 HW Timer will generate a Non-maskable Interrupt (NMI) 9 seconds before physically resetting the server, by removing power, so that the event can be logged to the HP Integrated Management Log (IML), a Non-Volatile Random Access Memory (NVRAM). The logging of the event is performed using the HP ProLiant ROM via an Industry Standard access known as a BIOS Service Directory Entry. Signed-off-by: Thomas Mingarelli Signed-off-by: Wim Van Sebroeck commit bb59b5578a73d0e0e4e208a014fa7ea0c4f0ccb4 Author: Mike Frysinger Date: Wed Jan 30 17:38:21 2008 +0800 [WATCHDOG] blackfin Watchdog driver: relocate all strings used in __init functions to __initdata Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Wim Van Sebroeck commit 6ea8115bb6f359df4f45152f2b40e1d4d1891392 Author: Florian Fainelli Date: Mon Jan 7 19:08:49 2008 +0100 [WATCHDOG] Convert mtx1 wdt to be a platform device and use generic GPIO API This patch converts the MTX-1 to be a platform device, use the available generic GPIO API for the MTX-1 board and register the miscdev alias. Signed-off-by: Florian Fainelli Signed-off-by: Wim Van Sebroeck commit 75c752e6c3147f596c13365b200b91d754b66f59 Author: Andrew Sharp Date: Thu Dec 13 16:16:42 2007 -0800 [WATCHDOG] Add support for SB1 hardware watchdog Support watchdog timers built into SiByte MIPS SoCs. Signed-off-by: Andy Sharp Signed-off-by: Wim Van Sebroeck Cc: Ralf Baechle Signed-off-by: Andrew Morton commit 6165894fb6293072848e5699f3fcbe88b7c60815 Author: Mauro Carvalho Chehab Date: Fri Feb 15 18:41:06 2008 -0300 V4L/DVB (7219): zoran: Fix namespace conflicts with Zoran 'GPIO_MAX' enum Thanks to Martin Michlmayr for reporting this issue: The zoran driver fails to compile on the ARM Orion platform with: In file included from drivers/media/video/zoran_procfs.c:50: drivers/media/video/zoran.h:232: error: expected identifier before numeric constant The reason is that drivers/media/video/zoran.h defines an enum with GPIO_MAX in it, but Orion contains a #define GPIO_MAX 32 in include/asm-arm/arch-orion/orion.h Signed-off-by: Mauro Carvalho Chehab commit ea35e3a754b2ba5f712c3f4df55e426ae2e4d60a Author: Paul Mundt Date: Thu Feb 14 07:24:22 2008 -0300 V4L/DVB (7205): tuner-xc2028 depends on FW_LOADER Signed-off-by: Paul Mundt Signed-off-by: Mauro Carvalho Chehab commit baff6cdd3328e7b35c4e155d79105621812bceec Author: Ricardo Cerqueira Date: Wed Feb 13 22:41:15 2008 -0300 V4L/DVB (7201): cx88-mpeg: Fix race condition in variable access There was a possible race condition in the increment/decrement of the active device references counter. Thanks to Trent Piepho (xyzzy@speakeasy.org) for bringing it up. Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab commit 40ae91a758df916d7a5640fb2de20537ef7849fd Author: Mauro Carvalho Chehab Date: Thu Feb 14 01:52:48 2008 -0300 V4L/DVB (7200): Fix FM firmware loading There's no need to load SCode table for FM. Signed-off-by: Mauro Carvalho Chehab commit 83db33a3e5c4200eaf5dec5b4883c0e73f468a3b Author: Jiri Slaby Date: Wed Feb 13 20:04:49 2008 -0300 V4L/DVB (7198): V4L, include ioctl.h in videodev headers Fix compilation of user processes which includes videodev*.h but not includes linux/ioctl.h: v4l2ext_helper.c: In function 'process_ioctl': v4l2ext_helper.c:183: warning: implicit declaration of function '_IOWR' v4l2ext_helper.c:183: error: expected expression before 'struct' v4l2ext_helper.c:183: error: case label does not reduce to an integer constant Signed-off-by: Jiri Slaby Signed-off-by: Mauro Carvalho Chehab commit 7c018804c0900e7be18507f1eb24e631aa9816ea Author: Robert Fitzsimons Date: Wed Feb 13 16:38:11 2008 -0300 V4L/DVB (7197): bttv: Fix overlay divide error The initial work to convert the bttv driver to V4L2 "Partial conversion from V4L1 to V4L2" (e84619b17440ccca4e4db7583d126c4189b987e5), missed the line which set the appropriate overlay crop structure in the newly allocated bttv_buffer. This then causes a divide error in the bttv_calc_geo function. Signed-off-by: Robert Fitzsimons Signed-off-by: Mauro Carvalho Chehab commit c9fe1d6ba603ddc5f2ef0a6b84f9df2bb4c679f1 Author: Tony Breeds Date: Tue Feb 12 02:54:33 2008 -0300 V4L/DVB (7195): xc5000: fix build error when built as module drivers/built-in.o: In function `set_type': tuner-core.c:(.text+0x8879d): undefined reference to `xc5000_attach' Signed-off-by: Tony Breeds Reviewed-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 27d0fe189437803d5ad146d508ec2fd77252c73f Author: Roland Stoll Date: Mon Feb 11 13:00:34 2008 -0300 V4L/DVB (7194): cx88-mpeg: Allow concurrent access to cx88-mpeg devices It currently isn't possible to open the frontend device of cx88-mpeg devices (DVB or Blackbird) multiple times concurrently. (for instance, to attach a signal monitoring tool while reading a stream, or to send a frequency change ioctl) This patch fixes that condition. Signed-off-by: Roland Stoll Signed-off-by: Ricardo Cerqueira Reviewed-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 968fb08912880e34a05a0cca7907392bac920aa2 Author: Ricardo Cerqueira Date: Wed Jan 16 19:56:55 2008 -0300 V4L/DVB (7193): tveeprom: Add proper tuner mapping for hauppauge eeprom id 133 Do away with the need to set tuner=63 on cx88xx with recent HVR-1300 boards Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab commit f0ba356c85c25c2732098885a6a089be4698da94 Author: Adrian Pardini Date: Mon Feb 11 12:40:53 2008 -0300 V4L/DVB (7192): Adds support for Genius TVGo A11MCE Signed-off-by: Adrian Pardini Signed-off-by: Mauro Carvalho Chehab commit 57566ad2d83f58c02e191aa7f4d7cddad3f92618 Author: Tobias Lorenz Date: Sat Feb 9 16:08:24 2008 -0300 V4L/DVB (7189): autosuspend support Together with Oliver Neukum from Novell, USB autosuspend support was added. Signed-off-by: Tobias Lorenz Signed-off-by: Mauro Carvalho Chehab commit 5caf51342c81c7cb2a8c3998e3f606ccfa79cee2 Author: Tobias Lorenz Date: Mon Feb 4 22:26:08 2008 -0300 V4L/DVB (7188): radio-si470x version 1.0.6 This patch combines all the finished discussions and its resulting patches from the mailing list. The version 1.0.6 is mainly influenced by Oliver Neukum. He found a lot of small issues, that are fixed with this patch now. For me the most interesting thing is, that it's now safer to use it on other architectures. The history for version 1.0.6 is: - fixed coverity checker warnings in *_usb_driver_disconnect - probe()/open() race by correct ordering in probe() - DMA coherency rules by separate allocation of all buffers - use of endianness macros - abuse of spinlock, replaced by mutex - racy handling of timer in disconnect, replaced by delayed_work - racy interruptible_sleep_on(), replaced with wait_event_interruptible() - handle signals in read() The driver is tested with all Debian/testing radio programs and rdsd. The patch is tested against checkpatch.pl v1.12. Signed-off-by: Tobias Lorenz Signed-off-by: Mauro Carvalho Chehab commit ea75baf4b0f117564bd50827a49c4b14d61d24e9 Author: Hartmut Hackmann Date: Sat Feb 9 23:54:24 2008 -0300 V4L/DVB (7186): tda10086: make the 22kHz tone for DISEQC a config option Some cards need the diseqc signal modulated, while some just need the envelope to control the LNB supply. This fixes Bug 9887 Signed-off-by: Hartmut Hackmann Acked-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 83947d307d63dc0c30ab0809714f0bcbbdf8c3e2 Author: Michael Krufky Date: Sun Feb 10 20:13:25 2008 -0300 V4L/DVB (7183): radio-si470x: fix build warning fix the following build warning: radio-si470x.c: In function 'si470x_get_rds_registers': radio-si470x.c:562: warning: format '%ld' expects type 'long int', but argument 3 has type 'unsigned int' Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 61b080d214c4dba91fb726169fb0c3f0e8de4b45 Author: Mauro Carvalho Chehab Date: Fri Feb 8 16:07:04 2008 -0300 V4L/DVB (7180): em28xx: add URB_NO_TRANSFER_DMA_MAP, since urb->transfer_dma is set Thanks to Alan Stern for pointing this issue. Signed-off-by: Mauro Carvalho Chehab commit 3687e1e67e4920a202d53cc24678fb34fcda8fc5 Author: Mauro Carvalho Chehab Date: Fri Feb 8 15:44:25 2008 -0300 V4L/DVB (7179): Allow more than one em28xx board em28xx driver is capable of handling more than one usb device. However, isoc transfers require a large amount of data to be transfered. Before this patch, just one em28xx board were enough to allocate more than 50% URBs: T: Bus=02 Lev=00 Prnt=00 Port=00 Cnt=00 Dev#= 1 Spd=480 MxCh= 8 B: Alloc=480/800 us (60%), #Int= 0, #Iso= 2 D: Ver= 2.00 Cls=09(hub ) Sub=00 Prot=01 MxPS=64 #Cfgs= 1 So, only one board could use an USB host at the same time. After the patch, it is possible to use more than one em28xx at the same time, on the same usb host, if the image size is slower or equal to 345600, since those images will require about 30% of the URBs: T: Bus=02 Lev=00 Prnt=00 Port=00 Cnt=00 Dev#= 1 Spd=480 MxCh= 8 B: Alloc=232/800 us (29%), #Int= 0, #Iso= 2 D: Ver= 2.00 Cls=09(hub ) Sub=00 Prot=01 MxPS=64 #Cfgs= 1 So, in thesis, after the patch, it would be possible to use up to 3 boards by each usb host, if the devices are generating small images. Signed-off-by: Mauro Carvalho Chehab commit 92ea42f442c4895e38f525a097d7d8ce2a55b9b9 Author: Mauro Carvalho Chehab Date: Wed Feb 6 18:52:15 2008 -0300 V4L/DVB (7164): em28xx-alsa: Add a missing mutex Signed-off-by: Mauro Carvalho Chehab commit 00b8730f5db19f9ea0985d7f14f869df79a0bf76 Author: Mauro Carvalho Chehab Date: Wed Feb 6 18:34:13 2008 -0300 V4L/DVB (7163): em28xx: makes audio settings more stable Improves audio configurations on em28xx: - mutes audio before changing amux; - adds a delay after setting audio src; - waits up to 50ms for ac97 busy. Signed-off-by: Mauro Carvalho Chehab commit 0df8130fe80ebde052516c1d729aa5d1c69ebc5c Author: Mauro Carvalho Chehab Date: Wed Feb 6 15:56:16 2008 -0300 V4L/DVB (7162): em28xx: Fix endian and returns the correct values Signed-off-by: Mauro Carvalho Chehab commit 0da5176f4e0d5aea3e33a11a17c1847939df4dcc Author: Mauro Carvalho Chehab Date: Wed Feb 6 15:55:19 2008 -0300 V4L/DVB (7161): em28xx: Fix printing debug values higher than 127 Signed-off-by: Mauro Carvalho Chehab commit 1e7ad56f1fef94a7d8c1050bf3548d957fe67c01 Author: Mauro Carvalho Chehab Date: Wed Feb 6 09:00:41 2008 -0300 V4L/DVB (7160): em28xx: Allow register dump/setting for debug Adds vidioc_[g|s]_register handlers. This allows getting/setting register from em28xx. Signed-off-by: Mauro Carvalho Chehab commit 7463dda2ae868d3e0a6c98f65d6331481fc73ca3 Author: Mauro Carvalho Chehab Date: Tue Feb 5 22:29:26 2008 -0300 V4L/DVB (7158): Fix em28xx audio initialization AC97 register initialization seem to always be needed. This patch fixes audio for Prolink/Pixelview USB2 board. Signed-off-by: Mauro Carvalho Chehab commit 1685a6fed210b110ac8abeff24e2ffd1713cb3fb Author: Andrew Morton Date: Tue Feb 5 07:37:21 2008 -0300 V4L/DVB (7156): em28xx/em28xx-core.c: fix use of potentially uninitialized variable drivers/media/video/em28xx/em28xx-core.c: In function 'em28xx_set_audio_source': drivers/media/video/em28xx/em28xx-core.c:276: warning: 'no_ac97' may be used uninitialized in this function This looks like a genuine bug to me. Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 384b835aed8acf341d99969b58d27434685bdd3d Author: Brandon Philips Date: Mon Feb 4 20:52:21 2008 -0300 V4L/DVB (7150): [v4l] convert videbuf_vmalloc_memory to videobuf_vmalloc_memory Signed-off-by: Brandon Philips Signed-off-by: Mauro Carvalho Chehab commit 18c0ecf16e1caa266e12319b5ab82d80e8a3ccf0 Author: Roel Kluin <12o3l@tiscali.nl> Date: Sat Feb 2 20:20:58 2008 -0300 V4L/DVB (7139): add parentheses '!' has a higher priority than '&': bitanding has no effect. Signed-off-by: Roel Kluin <12o3l@tiscali.nl> Signed-off-by: Mauro Carvalho Chehab commit 427d20c4e6321ed2482630900891e40b4f2de6a3 Author: Luc Saillard Date: Wed Jan 30 17:23:00 2008 -0300 V4L/DVB (7132): Add USB ID for a newer variant of Hauppauge WinTV-HVR 900 Device description: WinTV-HVR-900 M/R: 65018/B3C0 ##4207 Signed-off-by: Luc Saillard Signed-off-by: Mauro Carvalho Chehab commit fb62a5953e9e6969f78adc7291c1a8845116f776 Author: Mauro Carvalho Chehab Date: Thu Jan 31 13:59:29 2008 -0300 V4L/DVB (7122): saa7134-empress: Remove back lock videobuf functions at close() method already locks videobuf. It makes no sense to keep the locking at empress close() method. There is also a lock at open() method. I'm not sure if it is safe to remove the locking there. Signed-off-by: Mauro Carvalho Chehab commit 64f9477f95bf5d4ba49dc3988d47a15bc06bb5da Author: Mauro Carvalho Chehab Date: Thu Jan 31 13:57:53 2008 -0300 V4L/DVB (7121): Renames videobuf lock to vb_lock This helps to identify where vb_lock is being used, and find missusages of the locks. Signed-off-by: Mauro Carvalho Chehab commit ce3a35d3c00918296e552af5ecc7b771af766436 Author: Mauro Carvalho Chehab Date: Thu Jan 31 13:40:04 2008 -0300 V4L/DVB (7120): videobuf lock is already initialized at videobuf-core.c Removes the duplicated mutex_init code. Signed-off-by: Mauro Carvalho Chehab commit 0ed4a6ea9dbd9f5b77ce594f7f46be022d2c49ec Author: Oliver Endriss Date: Wed Jan 30 01:07:20 2008 -0300 V4L/DVB (7118): dvb-ttpci: Improved display of still pictures Improved display of still pictures (VIDEO_STILLPICTURE ioctl). Ensure that both fields are displayed for progressive frames. Thanks to Reinhard Nissl and Klaus Schmidinger for finding out that the FREEZE command does this. Thanks-to: Reinhard Nissl Thanks-to: Klaus Schmidinger Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 251130bf266000fe6e9fdccda50fe4b5c1d6cb24 Author: Kim Sandberg Date: Wed Jan 30 00:42:01 2008 -0300 V4L/DVB (7117): budget-av: Add support for Satelco EasyWatch PCI DVB-T Add support for Satelco EasyWatch PCI DVB-T, sub-id 0x1894:0x003a. Signed-off-by: Kim Sandberg Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 03aa73c58704182298495569bbb613bf8fc770d1 Author: Oliver Endriss Date: Tue Jan 29 23:56:51 2008 -0300 V4L/DVB (7116): budget-av: Add support for KNC TV Station Plus X4 Add support for KNC TV Station Plus X4, sub-system id 0x1894:0x0015. Based on a patch submitted by Johannes Deisenhofer. Thanks-to: Johannes Deisenhofer Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 998cb0827d62f13a80e7f7b0ec993e98184cbc57 Author: Tobias Lorenz Date: Mon Jan 28 22:49:14 2008 -0300 V4L/DVB (7110): Trivial printf warning fix (radio-si470) Thanks to Darren Salt for pointing this issue. Signed-off-by: Tobias Lorenz Signed-off-by: Mauro Carvalho Chehab commit c3f686f152767b84893e474acd1a7758988dc369 Author: Tobias Lorenz Date: Mon Jan 28 22:43:13 2008 -0300 V4L/DVB (7108): radio-si470x.c: check-after-use Adrian used the coverity checker against radio-si470x and found this: > The Coverity checker spotted the following check-after-use in > drivers/media/radio/radio-si470x.c: > > <-- snip --> > static void si470x_usb_driver_disconnect(struct usb_interface *intf) > { > struct si470x_device *radio = usb_get_intfdata(intf); > > del_timer_sync(&radio->timer); <------------------ > flush_scheduled_work(); > > usb_set_intfdata(intf, NULL); > if (radio) { <------------------ > video_unregister_device(radio->videodev); > kfree(radio->buffer); > kfree(radio); > } > } > <-- snip --> > > Either "radio" can be NULL and this case has to be properly handled or > the NULL check is not required. These two lines should indeed better be inside the if statement. Signed-off-by: Tobias Lorenz Signed-off-by: Mauro Carvalho Chehab commit 532fe65205253aef1ce5c0c76d2d8d303fb3fe71 Author: Adrian Bunk Date: Mon Jan 28 22:10:48 2008 -0300 V4L/DVB (7106): em28xx/: make 2 functions static This patch makes the following needlessly global functions static: - em28xx-core.c:em28xx_write_reg_bits() - em28xx-video.c:em28xx_vdev_init() Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab commit fe2b8f50a336bcd51e3d209c5838c573b4b540b3 Author: Adrian Bunk Date: Mon Jan 28 22:10:58 2008 -0300 V4L/DVB (7104): stk-sensor.c: make 2 functions static This patch makes the following needlessly global functions static: - stk_sensor_outb() - stk_sensor_inb() Signed-off-by: Adrian Bunk Acked-by: Jaime Velasco Juan Signed-off-by: Mauro Carvalho Chehab commit beb9e780a45a2e21f3d62bd4c71d695aa195fe69 Author: Adrian Bunk Date: Mon Jan 28 22:11:01 2008 -0300 V4L/DVB (7103): make stk_camera_cleanup() static stk_camera_cleanup() can become static. Signed-off-by: Adrian Bunk Acked-by: Jaime Velasco Juan Signed-off-by: Mauro Carvalho Chehab commit c52c4d063eb163d2980c1884370da453662a1f31 Author: Adrian Bunk Date: Mon Jan 28 22:11:15 2008 -0300 V4L/DVB (7102): make tuner-core.c:tuner_list static tuner_list can become static - and it's anyway a way too generic name for a global variable - see commit b00ef4b8d8c29bfb5f6f92ee60bc04b604f36ef2 for a completely different global variable of the same name I just made static... Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab commit 805d92dfa627acad3d4a78966bc5e4f8183d48b3 Author: Adrian Bunk Date: Mon Jan 28 22:12:41 2008 -0300 V4L/DVB (7100): frontends/tda18271-common.c: fix off-by-one This patch fixes an off-by-one error spotted by the Coverity checker. Signed-off-by: Adrian Bunk Reviewed-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 0e8f4cc5c8bb782edbaee54a760ebc034252fab0 Author: Matthias Schwarzott Date: Mon Jan 28 12:01:11 2008 -0300 V4L/DVB (7097): saa7134-dvb: add missing dvb_attach call (for tda10046_attach) saa7134-dvb: add missing dvb_attach around tda10046_attach This patch adds a possibly missing dvb_attach for tda10046_attach. This removes the hard dependency of saa7134-dvb on tda1004x module. Signed-off-by: Matthias Schwarzott Signed-off-by: Mauro Carvalho Chehab commit e08a8c9dc7d247ec2a98ea2d7ac5ecea6af5593c Author: Mauro Carvalho Chehab Date: Sun Jan 27 14:43:20 2008 -0300 V4L/DVB (7093): radio-sf16fmi: fix request_region() isapnp_fmi_probe attaches device. However, if request_region() fails, the device isn't disattached. Reviewed-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab commit dd49f30ca032464839085ec3a54dd9917829c891 Author: Douglas Schilling Landgraf Date: Sun Jan 27 14:29:51 2008 -0300 V4L/DVB (7092): radio-sf16fmr2: fix request_region() validation [bugzilla 9699] This patch changed the request_region() validation to avoid invalid return. Thanks to Roland Kletzing for bug report and data collection. Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab commit 0e3301ec23000ffbbe28771eb79628856a9a2f84 Author: Tobias Lorenz Date: Sun Jan 27 14:54:07 2008 -0300 V4L/DVB (7091): radio-si470x improvements and seldom problem fixed in tuning functions I updated the radio-si470x driver another time. Here are the commented history entries: - number of seek_retries changed to tune_timeout The last versions checked for the end of frequency tuning by polling a si470x register. Therefore polling depended on the usb utilization. This was changed to have a constant timeout now. - fixed problem with incomplete tune operations by own buffers The last version used a shared buffer to assembly the USB HID reports. It sometimes happened, that multiple functions were modifing this buffer simultanuously. When sending such reports, the hardware returned USB stalls (-EPIPE). Now buffers of the correct size (smaller than before) are allocated as local variables. - optimization of variables The size of some variables has been reduced to allow the compiler to generate more optimized code. - improved error logging At some important location, error checking was improved. Especially the usb transfers to access si470x registers and the tuning functions were modified. Signed-off-by: Tobias Lorenz Signed-off-by: Mauro Carvalho Chehab commit 2de3a5a5c52ae1550be537829bb487131430d74b Author: Jaime Velasco Juan Date: Sun Jan 27 12:25:00 2008 -0300 V4L/DVB (7090): V4L: stkwebcam: use v4l_compat_ioctl32 Signed-off-by: Jaime Velasco Juan Signed-off-by: Mauro Carvalho Chehab commit 1fdd61c0228a32b9a5e10593b225851d8920595b Author: Jaime Velasco Juan Date: Sun Jan 27 12:24:59 2008 -0300 V4L/DVB (7089): V4L: stkwebcam: Power management support Signed-off-by: Jaime Velasco Juan Signed-off-by: Mauro Carvalho Chehab commit 1112fb68ae9c838294d38e1f209fedbc0dbf11d5 Author: Jaime Velasco Juan Date: Sun Jan 27 12:24:58 2008 -0300 V4L/DVB (7088): V4L: stkwebcam: Add support for YUYV format Signed-off-by: Jaime Velasco Juan Signed-off-by: Mauro Carvalho Chehab commit 0ed464e13e9321de9d1fff356eda58498574272e Author: Cyrill Gorcunov Date: Sat Jan 26 07:38:01 2008 -0300 V4L/DVB (7086): driver: tcm825x - fix logical typo error This patch does fix potential NULL pointer dereference due to logical typo error. The issue is pointed out by Guennadi Liakhovetski Signed-off-by: Cyrill Gorcunov CC: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab commit 29e4e05041842bca57ec539e51cfeae8948e7320 Author: Hermann Pitton Date: Sun Jan 20 19:49:51 2008 -0300 V4L/DVB (7085): saa7134: detect the LifeView FlyDVB-T Hybrid Mini PCI Thanks to Angelo Lisco for his initial patch we missed and to Ahmet Dogan Ugurel confirming such a device functional. Signed-off-by: Hermann Pitton Signed-off-by: Hartmut Hackmann Signed-off-by: Mauro Carvalho Chehab commit 728b92a2301c705dc36419ab0e7163b129462696 Author: Hermann Pitton Date: Sun Jan 20 19:42:01 2008 -0300 V4L/DVB (7084): saa7134: add support for the Medion / Creatix CTX948 card This adds support for analog inputs and DVB-T. Good sensitivity for DVB-T currently needs to use analog TV first. DVB-S support is not yet completed, but is on the way. Signed-off-by: Hermann Pitton Signed-off-by: Hartmut Hackmann Signed-off-by: Mauro Carvalho Chehab commit ad1ef131c35bb6967acd5ce3072a32ec1d27b482 Author: Hermann Pitton Date: Sun Jan 20 19:32:39 2008 -0300 V4L/DVB (7083): saa7134: enable radio and external analog audio-in on the md2819 It also enumerates now the separate composite input at first and adds mute ability to radio and external audio-in. Many thanks to Daftcho Tabakov for reporting the flaws and testing. Signed-off-by: Hermann Pitton Signed-off-by: Hartmut Hackmann Signed-off-by: Mauro Carvalho Chehab commit 4ba243734a0363649c514353334ed3d6ca39a5fb Author: Hermann Pitton Date: Sun Jan 20 19:27:51 2008 -0300 V4L/DVB (7082): support for Twinhan Hybrid DTV-DVB 3056 PCI S-Video is unconfirmed, but likely correct. The remote is not yet investigated. Thanks go to Sioux for providing code and asking to fix the auto detection. Signed-off-by: sioux Signed-off-by: Hermann Pitton Signed-off-by: Hartmut Hackmann Signed-off-by: Mauro Carvalho Chehab commit c0e0aff9779303c7e3ef7e6db4001dbc2bfdcbdd Author: Antoine Jacquet Date: Fri Jan 25 22:03:10 2008 -0300 V4L/DVB (7081): zr364xx: add support for Creative DiVi CAM 516 Signed-off-by: Antoine Jacquet Signed-off-by: Mauro Carvalho Chehab commit 71c044752cdae89136862495f244d37073e2cf66 Author: Antoine Jacquet Date: Fri Jan 25 22:01:53 2008 -0300 V4L/DVB (7080): zr364xx: add support for Pentax Optio 50 Signed-off-by: Antoine Jacquet Signed-off-by: Mauro Carvalho Chehab commit e8e672c57736872ef0bd05640503ee04ff443890 Author: Antoine Jacquet Date: Fri Jan 25 22:00:19 2008 -0300 V4L/DVB (7079): zr364xx: fix typo in documentation Signed-off-by: Antoine Jacquet Signed-off-by: Mauro Carvalho Chehab commit 46c9fc861f2a47ce806671933f96f03ab3bdda7a Author: Akinobu Mita Date: Sat Jan 19 05:38:59 2008 -0300 V4L/DVB (7076): bt878: include KERN_ facility level printk should use KERN_* levels. CC: Manu Abraham Signed-off-by: Akinobu Mita Signed-off-by: Mauro Carvalho Chehab commit a348d2005d4a76c8c84150329f926c255c994ead Author: Mauro Carvalho Chehab Date: Fri Jan 18 08:53:26 2008 -0300 V4L/DVB (7049): Remove sound/driver.h sound/driver.h is already included by sound/core. Signed-off-by: Mauro Carvalho Chehab commit 057596eea8402aa8f7a670bf3195665aa8267204 Author: Mauro Carvalho Chehab Date: Sat Feb 2 11:25:31 2008 -0300 V4L/DVB (7133): Fix Kconfig dependencies As pointed by Adrian Bunk, with I2C=m and VIDEO_DEV=y, videodev brokes. This patch moves the functions that videodev needs from v4l2-common. It also fixes some Kconfig changes. After this patch, I2C=m / VIDEO_DEV=y will make v4l2 core statically linked into kernel. v4l2-common will be m, and all V4L drivers will also be m. This approach is very conservative, since it is possible to have V4L drivers that don't need I2C or v4l2-common. The better is to map what drivers really need v4l2-common, making them to select v4l2-common, and allowing the others to be 'y', 'm' and 'n'. Signed-off-by: Mauro Carvalho Chehab commit 1a4e30c3eaffb83218977477bb83d54316844acb Author: Mauro Carvalho Chehab Date: Thu Jan 31 13:15:52 2008 -0300 V4L/DVB (7119): Remove obsolete code from v4l2-common Signed-off-by: Mauro Carvalho Chehab commit a9254475bbfbed5f0596d952c6a3c9806e19dd0b Author: Mauro Carvalho Chehab Date: Tue Jan 29 18:32:35 2008 -0300 V4L/DVB (7115): Fix bug #9833: regression when compiling V4L without I2C Adrian Bunk reported: > > Commit 8ffbc6559493c64d6194c92d856196fdaeb8a5fb causes the following > > compile error with CONFIG_VIDEO_DEV=y/m, CONFIG_I2C=n: > > > > <-- snip --> > > > > ... > > MODPOST 26 modules > > ERROR: "i2c_attach_client" [drivers/media/video/v4l2-common.ko] undefined! > > make[2]: *** [__modpost] Error 1 > > > > <-- snip --> ... And what should happen if CONFIG_VIDEO_DEV=y, CONFIG_I2C=m? CC: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab commit 988d0093f9cb2bf27c299e373f9cbaac47dab2c1 Author: David S. Miller Date: Mon Feb 18 00:20:50 2008 -0800 [BLUETOOTH] hci_sysfs.c: Kill build warning. net/bluetooth/hci_sysfs.c: In function ‘del_conn’: net/bluetooth/hci_sysfs.c:339: warning: suggest parentheses around assignment used as truth value Signed-off-by: David S. Miller commit fea5fa875eb235dc186b1f5184eb36abc63e26cc Author: Joe Perches Date: Sun Feb 17 23:35:28 2008 -0800 [NET]: Remove MAC_FMT MAC_FMT is no longer used Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 235365f3aaaa10b7056293877c0ead50425f25c7 Author: Joe Perches Date: Sun Feb 17 23:34:54 2008 -0800 net/8021q/vlan_dev.c: Use print_mac. Remove direct use of MAC_FMT Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit b791160b5af4ea95c72fb59d13079664beca1963 Author: YOSHIFUJI Hideaki Date: Sun Feb 17 23:29:30 2008 -0800 [XFRM]: Fix ordering issue in xfrm_dst_hash_transfer(). Keep ordering of policy entries with same selector in xfrm_dst_hash_transfer(). Issue should not appear in usual cases because multiple policy entries with same selector are basically not allowed so far. Bug was pointed out by Sebastien Decugis . We could convert bydst from hlist to list and use list_add_tail() instead. Signed-off-by: YOSHIFUJI Hideaki Acked-by: Sebastien Decugis Signed-off-by: David S. Miller commit 82453021b8be85171350c695d7ebafe7b517c812 Author: S.Çağlar Onur Date: Sun Feb 17 23:25:57 2008 -0800 [BLUETOOTH] net/bluetooth/hci_core.c: Use time_* macros The functions time_before, time_before_eq, time_after, and time_after_eq are more robust for comparing jiffies against other values. So following patch implements usage of the time_after() macro, defined at linux/jiffies.h, which deals with wrapping correctly Signed-off-by: S.Çağlar Onur Acked-by: Marcel Holtmann Signed-off-by: David S. Miller commit cbc9fc5dec60f84b62e0144165c545abd24847c0 Author: S.Çağlar Onur Date: Sun Feb 17 23:24:10 2008 -0800 [SPARC64] arch/sparc64/kernel/unaligned.c: Use time_* macros The functions time_before, time_before_eq, time_after, and time_after_eq are more robust for comparing jiffies against other values. So following patch implements usage of the time_after() macro, defined at linux/jiffies.h, which deals with wrapping correctly Signed-off-by: S.Çağlar Onur Signed-off-by: David S. Miller commit 3c62a2d3477ff7725210db57aec3d2806fa10c20 Author: David S. Miller Date: Sun Feb 17 23:22:50 2008 -0800 [SPARC64]: Always register a PROM based early console. Signed-off-by: David S. Miller commit f6095a5176e17b510235e80ecfb542eaee6e5666 Author: David S. Miller Date: Sun Feb 17 22:44:32 2008 -0800 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller commit 966d905634de4433cea465fdcea19503c4ae260f Author: David S. Miller Date: Thu Feb 14 00:58:44 2008 -0800 [SPARC64]: Add -mtune=ultrasparc3 if possible. This gives better heuristics for the cost of a multiply (fixed 5 cycles), rather than the 'ultrasparc' setting (variable, and unpredictable if the second argument is non-constant). Example code size savings: text data bss dec hex filename 3823690 304040 448880 4576610 45d562 vmlinux 3824521 304040 448880 4577441 45d8a1 vmlinux.orig Signed-off-by: David S. Miller commit 54cd6ddec77b75e6926d73d263aec72255b24030 Author: David S. Miller Date: Thu Feb 14 00:37:21 2008 -0800 [SPARC64]: Remove Makefile code for ancient gcc and binutils. The kernel hasn't supported the compilers which need these tests for years. Signed-off-by: David S. Miller commit 5ee46e562c9c10a5e25920c4406a42061cf27839 Author: Wang Chen Date: Sun Feb 17 22:34:53 2008 -0800 [IPV6]: Fix hardcoded removing of old module code Rusty hardcoded the old module code. We can remove it now. Signed-off-by: Wang Chen Signed-off-by: David S. Miller commit 05705e4e1158ad2c1a22817f27d91ff0758fd0a9 Author: Pavel Emelyanov Date: Sun Feb 17 22:33:57 2008 -0800 [NETLABEL]: Move some initialization code into __init section. Everything that is called from netlbl_init() can be marked with __init. This moves 620 bytes from .text section to .text.init one. Signed-off-by: Pavel Emelyanov Acked-by: Paul Moore Signed-off-by: David S. Miller commit 227c43c3bca76df704231324405980851dc7f528 Author: Pavel Emelyanov Date: Sun Feb 17 22:33:16 2008 -0800 [NETLABEL]: Shrink the genl-ops registration code. Turning them to array and registration in a loop saves 80 lines of code and ~300 bytes from text section. Signed-off-by: Pavel Emelyanov Acked-by: Paul Moore Signed-off-by: David S. Miller commit f47b7257c7368698eabff6fd7b340071932af640 Author: Jarek Poplawski Date: Sun Feb 17 22:31:19 2008 -0800 [AX25] ax25_out: check skb for NULL in ax25_kick() According to some OOPS reports ax25_kick tries to clone NULL skbs sometimes. It looks like a race with ax25_clear_queues(). Probably there is no need to add more than a simple check for this yet. Another report suggested there are probably also cases where ax25 ->paclen == 0 can happen in ax25_output(); this wasn't confirmed during testing but let's leave this debugging check for some time. Reported-and-tested-by: Jann Traschewski Signed-off-by: Jarek Poplawski Signed-off-by: David S. Miller commit 9bf1d83e7ee653862ef740435a7f41e8fd6452a9 Author: Kris Katterjohn Date: Sun Feb 17 22:29:19 2008 -0800 [TCP]: Fix tcp_v4_send_synack() comment Signed-off-by: Kris Katterjohn Signed-off-by: David S. Miller commit 9c00409a2a677511506126634fbfd9f217989e57 Author: Uwe Kleine-Koenig Date: Sun Feb 17 22:28:32 2008 -0800 [IPV4]: fix alignment of IP-Config output Make the indented lines aligned in the output (not in the code). Signed-off-by: Uwe Kleine-Koenig Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 32b90fc8b11b94b719745512d7e58c0b25717260 Author: Matti Linnanvuori Date: Sun Feb 17 22:21:04 2008 -0800 Documentation: fix tcp.txt Replace BIC with CUBIC as default congestion control. Fix grammar. Signed-off-by: Matti Linnanvuori Signed-off-by: David S. Miller commit ae770152c801f10a91e5e86597a39b5f9ccf2d0d Author: Rudolf Marek Date: Fri Jan 18 00:50:04 2008 +0100 hwmon: (coretemp) Add Penryn CPU to coretemp This patch adds support for family 0x17, which has Penryn Core. It should also cover the 8 cores Xeons. Can someone test please? I think it should work. Signed-off-by: Rudolf Marek Acked-by: Jean Delvare Signed-off-by: Mark M. Hoffman commit 118a88718886a6cb7fb2cf7fb77ef2eea30c73a1 Author: Rudolf Marek Date: Sun Feb 17 22:59:39 2008 +0100 hwmon: (coretemp) Add TjMax detection for mobile CPUs Following patch will finally solve the detection of Intel Mobile CPUs which share same CPUID with Desktop/Server CPUs. We need this information to test some bit so we know if TjMax is 100C or 85C. Intel claims this works for mobiles only, respect that and set for desktops the TjMax to 100C. Intel provided some table on their wiki based on my chat with them at: http://softwarecommunity.intel.com/isn/Community/en-US/forums/30247249/ShowThread.aspx#30247249 Signed-off-by: Rudolf Marek Signed-off-by: Mark M. Hoffman commit c58310bf4933986513020fa90b4190c7492995ae Merge: 269cdfa... 1309d4e... Author: Lachlan McIlroy Date: Mon Feb 18 13:51:42 2008 +1100 Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus commit d6584f3a08055688b2344eb26379fb2f3147ce91 Author: Julia Lawall Date: Sun Feb 17 18:42:53 2008 -0800 net/9p/trans_virtio.c: Use BUG_ON if (...) BUG(); should be replaced with BUG_ON(...) when the test has no side-effects to allow a definition of BUG_ON that drops the code completely. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // @ disable unlikely @ expression E,f; @@ ( if (<... f(...) ...>) { BUG(); } | - if (unlikely(E)) { BUG(); } + BUG_ON(E); ) @@ expression E,f; @@ ( if (<... f(...) ...>) { BUG(); } | - if (E) { BUG(); } + BUG_ON(E); ) // Signed-off-by: Julia Lawall Signed-off-by: David S. Miller commit 163e3cb7daa8c3a6dde6a13a3d09a198930c6822 Author: Julia Lawall Date: Sun Feb 17 18:42:03 2008 -0800 net/rxrpc: Use BUG_ON if (...) BUG(); should be replaced with BUG_ON(...) when the test has no side-effects to allow a definition of BUG_ON that drops the code completely. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // @ disable unlikely @ expression E,f; @@ ( if (<... f(...) ...>) { BUG(); } | - if (unlikely(E)) { BUG(); } + BUG_ON(E); ) @@ expression E,f; @@ ( if (<... f(...) ...>) { BUG(); } | - if (E) { BUG(); } + BUG_ON(E); ) // Signed-off-by: Julia Lawall Signed-off-by: David S. Miller commit 9ff566074689e3aed1488780b97714ec43ba361d Author: David S. Miller Date: Sun Feb 17 18:39:54 2008 -0800 Revert "[NDISC]: Fix race in generic address resolution" This reverts commit 69cc64d8d92bf852f933e90c888dfff083bd4fc9. It causes recursive locking in IPV6 because unlike other neighbour layer clients, it even needs neighbour cache entries to send neighbour soliciation messages :-( We'll have to find another way to fix this race. Signed-off-by: David S. Miller commit 93b2d4a208eeb19bff95e98c34503ce4b03cd0f9 Author: David S. Miller Date: Sun Feb 17 18:35:07 2008 -0800 Revert "[RTNETLINK]: Send a single notification on device state changes." This reverts commit 45b503548210fe6f23e92b856421c2a3f05fd034. It break locking around dev->link_mode as well as cause other bootup problems. Signed-off-by: David S. Miller commit 269cdfaf769f5cd831284cc831790c7c5038040f Author: Lachlan McIlroy Date: Wed Nov 28 18:28:09 2007 +1100 [XFS] Added quota targets and removed dmapi directory Fixes build failures introduced by bad merge to mainline. commit 794f744b225aaf35742aac9e7b9dda96a9943413 Author: Eric Sandeen Date: Tue Nov 27 16:59:56 2007 +1100 [XFS] Fix up xfs out-of-tree builds. (a.k.a. external modules) Change -I include directives to find headers in the out-of-tree spot. This allows a directory containing only xfs files to be built as: SGI-PV: 971186 SGI-Modid: xfs-linux-melb:xfs-kern:29878a Signed-off-by: Eric Sandeen Signed-off-by: Donald Douwsma Signed-off-by: Lachlan McIlroy commit 58b7983d15a422d9616bdc4e245d5c31dfaefbe2 Author: Andi Kleen Date: Tue Nov 27 16:53:47 2007 +1100 [XFS] Remove Makefile wrappers in XFS Makefile (and Kbuild) would include Makefile-linux-26 I doubt XFS will really still compile on 2.4; so drop that. This moves Makefile-linux-26 into Makefile and drops Kbuild. Also having wrappers as both Kbuild and Makefile seemed redundant anyways. The patch is relatively large because it renames a file, but no functional changes. SGI-PV: 971050 SGI-Modid: xfs-linux-melb:xfs-kern:29781a Signed-off-by: Andi Kleen Signed-off-by: Donald Douwsma Signed-off-by: Tim Shimmin Signed-off-by: Lachlan McIlroy commit c8620c2590f43eff864fe597fcbe5b72ab7a7b94 Author: Adrian Bunk Date: Mon Feb 18 09:00:05 2008 +0800 [CRYPTO] null: Add missing Kconfig dependency on BLKCIPHER This patch fixes the following build error caused by commit 3631c650c495d61b1dabf32eb26b46873636e918: <-- snip --> ... LD .tmp_vmlinux1 crypto/built-in.o: In function `skcipher_null_crypt': crypto_null.c:(.text+0x3d14): undefined reference to `blkcipher_walk_virt' crypto_null.c:(.text+0x3d14): relocation truncated to fit: R_MIPS_26 against `blkcipher_walk_virt' crypto/built-in.o: In function `$L32': crypto_null.c:(.text+0x3d54): undefined reference to `blkcipher_walk_done' crypto_null.c:(.text+0x3d54): relocation truncated to fit: R_MIPS_26 against `blkcipher_walk_done' crypto/built-in.o:(.data+0x2e8): undefined reference to `crypto_blkcipher_type' make[1]: *** [.tmp_vmlinux1] Error 1 <-- snip --> Signed-off-by: Adrian Bunk Signed-off-by: Herbert Xu commit cd19ba1391f93bc3741d298667c074d2d3fcc9fd Author: Riki Oktarianto Date: Mon Feb 4 23:41:58 2008 -0800 hwmon: (applesmc) sensors set for MacBook2 On my mid-2007 MacBook2, reading Ts0P sensor always failed with this message: applesmc: wait status failed: 5 != 50. So I assume that there's no such Ts0p sensor in this model (please confirm, anyone). If there's the case, then we need a new set of sensors defined for MacBook2. Signed-off-by: Riki Oktarianto Cc: Nicolas Boichat Signed-off-by: Andrew Morton Signed-off-by: Mark M. Hoffman commit 5910a9b2b1ff6205b39e5e03fdfd0ddb2a78386a Author: Tobias Klauser Date: Sun Feb 17 15:39:24 2008 +0100 hwmon: (thmc50) Storage class should be before const qualifier The C99 specification states in section 6.11.5: The placement of a storage-class specifier other than at the beginning of the declaration specifiers in a declaration is an obsolescent feature. Signed-off-by: Tobias Klauser Signed-off-by: Mark M. Hoffman commit db4315d6f53edc2cc0b0b06fce1beffebb119c71 Author: Pavel Machek Date: Tue Feb 5 00:48:13 2008 +0100 timer_list: print relative expiry time signed Relative expiry time can get negative, so it should be signed. Signed-off-by: Pavel Machek Signed-off-by: Thomas Gleixner commit ba7c1927aa69c4dfe1ecf646f03b306e49dc8e37 Author: Sam Ravnborg Date: Sun Feb 17 13:22:51 2008 +0100 hwmon: (coretemp) fix section mismatch warning Fix following warning: WARNING: vmlinux.o(.text+0xebfd04): Section mismatch in reference from the function coretemp_cpu_callback() to the function .cpuinit.text:coretemp_device_add() coretemp_cpu_callback() are only used inside a HOTPLUG_CPU block so annotate it __cpuinit. The notifier referencing the function are annotated __refdata to silence warning from the exit function. The unregister function do not use the embedded pointer but clears the variable so the annotation is OK. Signed-off-by: Sam Ravnborg Signed-off-by: Mark M. Hoffman commit 6369a2887a1b35fde91573adc650528e3efea8e9 Author: Rudolf Marek Date: Fri Jan 18 00:42:54 2008 +0100 hwmon: (coretemp) Add maximum cooling temperature readout Following patch will add reporting of maximum temperature, at which all fans should spin full speed. It may be non-physical temperature on Desktop/Server CPUs. Signed-off-by: Rudolf Marek Acked-by: Jean Delvare Signed-off-by: Mark M. Hoffman commit 1d5f2c16c6125ae6da1435ac5a190ae08429902a Author: Jean Delvare Date: Sun Feb 10 19:01:15 2008 +0100 hwmon: (adm1026) Properly terminate sysfs groups The missing NULL at the end of two sysfs file groups causes a kernel crash when calling sysfs_create_group(). Signed-off-by: Jean Delvare Signed-off-by: Mark M. Hoffman commit af865765a9ee3e3510f0fe82a4f1308d2820b7f6 Author: Roger Lucas Date: Wed Feb 13 07:52:06 2008 -0500 hwmon: (vt8231) Update maintainer email address Signed-off-by: Roger Lucas (modified MAINTAINERS entry also - MMH) Signed-off-by: Mark M. Hoffman commit 2d1374cad5a97d7c08a2c0e4282fb674b588b421 Author: Jean Delvare Date: Sun Jan 6 15:46:02 2008 +0100 hwmon: (vt8231) Add individual alarm files The new libsensors needs these individual alarm files. Signed-off-by: Jean Delvare CC: Roger Lucas Acked-by: Juerg Haefliger Signed-off-by: Mark M. Hoffman commit 13ff05e9f87101407445f79c7402aca087ddbd02 Author: Jean Delvare Date: Sun Jan 6 15:42:04 2008 +0100 hwmon: (via686a) Add individual alarm files The new libsensors needs these individual alarm files. Signed-off-by: Jean Delvare Acked-by: Juerg Haefliger Signed-off-by: Mark M. Hoffman commit 1f08af7ea95e0f4ec632664b9f21a687426df658 Author: Jean Delvare Date: Sun Jan 6 15:36:13 2008 +0100 hwmon: (smsc47m1) Add individual alarm files The new libsensors needs these individual alarm files. Signed-off-by: Jean Delvare Acked-by: Juerg Haefliger Signed-off-by: Mark M. Hoffman commit 71062ffcd5173b8291ee80e84711b619b34a64eb Author: Jean Delvare Date: Sun Jan 6 15:27:59 2008 +0100 hwmon: (max1619) Add individual alarm and fault files The new libsensors needs these individual alarm and fault files. Signed-off-by: Jean Delvare Acked-by: Juerg Haefliger Signed-off-by: Mark M. Hoffman commit 6cb59e915d04f71c62a0ee8fab34de274aa3fe2a Author: Jean Delvare Date: Sun Jan 6 15:25:52 2008 +0100 hwmon: (lm92) Add individual alarm files The new libsensors needs these individual alarm files. Signed-off-by: Jean Delvare Acked-by: Juerg Haefliger Signed-off-by: Mark M. Hoffman commit ea833f0b5a8afcc698c5ccb06237902c0e21e032 Author: Holger Schurig Date: Mon Feb 11 16:53:15 2008 +0100 [ARM] 4829/1: add .get method to pxa-cpufreq to silence a warning The .get method is needed for suspend/resume. Otherwise you get this in dmesg: cpufreq: suspend failed to assert current frequency is what timing core thinks it is. cpufreq: resume failed to assert current frequency is what timing core thinks it is. Signed-off-by: Holger Schurig Signed-off-by: Russell King commit ac2bf5bdc6ab9d820152623122973ccb1c166031 Author: Holger Schurig Date: Mon Feb 11 16:52:30 2008 +0100 [ARM] 4828/1: fix 3 warnings in drivers/video/pxafb.c * Silence a debug output. * Silence three sparse warnings, one still left. Signed-off-by: Holger Schurig Signed-off-by: Russell King commit d6a7b5f84b5c15617010e06c95129fe8800e6b21 Author: Holger Schurig Date: Mon Feb 11 16:51:41 2008 +0100 [ARM] 4827/1: fix two warnings in drivers/i2c/busses/i2c-pxa.c This fixes two warnings: * unused static defined function decode_ICR() when compiled without CONFIG_I2C_PXA_SLAVE * a sparse warning about a void function returning something Signed-off-by: Holger Schurig Signed-off-by: Russell King commit 59e8ce574445c5e7a65ec36f47a54803de704e96 Author: Byron Bradley Date: Sun Feb 10 22:31:09 2008 +0100 [ARM] 4826/1: Orion: Register the RTC interrupt on the TS-209 The QNAP TS-209 has its RTC interrupt on GPIO 3. Setup this as an interrupt and pass it to the i2c_board_info. Signed-off-by: Byron Bradley Acked-by: Nicolas Pitre Signed-off-by: Russell King commit a0dd005d1d9f4c3beab52086f3844ef9342d1e67 Author: Russell King Date: Sun Feb 17 10:35:15 2008 +0000 [ARM] pxa: fix clock lookup to find specific device clocks Ensure that the clock lookup always finds an entry for a specific device and ID before it falls back to finding just by ID. This fixes a problem reported by Holger Schurig where the BTUART was assigned the wrong clock. Tested-by: Holger Schurig Signed-off-by: Russell King commit edd2fd643c500c812cae5b0d314ab9db9f959898 Author: Chien Tung Date: Fri Feb 15 21:00:36 2008 -0600 RDMA/nes: Fix VLAN support We need to account for the VLAN header size in nes_netdev_change_mtu() and nes_netdev_init(). Also, add spin lock/unlock during VLAN RX registration so only one process can assign VLAN group for a given interface at a time. Signed-off-by: Chien Tung Signed-off-by: Glenn Streiff Signed-off-by: Roland Dreier commit 13dbf42210565418e925f883e9217b9eda5244a2 Author: Josh Boyer Date: Sat Feb 16 08:01:10 2008 -0600 [POWERPC] 44x: Add multiplatform defconfig Add a multiboard defconfig for PowerPC 44x now that the wrapper can create the proper zImages for multiple boards. Signed-off-by: Josh Boyer commit e85ff4b53eb4252d967922bd75cb6d10863955f3 Author: Glauber Costa Date: Sat Feb 16 01:01:13 2008 -0500 ACPI: remove is_processor_present prototype The function itself is defined just below, so this prototype is not really useful. Signed-off-by: Glauber Costa Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 262ee35be6a3aae9b4a7aafafc2dba901fc36620 Author: Carlos Corbacho Date: Sat Feb 16 00:02:56 2008 +0000 acer-wmi: Add DMI match for mail LED on Acer TravelMate 4200 series The TM4200 series use the same method as the TM2490 series to control the mail LED, so add a DMI based quirk for these laptops. Signed-off-by: Carlos Corbacho Signed-off-by: Len Brown commit 4fd7f5188c377c1e9aa8f224f6edf96d170a7d32 Author: Harvey Harrison Date: Fri Feb 15 17:07:19 2008 -0800 ACPI: sparse fix, replace macro with static function replace acpi_util_eval_error macro with static function. Avoid these sparse warnings due to using buffer within the macro. drivers/acpi/utils.c:273:3: warning: symbol 'buffer' shadows an earlier one drivers/acpi/utils.c:259:21: originally declared here drivers/acpi/utils.c:279:3: warning: symbol 'buffer' shadows an earlier one drivers/acpi/utils.c:259:21: originally declared here drivers/acpi/utils.c:368:3: warning: symbol 'buffer' shadows an earlier one drivers/acpi/utils.c:348:21: originally declared here drivers/acpi/utils.c:375:3: warning: symbol 'buffer' shadows an earlier one drivers/acpi/utils.c:348:21: originally declared here drivers/acpi/utils.c:382:3: warning: symbol 'buffer' shadows an earlier one drivers/acpi/utils.c:348:21: originally declared here drivers/acpi/utils.c:402:4: warning: symbol 'buffer' shadows an earlier one drivers/acpi/utils.c:348:21: originally declared here Signed-off-by: Harvey Harrison Signed-off-by: Len Brown commit 6c231bd5eb07ce546517019f334652b9ecfc329a Author: Henrique de Moraes Holschuh Date: Sat Feb 16 02:17:58 2008 -0200 ACPI: thinkpad-acpi: add tablet-mode reporting A quick study of the 0x5009/0x500A HKEY event on the X61t DSDT revealed the existence of the EC HTAB register (EC 0x0f, bit 7), and a compare with the X41t DSDT shows that HKEY.MHKG can be used to verify if the ThinkPad is tablet-capable (MHKG present), and in tablet mode (bit 3 of MHKG return is set). Add an attribute to report this information, "hotkey_tablet_mode". This attribute has poll()/select() support, and can be used along with EV_SW SW_TABLET_MODE to hook userspace to tablet events. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit d147da73c9a3f617e4685c6a7762961fe19833e7 Author: Henrique de Moraes Holschuh Date: Sat Feb 16 02:17:57 2008 -0200 ACPI: thinkpad-acpi: minor hotkey_radio_sw fixes Fixes some minor points in the radio switch code and docs. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit d0788cfbae0eddf13d5f2591acb1b407ba041d71 Author: Henrique de Moraes Holschuh Date: Sat Feb 16 02:17:56 2008 -0200 ACPI: thinkpad-acpi: improve thinkpad-acpi input device documentation Fix a few spelling errors, and also document the EV_SW events thinkpad-acpi can issue. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit b3ec6f911a681f38e4630ef8bf20b3d3cb0f63c2 Author: Henrique de Moraes Holschuh Date: Sat Feb 16 02:17:55 2008 -0200 ACPI: thinkpad-acpi: issue input events for tablet swivel events Issue EV_SW SW_TABLET_MODE events for HKEY events 0x5009 and 0x500A on the X41t/X60t/X61t. As usual, we suppress the HKEY events on the netlink interface to avoid sending duplicate events to userspace. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit d7c1d17dfed996e84212fc1ce617b2586dd70ec2 Author: Henrique de Moraes Holschuh Date: Sat Feb 16 02:17:54 2008 -0200 ACPI: thinkpad-acpi: make the video output feature optional The video output port control feature is not very useful on many ThinkPads (especially when a X server is running), and lately userspace is getting better and better at it, so it makes sense to allow users to stripe out the thinkpad-acpi video feature from their kernels and save at least 2KB. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit 7526696a013f33d4926fdc080c26fe6af07ba30f Author: Henrique de Moraes Holschuh Date: Sat Feb 16 02:17:53 2008 -0200 ACPI: thinkpad-acpi: synchronize input device switches Issue EV_SW events at module init time to synchronize the input device with the current state of the switch, otherwise we might lose the first event. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit 1bc6b9cdd5e608f0b7e6160a823c9dcd51820410 Author: Henrique de Moraes Holschuh Date: Sat Feb 16 02:17:52 2008 -0200 ACPI: thinkpad-acpi: always track input device open/close The open() and close() hooks for the input device are useful even when hotkey NVRAM polling support is not in use, so it is better to always have them around. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit 5f24927f48c63e79ff8e286fc8530f4525b4182a Author: Henrique de Moraes Holschuh Date: Sat Feb 16 02:17:51 2008 -0200 ACPI: thinkpad-acpi: trivial fix to documentation Fix a stray ibm-acpi that should have been replaced with thinkpad-acpi. Thanks to Damjan for noticing this one. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit cbb14842137ff78df10038da8ca8a97917a5a926 Author: Henrique de Moraes Holschuh Date: Sat Feb 16 02:17:50 2008 -0200 ACPI: thinkpad-acpi: trivial fix to module_desc typo Thanks to Damjan for noticing this one. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit 4b63c3b9a636b02793d2edb878e83840d4cdb25f Author: Josh Boyer Date: Fri Feb 15 22:05:03 2008 -0600 [POWERPC] 44x: Fix Kconfig formatting Clean up some whitespace issues in the 44x Kconfig file. Signed-off-by: Josh Boyer commit 8eb70ea2dbba1d0b15f693a85b60d1f56c527ff2 Author: Josh Boyer Date: Fri Feb 15 22:00:19 2008 -0600 [POWERPC] 4xx: Update defconfigs for 2.6.25 Update the 4xx defconfigs to remove WANT_DEVICE_TREE and add MTD_OF_PARTS where appropriate. Signed-off-by: Josh Boyer commit e563db977f58836c30ce3ee7cb6719c47feac4be Author: Stefan Roese Date: Wed Jan 16 20:00:00 2008 +1100 [POWERPC] 4xx: Remove "i2c" and "xxmii-interface" device_types from dts Remove all "i2c" and "xxmii-interface" (rgmii etc) device_type entries from the 4xx dts files. Signed-off-by: Stefan Roese Signed-off-by: Josh Boyer commit 7fe5f10ed032251f35258be2ee5296bca4299471 Author: Wolfgang Ocker Date: Mon Feb 11 06:24:02 2008 +1100 [POWERPC] PPC440EP Interrupt Triggering and Level Settings Corrected IRQ triggering and level settings according to latest revision of the 440EP User Manual (rev 1.24 nov 16, 2007). The incorrect settings might cause a failure of the network if both onchip ethernet ports are under heavy load. Signed-off-by: Wolfgang Ocker Acked-by: Stefan Roese Signed-off-by: Josh Boyer commit 2278e8119d9465b498763af7c1077b558f7599b1 Author: Stefan Roese Date: Wed Feb 6 23:21:59 2008 +1100 [POWERPC] net: NEWEMAC: Remove "rgmii-interface" from rgmii matching table With the removal the the "rgmii-interface" device_type property from the dts files, the newemac driver needs an update to only rely on compatible property. Signed-off-by: Stefan Roese Acked-by: Benjamin Herrenschmidt Acked-by: Jeff Garzik Signed-off-by: Josh Boyer commit b57dfbc4f7f8d394c5e96677d2b66ffca1b4e8a7 Merge: 42fe95c... e8ef7f2... Author: David S. Miller Date: Fri Feb 15 15:59:19 2008 -0800 Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit 42fe95cae50bbea4c83b15962b853d6d3b14db37 Merge: 997b37d... 6fff1c6... Author: David S. Miller Date: Fri Feb 15 15:56:47 2008 -0800 Merge branch 'fixes' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 69f6b8dd6b94ac594b6920b4530a3390fb1d3fd6 Author: Thomas Sujith Date: Fri Feb 15 01:05:23 2008 -0500 intel_menlo: extract return values using PTR_ERR Need to extract errors using PTR_ERR macro and process accordingly.thermal_cooling_device_register returning NULL means that CONFIG_THERMAL=n and in that case no need to create symbolic links. Signed-off-by: Thomas Sujith Signed-off-by: Len Brown commit 1309d4e68497184d2fd87e892ddf14076c2bda98 Merge: 101142c... 5410f72... Author: Linus Torvalds Date: Fri Feb 15 15:29:23 2008 -0800 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: ata: fix sparse warning in pata_acpi.c ata: fix sparse warning in pata_marvell.c ata: fix sparse warning in pata_jmicron.c ata: fix sparse warning in pata_cs5536.c ata: sparse fixes for pata_amd.c pata_scc.c: add thaw ops pata_cs5536.c bugfix pata_legacy: don't call ata_host_detach() after initialization failure ata: fix sparse warnings in sata_mv.c ata: fix sparse warning in sata_via.c ata: fix sparse warning in sata_promise.c ata: fix sparse warning in ata_piix.c ata: fix sparse warning in libata-core.c ata: make ata_scsiop_inq_89 static in libata-scsi.c commit 43ff39f2f6450fa2e9a566f8bf007a26d76f2c9d Author: Thomas Sujith Date: Fri Feb 15 18:29:18 2008 -0500 ACPI video: check for error from thermal_cooling_device_register Need to check whether thermal_cooling_device_register returned ERROR or not. Signed-off-by: Thomas Sujith Signed-off-by: Len Brown commit d76628c67cdeebf84766a19c67c821c2e518baa4 Author: Thomas Sujith Date: Fri Feb 15 18:26:54 2008 -0500 ACPI thermal: extract return values using PTR_ERR Need to extract errors using PTR_ERR macro and process accordingly.thermal_cooling_device_register returning NULL means that CONFIG_THERMAL=n and in that case no need to create symbolic links. Signed-off-by: Thomas Sujith Signed-off-by: Len Brown commit f28bb45e2863173a7464d98907677e903f42c68b Author: Zhao Yakui Date: Fri Feb 15 08:34:37 2008 +0800 ACPI: thermal: Check whether cooling device exists before unregistering OS should check whether the cooling device exists before it is unregistered. If it doesn't exists, it is unnecessary to remove the sysfs link and call the function of thermal_cooling_device_unregister. http://bugzilla.kernel.org/show_bug.cgi?id=9982 Signed-off-by: Zhao Yakui Tested-by : Dhaval Giani Signed-off-by: Len Brown commit 19b36780ee7ddeb5080e3f1f858a83c4824f1fdc Author: Thomas Sujith Date: Fri Feb 15 01:01:52 2008 -0500 ACPI fan: extract return values using PTR_ERR Need to extract errors using PTR_ERR macro and process accordingly. thermal_cooling_device_register returning NULL means that CONFIG_THERMAL=n and in that case no need to create symbolic links. Signed-off-by: Thomas Sujith Signed-off-by: Len Brown commit 3e6fda5c1159823fc02463eceb564c8bfc0e7a0e Author: Thomas Sujith Date: Fri Feb 15 00:59:50 2008 -0500 thermal: use ERR_PTR for returning error Need to return using ERR_PTR instead of NULL in case of errors. Signed-off-by: Thomas Sujith Signed-off-by: Len Brown commit c751670902c3dd9abbed279170a832e6a1e6cf94 Author: Thomas Sujith Date: Fri Feb 15 00:58:50 2008 -0500 thermal: validate input parameters Added sanity check to make sure that thermal zone and cooling device exists. Signed-off-by: Thomas Sujith Signed-off-by: Len Brown commit 5958f1a4da39581074bab50cabd0a582e651b90f Author: Randy Dunlap Date: Sun Feb 3 15:06:25 2008 -0800 kernel-doc: fix pci-acpi warning Fix PCI kernel-doc warning: Warning(linux-2.6.24-git12//drivers/pci/pci-acpi.c:166): No description found for parameter 'hid' Signed-off-by: Randy Dunlap Signed-off-by: Len Brown commit 11e0704b7ec3abfeaee7e3a56f11c82024d1ae01 Author: Glenn Streiff Date: Fri Feb 15 11:41:27 2008 -0600 RDMA/nes: Fix MAC interrupt erroneously masked on ifdown Only mask out MAC interrupt if necessary and re-enable on ifup. There could be multiple netdevs going through the same MAC. MAC interrupts should not be masked off until the last netdev is downed. Signed-off-by: Chien Tung Signed-off-by: Glenn Streiff Signed-off-by: Roland Dreier commit c7482b81c8b524193d736488c149adbe27a7eb7f Author: Li Zefan Date: Fri Feb 15 10:24:49 2008 +0800 IB: Fix return value in ib_device_register_sysfs() If kobject_create_and_add() fails and returns NULL, the current code in ib_device_register_sysfs() does not set ret and hence returns 0. Set ret to -ENOMEM for this failure, so that the caller knows that ib_device_register_sysfs() actually failed. Signed-off-by: Li Zefan Signed-off-by: Roland Dreier commit 5410f729e331bd607d99057ece59f6d7866cd3dc Author: Harvey Harrison Date: Wed Feb 13 21:14:31 2008 -0800 ata: fix sparse warning in pata_acpi.c drivers/ata/pata_acpi.c:80:2: warning: returning void-valued expression Signed-off-by: Harvey Harrison Signed-off-by: Jeff Garzik commit 42268e26aa9d2b6d0d1f890c354447f185fc2624 Author: Harvey Harrison Date: Wed Feb 13 21:14:29 2008 -0800 ata: fix sparse warning in pata_marvell.c drivers/ata/pata_marvell.c:88:2: warning: returning void-valued expression Signed-off-by: Harvey Harrison Signed-off-by: Jeff Garzik commit ef2f2e4911654f0bc3b432b3d27e7c4d992efb7b Author: Harvey Harrison Date: Wed Feb 13 21:14:26 2008 -0800 ata: fix sparse warning in pata_jmicron.c drivers/ata/pata_jmicron.c:118:2: warning: returning void-valued expression Signed-off-by: Harvey Harrison Signed-off-by: Jeff Garzik commit 2072fb55cf2400f2f7f4b47849b69f440bb9808f Author: Harvey Harrison Date: Wed Feb 13 21:14:23 2008 -0800 ata: fix sparse warning in pata_cs5536.c Everybody passes in a u32...why fight it. drivers/ata/pata_cs5536.c:124:26: warning: incorrect type in argument 3 (different signedness) drivers/ata/pata_cs5536.c:124:26: expected int *val drivers/ata/pata_cs5536.c:124:26: got unsigned int * Signed-off-by: Harvey Harrison Signed-off-by: Jeff Garzik commit d98f88c222bf56cfa5839930fb0d0af22d1c36bf Author: Harvey Harrison Date: Wed Feb 13 21:14:20 2008 -0800 ata: sparse fixes for pata_amd.c drop return statement. drivers/ata/pata_amd.c:149:2: warning: returning void-valued expression Commit ce54d1616302117fa98513ae916bb3333e1c02ea pata_amd: update mode selection for NV PATAs added the initializer for nv_mode_filter but missed deleting the previously set mode_filter drivers/ata/pata_amd.c:509:3: warning: Initializer entry defined twice drivers/ata/pata_amd.c:521:3: also defined here drivers/ata/pata_amd.c:544:3: warning: Initializer entry defined twice drivers/ata/pata_amd.c:556:3: also defined here Signed-off-by: Harvey Harrison Signed-off-by: Jeff Garzik commit 1ec414ecc0fe09a610dfafcc6958103a37b7eb0f Author: Akira Iguchi Date: Wed Feb 13 11:55:07 2008 +0900 pata_scc.c: add thaw ops This patch adds default thaw ops and fixes the freeze/thaw inconsistency. Signed-off-by: Kou Ishizaki Signed-off-by: Akira Iguchi Signed-off-by: Jeff Garzik commit b6966a61a8b5df2987856c81f39a8fd014d32a80 Author: Martin K. Petersen Date: Wed Feb 13 01:41:44 2008 -0500 pata_cs5536.c bugfix Fix speed negotiation for secondary device. Signed-off-by: Martin K. Petersen Signed-off-by: Jeff Garzik commit 7a3a16fe7ddf0570e2fcf286d7e244a5e1e16f6a Author: Tejun Heo Date: Wed Feb 13 18:20:19 2008 +0900 pata_legacy: don't call ata_host_detach() after initialization failure ata_host_detach() detaches an attached port and shouldn't be called on a port which hasn't been attached yet. pata_legacy incorrectly calls ata_host_detach() on unattached port after initialization failure causing oops. Fix it. Signed-off-by: Tejun Heo Cc: Alan Cox Cc: Ingo Molnar Cc: Arjan van de Ven Signed-off-by: Jeff Garzik commit 5ab063e397d9f6fcadb37a07465efcc87f9e9345 Author: Harvey Harrison Date: Wed Feb 13 21:14:14 2008 -0800 ata: fix sparse warnings in sata_mv.c pp is never used again in this function, no need to declare a new one. drivers/ata/sata_mv.c:1545:24: warning: symbol 'pp' shadows an earlier one drivers/ata/sata_mv.c:1501:22: originally declared here drivers/ata/sata_mv.c:1553:24: warning: symbol 'pp' shadows an earlier one drivers/ata/sata_mv.c:1501:22: originally declared here Signed-off-by: Harvey Harrison Signed-off-by: Jeff Garzik commit 48e1f800eaa08eefe00476b83a7983b707d31848 Author: Harvey Harrison Date: Wed Feb 13 21:14:11 2008 -0800 ata: fix sparse warning in sata_via.c drivers/ata/sata_via.c:336:2: warning: returning void-valued expression Signed-off-by: Harvey Harrison Signed-off-by: Jeff Garzik commit 6903c0f7efe907ada1b9636b52c5ae11fd51ab68 Author: Harvey Harrison Date: Wed Feb 13 21:14:08 2008 -0800 ata: fix sparse warning in sata_promise.c drivers/ata/sata_promise.c:546:15: warning: symbol 'len' shadows an earlier one drivers/ata/sata_promise.c:538:6: originally declared here len is set again immediately after the loop, so this is safe. Signed-off-by: Harvey Harrison Signed-off-by: Jeff Garzik commit 018d982721209241ede1180aa795d68833c26b10 Author: Harvey Harrison Date: Wed Feb 13 21:14:05 2008 -0800 ata: fix sparse warning in ata_piix.c drivers/ata/ata_piix.c:1655:8: warning: symbol 'rc' shadows an earlier one drivers/ata/ata_piix.c:1616:6: originally declared here Signed-off-by: Harvey Harrison Signed-off-by: Jeff Garzik commit eeb37ac87459f8e86d53243bd97e0c086de7eb87 Author: Harvey Harrison Date: Thu Feb 14 10:45:23 2008 -0800 ata: fix sparse warning in libata-core.c rc is used to test the return value and possibly return an error. No need to redeclare inside the loop. drivers/ata/libata-core.c:7089:7: warning: symbol 'rc' shadows an earlier one drivers/ata/libata-core.c:7030:9: originally declared here Signed-off-by: Harvey Harrison Signed-off-by: Jeff Garzik commit 08f01058fe8fcf0d4d69d96d667c51d52859b31d Author: Harvey Harrison Date: Thu Feb 14 10:45:20 2008 -0800 ata: make ata_scsiop_inq_89 static in libata-scsi.c Signed-off-by: Harvey Harrison Signed-off-by: Jeff Garzik commit 6fff1c64ffd899e0b70fbb0201c6603f078ea942 Author: Stefano Brivio Date: Sat Feb 9 07:20:43 2008 +0100 b43legacy: Add driver load messages This adds printk messages with basic information about the driver being loaded. This information includes a summary of the compiled-in features, which simplifies bug-reporting and debugging a lot. Also a firmware ID is printed. This is a unique identifier blob for a specific version of the firmware. This ID is attached to a specific version of the firmware blob in b43-fwcutter (see fwcutter git). This helps users to select the right firmware for their device. This also makes it possible to use automated scripts to fetch and extract the right firmware for the driver. (The script will grep the .ko for the "Firmware-ID: xxx" string.) While the driver might still support other versions of the firmware for backward compatibility, this will always print out the officially supported version, which people _should_ use. Signed-off-by: Stefano Brivio Signed-off-by: John W. Linville commit 943dbef4b84b9cee3501e45b654e38335900570b Author: Dan Williams Date: Thu Feb 14 17:49:41 2008 -0500 ipw2200: fix ucode assertion for RX queue overrun Restock the RX queue when there are a lot of unused frames so that the RX ring buffer doesn't overrun, causing a ucode assertion. Backport of patch "iwlwifi: fix ucode assertion for RX queue overrun". Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit a6477249b4a1c2da6376f47fc175882be9adb844 Author: Reinette Chatre Date: Thu Feb 14 10:40:28 2008 -0800 iwlwifi: only check for association id when associating with AP There is no association process in IBSS mode - so testing the association id is not needed. Signed-off-by: Reinette Chatre Signed-off-by: Tomas Winkler CC: Richard Scherping Signed-off-by: John W. Linville commit 58ff6d4db9b51533656173282de8d21f72080a49 Author: Tomas Winkler Date: Wed Feb 13 02:47:54 2008 +0200 iwlwifi: reverting 'misc wireless annotations' patch for iwlwifi This patch revert commit blow that wrongly suppressed sparse warning in iwlwifi eeprom reading In addtion it suppresses correctly the iwlwifi eeprom register reading anomaly. commit 45883ae47a0a4700c0f4716dc75a255cccdc3a76 misc wireless annotations Signed-off-by: Al Viro Signed-off-by: Tomas Winkler Cc: Al Viro Signed-off-by: John W. Linville commit cfbc35b62700447b6b14b744554f5dca17bdfa45 Author: Stefano Brivio Date: Tue Feb 12 03:09:10 2008 +0100 b43legacy: fix firmware load message level The firmware version information should always get printed. Not only on a debug build. The patch by Michael Buesch has been ported to b43legacy. Signed-off-by: Stefano Brivio Signed-off-by: John W. Linville commit 1a1c360d73e5100a4dda1010ce0f1ebd71e03811 Author: Stefano Brivio Date: Tue Feb 12 03:09:00 2008 +0100 b43legacy: add firmware information to modinfo This adds the firmware ID to modinfo. The patch by Michael Buesch has been ported to b43legacy. Signed-off-by: Stefano Brivio Signed-off-by: John W. Linville commit ceffefd15aac78841432230627308b8a382dbcfc Author: Michael Buesch Date: Sun Feb 10 14:16:52 2008 +0100 mac80211: Fix initial hardware configuration On the initial device-open we need to defer the hardware reconfiguration after we incremented the open_count, because the hw_config checks this flag and won't call the lowlevel driver in case it is zero. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit db433febbadaf1fa9862fb5068b119be1d312d76 Author: Ivo van Doorn Date: Sun Feb 10 11:21:57 2008 +0100 rt2x00: Add new USB ID to rt2500usb Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 588e6cdfccb847661c62a2cc0f301d689b94ee64 Author: Michael Buesch Date: Sat Feb 9 17:53:41 2008 +0100 b43: Fix firmware load message level The firmware version information should always get printed. Not only on a debug build. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 9c7d99d6fba1f26b95fb70b43f7954e9684cad3e Author: Michael Buesch Date: Sat Feb 9 10:23:49 2008 +0100 b43: Add firmware information to modinfo This adds the firmware ID to modinfo. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 26bc783f8cf7227718f8b4cbc32f0c3a898b128f Author: Michael Buesch Date: Sat Feb 9 00:18:35 2008 +0100 b43: Add driver load messages This adds printk messages with basic information about the driver being loaded. This information includes a summary of the compiled-in features, which simplifies bug-reporting and debugging a lot. Also a firmware ID is printed. This is a unique identifier blob for a specific version of the firmware. This ID is attached to a specific version of the firmware blob in b43-fwcutter (see fwcutter git). This helps users to select the right firmware for their device. This also makes it possible to use automated scripts to fetch and extract the right firmware for the driver. (the script will grep the .ko for the "Firmware-ID: xxx" string. While the driver might still support other versions of the firmware for backward compatibility, this will always print out the officially supported version, which people _should_ use. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 8e118f0ed866afab654a438b85643d4f1472f28b Author: Stefano Brivio Date: Fri Feb 8 06:31:53 2008 +0100 b43legacy: fix DMA for 30/32-bit DMA engines This checks if the DMA address is bigger than what the controller can manage. It will reallocate the buffers in the GFP_DMA zone in that case. The patch by Michael Buesch has been ported to b43legacy. Thanks to Matti Viljanen for reporting this. Cc: Matti Viljanen Signed-off-by: Stefano Brivio Signed-off-by: John W. Linville commit d68ab68066805fdfee1f5f29ec2ec0179fd92fe1 Author: Mohamed Abbas Date: Thu Feb 7 13:16:33 2008 -0800 iwlwifi: earlier rx allocation Value of count is used to decide when to replenish rx buffers. If it is equal or above 8 we replenish the buffers. Ensure there is no starvation by initializing count to 8 - thus forcing replenish at first iteration. This is helpful when rx receives batches of buffers smaller than 8. Signed-off-by: Mohamed Abbas Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit c342a1b91f6ccd317c68defd3b4c7bb75397d967 Author: Gregory Greenman Date: Wed Feb 6 11:20:40 2008 -0800 iwlwifi: Don't send host commands on rfkill This patch prevents sending host commands when rfkill is on Signed-off-by: Gregory Greenman Signed-off-by: Tomas Winkler Signed-off-by: John W. Linville commit 9788864e2169ed3611e61c097efe4944c23fe7e9 Author: Reinette Chatre Date: Wed Feb 6 11:20:38 2008 -0800 iwlwifi: do not clear GEO_CONFIGURED bit when calling _down The geos information is set up during probe and should only be removed during pci_remove, not during _down. This is a temporary fix until the setting of the status bits have been cleaned up (to explicitly match all setting with clearing of status bits). Signed-off-by: Reinette Chatre Signed-off-by: Tomas Winkler Signed-off-by: John W. Linville commit a97b1f3d203d0fe5503578c6ee8bfdb89ed72679 Author: Jussi Kivilinna Date: Wed Feb 6 15:36:10 2008 +0200 rndis_wlan: enable stall workaround by link quality instead of link speed Enable workaround for poor link stalls by link quality instead of link speed. Using link speed caused workaround be active always on 802.11b networks which reduced performance and not even catch all stalls. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit 281c56dd276e587a7b4a65764ac68ae250e73235 Author: Bruno Randolf Date: Tue Feb 5 18:44:55 2008 +0900 ath5k: correct padding in tx descriptors when setting up the tx descriptors for the hardware we must account for any padding between the header and the data we might have added previously. frame len is the length of the frame in the air (including FCS but no padding) and buffer len is the length of the buffer (including padding, but without FCS). changing the way ah_setup_tx_desc is called: now excluding the FCS, since it's easier to add that in the function where we need it. before this fix we sent trailing zero bytes after the packet (because frame len included the padding) which was not a big problem without WEP, but with WEP this resultes in a wrong WEP checksum and the packet is discarded - which is how i noticed at all ;) an easy way to run into header padding problems, btw, is to connect to a QoS (WME) enabled access point (eg. madwifi) - QoS data frames are 2 byte longer and will require padding. this patch applies on top of luis latest patch series from 04.02.2008. drivers/net/wireless/ath5k/base.c: Changes-licensed-under: 3-Clause-BSD drivers/net/wireless/ath5k/hw.c: Changes-licensed-under: ISC Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit bd196ec7f03fff6935f66a9a3cf27accd34a75b9 Author: John W. Linville Date: Thu Feb 7 15:46:01 2008 -0500 wavelan: mark hardware interfacing structures as packed With assists from Russell King and Andrew Morton ... Signed-off-by: John W. Linville commit e8ef7f295b9f02c1522da405ac545318174239d5 Author: David Graham Date: Thu Feb 14 10:17:20 2008 -0800 e1000e: PCIe devices do not need to unset MANC_ARP_ENA Users reported that ARP's were lost with e1000e. The problem is fixed by not enabling this manageability configuration bit. None of the release_manageability code is actually needed as the normal device reset during a shutdown returns everthing to the right condition automatically. Signed-off-by: David Graham Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit aa20c6c6d22efcca76c6225eb46f5903ce14c7c8 Author: David Graham Date: Thu Feb 14 10:17:12 2008 -0800 igb: PCIe devices do not need to unset MANC_ARP_ENA Users reported that ARP's were lost with igb. The problem is fixed by not enabling this manageability configuration bit. None of the release_manageability code is actually needed as the normal device reset during a shutdown returns everthing to the right condition automatically. Signed-off-by: David Graham Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit 41825d7158d4ca6488d562d73279392a886b9e7c Author: Auke Kok Date: Tue Feb 12 15:20:33 2008 -0800 ixgbe: Correctly obtain protocol information on transmit In reply to "RE: [Fwd: [PATCH 2.6.25] ixgbe/igb: correctly obtain protocol information on transmit]" from Andy Gospodarek: The driver was incorrectly looking at socket headers for protocol information, needed for checksumming offload. Fix this by not looking at the socket but frame headers instead. This disregards extension headers but it's unclear that linux generates those anyway. Tested by Andy Gospodarek. Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit 5918bd88effd0233a048983570ec5803f5f753dc Author: Auke Kok Date: Tue Feb 12 15:20:24 2008 -0800 e1000e: Fix CRC stripping in hardware context bug CRC stripping was only correctly enabled for packet split recieves which is used when receiving jumbo frames. Correctly enable SECRC also for normal buffer packet receives. Tested by Andy Gospodarek and Johan Andersson, see bugzilla #9940. Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit fdb26629f31b898c2c4a4127c7d5c2401fb5ac60 Author: Al Viro Date: Wed Feb 13 03:58:36 2008 +0000 gianfar iomem misannotations Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit 9f30c768c00fd0f0a2ab37ef29d8c8c5a7abdf2e Author: Jarek Poplawski Date: Wed Feb 13 11:17:58 2008 +0000 mkiss: ax_bump() locking fix According to one of OOPSes reported by Jann softirq can break while skb is prepared for netif_rx. The report isn't complete, so the real reason of the later bug could be different, but IMHO this locking break in ax_bump is unsafe and unnecessary. Reported-and-tested-by: Jann Traschewski Signed-off-by: Jarek Poplawski Signed-off-by: Jeff Garzik commit a1a98b72dbd17e53cd92b8e78f404525ebcfd981 Author: Chuck Ebbert Date: Wed Feb 13 19:47:11 2008 -0500 Fix station address detection in smc Megahertz EM1144 PCMCIA ethernet adapter needs special handling because it has two VERS_1 tuples and the station address is in the second one. Conversion to generic handling of these fields broke it. Reverting that fixes the device. https://bugzilla.redhat.com/show_bug.cgi?id=233255 Thanks go to Jon Stanley for not giving up on this one until the problem was found. Signed-off-by: Chuck Ebbert Signed-off-by: Jeff Garzik commit fa2144ba9a31d1d0dc9607508576c3850e0d95b1 Author: Sam Ravnborg Date: Fri Feb 15 13:53:11 2008 +0100 kbuild: explain why DEBUG_SECTION_MISMATCH is UNDEFINED We started to see patches enabling this - so explain why it is disabled and the condition to enable it again. Signed-off-by: Sam Ravnborg commit 242f1a343776a621ad5c3446d6f2718d37863cb5 Author: Frederik Deweerdt Date: Fri Feb 15 19:19:33 2008 +0800 [CRYPTO] tcrypt: Add missing Kconfig dependency on BLKCIPHER Building latest git fails with the following error: ERROR: "crypto_alloc_ablkcipher" [crypto/tcrypt.ko] undefined! This appears to happen because CONFIG_CRYPTO_TEST is set while CONFIG_CRYPTO_BLKCIPHER is not. The following patch fixes the problem for me. Signed-off-by: Frederik Deweerdt Signed-off-by: Herbert Xu commit f881d8290c59beb472062142aab54af2554d0d9c Author: Patrick McHardy Date: Fri Feb 15 19:15:05 2008 +0800 [HIFN]: Fix invalid config ifdefs for RNG support The CRYPTO_DEV_HIFN_795X_RNG ifdefs are missing the CONFIG_ prefix. Signed-off-by: Patrick McHardy Signed-off-by: Herbert Xu commit cf87dcd14064e7660f2b11b35b9e4949e9812fd2 Author: Sam Ravnborg Date: Wed Feb 13 22:50:24 2008 +0100 kbuild: fix building vmlinux.o Ingo Molnar wrote: > > i've got a build log from a weird build error below: > > LD init/built-in.o > distcc[12023] ERROR: compile (null) on localhost failed > make: *** [vmlinux.o] Error 1 > make: *** Waiting for unfinished jobs.... > LD .tmp_vmlinux1 > Building vmlinux.o were moved up in the dependency chain so we started to build it before the kallsym stuff. This was done to let modpost report section mismatch bugs even when the final link failed. Originally I had expected the dependency of $(kallsyms.o) to cover this but it turns out that we need to be even more explicit. Fix this by adding a conditional dependency on firat target used in the kallsyms serie of builds. Signed-off-by: Sam Ravnborg Cc: Ingo Molnar Cc: Roland McGrath commit e06b8b98da071f7dd78fb7822991694288047df0 Author: Sam Ravnborg Date: Wed Feb 13 22:43:28 2008 +0100 kbuild: allow -fstack-protector to take effect Arjan van de Ven wrote: === I just read the excellent LWN writeup of the vmsplice security thing, and that got me wondering why this attack wasn't stopped by the CONFIG_CC_STACKPROTECTOR option... because it plain should have been... Some analysis later.. it turns out that the following line in the top level Makefile, added by you in October 2007, entirely disables CONFIG_CC_STACKPROTECTOR ;( With this line removed the exploit will be nicely stopped. CFLAGS += $(call cc-option, -fno-stack-protector) Now I realize that certain distros have patched gcc to compensate for their lack of distro wide CFLAGS, and it's great to work around that... but would there be a way to NOT disable this for CONFIG_CC_STACKPROTECTOR please? It would have made this exploit not possible for those kernels that enable this feature (and that includes distros like Fedora) === Move the assignment to KBUILD_CFLAGS up before including the arch specific Makefile so arch makefiles may override the setting. Signed-off-by: Sam Ravnborg Cc: Arjan van de Ven Cc: stable@kernel.org commit 208c70a45624400fafd7511b96bc426bf01f8f5e Author: Alexey Starikovskiy Date: Thu Feb 14 15:58:47 2008 -0500 ACPI: EC: Use proper handle for boot EC Fall back to ACPI_ROOT_HANDLE only in case of error. ACPI: EC: EC description table is found, configuring boot EC ACPI Error (evregion-0316): No handler for Region [ECOR] (ffff81007a651620) [EmbeddedControl] [20070126] ACPI Error (exfldio-0289): Region EmbeddedControl(3) has no handler [20070126] http://bugzilla.kernel.org/show_bug.cgi?id=9916 Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit 42086cec3263b8c015ca3faa01e8190f0e3ff445 Author: Chris Zankel Date: Mon Jan 28 15:55:01 2008 -0800 [XTENSA] Allow debugger to modify the WINDOWBASE register. For the 'return' command, GDB needs to adjust WINDOWBASE. In case WB is different from 0, we need to rotate the window register file and update WINDOWSTART and WMASK. This patch also removes some ret|= statements for __get_user/__put_user as the address range was alrady checked a couple of lines earlier. Signed-off-by: Chris Zankel commit bdd362ff4ff8dc0c697ce87dbb337f3b7341fc46 Author: Bob Wilson Date: Fri Feb 1 16:56:32 2008 -0800 [XTENSA] Fix makefile to work with binutils-2.18. When building with binutils-2.18, vmlinux includes .note.gnu.build-id sections that need to be stripped out when building the binary image. The old .xt.insn sections haven't been used for a long time, so don't bother stripping them. Signed-off-by: Bob Wilson Signed-off-by: Chris Zankel commit e1088430626b2ec4cd64f2fb7d9fd7c6df5d5824 Author: Chris Zankel Date: Tue Jan 22 00:45:25 2008 -0800 [XTENSA] Fix register corruption for certain processor configurations For processor configurations that have optional registers (compiler-used but non-coprocessor), user space registers might get corrupted when there are only 4 registers in the current window-frame, ie. register a4 belongs to the oldest frame in the register file. Signed-off-by: Chris Zankel commit 9f8fcf38e8928cccf8c7b32668d146e457f2ccf2 Author: Chris Zankel Date: Fri Jan 18 16:15:29 2008 -0800 [XTENSA] Fix cache flush macro for D$/I$ aliasing/non-aliasing For configurations that have aliasing in the data cache but not in the instruction cache, we don't need to flush the instruction cache. Thus, we didn't define the macros to flush the instruction cache. Some cache-flush functions, howerver, were using those macros. Signed-off-by: Chris Zankel commit 679262578ba975037901556b2ddc6b17a77cf671 Author: Chris Zankel Date: Tue Jan 15 09:49:18 2008 -0800 [XTENSA] Exclude thread-global registers from the xtregs structures. Signed-off-by: Chris Zankel commit 44c64e6b15ceab6a4927f54e1081a74ba096b95a Author: Chris Zankel Date: Fri Jan 11 11:44:17 2008 -0800 [XTENSA] Add support for the sa_restorer function Supporting the sa_restorer function allows for better security since the sigreturn system call doesn't need to be placed on the stack, so the stack doesn't need to be executable. This requires support from the c-library as it has to provide the restorer function. Signed-off-by: Chris Zankel commit c658eac628aa8df040dfe614556d95e6da3a9ffb Author: Chris Zankel Date: Tue Feb 12 13:17:07 2008 -0800 [XTENSA] Add support for configurable registers and coprocessors The Xtensa architecture allows to define custom instructions and registers. Registers that are bound to a coprocessor are only accessible if the corresponding enable bit is set, which allows to implement a 'lazy' context switch mechanism. Other registers needs to be saved and restore at the time of the context switch or during interrupt handling. This patch adds support for these additional states: - save and restore registers that are used by the compiler upon interrupt entry and exit. - context switch additional registers unbound to any coprocessor - 'lazy' context switch of registers bound to a coprocessor - ptrace interface to provide access to additional registers - update configuration files in include/asm-xtensa/variant-fsf Signed-off-by: Chris Zankel commit 71d28e6c285548106f551fde13ca6d589433d843 Author: Bob Wilson Date: Tue Oct 16 16:43:00 2007 -0700 [XTENSA] Clean up stat structs. Avoid using typedefs for stat fields. Make stat64.st_blocks an unsigned long long to avoid endian-specific padding with 32-bit values. Clean up signed vs. unsigned and int vs. long types to be consistent with other uses of these values. Signed-off-by: Bob Wilson Signed-off-by: Chris Zankel commit 36dffadb7f19671aab58be43c5896ea87d5fb1bf Author: Chris Zankel Date: Tue Feb 12 13:14:17 2008 -0800 [XTENSA] Use preprocessor to generate the linker script for the ELF boot image Signed-off-by: Marc Gauthier Signed-off-by: Chris Zankel commit 6d15d109632ff01e13c26893030e2ed9e6c4e3fd Author: Marc Gauthier Date: Sun Dec 30 22:00:54 2007 -0800 [XTENSA] Add missing RELOCATE_ENTRY for debug vector We also need to relocate the debug vector if in RAM. Signed-off-by: Marc Gauthier commit de6b03456e2e11cbff9f4bb147177374b260d04e Author: Chris Zankel Date: Wed Dec 19 10:21:50 2007 -0800 [XTENSA] Add volatile keyword to asm statements accessing counter registers The compiler get's sometimes to smart and doesn't reread the counter registers and the kernel doesn't schedule until the counter wraps around. Signed-off-by: Chris Zankel commit 03dfa442e5aaf644bb9b3b506abbd76786867eb1 Author: Chris Zankel Date: Tue Feb 12 13:10:40 2008 -0800 [XTENSA] Remove unused code We will never (need to) support signal handling coming from a double exception. There are too many things that could go wrong and delivering signals is not the fastest method for IPC, anyway. Signed-off-by: Chris Zankel commit 3b4a49e21b0d8a69629623815a8caff3eb4cf9f7 Author: Chris Zankel Date: Mon Jan 7 16:42:21 2008 -0800 [XTENSA] Fix modules for non-exec processor configurations We need to use vmalloc_exec for module loading. Also remove the definitions MODULE_START and MODULE_END, which wasn't used, and increase the VMALLOC memory range accordingly. Signed-off-by: Chris Zankel commit 3e92501a4e10e640786de10786c434834a0c1651 Author: Marc Gauthier Date: Tue Dec 11 15:28:07 2007 -0800 [XTENSA] Add missing cast in elf.h ELF_CORE_COPY_REGS() Avoids compiler warning. Signed-off-by: Marc Gauthier commit ea0b6b066304d9f7e24b273c71fab5d67ce54f96 Author: Chris Zankel Date: Wed Jan 9 09:22:36 2008 -0800 [XTENSA] Fix comments regarding the number of frames to save Signed-off-by: Marc Gauthier Signed-off-by: Chris Zankel commit 50c0716aa2f49a9d34589e380fad73402464c088 Author: Chris Zankel Date: Wed Nov 14 13:47:02 2007 -0800 [XTENSA] Add missing a2 register restore in register spill routine Register a2 is saved in depc but wasn't getting restored before returning from _spill_registers when there weren't any registers to spill. The mask to cut the top bit from the rotated WINDOWMASK register was also one bit short. Signed-off-by: CHris Zankel commit ed3174d93c342b8b2eeba6bbd124707d55304a7b Author: Marc Gauthier Date: Tue Oct 23 16:40:24 2007 -0700 [XTENSA] adjust boot linker script start addresses Move boot-redboot load address from 0xD0200000 to 0xD1000000 to make space for larger kernel images, in particular those with an embedded initramfs filesystem. Also properly set the ELF start address in boot-elf images so that PC need not be set manually when loading them using GDB. Signed-off-by: Marc Gauthier commit 3befce8f0f79be8322aba885ed052b8ad927913d Author: Chris Zankel Date: Tue Feb 12 12:22:15 2008 -0800 [XTENSA] Remove oldmask from sigcontext and fix register flush Remove oldmask from the sigcontext structure. Also update wmask and windowstart when we flush the AR registers to stack. Signed-off-by: Chris Zankel commit 8d7e8240e66cecc84a375aceb26942d02b291198 Author: Chris Zankel Date: Tue Feb 12 11:55:32 2008 -0800 [XTENSA] Clean up elf-gregset. Remove additional registers from the ELF gregset structure that are only used by the kernel or are not required or invalid in user-space. The ar registers are always aligned to a windowbase value of 0, and the WB register is always assumed to be 0. Increase the size of the structure to 128 entries. This will provide enough space in future. Signed-off-by: Chris Zankel commit 0b2c3afdaaaa3e577300b2235df43eb8af00020b Author: Chris Zankel Date: Tue Feb 12 10:11:45 2008 -0800 [XTENSA] Fix icache flush for cache aliasing Set the execution bit in the temporary TLB when we flush the instruction cache. Signed-off-by: Chris Zankel commit 70e137eb48f62e59dfa5e06d0d01f123e9464f9a Author: Chris Zankel Date: Tue Oct 23 10:58:53 2007 -0700 [XTENSA] Fix clobbered register in asm macro We dangerously re-used an input operand to an asm macro without defining a constraint. By defining a separate output operand (instead of input/output operand), the compiler is more flexible during register allocation. Signed-off-by: Chris Zankel commit c865415838146d83c92e4c1ae69aff45ef9f35f8 Author: Marc Gauthier Date: Fri Sep 21 16:38:09 2007 -0700 [XTENSA] Prevent inlining ISS platform asm constructs The simcall asm macro assumes Windowed ABI parameter passing in registers, and doesn't work if its containing function gets inlined. This fix prevents that from happening. Signed-off-by: Marc Gauthier commit b67360db143448be1f6d68835c6d0cc43837667f Author: Chris Zankel Date: Thu Sep 6 01:38:18 2007 -0700 [XTENSA] Flush the page-address in update-mmu instead of user-address The TLB entry for the user address doesn't exist at the time we want to flush the caches, so use the page address. Note that processor configurations with cache-aliasing issues are treated separately. Signed-off-by: Chris Zankel commit 49883224f6665e2b056fc3e7325b3bba9d1ff2c4 Author: Chris Zankel Date: Wed Nov 14 13:39:40 2007 -0800 [XTENSA] Fix argument list for pgd_ctor constructor. The argument list for ctor function element in the kmem_cache structure has changed. Signed-off-by: Chris Zankel commit b26d0ab0e6fa3a886d2799bf89eb05dd52f8b7c2 Author: Chris Zankel Date: Thu Sep 13 13:44:07 2007 -0700 [XTENSA] Concentrate platforms into one platforms directory. Create arch/xtensa/platforms/ directory to concentrate all platforms under that subdirectory and moves the ISS platform to that directory. Signed-off-by: Chris Zankel commit 4f8d98ff4825336b23372bb552852625fc90d3b1 Author: Chris Zankel Date: Wed Feb 13 16:44:19 2008 -0800 [XTENSA] Add .literal sections for various init sectiont to linker script Xtensa requires separate .literal section for each .text section. Adding addition init sections for cpuinit, meminit, and devinit, broke the Xtensa linker script, so, add these literal sections manually for now. Signed-off-by: Chris Zankel commit e584d85fb1cba2b08c266348b58eb4a881a88b40 Author: Chris Zankel Date: Wed Feb 13 16:25:09 2008 -0800 [XTENSA] Fix non-existent pte_token_t typedef to pgtable_t This bug was introduced in 2f569afd9ced9ebec9a6eb3dbf6f83429be0a7b4. (CONFIG_HIGHPTE vs. sub-page page tables) Signed-off-by: Chris Zankel commit 78c5bbc15bc467ec98cf4db55ae9c57522c1b77b Author: Adrian Bunk Date: Fri Dec 7 17:14:47 2007 -0800 [XTENSA] Remove dead code reported by Robert P. J. Day. Signed-off-by: Adrian Bunk Signed-off-by: Christian Zankel Signed-off-by: Andrew Morton commit 1e12e3919ea83ce28f8c017b83f68739485fef81 Author: Chris Zankel Date: Fri Jan 18 14:26:55 2008 -0800 [XTENSA] Remove duplicate includes. Signed-off-by: Lucas Woods Signed-off-by: Andrew Morton Signed-off-by: Christian Zankel commit 587c90616a5b44e6ccfac38e64d4fecee51d588c Author: Roman Zippel Date: Mon Feb 11 21:13:47 2008 +0100 kconfig: fix select in combination with default > The attached .config (with current -git) results in a compile > error since it contains: > > CONFIG_X86=y > # CONFIG_EMBEDDED is not set > CONFIG_SERIO=m > CONFIG_SERIO_I8042=y > > Looking at drivers/input/serio/Kconfig I simply don't get how this > can happen. You've hit the rather subtle rules of select vs default. What happened is that SERIO is selected to m, but SERIO_I8042 isn't selected so the default of y is used instead. We already had the problem in the past that select and default don't work well together, so this patch cleans this up and makes the rule hopefully more straightforward. Basically now the value is calculated like this: (value && dependency) || select where the value is the user choice (if available and the symbol is visible) or default. In this case it means SERIO and SERIO_I8042 are both set to y due to their default and if SERIO didn't had the default, then the SERIO_I8042 value would be limited to m due to the dependency. I tested this patch with more 10000 random configs and above case is the only the difference that showed up, so I hope there is nothing that depended on the old more complex and subtle rules. Signed-off-by: Roman Zippel Tested-by: Adrian Bunk Signed-off-by: Sam Ravnborg commit 0f78e7542e94e8f64ed393289d7bfac032634620 Author: David S. Miller Date: Wed Feb 13 01:00:26 2008 -0800 [SPARC64]: Remove DEBUG_BOOTMEM. We'll replace it in the future with better logging facilities that can be enabled at run time. Signed-off-by: David S. Miller commit b83ebf566b64d3702c6b50dbee2052623cd55ce5 Author: Robert P. J. Day Date: Tue Feb 12 22:09:29 2008 -0800 [SPARC64]: Use shorter "get_zeroed_page" call. Signed-off-by: Robert P. J. Day Signed-off-by: David S. Miller commit b3dd5b82560eef53a537e409f50261d0b33c75ce Author: Robert P. J. Day Date: Tue Feb 12 22:08:55 2008 -0800 [SPARC]: Use shorter form of "get_zeroed_page". Signed-off-by: Robert P. J. Day Signed-off-by: David S. Miller commit 631a9dca60ddd7d84a08171a14828e9cfb667d48 Author: Robert Reif Date: Tue Feb 12 18:23:31 2008 -0800 [SPARC]: video/cg14.c and video/sbuslib.c build fixes Apparently these drivers now need uaccess.h Signed-off-by: Robert Reif Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 4a75834644ae32ded9bed14db39834d6d3bc4793 Author: Auke Kok Date: Mon Feb 11 09:26:06 2008 -0800 ixgbe: remove accidentally added #ifdef Let's not add these #ifdef NETIF_F_TSO's back. Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit 4bebfaa56b72c94fe4997240ee73ad1c1fcf96c9 Author: Auke Kok Date: Mon Feb 11 09:26:01 2008 -0800 ixgbe: Disallow device reset during ethtool test Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit 0c254d863338ceff630814bf17cf8e4b61cb8aa3 Author: Auke Kok Date: Mon Feb 11 09:25:56 2008 -0800 ixgbe: warn when device is in a x4 or lower width slot It's easy to oversee this issue when working with this card as evrything will work OK but performance is severely limited (something like 1.5gbit on a x1 link) if the pci-express slot does not offer more bandwidth. Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit 23b66e2bc2bcebacab7292d7731b7372065b3f98 Author: Auke Kok Date: Mon Feb 11 09:25:51 2008 -0800 e1000e: Fix logic reversal keeping link active A logic mishap caused the adapter to keep link while we can disable it due to WoL not being active, and vice versa. Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit 14782ca8262818921a460c80a761a93740b838a2 Author: Auke Kok Date: Mon Feb 11 09:25:46 2008 -0800 e1000: warn if this driver is used for e1000e devices We're already starting to see reports from users still using e1000 where they should be using e1000e now that this is actually possible. Just to prevent some of this thrash, add a big warning on load on these devices that people should switch to e1000e. Signed-off-by: Auke Kok Acked-by: Jesse Brandeburg Signed-off-by: Jeff Garzik commit 030ed68bf063e99cea6371d1fb771a870cab1c1d Author: Julia Lawall Date: Mon Feb 11 09:25:40 2008 -0800 replace code with FIELD_SIZEOF Signed-off-by: Julia Lawall Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit 9dde447a09ec8fc0ba8375a16fe6bed2470f0d14 Author: Alex Bounine Date: Mon Feb 11 14:36:37 2008 -0500 Tsi108_eth: Add ethtool support Add ethtool support to tsi108_eth network driver. Signed-off-by: Alexandre Bounine Signed-off-by: Jeff Garzik commit b1aefe58c21de4265223b563ae923b50f4c4be08 Author: Alex Bounine Date: Mon Feb 11 14:36:12 2008 -0500 Tsi108_eth: fix link recovery after disconnect Bug fix for tsi108_eth network driver. This patch fixes a problem with link recovery after connection was lost. Signed-off-by: Alexandre Bounine Signed-off-by: Jeff Garzik commit 85bbe2158340dafb060fc7fe55a8208fe08cae26 Author: Alex Bounine Date: Mon Feb 11 14:35:49 2008 -0500 Tsi108_eth: remove not needed code Code clean-up for tsi108_eth network driver. This patch removes not needed dummy read and the corresponding comment. The PHY logic requires two reads from the status register to get current link status. This is done correctly inside mii_check_media(). Signed-off-by: Alexandre Bounine Signed-off-by: Jeff Garzik commit 6a87155a39f538f9d13cebf2c9b7c19bd41d7da9 Author: Alex Bounine Date: Mon Feb 11 14:35:26 2008 -0500 Tsi108_eth: fix detection of 1000Mb mode Bug fix for tsi108_eth network driver. This patch fixes a problem with detection of 1000Mb speed. Signed-off-by: Alexandre Bounine Signed-off-by: Jeff Garzik commit a235ef2c632a096cdb2b02379c89b49e97faaaa4 Author: Alex Bounine Date: Mon Feb 11 14:33:40 2008 -0500 Tsi108_eth: add missing linking to driver data Bug fix for tsi108_eth network driver. This patch adds missing linking to driver data. Signed-off-by: Alexandre Bounine Signed-off-by: Jeff Garzik