commit 57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 Author: Linus Torvalds Date: Thu Oct 23 20:06:52 2008 -0700 Linux 2.6.28-rc1 commit 325dcfdc81f124812a7b692354996ef7fe5b90ed Author: Randy Dunlap Date: Thu Oct 23 18:14:55 2008 -0700 Fix PCI hotplug printk format Fix printk format warning: drivers/pci/hotplug/acpiphp_ibm.c:207: warning: format '%08lx' expects type 'long unsigned int', but argument 3 has type 'long long unsigned int' Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 3a2c5dad6c4d4551effba477f4f45fa5feb1293f Merge: 2242d5e... a491913... Author: Linus Torvalds Date: Thu Oct 23 19:31:34 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: PCI: remove unused resource assignment in pci_read_bridge_bases() PCI hotplug: shpchp: message refinement PCI hotplug: shpchp: replace printk with dev_printk PCI: add routines for debugging and handling lost interrupts PCI hotplug: pciehp: message refinement PCI: fix ARI code to be compatible with mixed ARI/non-ARI systems PCI hotplug: cpqphp: fix kernel NULL pointer dereference commit 2242d5eff17cf91110a3c44747f9f2e1a938cbda Merge: 5579a78... fd6149d... Author: Linus Torvalds Date: Thu Oct 23 19:19:54 2008 -0700 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: (29 commits) tcp: Restore ordering of TCP options for the sake of inter-operability net: Fix disjunct computation of netdev features sctp: Fix to handle SHUTDOWN in SHUTDOWN_RECEIVED state sctp: Fix to handle SHUTDOWN in SHUTDOWN-PENDING state sctp: Add check for the TSN field of the SHUTDOWN chunk sctp: Drop ICMP packet too big message with MTU larger than current PMTU p54: enable 2.4/5GHz spectrum by eeprom bits. orinoco: reduce stack usage in firmware download path ath5k: fix suspend-related oops on rmmod [netdrvr] fec_mpc52xx: Implement polling, to make netconsole work. qlge: Fix MSI/legacy single interrupt bug. smc911x: Make the driver safer on SMP smc911x: Add IRQ polarity configuration smc911x: Allow Kconfig dependency on ARM sis190: add identifier for Atheros AR8021 PHY 8139x: reduce message severity on driver overlap igb: add IGB_DCA instead of selecting INTEL_IOATDMA igb: fix tx data corruption with transition to L0s on 82575 ehea: Fix memory hotplug support netdev: DM9000: remove BLACKFIN hacking in DM9000 netdev driver ... commit 5579a782ad7ffa162b1060993e4a298dd50e7a33 Merge: 969907a... 60b8267... Author: Linus Torvalds Date: Thu Oct 23 19:19:14 2008 -0700 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: math-emu: Fix thinko in _FP_DIV math-emu: Fix signalling of underflow and inexact while packing result. sparc: Add checkstack support sparc: correct section of current_pc() sparc: correct section of apc_no_idle sparc64: Fix race in arch/sparc64/kernel/trampoline.S commit a491913ff22c2b69d937d14296db6fa34dbff068 Author: Zhao, Yu Date: Mon Oct 13 21:02:27 2008 +0800 PCI: remove unused resource assignment in pci_read_bridge_bases() This cleanup removes the resource assignment in pci_read_bridge_bases() since it has taken care by pci_alloc_child_bus() when allocating the bus: /* Set up default resource pointers and names.. */ for (i = 0; i < PCI_BRIDGE_RES_NUM; i++) { child->resource[i] = &bridge->resource[PCI_BRIDGE_RESOURCES+i]; child->resource[i]->name = child->name; } Signed-off-by: Yu Zhao Signed-off-by: Jesse Barnes commit be7bce250a88fbbb5a67204eb148bce8b798780a Author: Taku Izumi Date: Thu Oct 23 11:54:39 2008 +0900 PCI hotplug: shpchp: message refinement This patch refines messages in shpchp module. The main changes are as follows: - remove the trailing "." - remove __func__ as much as possible - capitalize the first letter of messages - show PCI device address including its domain Signed-off-by: Taku Izumi Signed-off-by: Jesse Barnes commit f98ca311f3a32e2adc229fecd6bf732db07fcca3 Author: Taku Izumi Date: Thu Oct 23 11:52:12 2008 +0900 PCI hotplug: shpchp: replace printk with dev_printk This patch replaces printks within shpchp module with dev_printks. Signed-off-by: Taku Izumi Signed-off-by: Jesse Barnes commit 969907a956752f88dde4aa23fa8c033b9a939aee Merge: ea54168... fa3fd72... Author: Linus Torvalds Date: Thu Oct 23 16:08:11 2008 -0700 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: drivers/ide/generic.c -> drivers/ide/ide-pci-generic.c ide-disk: set non-rotational queue flag for SSD and CF devices ide-cd: add TEAC CD-224E to the NO_AUTOCLOSE list ide: Add tx4938ide driver (v2) TXx9: Add TX4938 ATA support (v3) ide: Add tx4939ide driver (v6) ide: two more pci_ioremap_bar() conversions pci: use pci_ioremap_bar() in drivers/ide sgiioc4: use ide_host_add() (take 2) sgiioc4: fix error cleanup path (take 2) commit ea541686d8454efac4f2b5c0767affb12d4b6a52 Merge: 0d876c6... 601a1b9... Author: Linus Torvalds Date: Thu Oct 23 16:07:32 2008 -0700 Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds * 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds: leds/acpi: Fix merge fallout from acpi_driver_data change leds: Simplify logic in leds-ams-delta leds: Fix trigger registration race leds: Fix leds-class.c comment leds: Add driver for HP harddisk protection LEDs leds: leds-pca955x - Mark pca955x_led_set() static leds: Remove uneeded leds-cm-x270 driver leds: Remove uneeded strlen calls leds: Add leds-wrap default-trigger leds: Make default trigger fields const leds: Add backlight LED trigger leds: da903x: Add support for LEDs found on DA9030/DA9034 commit 0d876c6a96e2cabf8632e8066b617d9c2dec9518 Merge: 900bca3... 6ffab0e... Author: Linus Torvalds Date: Thu Oct 23 16:06:49 2008 -0700 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] pxa: corgi backlight driver should not select ssp drivers [ARM] 5321/1: Kirkwood: fix typo in Makefile [ARM] 5320/1: fix assembly constraints in implementation of do_div() [ARM] 5318/1: Swap the PRRR and NMRR values in proc-v7.S [ARM] 5316/1: AT91: oops (regression) fix on gpio irq [ARM] msm: vreg interface to msm7k pmic [ARM] msm: dma: various basic dma improvements and bugfixes [ARM] msm: clock: provide clk_*() api support for [ARM] msm: clean up iomap and devices [ARM] msm: add proc_comm support, necessary for clock and power control [ARM] msm: rename ARCH_MSM7X00A to ARCH_MSM [ARM] pxa/spitz: fix unbalance parenthesis in header file spitz.h [ARM] pxa: update {corgi,spitz}_defconfig to favor SPI-based drivers [ARM] pxa: fix the corgi_ssp.c dependency issue in {corgi,spitz}_defconfig Revert "[ARM] pxa/corgi: remove now unused corgi_ssp.c and corgi_lcd.c" commit 900bca34940ca1db8dd04a2e9b240ffac32da6f6 Merge: 2fca5cc... d03ebb1... Author: Linus Torvalds Date: Thu Oct 23 16:05:59 2008 -0700 Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight * 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight: backlight: Add driver for Tabletkiosk Sahara TouchIT-213 Tablet PC backlight: da903x: Add backlight driver for DA9030/DA9034 tosa: add support for bl/lcd driver backlight: add support for Sharp SL-6000 LCD and backlight drivers commit 2fca5ccf97d2c28bcfce44f5b07d85e74e3cd18e Author: Jens Axboe Date: Wed Oct 22 09:34:49 2008 +0200 libata: switch to using block layer tagging support libata currently has a pretty dumb ATA_MAX_QUEUE loop for finding a free tag to use. Instead of fixing that up, convert libata to using block layer tagging - gets rid of code in libata, and is also much faster. Signed-off-by: Jens Axboe Acked-by: Tejun Heo Signed-off-by: Linus Torvalds commit 388c8c16abafc2e74dff173b5de9ee519ea8d32f Author: James Bottomley Date: Sun Aug 3 13:02:12 2008 -0500 PCI: add routines for debugging and handling lost interrupts We're getting a lot of storage drivers blamed for interrupt misrouting issues. This patch provides a standard way of reporting the problem ... and, if possible, correcting it. Signed-off-by: James Bottomley Signed-off-by: Jesse Barnes commit 18b341b76cd99ce949806ccf5565900465ec2e7f Author: Taku Izumi Date: Thu Oct 23 11:47:32 2008 +0900 PCI hotplug: pciehp: message refinement This patch refines messages in pciehp module. The main changes are as follows: - remove the trailing "." - remove __func__ as much as possible - capitalize the first letter of messages - show PCI device address including its domain Signed-off-by: Taku Izumi Signed-off-by: Jesse Barnes commit 8113587c2d14d3be2414190845b2e2617c0aa33b Author: Zhao, Yu Date: Thu Oct 23 13:15:39 2008 +0800 PCI: fix ARI code to be compatible with mixed ARI/non-ARI systems The original ARI support code has a compatibility problem with non-ARI devices. If a device doesn't support ARI, turning on ARI forwarding on its upper level bridge will cause undefined behavior. This fix turns on ARI forwarding only when the subordinate devices support it. Tested-by: Suresh Siddha Signed-off-by: Yu Zhao Signed-off-by: Jesse Barnes commit d2174c3c07adad88dd9ba37a731e0b00b746822a Author: Kenji Kaneshige Date: Fri Oct 17 09:23:51 2008 +0900 PCI hotplug: cpqphp: fix kernel NULL pointer dereference The following patch fixes the regression in 2.6.27 that causes kernel NULL pointer dereference at cpqphp driver probe time. This patch should be backported to the .27 stable series. Seems to have been introduced by f46753c5e354b857b20ab8e0fe7b2579831dc369. The root cause of this problem seems that cpqphp driver calls pci_hp_register() wrongly. In current implementation, cpqphp driver passes 'ctrl->pci_dev->subordinate' as a second parameter for pci_hp_register(). But because hotplug slots and it's hotplug controller (exists as a pci funcion) are on the same bus, it should be 'ctrl->pci_dev->bus' instead. Cc: Tested-by: Ingo Molnar Signed-off-by: Kenji Kaneshige Signed-off-by: Jesse Barnes commit 601a1b92ed3ce0025f7bec6fc591cceaef8d9d69 Author: Stephen Rothwell Date: Thu Oct 23 22:35:19 2008 +0100 leds/acpi: Fix merge fallout from acpi_driver_data change Signed-off-by: Stephen Rothwell Signed-off-by: Richard Purdie commit fa3fd7204e1a4e8538117f0edbfecd4132276860 Author: Bartlomiej Zolnierkiewicz Date: Thu Oct 23 23:24:20 2008 +0200 ide: drivers/ide/generic.c -> drivers/ide/ide-pci-generic.c Suggested-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit c77380d4534c65cc9865a6b4efea44be4d039207 Author: Bartlomiej Zolnierkiewicz Date: Thu Oct 23 23:22:09 2008 +0200 ide-disk: set non-rotational queue flag for SSD and CF devices Signed-off-by: Bartlomiej Zolnierkiewicz commit 64c2eae225137a8f5a88b6a416fc182d36e8ae9f Author: Márton Németh Date: Thu Oct 23 23:22:09 2008 +0200 ide-cd: add TEAC CD-224E to the NO_AUTOCLOSE list The "TEAC CD-ROM CD-224E" cannot close its tray, so add it to the NO_AUTOCLOSE list. This will correct the "Can close tray" field of /proc/sys/dev/cdrom/info. Signed-off-by: Márton Németh Acked-by: Borislav Petkov [bart: minor fixups to patch description] Signed-off-by: Bartlomiej Zolnierkiewicz commit 28502848f52f12fcebbdec663103db2dd0740122 Author: Atsushi Nemoto Date: Thu Oct 23 23:22:08 2008 +0200 ide: Add tx4938ide driver (v2) This is the driver for the Toshiba TX4938 SoC EBUS controller ATA mode. It has custom set_pio_mode and some hacks for big endian. Signed-off-by: Atsushi Nemoto Cc: ralf@linux-mips.org Cc: sshtylyov@ru.mvista.com Signed-off-by: Bartlomiej Zolnierkiewicz commit 5d1d2f8c26f2d197df1f4b6a7f4c0088b190343e Author: Atsushi Nemoto Date: Thu Oct 23 23:22:08 2008 +0200 TXx9: Add TX4938 ATA support (v3) Add a helper routine to register tx4938ide driver and use it on RBTX4938 board. Signed-off-by: Atsushi Nemoto Acked-by: Ralf Baechle Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 37897989232e6533772b0e24369b35ee9f56c8b6 Author: Atsushi Nemoto Date: Thu Oct 23 23:22:07 2008 +0200 ide: Add tx4939ide driver (v6) This is the driver for the Toshiba TX4939 SoC ATA controller. This controller has standard ATA taskfile registers and DMA command/status registers, but the register layout is swapped on big endian. There are some other endian issue and some special registers which requires many custom dma_ops/tp_ops routines and build_dmatable. Signed-off-by: Atsushi Nemoto Acked-by: Sergei Shtylyov Cc: ralf@linux-mips.org Signed-off-by: Bartlomiej Zolnierkiewicz commit 1f1ab2745be4afc77446f17dd575a7e5695710fd Author: Arjan van de Ven Date: Thu Oct 23 23:22:07 2008 +0200 ide: two more pci_ioremap_bar() conversions based on suggestion from Sergei Shtylyov, there are two more places where using pci_ioremap_bar() makes sense. Signed-off-by: Arjan van de Ven Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 283435621a21679e02088b5abcce7d15d6d2010a Author: Arjan van de Ven Date: Thu Oct 23 23:22:07 2008 +0200 pci: use pci_ioremap_bar() in drivers/ide Use the newly introduced pci_ioremap_bar() function in drivers/ide. pci_ioremap_bar() just takes a pci device and a bar number, with the goal of making it really hard to get wrong, while also having a central place to stick sanity checks. Signed-off-by: Arjan van de Ven Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 95a84cd19224e7d41934d261b568dd04bf2bda3e Author: Sergei Shtylyov Date: Thu Oct 23 23:22:06 2008 +0200 sgiioc4: use ide_host_add() (take 2) Convert the driver to use ide_host_add() -- this seems to be a straightforward change which I'm not sure why hasn't been done yet... While doing this at last, get rid of: - useless local copy of the 'sgiioc4_port_info' variable; - unnecessary 'goto' and label... Signed-off-by: Sergei Shtylyov Cc: jeremy@sgi.com Signed-off-by: Bartlomiej Zolnierkiewicz commit 3059ef99a167da6d5d77701fda5b905d985e31af Author: Sergei Shtylyov Date: Thu Oct 23 23:22:06 2008 +0200 sgiioc4: fix error cleanup path (take 2) The driver "forgot" to call iounmap() iff request_mem_region() call failed in sgiioc4_ide_setup_pci_device()... Signed-off-by: Sergei Shtylyov Cc: jeremy@sgi.com Signed-off-by: Bartlomiej Zolnierkiewicz commit 6ffab0efc17f70f44810ae50fc40f934c8173f35 Author: Russell King Date: Thu Oct 23 22:06:53 2008 +0100 [ARM] pxa: corgi backlight driver should not select ssp drivers Resolves build errors with eseries and magician defconfigs (which make use of the corgi backlight driver.) Signed-off-by: Russell King commit fd6149d332973bafa50f03ddb0ea9513e67f4517 Author: Ilpo Järvinen Date: Thu Oct 23 14:06:35 2008 -0700 tcp: Restore ordering of TCP options for the sake of inter-operability This is not our bug! Sadly some devices cannot cope with the change of TCP option ordering which was a result of the recent rewrite of the option code (not that there was some particular reason steming from the rewrite for the reordering) though any ordering of TCP options is perfectly legal. Thus we restore the original ordering to allow interoperability with/through such broken devices and add some warning about this trap. Since the reordering just happened without any particular reason, this change shouldn't cost us anything. There are already couple of known failure reports (within close proximity of the last release), so the problem might be more wide-spread than a single device. And other reports which may be due to the same problem though the symptoms were less obvious. Analysis of one of the case revealed (with very high probability) that sack capability cannot be negotiated as the first option (SYN never got a response). Signed-off-by: Ilpo Järvinen Reported-by: Aldo Maggi Tested-by: Aldo Maggi Signed-off-by: David S. Miller commit 332edc2f7fa58b818dfed1cede60272eecc27c0a Merge: f8aea20... f81db82... Author: Linus Torvalds Date: Thu Oct 23 13:02:48 2008 -0700 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: staging: pcc_acpi: delete obsolete driver commit f8aea20018aefa51bf818914c9c1ef9006353dbb Merge: c3c9897... 520a2c2... Author: Linus Torvalds Date: Thu Oct 23 13:02:03 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (21 commits) [SCSI] sd: fix computation of the full size of the device [SCSI] lib: string_get_size(): don't hang on zero; no decimals on exact [SCSI] sun3x_esp: Convert && to || [SCSI] sd: remove command-size switching code [SCSI] 3w-9xxx: remove unnecessary local_irq_save/restore for scsi sg copy API [SCSI] 3w-xxxx: remove unnecessary local_irq_save/restore for scsi sg copy API [SCSI] fix netlink kernel-doc [SCSI] sd: Fix handling of NO_SENSE check condition [SCSI] export busy state via q->lld_busy_fn() [SCSI] refactor sdev/starget/shost busy checking [SCSI] mptfusion: Increase scsi-timeouts, similariy to the LSI 4.x driver. [SCSI] aic7xxx: Take the LED out of diagnostic mode on PM resume [SCSI] aic79xx: user visible misuse wrong SI units (not disk size!) [SCSI] ipr: use memory_read_from_buffer() [SCSI] aic79xx: fix shadowed variables [SCSI] aic79xx: fix shadowed variables, add statics [SCSI] aic7xxx: update *_shipped files [SCSI] aic7xxx: update .reg files [SCSI] aic7xxx: introduce "dont_generate_debug_code" keyword in aicasm parser [SCSI] scsi_dh: Initialize path state to be passive when path is not owned ... commit c3c9897c63ebb0b93b7f78724e38d6ee1da04041 Merge: d244118... 3cfba08... Author: Linus Torvalds Date: Thu Oct 23 12:38:39 2008 -0700 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: fix section mismatch warning - apic_x2apic_phys x86: fix section mismatch warning - apic_x2apic_cluster x86: fix section mismatch warning - apic_x2apic_uv_x x86: fix section mismatch warning - apic_physflat x86: fix section mismatch warning - apic_flat x86: memtest fix use of reserve_early() x86 syscall.h: fix argument order x86/tlb_uv: remove strange mc146818rtc include x86: remove redundant KERN_DEBUG on pr_debug x86: do_boot_cpu - check if we have ESR register x86: MAINTAINERS change for AMD microcode patch loader x86/proc: fix /proc/cpuinfo cpu offline bug x86: call dmi-quirks for HP Laptops after early-quirks are executed x86, kexec: fix hang on i386 when panic occurs while console_sem is held MCE: Don't run 32bit machine checks with interrupts on x86: SB600: skip IRQ0 override if it is not routed to INT2 of IOAPIC x86: make variables static commit f81db8200d1aaf45069399e7525c442ac3013826 Author: Len Brown Date: Thu Oct 23 15:14:52 2008 -0400 staging: pcc_acpi: delete obsolete driver pcc_acpi is based on an old version of drivers/misc/panasonic-laptop.c Signed-off-by: Len Brown commit d2441183dc222d12961ff2201f5086c846505d93 Author: Linus Torvalds Date: Thu Oct 23 12:07:17 2008 -0700 Fix compile warning in kernel/params.c Move free_module_param_attrs() into the CONFIG_MODULES section, since it's only used inside there. Thus avoiding the warning kernel/params.c:514: warning: 'free_module_param_attrs' defined but not used Signed-off-by: Linus Torvalds commit 88ed86fee6651033de9b7038dac7869a9f19775a Merge: 3856d30... 59c7572... Author: Linus Torvalds Date: Thu Oct 23 12:04:37 2008 -0700 Merge branch 'proc' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc * 'proc' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc: (35 commits) proc: remove fs/proc/proc_misc.c proc: move /proc/vmcore creation to fs/proc/vmcore.c proc: move pagecount stuff to fs/proc/page.c proc: move all /proc/kcore stuff to fs/proc/kcore.c proc: move /proc/schedstat boilerplate to kernel/sched_stats.h proc: move /proc/modules boilerplate to kernel/module.c proc: move /proc/diskstats boilerplate to block/genhd.c proc: move /proc/zoneinfo boilerplate to mm/vmstat.c proc: move /proc/vmstat boilerplate to mm/vmstat.c proc: move /proc/pagetypeinfo boilerplate to mm/vmstat.c proc: move /proc/buddyinfo boilerplate to mm/vmstat.c proc: move /proc/vmallocinfo to mm/vmalloc.c proc: move /proc/slabinfo boilerplate to mm/slub.c, mm/slab.c proc: move /proc/slab_allocators boilerplate to mm/slab.c proc: move /proc/interrupts boilerplate code to fs/proc/interrupts.c proc: move /proc/stat to fs/proc/stat.c proc: move rest of /proc/partitions code to block/genhd.c proc: move /proc/cpuinfo code to fs/proc/cpuinfo.c proc: move /proc/devices code to fs/proc/devices.c proc: move rest of /proc/locks to fs/locks.c ... commit 3856d30ded1fe43c6657927ebad402d25cd128f4 Author: Christoph Hellwig Date: Thu Oct 23 20:33:29 2008 +0200 ext4: remove unused variable in ext4_get_parent Signed-off-by: Christoph Hellwig [ All users removed in "switch all filesystems over to d_obtain_alias", aka commit 440037287c5ebb07033ab927ca16bb68c291d309 ] Signed-off-by: Linus Torvalds commit fd55cd3d3a8e57b6fac5966a23aca3cf6035b34c Author: Nicolas Pitre Date: Thu Oct 23 19:35:09 2008 +0100 [ARM] 5321/1: Kirkwood: fix typo in Makefile Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit f3161f36f5f49ee995b90d6207d8b6d990355e0a Author: Linus Torvalds Date: Thu Oct 23 11:54:08 2008 -0700 pcc-acpi: fix compile with new stricter ACPI types This was another merge problem that wasn't a data conflict, but due to independent changes in two branches that just didn't work together. The pcc-acpi staging driver used acpi_driver_data(device) = hotkey; to set driver data, but the ACPI merge made that invalid in commit db89b4f0dbab837d0f3de2c3e9427a8d5393afa3 ("ACPI: catch calls of acpi_driver_data on pointer of wrong type"), and now you're supposed to just do. device->driver_data = hotkey; instead. Fix it up. Signed-off-by: Linus Torvalds commit 12e1ec9ff31d388305da644b452c9f80d244aa55 Author: Linus Torvalds Date: Thu Oct 23 11:48:56 2008 -0700 ext3 quota support: fix compile failure This one was due to a merge error: we added a use of nd.path in commit 2d7c820e56ce83b23daee9eb5343730fb309418e ("ext3: add checks for errors from jbd"), and concurrently we got rid of 'nd' and used a naked 'path' in commit 8264613def2e5c4f12bc3167713090fd172e6055 ("[PATCH] switch quota_on-related stuff to kern_path()"). That all merged cleanly, but it didn't actually _work_. This should fix it. Signed-off-by: Linus Torvalds commit 1f6d6e8ebe73ba9d9d4c693f7f6f50f661dbd6e4 Merge: db563fc... 268a3dc... Author: Linus Torvalds Date: Thu Oct 23 10:53:02 2008 -0700 Merge branch 'v28-range-hrtimers-for-linus-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'v28-range-hrtimers-for-linus-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (37 commits) hrtimers: add missing docbook comments to struct hrtimer hrtimers: simplify hrtimer_peek_ahead_timers() hrtimers: fix docbook comments DECLARE_PER_CPU needs linux/percpu.h hrtimers: fix typo rangetimers: fix the bug reported by Ingo for real rangetimer: fix BUG_ON reported by Ingo rangetimer: fix x86 build failure for the !HRTIMERS case select: fix alpha OSF wrapper select: fix alpha OSF wrapper hrtimer: peek at the timer queue just before going idle hrtimer: make the futex() system call use the per process slack value hrtimer: make the nanosleep() syscall use the per process slack hrtimer: fix signed/unsigned bug in slack estimator hrtimer: show the timer ranges in /proc/timer_list hrtimer: incorporate feedback from Peter Zijlstra hrtimer: add a hrtimer_start_range() function hrtimer: another build fix hrtimer: fix build bug found by Ingo hrtimer: make select() and poll() use the hrtimer range feature ... commit db563fc2e80534f98c7f9121a6f7dfe41f177a79 Merge: eb81071... b1c8d2b... Author: Linus Torvalds Date: Thu Oct 23 10:43:36 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: cifs: handle the TCP_Server_Info->tsk field more carefully cifs: fix unlinking of rename target when server doesn't support open file renames [CIFS] improve setlease handling [CIFS] fix saving of resume key before CIFSFindNext cifs: make cifs_rename handle -EACCES errors [CIFS] fix build error [CIFS] undo changes in cifs_rename_pending_delete if it errors out cifs: track DeletePending flag in cifsInodeInfo cifs: don't use CREATE_DELETE_ON_CLOSE in cifs_rename_pending_delete [CIFS] eliminate usage of kthread_stop for cifsd [CIFS] Add nodfs mount option commit eb81071584bed0b04adcaf57e525638d0f92e1e1 Merge: 5f4f0c4... bfd4e66... Author: Linus Torvalds Date: Thu Oct 23 10:42:55 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: aoa i2sbus: don't overwrite module parameter ALSA: ASoC: tlv320aic3x: Fix DSP DAI format and signal polarities matching ALSA: ASoC: OMAP: Continue fixing DSP DAI format in McBSP DAI driver ALSA: Ensure PXA runtime data is initialised ALSA: hda - correct bracketing in spdif test in patch_sigmatel.c ALSA: hda - Fix conflicting volume controls on ALC260 commit 5f4f0c4d3fc95cb7d509e4469a22aed40532f0fc Author: Linus Torvalds Date: Thu Oct 23 10:28:25 2008 -0700 compat_blkdev_driver_ioctl: Remove unused variable warning Variable 'ret' is no longer used. Don't declare it. Signed-off-by: Linus Torvalds commit 54d822a6169b76b807b8cdbbf76ff2812a88947f Merge: 2248485... d921455... Author: Linus Torvalds Date: Thu Oct 23 10:23:31 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6: avr32: Fix GPIO initcall breakage avr32: Scale loops_per_jiffy when cpu frequency changes avr32: Fix bug in LCD pin setup on port C avr32: Add defconfig for the favr-32 board avr32: Add defconfig for the mimc200 board avr32: Add MIMC200 board support avr32: Fix MIMC200 board use of SPD network pins avr32: add support for EarthLCD Favr-32 board avr32: Add support for EVKLCD10X addon boards avr32: Kconfig: Remove pointless if around atstk1000 include commit 22484856402bfa1ff3defe47f6029ab0418240d9 Merge: 5ed487b... 56b26ad... Author: Linus Torvalds Date: Thu Oct 23 10:23:07 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev * git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev: (66 commits) [PATCH] kill the rest of struct file propagation in block ioctls [PATCH] get rid of struct file use in blkdev_ioctl() BLKBSZSET [PATCH] get rid of blkdev_locked_ioctl() [PATCH] get rid of blkdev_driver_ioctl() [PATCH] sanitize blkdev_get() and friends [PATCH] remember mode of reiserfs journal [PATCH] propagate mode through swsusp_close() [PATCH] propagate mode through open_bdev_excl/close_bdev_excl [PATCH] pass fmode_t to blkdev_put() [PATCH] kill the unused bsize on the send side of /dev/loop [PATCH] trim file propagation in block/compat_ioctl.c [PATCH] end of methods switch: remove the old ones [PATCH] switch sr [PATCH] switch sd [PATCH] switch ide-scsi [PATCH] switch tape_block [PATCH] switch dcssblk [PATCH] switch dasd [PATCH] switch mtd_blkdevs [PATCH] switch mmc ... commit 5ed487bc2c44ca4e9668ef9cb54c830e2a9fac47 Merge: 5b34653... fd217f4... Author: Linus Torvalds Date: Thu Oct 23 10:22:40 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (46 commits) [PATCH] fs: add a sanity check in d_free [PATCH] i_version: remount support [patch] vfs: make security_inode_setattr() calling consistent [patch 1/3] FS_MBCACHE: don't needlessly make it built-in [PATCH] move executable checking into ->permission() [PATCH] fs/dcache.c: update comment of d_validate() [RFC PATCH] touch_mnt_namespace when the mount flags change [PATCH] reiserfs: add missing llseek method [PATCH] fix ->llseek for more directories [PATCH vfs-2.6 6/6] vfs: add LOOKUP_RENAME_TARGET intent [PATCH vfs-2.6 5/6] vfs: remove LOOKUP_PARENT from non LOOKUP_PARENT lookup [PATCH vfs-2.6 4/6] vfs: remove unnecessary fsnotify_d_instantiate() [PATCH vfs-2.6 3/6] vfs: add __d_instantiate() helper [PATCH vfs-2.6 2/6] vfs: add d_ancestor() [PATCH vfs-2.6 1/6] vfs: replace parent == dentry->d_parent by IS_ROOT() [PATCH] get rid of on-stack dentry in udf [PATCH 2/2] anondev: switch to IDA [PATCH 1/2] anondev: init IDR statically [JFFS2] Use d_splice_alias() not d_add() in jffs2_lookup() [PATCH] Optimise NFS readdir hack slightly. ... commit 5b34653963de7a6d0d8c783527457d68fddc60fb Merge: 765426e... 5e1b007... Author: Linus Torvalds Date: Thu Oct 23 10:22:01 2008 -0700 Merge branch 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (26 commits) x86: canonicalize remaining header guards x86: drop double underscores from header guards x86: Fix ASM_X86__ header guards x86, um: get rid of uml-config.h x86, um: get rid of arch/um/Kconfig.arch x86, um: get rid of arch/um/os symlink x86, um: get rid of excessive includes of uml-config.h x86, um: get rid of header symlinks x86, um: merge Kconfig.i386 and Kconfig.x86_64 x86, um: get rid of sysdep symlink x86, um: trim the junk from uml ptrace-*.h x86, um: take vm-flags.h to sysdep x86, um: get rid of uml asm/arch x86, um: get rid of uml highmem.h x86, um: get rid of uml unistd.h x86, um: get rid of system.h -> system.h include x86, um: uml atomic.h is not needed anymore x86, um: untangle uml ldt.h x86, um: get rid of more uml asm/arch uses x86, um: remove dead header (uml module-generic.h; never used these days) ... commit bfd4e66b8d0dfcdbe3f5ccff45757f098bdbb26e Merge: 975f6b0... 4b7d283... 9f50bba... da74ae3... Author: Takashi Iwai Date: Thu Oct 23 19:20:54 2008 +0200 Merge branches 'topic/asoc', 'topic/misc-fixes' and 'topic/hda' into for-linus commit 765426e8ee4c0ab2bc9d44951f4865b8494cdbd0 Merge: 36ec891... 898b054... Author: Linus Torvalds Date: Thu Oct 23 10:20:36 2008 -0700 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: (123 commits) dock: make dock driver not a module ACPI: fix ia64 build warning ACPI: hack around sysfs warning with link order ACPI suspend: fix build warning when CONFIG_ACPI_SLEEP=n intel_menlo: fix build warning panasonic-laptop: fix build ACPICA: Update version to 20080926 ACPICA: Add support for zero-length buffer-to-string conversions ACPICA: New: Validation for predefined ACPI methods/objects ACPICA: Fix for implicit return compatibility ACPICA: Fixed a couple memory leaks associated with "implicit return" ACPICA: Optimize buffer allocation procedure ACPICA: Fix possible memory leak, error exit path ACPICA: Fix fault after mem allocation failure in AML parser ACPICA: Remove unused ACPI register bit definition ACPICA: Update version to 20080829 ACPICA: Fix possible memory leak in acpi_ns_get_external_pathname ACPICA: Cleanup for internal Reference Object ACPICA: Update comments - no functional changes ACPICA: Update for Reference ACPI_OPERAND_OBJECT ... commit 36ec891895020f3bc9953c8b11d079c6d77d76bd Merge: 70740d6... e4b41db... Author: Linus Torvalds Date: Thu Oct 23 10:20:15 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (23 commits) sh: asm/gpio.h needs linux/kernel.h for might_sleep()/WARN_ON(). sh: mach-highlander: Handle SCIF pinmuxing on R7785RP. sh: sh7785 pinmux support sh: update defconfigs. sh: Kill off unused p1fc divisors from SH7763 clk fwk. sh: improve pinmux support for single direction pins sh: use 10MHz VIO_CLK for ov772x on Migo-R sh: Update gpio_set_value() pin value handling sh: update ov772x byte order on Migo-R rtc: Add R2025S/D comment to rs5c372 Kconfig entry. sh: Export cache flush routines needed by sh_eth on SH7619. sh: Wire up oops reporting in the die notifier chain. sh: ap325rxa: Kill off unused port definitions. sh: Hook up PB0->PB7 input-only pins in SH7203 PFC. sh: ap325rxa: Move off of hardcoded pinmux for flctl initialization. sh: add support FLCTL for ap325rxa board sh: gpio: Stub in dummy GPIO<->IRQ mapping routines. sh: rsk7203: leds-gpio support for RSK+ LEDs. sh: gpio: Include asm-generic/gpio.h for non-gpiolib stubs. sh: fix soc-camera compile breakage on Migo-R. ... commit 70740d6c93030b339b4ad17fd58ee135dfc13913 Merge: a3415dc... 7e78f72... Author: Linus Torvalds Date: Thu Oct 23 10:18:40 2008 -0700 Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm: Avoid oops in DRM_IOCTL_RM_DRAW if a bad handle is supplied. drm: Add 32-bit compatibility for DRM_IOCTL_UPDATE_DRAW. drm/i915: use pipes, not planes to label vblank data drm/i915: hold dev->struct_mutex and DRM lock during vblank ring operations i915: Fix format string warnings on x86-64. i915: Don't dereference HWS in /proc debug files when it isn't initialized. i915: Enable IMR passthrough of vblank events before enabling it in pipestat. drm: Remove two leaks of vblank reference count in error paths. drm: fix leak of cliprects in drm_rmdraw() i915: Disable MSI on GM965 (errata says it doesn't work) drm: Set cliprects to NULL when changing drawable to having 0 cliprects. i915: Protect vblank IRQ reg access with spinlock commit a3415dc34f4a615a904852e7a9d0cc2877007e9e Merge: b4d0b08... 05a34f5... Author: Linus Torvalds Date: Thu Oct 23 10:16:53 2008 -0700 Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (32 commits) PCI hotplug: fix logic in Compaq hotplug controller bus speed setup PCI: don't export linux/io.h from pci.h PCI: PCI_QUIRKS depends on PCI PCI hotplug: pciehp: poll data link layer link active PCI hotplug: pciehp: fix possible memory leak in pcie_init PCI: Workaround invalid P2P bridge bus numbers PCI Hotplug: fakephp: add duplicate slot name debugging PCI: Hotplug core: remove 'name' PCI: shcphp: remove 'name' parameter PCI: SGI Hotplug: stop managing bss_hotplug_slot->name PCI: rpaphp: kmalloc/kfree slot->name directly PCI: pciehp: remove 'name' parameter PCI: ibmphp: stop managing hotplug_slot->name PCI: fakephp: remove 'name' parameter PCI, PCI Hotplug: introduce slot_name helpers PCI: cpqphp: stop managing hotplug_slot->name PCI: cpci_hotplug: stop managing hotplug_slot->name PCI: acpiphp: remove 'name' parameter PCI: prevent duplicate slot names PCI Hotplug: serialize pci_hp_register and pci_hp_deregister ... commit b4d0b08a4c3947c6ac004c9d83154ec5999c1861 Merge: 3321737... e45c540... Author: Linus Torvalds Date: Thu Oct 23 10:14:45 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs: 9p: fix sparse warnings 9p: rdma: RDMA Transport Support for 9P 9p: fix format warning 9p: fix debug build error commit 33217379becdee25021cabb25032b3bf703d0e96 Merge: feeedc6... 30bc4df... Author: Linus Torvalds Date: Thu Oct 23 10:14:23 2008 -0700 Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux * 'for-2.6.28' of git://linux-nfs.org/~bfields/linux: nfsd: clean up expkey_parse error cases nfsd: Drop reference in expkey_parse error cases nfsd: Fix memory leak in nfsd_getxattr NFSD: Fix BUG during NFSD shutdown processing commit feeedc6c820e1026453ad865076cee435f24d30a Merge: a270283... 11f1f2a... Author: Linus Torvalds Date: Thu Oct 23 10:10:25 2008 -0700 Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: i2c: Add info->archdata field i2c: Inform about deprecated chips directory i2c: Use pci_ioremap_bar() Schedule removal of the legacy i2c device driver binding model i2c: Clean up i2c: Update and clean up writing-clients document i2c: Drop 2-byte address block transfer defines i2c: Delete legacy model documentation i2c: Constify i2c_get_clientdata's parameter i2c: Delete outdated client porting guide i2c: Make clear what the class field of i2c_adapter is good for i2c-algo-pcf: Fix typo in debugging log message i2c-algo-pcf: Add adapter hooks around xfer begin and end i2c-algo-pcf: Pass adapter data into ->waitforpin() method i2c-i801: Add support for Intel Ibex Peak commit a27028349ccbcec9dde9d6dbba9d4017ad9ad5ab Merge: 4543237... 6c64094... Author: Linus Torvalds Date: Thu Oct 23 10:09:50 2008 -0700 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: USB: don't rebind drivers after failed resume or reset USB: fix memory leak in cdc-acm USB: Unusual dev for Mio moov 330 gps USB: cdc-wdm: make module autoload work USB: Fix unneeded endpoint check in pxa27x_udc usb/gadget: fix kernel-doc warning USB: Speedtouch: add pre_reset and post_reset routines USB: usbtest.c: length, sglen and vary are unsigned, so cannot be negative USB: support Huawei data card product IDs USB: add ZTE MF626 USB GSM modem entry USB: storage: Avoid I/O errors when issuing SCSI ioctls to JMicron USB/ATA bridge USB: Fix debugfs_create_file's error checking method for usb/gadget/s3c2410_udc USB: ohci: add support for tmio-ohci cell commit 45432371b448c80622d8069b845625996127caeb Merge: 92fb83a... 51b9054... Author: Linus Torvalds Date: Thu Oct 23 10:09:33 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (42 commits) Staging: usbip: fix build warning on 64bit kernels Staging: me4000: remove some compiler warnings Staging: wbusb: fix a bunch of compiler warnings Staging: w35und: module init cleanup Staging: w35und: use gotos for error handling Staging: w35und: remove spinlock wrappers Staging: sxg: fix compiler warnings. Staging: sxg: fix up unused function warnings Staging: sxg: clean up C99 comments Staging: Lindent the echo driver Staging: SLICOSS: Free multicast list at driver exit Staging: PCC-ACPI: Fix all checkpatch errors Staging: pcc-acpi: update to latest version Staging: Clean up sxg driver Staging: remove remaining uses of __FUNCTION__ Staging: add poch driver Staging: wlan-ng: fix build error if wireless networking is not enabled Staging: echo: remove annoying "end of function" markers Staging: echo: remove __cplusplus macro magic Staging: echo: remove dead code ... commit 92fb83afd6664a6f8a05f990d264c998f9b99f69 Merge: a534487... df13b31... Author: Linus Torvalds Date: Thu Oct 23 10:05:40 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile: (21 commits) OProfile: Fix buffer synchronization for IBS oprofile: hotplug cpu fix oprofile: fixing whitespaces in arch/x86/oprofile/* oprofile: fixing whitespaces in arch/x86/oprofile/* oprofile: fixing whitespaces in drivers/oprofile/* x86/oprofile: add the logic for enabling additional IBS bits x86/oprofile: reordering functions in nmi_int.c x86/oprofile: removing unused function parameter in add_ibs_begin() oprofile: more whitespace fixes oprofile: whitespace fixes OProfile: Rename IBS sysfs dir into "ibs_op" OProfile: Rework string handling in setup_ibs_files() OProfile: Rework oprofile_add_ibs_sample() function oprofile: discover counters for op ppro too oprofile: Implement Intel architectural perfmon support oprofile: Don't report Nehalem as core_2 oprofile: drop const in num counters field Revert "Oprofile Multiplexing Patch" x86, oprofile: BUG: using smp_processor_id() in preemptible code x86/oprofile: fix on_each_cpu build error ... Manually fixed trivial conflicts in drivers/oprofile/{cpu_buffer.c,event_buffer.h} commit a5344876065e047d507800d0801a637d68d3b129 Merge: 296e1ce... 8163bca... Author: Linus Torvalds Date: Thu Oct 23 10:00:14 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: stop_machine: fix error code handling on multiple cpus stop_machine: use workqueues instead of kernel threads workqueue: introduce create_rt_workqueue Call init_workqueues before pre smp initcalls. Make panic= and panic_on_oops into core_params Make initcall_debug a core_param core_param() for genuinely core kernel parameters param: Fix duplicate module prefixes module: check kernel param length at compile time, not runtime Remove stop_machine during module load v2 module: simplify load_module. commit 296e1ce0dc36bb106c139e25482d02da43c70e71 Merge: b14ea38... becd430... Author: Linus Torvalds Date: Thu Oct 23 09:59:29 2008 -0700 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (36 commits) V4L/DVB (9336): cx88: always de-alloc frontends on fault condition V4L/DVB (9335): videobuf: split unregister bus creating self-contained frontend de-allocator V4L/DVB (9334): cx88: dvb_remove debug output V4L/DVB (9333): cx88: Not all boards that requires cx88-mpeg has frontends V4L/DVB (9332): cx88: initial fix for analogue only compilation V4L/DVB (9331): Remove unused inode parameter from video_ioctl2 V4L/DVB (9330): Get rid of inode parameter at v4l_compat_translate_ioctl() V4L/DVB (9328): ivtvfb: FB_BLANK_POWERDOWN turns off video output V4L/DVB (9327): v4l: use video_device.num instead of minor in video%d V4L/DVB (9326): ivtv: avoid green flashing when loading ivtv V4L/DVB (9325): ivtv: switch to unlocked_ioctl. V4L/DVB (9324): v4l2: add video_ioctl2_unlocked for unlocked_ioctl support. V4L/DVB (9323): v4l2-int-if: Add enum_framesizes and enum_frameintervals ioctls. V4L/DVB (9322): v4l2-int-if: Export more interfaces to modules V4L/DVB (9321): v4l2-int-if: Define new power state changes V4L/DVB (9320): v4l2: Add 10-bit RAW Bayer formats V4L/DVB (9319): v4l2-int-if: Add cropcap, g_crop and s_crop commands. V4L/DVB (9318): v4l2-int-if: Add command to get slave private data. V4L/DVB (9316): s5h1411: Power down s5h1411 when not in use V4L/DVB (9315): s5h1411: Skip reconfiguring demod modulation if already at the desired modulation ... commit b14ea38e13686799b9d2545d467a0ec84732981c Merge: 6770ab5... c4bd822... Author: Linus Torvalds Date: Thu Oct 23 09:57:16 2008 -0700 Merge branch 'v28-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'v28-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: NOHZ: fix thinko in the timer restart code path commit 6770ab5cf506f0f00c17a5f063c5506bdc1eb170 Merge: 326528a... b876d08... Author: Linus Torvalds Date: Thu Oct 23 09:53:14 2008 -0700 Merge git://git.infradead.org/iommu-2.6 * git://git.infradead.org/iommu-2.6: Admit to maintaining VT-d, for my sins. dmar: fix uninitialised 'ret' variable in dmar_parse_dev() intel-iommu: use coherent_dma_mask in alloc_coherent amd_iommu: fix nasty bug that caused ILLEGAL_DEVICE_TABLE_ENTRY errors intel-iommu: IA64 support dmar: remove the quirk which disables dma-remapping when intr-remapping enabled dmar: Use queued invalidation interface for IOTLB and context invalidation dmar: context cache and IOTLB invalidation using queued invalidation dmar: use spin_lock_irqsave() in qi_submit_sync() commit 326528a54f61e38fc16bf2e8ac028c6a33b615ed Merge: 3e5cce6... 2bfba3c... Author: Linus Torvalds Date: Thu Oct 23 09:52:39 2008 -0700 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: remove useless subdirs from drivers/ide/ commit 3e5cce627cfaa35410ab77c50641c52b7096d3b5 Merge: f2e4bd2... 51157b4... Author: Linus Torvalds Date: Thu Oct 23 09:50:12 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm * git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm: dm: tidy local_init dm: remove unused flush_all dm raid1: separate region_hash interface part1 dm: mark split bio as cloned dm crypt: remove waitqueue dm crypt: fix async split dm crypt: tidy sector dm: remove dm header from targets dm: publish array_too_big dm exception store: fix misordered writes dm exception store: refactor zero_area dm snapshot: drop unused last_percent dm snapshot: fix primary_pe race dm kcopyd: avoid queue shuffle commit 520a2c2741747062e75f91cd0faddb564fbc64d2 Author: H. Peter Anvin Date: Tue Oct 14 11:34:20 2008 -0700 [SCSI] sd: fix computation of the full size of the device When computing the full size of the device, we need to cast sdkp->capacity before shifting, since in some configurations sector_t can be a 32-bit number. Also, change ffz(~x) to the more idiomatic ilog2(x). Signed-off-by: H. Peter Anvin Signed-off-by: James Bottomley commit a8659597bf744b0f8d2560e2a734b5c941569e0e Author: H. Peter Anvin Date: Tue Oct 14 11:34:21 2008 -0700 [SCSI] lib: string_get_size(): don't hang on zero; no decimals on exact We would hang forever when passing a zero to string_get_size(). Furthermore, string_get_size() would produce decimals on a value small enough to be exact. Finally, a few formatting issues are inconsistent with standard SI style guidelines. - If the value is less than the divisor, skip the entire rounding step. This prints out all small values including zero as integers, without decimals. - Add a space between the value and the symbol for the unit, consistent with standard SI practice. - Lower case k in kB since we are talking about powers of 10. - Finally, change "int" to "unsigned int" in one place to shut up a gcc warning when compiling the code out-of-kernel for testing. Signed-off-by: H. Peter Anvin Signed-off-by: James Bottomley commit 3fe68cc152fc7cc6a763c692544a0ab71926c800 Author: Julia Lawall Date: Tue Oct 14 18:00:19 2008 +0200 [SCSI] sun3x_esp: Convert && to || The pattern !E && !E->fld is nonsensical. The patch below updates this according to the assumption that && should be ||. But perhaps another solution was intended. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // @disable and_comm@ expression E; identifier fld; @@ - !E && !E->fld + !E || !E->fld // Signed-off-by: Julia Lawall Acked-By: Thomas Bogendoerfer Signed-off-by: James Bottomley commit d4c9b736080056ae3ba81dcf2ac418193c57dbb1 Author: Alan Stern Date: Fri Oct 10 16:03:20 2008 -0400 [SCSI] sd: remove command-size switching code This patch (as1138) removes from sd.c some old code for switching from 10-byte commands to 6-byte commands. This code is redundant -- the switching for READ and WRITE is already handled in scsi_io_completion() and the switching for MODE SENSE is already handled in scsi_mode_sense(). (There is no comparable switch for MODE SELECT, but I doubt one is needed.) Furthermore the other handlers do a better job; they check for appropriate ASC and ASCQ values before blindly switching the size. The code in sd.c is known to cause problems with some devices by switching when it shouldn't. Signed-off-by: Alan Stern Signed-off-by: James Bottomley commit 36a529202b334d0513cfeabeadca940ec41c8165 Author: FUJITA Tomonori Date: Sat Oct 11 16:00:00 2008 +0900 [SCSI] 3w-9xxx: remove unnecessary local_irq_save/restore for scsi sg copy API Since the commit 50bed2e2862a8f3a4f7d683d0d27292e71ef18b9 (sg: disable interrupts inside sg_copy_buffer), no need to disable interrupts before calling scsi_sg_copy_from_buffer. So we can simplify twa_scsiop_execute_scsi_complete() a bit, which disables interrupts just for scsi_sg_copy_from_buffer. Signed-off-by: FUJITA Tomonori Acked-by: Adam Radford Signed-off-by: James Bottomley commit 0723d4a8064d52ae44ef2e19749a190b08846be3 Author: FUJITA Tomonori Date: Thu Oct 9 11:25:42 2008 +0900 [SCSI] 3w-xxxx: remove unnecessary local_irq_save/restore for scsi sg copy API Since the commit 50bed2e2862a8f3a4f7d683d0d27292e71ef18b9 (sg: disable interrupts inside sg_copy_buffer), no need to disable interrupts before calling scsi_sg_copy_from_buffer. So we can simplify tw_transfer_internal, which disables interrupts just for scsi_sg_copy_from_buffer. Signed-off-by: FUJITA Tomonori \ Acked-by: Adam Radford Signed-off-by: James Bottomley commit aa198bf1dadefaefeb2c4a32444dfc6c7f93938d Author: Randy Dunlap Date: Mon Oct 13 09:15:09 2008 -0700 [SCSI] fix netlink kernel-doc Fix kernel-doc warning: the function short description must be on one line and the previous comment is not kernel-doc but it was confusing scripts/kernel-doc. Warning(lin2627-g3-kdocfixes//drivers/scsi/scsi_netlink.c:221): No description found for parameter 'skb' Signed-off-by: Randy Dunlap Signed-off-by: James Bottomley commit 10dab22664914505dcb804d9ad09cad6bc94d349 Author: Jamie Wellnitz Date: Thu Sep 11 21:39:36 2008 -0400 [SCSI] sd: Fix handling of NO_SENSE check condition The current handling of NO_SENSE check condition is the same as RECOVERED_ERROR, and assumes that in both cases, the I/O was fully transferred. We have seen cases of arrays returning with NO_SENSE (no error), but the I/O was not completely transferred, thus residual set. Thus, rather than return good_bytes as the entire transfer, set good_bytes to 0, so that the midlayer then applies the residual in calculating the transfer, and for sd, will fail the I/O and fall into a retry path. Signed-off-by: Jamie Wellnitz Signed-off-by: James Bottomley commit 6c5121b78ba5c70a9990e2af6cb4d6bbffe0d4d8 Author: Kiyoshi Ueda Date: Sat Oct 4 14:11:35 2008 -0400 [SCSI] export busy state via q->lld_busy_fn() This patch implements q->lld_busy_fn() for scsi mid layer to export its busy state for request stacking drivers. For efficiency, no lock is taken to check the busy state of shost/starget/sdev, since the returned value is not guaranteed and may be changed after request stacking drivers call the function, regardless of taking lock or not. When scsi can't dispatch I/Os anymore and needs to kill I/Os (e.g. !sdev), scsi needs to return 'not busy'. Otherwise, request stacking drivers may hold requests forever. Signed-off-by: Kiyoshi Ueda Signed-off-by: Jun'ichi Nomura Signed-off-by: James Bottomley commit 9d11251709f31d49c8167a619d4475fdf6cd7f73 Author: Kiyoshi Ueda Date: Sat Oct 4 14:11:06 2008 -0400 [SCSI] refactor sdev/starget/shost busy checking This patch refactors the busy checking codes of scsi_device, Scsi_Host and scsi_target. There should be no functional change. This is a preparation for another patch which exports scsi's busy state to the block layer for request stacking drivers. Signed-off-by: Kiyoshi Ueda Signed-off-by: Jun'ichi Nomura Signed-off-by: James Bottomley commit 22ab019b6ff8f3f93ddc93135d7e7ff24d982fe0 Author: Bernd Schubert Date: Tue Sep 23 15:28:58 2008 +0200 [SCSI] mptfusion: Increase scsi-timeouts, similariy to the LSI 4.x driver. Make SPI timeout 10s the same as SAS Signed-off-by: Bernd Schubert Acked-by: "Prakash, Sathya" Signed-off-by: James Bottomley commit 7583221f6066978487f14caf31b4ea5d99713bfa Author: thomas schorpp Date: Fri Oct 3 23:45:29 2008 +0200 [SCSI] aic7xxx: Take the LED out of diagnostic mode on PM resume Take the Diag/Activity-LED of the HBA out of diagnostic mode on PM resume after successful PM resume from standby and HBA restart, it remained always on before. If something fails before complete recovery, it should remain on, since it is a diagnostics LED, reason for the used higher layer for the clear. Signed-off-by: thomas.schorpp@gmail.com Acked-by: Hannes Reinecke Signed-off-by: James Bottomley commit d91ab4e7df0c0c9f98c830e04e875f39d41b21f6 Author: Alan Cox Date: Tue Sep 23 17:26:30 2008 +0100 [SCSI] aic79xx: user visible misuse wrong SI units (not disk size!) MHZ not Mhz for SI unit pedants Closes bug #6422 Signed-off-by: Alan Cox Acked-by: Hannes Reinecke Signed-off-by: James Bottomley commit d777aaf386ba71d6fbe803c015330a766cad53d8 Author: Akinobu Mita Date: Mon Sep 22 14:56:47 2008 -0700 [SCSI] ipr: use memory_read_from_buffer() Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Acked-by: Brian King Signed-off-by: James Bottomley commit 3ba7f18cd9d974a5b1e75a68a4f0a50f1df8585e Author: Harvey Harrison Date: Mon Sep 22 14:56:46 2008 -0700 [SCSI] aic79xx: fix shadowed variables OK to just reuse the outer declaration as it is never used again. drivers/scsi/aic7xxx/aic79xx_pci.c:340:12: warning: symbol 'devconfig' shadows an earlier one drivers/scsi/aic7xxx/aic79xx_pci.c:299:12: originally declared here targpcistat is always assigned just before use, remove the inner declaration. drivers/scsi/aic7xxx/aic79xx_pci.c:486:9: warning: symbol 'targpcistat' shadows an earlier one drivers/scsi/aic7xxx/aic79xx_pci.c:429:9: originally declared here Signed-off-by: Harvey Harrison Signed-off-by: Andrew Morton Acked-by: Hannes Reinecke Signed-off-by: James Bottomley commit 678e80a32fcce02323bbd753ed8944ea92d0a2d5 Author: Harvey Harrison Date: Mon Sep 22 14:56:45 2008 -0700 [SCSI] aic79xx: fix shadowed variables, add statics Redeclared within different if/else blocks, safe to reuse the original from beginning of function. drivers/scsi/aic7xxx/aic79xx_core.c:2475:10: warning: symbol 'scbid' shadows an earlier one drivers/scsi/aic7xxx/aic79xx_core.c:2399:10: originally declared here drivers/scsi/aic7xxx/aic79xx_core.c:2586:10: warning: symbol 'scbid' shadows an earlier one drivers/scsi/aic7xxx/aic79xx_core.c:2399:10: originally declared here drivers/scsi/aic7xxx/aic79xx_core.c:2587:15: warning: symbol 'scb' shadows an earlier one drivers/scsi/aic7xxx/aic79xx_core.c:2393:13: originally declared here Use caminfo for the outer declaration, the redeclared version is iterating over all initiator/target pairs (devices) which. drivers/scsi/aic7xxx/aic79xx_core.c:8857:23: warning: symbol 'devinfo' shadows an earlier one drivers/scsi/aic7xxx/aic79xx_core.c:8711:21: originally declared here Forward declaration was already marked static, make the definition match. drivers/scsi/aic7xxx/aic79xx_core.c:3693:1: warning: symbol 'ahd_devlimited_syncrate' was not declared. Should it be static? Signed-off-by: Harvey Harrison Signed-off-by: Andrew Morton Acked-by: Hannes Reinecke Signed-off-by: James Bottomley commit 060ae855a836d3ed3359faa13874e92caaa34763 Author: Denys Vlasenko Date: Mon Sep 22 14:56:42 2008 -0700 [SCSI] aic7xxx: update *_shipped files Signed-off-by: Denys Vlasenko Signed-off-by: Andrew Morton Acked-by: Hannes Reinecke Signed-off-by: James Bottomley commit 7b61ab89f9981ef296fb04dc42ee46fcc922c14f Author: Denys Vlasenko Date: Mon Sep 22 14:56:41 2008 -0700 [SCSI] aic7xxx: update .reg files Update .reg files, marking unused registers with dont_generate_debug_code. Comment explains how to use it. Signed-off-by: Denys Vlasenko Signed-off-by: Andrew Morton Acked-by: Hannes Reinecke Signed-off-by: James Bottomley commit fa25b99a503f68594a1787e6f31159a5aec77928 Author: Denys Vlasenko Date: Mon Sep 22 14:56:40 2008 -0700 [SCSI] aic7xxx: introduce "dont_generate_debug_code" keyword in aicasm parser aic7xxx still contains ~30kb of dead code if pretty printing of registers is requested. These patches deal with it. Size differences: text data bss dec hex filename DEBUG_ENABLE+PRETTY_PRINT: 234697 2362 1188 238247 3a2a7 linux-2.6.26-rc8-/drivers/scsi/aic7xxx/built-in.o 205092 2362 1188 208642 32f02 linux-2.6.26-rc8/drivers/scsi/aic7xxx/built-in.o NO_DEBUG_ENABLE+PRETTY_PRINT: 227272 2362 1172 230806 38596 linux-2.6.26-rc8-/drivers/scsi/aic7xxx/built-in.o 197671 2362 1172 201205 311f5 linux-2.6.26-rc8/drivers/scsi/aic7xxx/built-in.o DEBUG_ENABLE+NO_PRETTY_PRINT: 192457 2362 1188 196007 2fda7 linux-2.6.26-rc8-/drivers/scsi/aic7xxx/built-in.o 192457 2362 1188 196007 2fda7 linux-2.6.26-rc8/drivers/scsi/aic7xxx/built-in.o NO_DEBUG_ENABLE+NO_PRETTY_PRINT: 185040 2362 1172 188574 2e09e linux-2.6.26-rc8-/drivers/scsi/aic7xxx/built-in.o 185040 2362 1172 188574 2e09e linux-2.6.26-rc8/drivers/scsi/aic7xxx/built-in.o This patch: Introduce "dont_generate_debug_code" keyword in aicasm parser. Signed-off-by: Denys Vlasenko Signed-off-by: Andrew Morton Acked-by: Hannes Reinecke Signed-off-by: James Bottomley commit 5a36756b8b3d7178d9c101d1e2a7a83fd7b17706 Author: Chandra Seetharaman Date: Thu Aug 21 23:12:40 2008 -0700 [SCSI] scsi_dh: Initialize path state to be passive when path is not owned Set the path state to be passive when we learn that the controller does not own the path to the LUN. This will avoid sending even a single i/o thru the passive path at the probe time. Signed-off-by: Chandra Seetharaman Signed-off-by: James Bottomley commit 32c356d76d7e13dcd0675189d8e9c64ef66aa561 Author: James Bottomley Date: Wed Aug 20 00:58:13 2008 +0200 [SCSI] fix removable device inability to detect disk changes On Tue, 12 Aug 2008 15:08:14 +0200 Giuliano Pochini wrote: > Fujitsu magneto-optical drive, Adaptec 29160 and > Linux Jay 2.6.26 #7 SMP Sun Aug 10 18:34:22 CEST 2008 ppc 7455, altivec supported PowerMac3,6 GNU/Linux > > When I insert a disk and I mount it, scsi_test_unit_ready() is called and > the do-while loop gets sshdr->sense_key == UNIT_ATTENTION in the first > cycle and 0 in the second one. So the if below misses the UNIT_ATTENTION > and sdev->changed = 1 is not executed. At this point bad things can > happen... I'm not sure how to fix this. Any clue ? The problem is essentially caused by us eating UNIT_ATTENTION conditions in scsi_test_unit_ready(). Fix by updating the ->changed flag when this happens if the media is removable. [pochini@shiny.it: updates to tidy up patch] Signed-off-by: Giuliano Pochini Signed-off-by: James Bottomley commit f2e4bd2b37bf072babc6a1f6c2a7ef53b7b046ad Merge: 133e887... 5f86515... Author: Linus Torvalds Date: Thu Oct 23 09:38:55 2008 -0700 Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: rcupdate: fix bug of rcu_barrier*() profiling: fix !procfs build Fixed trivial conflicts in 'include/linux/profile.h' commit 133e887f90208d339088dd60cb1d08a72ba27288 Merge: e82cff7... 0c4b83d... Author: Linus Torvalds Date: Thu Oct 23 09:37:16 2008 -0700 Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: disable the hrtick for now sched: revert back to per-rq vruntime sched: fair scheduler should not resched rt tasks sched: optimize group load balancer sched: minor fast-path overhead reduction sched: fix the wrong mask_len, cleanup sched: kill unused scheduler decl. sched: fix the wrong mask_len sched: only update rq->clock while holding rq->lock commit e82cff752f57810a2259415ad2e9087c2d69484c Merge: b80de36... b6f3b78... Author: Linus Torvalds Date: Thu Oct 23 09:36:55 2008 -0700 Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: genirq: NULL struct irq_desc's member 'name' in dynamic_irq_cleanup() genirq: fix off by one and coding style genirq: fix set_irq_type() when recording trigger type commit b80de369aa5c7c8ce7ff7a691e86e1dcc89accc6 Author: Lee Howard Date: Tue Oct 21 13:50:14 2008 +0100 8250: Add more OxSemi devices These have the Mainpine PCI identifier on however Additional paranoia check for Tornado versions added by Alan Cox (and this time I remembered to do an stg refresh so that the corrections ended up in these patches not randomly attached to another diff -- Alan) Signed-off-by: Lee Howard Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 7106b4e333baeaf3c596e4d240438059b8a7616d Author: Lee Howard Date: Tue Oct 21 13:48:58 2008 +0100 8250: Oxford Semiconductor Devices Add support for the OxSemi 'Tornado' devices. Reformatted and reworked a bit by Alan Cox Signed-off-by: Lee Howard Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 9f50bbad8fc3b0f9fd453ab1e2716b3106d89b13 Author: Johannes Berg Date: Thu Oct 23 13:57:39 2008 +0200 ALSA: aoa i2sbus: don't overwrite module parameter We shouldn't modify a global variable here. Signed-off-by: Johannes Berg Signed-off-by: Takashi Iwai commit cb4bca3540535a15705b50bdaea4fe2fddd183b3 Author: Alan Cox Date: Tue Oct 21 13:47:44 2008 +0100 tty: Fix tty_port kref screwup Pass the brown paper bags please. I changed the semantics of this so the function was supposed to do the extra kref itself then forgot to do the change.. duh.... Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 7dc9b48fc5b9641d4b2a222825e5be64ebb27356 Author: Alan Cox Date: Tue Oct 21 13:44:58 2008 +0100 watchdog: Fix warning This seems to have popped up after the recent merges: drivers/watchdog/w83697ug_wdt.c: In function ‘w83697ug_select_wd_register’: drivers/watchdog/w83697ug_wdt.c:105: warning: ‘return’ with a value, in function returning void Signed-off-by: Alan Cox Acked-by: Wim Van Sebroeck Signed-off-by: Linus Torvalds commit a8ddac7e53e89cb877965097d05adfeb1c91def3 Author: Nick Piggin Date: Tue Oct 21 10:59:15 2008 +0200 mutex: speed up generic mutex implementations - atomic operations which both modify the variable and return something imply full smp memory barriers before and after the memory operations involved (failing atomic_cmpxchg, atomic_add_unless, etc don't imply a barrier because they don't modify the target). See Documentation/atomic_ops.txt. So remove extra barriers and branches. - All architectures support atomic_cmpxchg. This has no relation to __HAVE_ARCH_CMPXCHG. We can just take the atomic_cmpxchg path unconditionally This reduces a simple single threaded fastpath lock+unlock test from 590 cycles to 203 cycles on a ppc970 system. Signed-off-by: Nick Piggin Signed-off-by: Linus Torvalds commit 5a439c565799cb8d290d71ce375e86be64d43a4b Merge: 94b6da5... 0025427... Author: Linus Torvalds Date: Thu Oct 23 09:16:56 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6: xtensa: Add config files for Diamond 232L - Rev B processor variant xtensa: Fix io regions xtensa: Add support for the Sonic Ethernet device for the XT2000 board. xtensa: replace remaining __FUNCTION__ occurrences xtensa: use newer __SPIN_LOCK_UNLOCKED macro XTENSA: warn about including directly. commit 94b6da5ab8293b04a300ba35c72eddfa94db8b02 Author: KAMEZAWA Hiroyuki Date: Wed Oct 22 14:15:05 2008 -0700 memcg: fix page_cgroup allocation page_cgroup_init() is called from mem_cgroup_init(). But at this point, we cannot call alloc_bootmem(). (and this caused panic at boot.) This patch moves page_cgroup_init() to init/main.c. Time table is following: == parse_args(). # we can trust mem_cgroup_subsys.disabled bit after this. .... cgroup_init_early() # "early" init of cgroup. .... setup_arch() # memmap is allocated. ... page_cgroup_init(); mem_init(); # we cannot call alloc_bootmem after this. .... cgroup_init() # mem_cgroup is initialized. == Before page_cgroup_init(), mem_map must be initialized. So, I added page_cgroup_init() to init/main.c directly. (*) maybe this is not very clean but - cgroup_init_early() is too early - in cgroup_init(), we have to use vmalloc instead of alloc_bootmem(). use of vmalloc area in x86-32 is important and we should avoid very large vmalloc() in x86-32. So, we want to use alloc_bootmem() and added page_cgroup_init() directly to init/main.c [akpm@linux-foundation.org: remove unneeded/bad mem_cgroup_subsys declaration] [akpm@linux-foundation.org: fix build] Acked-by: Balbir Singh Tested-by: Balbir Singh Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit be07c4ed4043ab8c26f222348136141335e47a2f Author: Duane Griffin Date: Wed Oct 22 14:15:03 2008 -0700 jbd: abort instead of waiting for nonexistent transactions The __log_wait_for_space function sits in a loop checkpointing transactions until there is sufficient space free in the journal. However, if there are no transactions to be processed (e.g. because the free space calculation is wrong due to a corrupted filesystem) it will never progress. Check for space being required when no transactions are outstanding and abort the journal instead of endlessly looping. This patch fixes the bug reported by Sami Liedes at: http://bugzilla.kernel.org/show_bug.cgi?id=10976 Signed-off-by: Duane Griffin Tested-by: Sami Liedes Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9f818b4ac04f53458d0354950b4f229f54be4dbf Author: Hidehiro Kawai Date: Wed Oct 22 14:15:02 2008 -0700 jbd: test BH_Write_EIO to detect errors on metadata buffers __try_to_free_cp_buf(), __process_buffer(), and __wait_cp_io() test BH_Uptodate flag to detect write I/O errors on metadata buffers. But by commit 95450f5a7e53d5752ce1a0d0b8282e10fe745ae0 "ext3: don't read inode block if the buffer has a write error"(*), BH_Uptodate flag can be set to inode buffers with BH_Write_EIO in order to avoid reading old inode data. So now, we have to test BH_Write_EIO flag of checkpointing inode buffers instead of BH_Uptodate. This patch does it. Signed-off-by: Hidehiro Kawai Acked-by: Jan Kara Acked-by: Eric Sandeen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d7c820e56ce83b23daee9eb5343730fb309418e Author: Hidehiro Kawai Date: Wed Oct 22 14:15:01 2008 -0700 ext3: add checks for errors from jbd If the journal has aborted due to a checkpointing failure, we have to keep the contents of the journal space. Otherwise, the filesystem will lose uncheckpointed metadata completely and become inconsistent. To avoid this, we need to keep needs_recovery flag if checkpoint has failed. With this patch, ext3_put_super() detects a checkpointing failure from the return value of journal_destroy(), then it invokes ext3_abort() to make the filesystem read only and keep needs_recovery flag. Errors from journal_flush() are also handled by this patch in some places. Signed-off-by: Hidehiro Kawai Cc: Jan Kara Cc: Stephen Rothwell Cc: Al Viro Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4afe978530702c934dfdb11f54073136818b2119 Author: Hidehiro Kawai Date: Wed Oct 22 14:15:00 2008 -0700 jbd: fix error handling for checkpoint io When a checkpointing IO fails, current JBD code doesn't check the error and continue journaling. This means latest metadata can be lost from both the journal and filesystem. This patch leaves the failed metadata blocks in the journal space and aborts journaling in the case of log_do_checkpoint(). To achieve this, we need to do: 1. don't remove the failed buffer from the checkpoint list where in the case of __try_to_free_cp_buf() because it may be released or overwritten by a later transaction 2. log_do_checkpoint() is the last chance, remove the failed buffer from the checkpoint list and abort the journal 3. when checkpointing fails, don't update the journal super block to prevent the journaled contents from being cleaned. For safety, don't update j_tail and j_tail_sequence either 4. when checkpointing fails, notify this error to the ext3 layer so that ext3 don't clear the needs_recovery flag, otherwise the journaled contents are ignored and cleaned in the recovery phase 5. if the recovery fails, keep the needs_recovery flag 6. prevent cleanup_journal_tail() from being called between __journal_drop_transaction() and journal_abort() (a race issue between journal_flush() and __log_wait_for_space() Signed-off-by: Hidehiro Kawai Acked-by: Jan Kara Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66f50ee3cee4c9d98eea0add6f439e6e5e0ca4a5 Author: Paul Mundt Date: Wed Oct 22 14:14:59 2008 -0700 profiling: fix up CONFIG_PROC_FS=n build In the case where procfs is disabled, create_proc_profile() does not exist. Stub it in with the others. Signed-off-by: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c8210427bd1b7efa1dabf93f4d2312f29908d8f Author: Paul Mundt Date: Wed Oct 22 14:14:58 2008 -0700 mm: page_cgroup needs linux/vmalloc.h for vmalloc_node()/vfree(). mm/page_cgroup.c: In function 'init_section_page_cgroup': mm/page_cgroup.c:111: error: implicit declaration of function 'vmalloc_node' mm/page_cgroup.c:111: warning: assignment makes pointer from integer without a cast mm/page_cgroup.c: In function '__free_page_cgroup': mm/page_cgroup.c:140: error: implicit declaration of function 'vfree' Signed-off-by: Paul Mundt Reviewed-by: KAMEZAWA Hiroyuki Cc: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9bf9b2f3ad6362cdc9ef79291d440a92960b8f51 Merge: 9779a83... 54622f1... Author: Linus Torvalds Date: Thu Oct 23 08:28:25 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (53 commits) powerpc: Support for relocatable kdump kernel powerpc: Don't use a 16G page if beyond mem= limits powerpc: Add del_node() for early boot code to prune inapplicable devices. powerpc: Further compile fixup for STRICT_MM_TYPECHECKS powerpc: Remove empty #else from signal_64.c powerpc: Move memory size print into common show_cpuinfo for 32-bit hvc_console: Remove __devexit annotation of hvc_remove() hvc_console: Add support for tty window resizing hvc_console: Fix loop if put_char() returns 0 hvc_console: Add tty driver flag TTY_DRIVER_RESET_TERMIOS hvc_console: Add a hangup notifier for backends powerpc/83xx: Add DS1339 RTC support for MPC8349E-mITX boards .dts powerpc/83xx: Add support for MCU microcontroller in .dts files powerpc/85xx: Move mpc8572ds.dts to address-cells/size-cells = <2> of/spi: Support specifying chip select as active high via device tree powerpc: Remove device_type = "board_control" properties in .dts files i2c-cpm: Suppress autoprobing for devices powerpc/85xx: Fix mpc8536ds dma interrupt numbers powerpc/85xx: Enable enhanced functions for 8536 TSEC powerpc: Delete unused prom_strtoul and prom_memparse ... commit 9779a8325a9bbf4ccd3853e0e4064984cf9da9c9 Merge: 309e1e4... 61e0e79... Author: Linus Torvalds Date: Thu Oct 23 08:20:34 2008 -0700 Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb * 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb: (47 commits) uwb: wrong sizeof argument in mac address compare uwb: don't use printk_ratelimit() so often uwb: use kcalloc where appropriate uwb: use time_after() when purging stale beacons uwb: add credits for the original developers of the UWB/WUSB/WLP subsystems uwb: add entries in the MAINTAINERS file uwb: depend on EXPERIMENTAL wusb: wusb-cbaf (CBA driver) sysfs ABI simplification uwb: document UWB and WUSB sysfs files uwb: add symlinks in sysfs between radio controllers and PALs uwb: dont tranmit identification IEs uwb: i1480/GUWA100U: fix firmware download issues uwb: i1480: remove MAC/PHY information checking function uwb: add Intel i1480 HWA to the UWB RC quirk table uwb: disable command/event filtering for D-Link DUB-1210 uwb: initialize the debug sub-system uwb: Fix handling IEs with empty IE data in uwb_est_get_size() wusb: fix bmRequestType for Abort RPipe request wusb: fix error path for wusb_set_dev_addr() wusb: add HWA host controller driver ... commit 309e1e4240636f3a9704d77a164a08e1f5a81fea Merge: 724bdd0... 7cf5244... Author: Linus Torvalds Date: Thu Oct 23 08:18:33 2008 -0700 Merge branch 'for-next' of git://git.o-hand.com/linux-mfd * 'for-next' of git://git.o-hand.com/linux-mfd: mfd: check for platform_get_irq() return value in sm501 mfd: use pci_ioremap_bar() in sm501 mfd: Don't store volatile bits in WM8350 register cache mfd: don't export wm3850 static functions mfd: twl4030-gpio driver mfd: rtc-twl4030 driver mfd: twl4030 IRQ handling update commit 724bdd097e4d47b6ad963db5d92258ab5c485e05 Merge: dc8dcad... 56f2fda... Author: Linus Torvalds Date: Thu Oct 23 08:16:03 2008 -0700 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/ehca: Reject dynamic memory add/remove when ehca adapter is present IB/ehca: Fix reported max number of QPs and CQs in systems with >1 adapter IPoIB: Set netdev offload features properly for child (VLAN) interfaces IPoIB: Clean up ethtool support mlx4_core: Add Ethernet PCI device IDs mlx4_en: Add driver for Mellanox ConnectX 10GbE NIC mlx4_core: Multiple port type support mlx4_core: Ethernet MAC/VLAN management mlx4_core: Get ethernet MTU and default address from firmware mlx4_core: Support multiple pre-reserved QP regions Update NetEffect maintainer emails to Intel emails RDMA/cxgb3: Remove cmid reference on tid allocation failures IB/mad: Use krealloc() to resize snoop table IPoIB: Always initialize poll_timer to avoid crash on unload IB/ehca: Don't allow creating UC QP with SRQ mlx4_core: Add QP range reservation support RDMA/ucma: Test ucma_alloc_multicast() return against NULL, not with IS_ERR() commit dc8dcad83b53e3aebc52889e81772c00a1490408 Merge: fdc76bf... b78152e... Author: Linus Torvalds Date: Thu Oct 23 08:15:29 2008 -0700 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: sata_via: load DEVICE register when CTL changes libata: set device class to NONE if phys_offline libata-eh: fix slave link EH action mask handling libata: transfer EHI control flags to slave ehc.i libata-sff: fix ata_sff_post_internal_cmd() libata: initialize port_task when !CONFIG_ATA_SFF commit fdc76bf9b62446c9d4b00e0d355c3212b4f1b13b Merge: 72441bd... f6335c4... Author: Linus Torvalds Date: Thu Oct 23 08:12:21 2008 -0700 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] clps711x: add sparsemem definitions [ARM] 5315/1: Fix section mismatch warning (sa1111) [ARM] Orion: activate workaround for 88f6183 SPI clock erratum [ARM] Orion: instantiate the dsa switch driver [ARM] mv78xx0: force link speed/duplex on eth2/eth3 [ARM] remove extra brace in arch/arm/mach-pxa/trizeps4.c [ARM] balance parenthesis in header file [ARM] pxa: fix trizeps PCMCIA build [ARM] pxa: fix trizeps defconfig [ARM] dmabounce requires ZONE_DMA [ARM] 5303/1: period_cycles should be greater than 1 [ARM] 5310/1: Fix cache flush functions for ARMv4 [ARM] pxa: fix 3bca103a1e658d23737d20e1989139d9ca8973bf [ARM] pxa: fix redefinition of NR_IRQS [ARM] S3C24XX: Fix redefine of DEFINE_TIMER() in s3c24xx pwm-clock.c [ARM] S3C2443: Fix HCLK rate [ARM] S3C24XX: Serial driver debug depends on DEBUG_LL [ARM] S3C24XX: pwm-clock set_parent mask fix commit 72441bdc76f7f71d7b75cdaa48f26dbb1f3d932e Merge: 2515ddc... fe39316... Author: Linus Torvalds Date: Thu Oct 23 08:07:35 2008 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: (41 commits) [IA64] Fix annoying IA64_TR_ALLOC_MAX message. [IA64] kill sys32_pipe [IA64] remove sys32_pause [IA64] Add Variable Page Size and IA64 Support in Intel IOMMU ia64/pv_ops: paravirtualized instruction checker. ia64/xen: a recipe for using xen/ia64 with pv_ops. ia64/pv_ops: update Kconfig for paravirtualized guest and xen. ia64/xen: preliminary support for save/restore. ia64/xen: define xen machine vector for domU. ia64/pv_ops/xen: implement xen pv_time_ops. ia64/pv_ops/xen: implement xen pv_irq_ops. ia64/pv_ops/xen: define the nubmer of irqs which xen needs. ia64/pv_ops/xen: implement xen pv_iosapic_ops. ia64/pv_ops/xen: paravirtualize entry.S for ia64/xen. ia64/pv_ops/xen: paravirtualize ivt.S for xen. ia64/pv_ops/xen: paravirtualize DO_SAVE_MIN for xen. ia64/pv_ops/xen: define xen paravirtualized instructions for hand written assembly code ia64/pv_ops/xen: define xen pv_cpu_ops. ia64/pv_ops/xen: define xen pv_init_ops for various xen initialization. ia64/pv_ops/xen: elf note based xen startup. ... commit 59c7572e82d69483a66eaa67b46548baeb69ecf4 Author: Alexey Dobriyan Date: Mon Oct 6 14:49:39 2008 +0400 proc: remove fs/proc/proc_misc.c Now that everything was moved to their more or less expected places, apply rm(1). Signed-off-by: Alexey Dobriyan commit 5aa140c2deca3701238d5acddf436ad7b02664c7 Author: Alexey Dobriyan Date: Mon Oct 6 14:36:31 2008 +0400 proc: move /proc/vmcore creation to fs/proc/vmcore.c Signed-off-by: Alexey Dobriyan commit 6d80e53f0056178c63fa8fbf3e8de40fb4df5f50 Author: Alexey Dobriyan Date: Mon Oct 6 14:26:12 2008 +0400 proc: move pagecount stuff to fs/proc/page.c Signed-off-by: Alexey Dobriyan commit 97ce5d6dcb07c403c0fc6001b755aacc38b5d7ff Author: Alexey Dobriyan Date: Mon Oct 6 14:14:19 2008 +0400 proc: move all /proc/kcore stuff to fs/proc/kcore.c Signed-off-by: Alexey Dobriyan commit b5aadf7f14c1acc94956aa257e018e9de3881f41 Author: Alexey Dobriyan Date: Mon Oct 6 13:23:43 2008 +0400 proc: move /proc/schedstat boilerplate to kernel/sched_stats.h Signed-off-by: Alexey Dobriyan commit 3b5d5c6b0ccba733a313f8752ebc3f8015628ba3 Author: Alexey Dobriyan Date: Mon Oct 6 13:19:27 2008 +0400 proc: move /proc/modules boilerplate to kernel/module.c Signed-off-by: Alexey Dobriyan commit 31d85ab28e71b0c938e0ef48af45747e80d99b53 Author: Alexey Dobriyan Date: Mon Oct 6 12:55:38 2008 +0400 proc: move /proc/diskstats boilerplate to block/genhd.c Signed-off-by: Alexey Dobriyan Acked-by: Jens Axboe commit 4b7d283150b35db6e5e10f72606f603ff424c92a Author: Jarkko Nikula Date: Thu Oct 23 14:27:03 2008 +0300 ALSA: ASoC: tlv320aic3x: Fix DSP DAI format and signal polarities matching - Codec doesn't support to configure bit clock and frame sync polarities - Codec doesn't support DSP_A format but DSP_B with inverted bit clock polarity - Match also other formats with their signal polarities Signed-off-by: Jarkko Nikula Acked-by: Mark Brown Signed-off-by: Takashi Iwai commit 5c9fe6281b75832e8d2555ec8700ea763d9a865e Author: Alexey Dobriyan Date: Mon Oct 6 04:19:42 2008 +0400 proc: move /proc/zoneinfo boilerplate to mm/vmstat.c Signed-off-by: Alexey Dobriyan Acked-by: Christoph Lameter commit d9214556b11a8d18ff588e60824c12041d30f791 Merge: 72a1419... e82c610... Author: Haavard Skinnemoen Date: Thu Oct 23 15:24:10 2008 +0200 Merge branches 'boards' and 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 commit e82c6106b04b85879d802bbbeaed30d9b10a92e2 Author: Haavard Skinnemoen Date: Thu Oct 23 14:42:19 2008 +0200 avr32: Fix GPIO initcall breakage Add essential system devices, including GPIO controllers, automatically at core_initcall time. This ensures that the devices are there when the PIO driver gets initialized at postcore_initcall, fixing a bug exposed by commit d6634db8fe1784d0a8e4e156970fec034708446e "avr32: Use platform_driver_probe for pio platform driver". Signed-off-by: Haavard Skinnemoen commit e3f91ca48162c3eb70450314a4d09384fccb92fa Author: Haavard Skinnemoen Date: Thu Oct 23 11:23:08 2008 +0200 avr32: Scale loops_per_jiffy when cpu frequency changes The loops_per_jiffy variable isn't updated when cpufreq changes the CPU frequency. This could cause udelay() and friends to produce wrong delays. Signed-off-by: Haavard Skinnemoen commit 6090065663ba5daab82d116d3040dc924e8cf79f Author: Alex Raimondi Date: Mon Oct 13 16:03:45 2008 +0200 avr32: Fix bug in LCD pin setup on port C Bug was introduced with the new at32_select_periph function. Signed-off-by: Alex Raimondi Signed-off-by: Haavard Skinnemoen commit b6aa44ab698c7df9d951d3eb45c4fcb8ba68fb25 Author: Alexey Dobriyan Date: Mon Oct 6 04:17:48 2008 +0400 proc: move /proc/vmstat boilerplate to mm/vmstat.c Signed-off-by: Alexey Dobriyan Acked-by: Christoph Lameter commit 74e2e8e8ce7b3c0f878a349f9fa6cf2831548eef Author: Alexey Dobriyan Date: Mon Oct 6 04:15:36 2008 +0400 proc: move /proc/pagetypeinfo boilerplate to mm/vmstat.c Signed-off-by: Alexey Dobriyan commit 8f32f7e5ac2ed11b0659b6b55af926f3d58ffd9d Author: Alexey Dobriyan Date: Mon Oct 6 04:13:52 2008 +0400 proc: move /proc/buddyinfo boilerplate to mm/vmstat.c Signed-off-by: Alexey Dobriyan commit 884afaab44c9f92eb618ce53b3d2b5316f174a39 Author: Nicolas Pitre Date: Thu Oct 23 04:34:08 2008 +0100 [ARM] 5320/1: fix assembly constraints in implementation of do_div() Those inline assembly segments using the umlal instruction must have the & modifier so to be sure that a purely input register won't alias one of the registers used as input+output. In most cases, the inputs are still used after the outputs are touched, and most binutil versions insist on "rdhi, rdlo and rm must all be different" even for ARMv6+. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 5f6a6a9c4e4d790aae55cb412a7643329057c5e0 Author: Alexey Dobriyan Date: Mon Oct 6 03:50:47 2008 +0400 proc: move /proc/vmallocinfo to mm/vmalloc.c Signed-off-by: Alexey Dobriyan Acked-by: Christoph Lameter commit 7b3c3a50a3e0ea46815150d420fa276ac254572b Author: Alexey Dobriyan Date: Mon Oct 6 02:42:17 2008 +0400 proc: move /proc/slabinfo boilerplate to mm/slub.c, mm/slab.c Lose dummy ->write hook in case of SLUB, it's possible now. Signed-off-by: Alexey Dobriyan Acked-by: Pekka Enberg commit a0ec95a8e69792e4ad642daac037c9b01ea3e2cd Author: Alexey Dobriyan Date: Mon Oct 6 00:59:10 2008 +0400 proc: move /proc/slab_allocators boilerplate to mm/slab.c Signed-off-by: Alexey Dobriyan Acked-by: Pekka Enberg commit d6917e19f3fda8e1f88bc23ddceed952927bd716 Author: Alexey Dobriyan Date: Sun Oct 5 00:08:44 2008 +0400 proc: move /proc/interrupts boilerplate code to fs/proc/interrupts.c Signed-off-by: Alexey Dobriyan commit df8106dbb59a8c167ea16631059ecb5f7d77da13 Author: Alexey Dobriyan Date: Sun Oct 5 00:01:56 2008 +0400 proc: move /proc/stat to fs/proc/stat.c Signed-off-by: Alexey Dobriyan commit f500975a3f3ecf3611d79f1d933906753460b9f2 Author: Alexey Dobriyan Date: Sat Oct 4 23:53:21 2008 +0400 proc: move rest of /proc/partitions code to block/genhd.c Signed-off-by: Alexey Dobriyan Acked-by: Jens Axboe commit 8591cf43224980a0bc9216a4e50b0a740f8cba35 Author: Alexey Dobriyan Date: Sat Oct 4 23:40:23 2008 +0400 proc: move /proc/cpuinfo code to fs/proc/cpuinfo.c Signed-off-by: Alexey Dobriyan commit fe2510426a02dd2fefcb0389b60f77cbe0462289 Author: Alexey Dobriyan Date: Sat Oct 4 23:11:37 2008 +0400 proc: move /proc/devices code to fs/proc/devices.c Signed-off-by: Alexey Dobriyan commit d8ba7a363393f803c93c8cffabd6d0362618bc2a Author: Alexey Dobriyan Date: Sat Oct 4 22:34:18 2008 +0400 proc: move rest of /proc/locks to fs/locks.c Signed-off-by: Alexey Dobriyan commit ae048112c099b0f3adb57f7c0b3a49bc62244609 Author: Alexey Dobriyan Date: Sat Oct 4 14:39:12 2008 +0400 proc: move /proc/kmsg creation to fs/proc/kmsg.c Signed-off-by: Alexey Dobriyan commit 659689280ad91d31235db79cda6c7c799c4d3781 Author: Alexey Dobriyan Date: Sat Oct 4 14:30:53 2008 +0400 proc: remove remnants of ->read_proc in proc_misc.c Signed-off-by: Alexey Dobriyan commit 6e62775ece1c83a84d86df44cfd8ea3e6c96ce23 Author: Alexey Dobriyan Date: Sat Oct 4 14:28:09 2008 +0400 proc: move /proc/execdomains to kernel/exec_domain.c Signed-off-by: Alexey Dobriyan commit cf9887f102541b8a0adb73f7da9c28d090622010 Author: Alexey Dobriyan Date: Sat Oct 4 14:13:59 2008 +0400 proc: switch /proc/cmdline to seq_file and move it to fs/proc/cmdline.c while I'm at it. Signed-off-by: Alexey Dobriyan commit 6827400713fa22312ca3b4f47b0e64871c88040c Author: Alexey Dobriyan Date: Sat Oct 4 14:08:37 2008 +0400 proc: move /proc/filesystems to fs/filesystems.c Signed-off-by: Alexey Dobriyan commit 4c150f6c30f5129bbce5c41568a285b1f7ca8d8b Author: Alexey Dobriyan Date: Sat Oct 4 13:49:34 2008 +0400 proc: move /proc/stram to m68k-specific code Signed-off-by: Alexey Dobriyan commit 813dcf7a6e642feb1ea566b96ce2912249d2b57d Author: Alexey Dobriyan Date: Fri Oct 3 22:42:36 2008 +0400 proc: move /proc/hardware to m68k-specific code Signed-off-by: Alexey Dobriyan commit b457d151613873ea035de0c7348abc3d4b6efd34 Author: Alexey Dobriyan Date: Fri Oct 3 11:53:19 2008 +0400 proc: switch /proc/version to seq_file and move it to fs/proc/version.c while I'm at it. Signed-off-by: Alexey Dobriyan commit e1759c215bee5abbcb6cb066590ab20905154ed5 Author: Alexey Dobriyan Date: Wed Oct 15 23:50:22 2008 +0400 proc: switch /proc/meminfo to seq_file and move it to fs/proc/meminfo.c while I'm at it. Signed-off-by: Alexey Dobriyan commit 9617760287eec9091d26e6967bd3e4194de18f97 Author: Alexey Dobriyan Date: Fri Oct 3 02:38:18 2008 +0400 proc: switch /proc/uptime to seq_file and move it to fs/proc/uptime.c while I'm at it. Signed-off-by: Alexey Dobriyan commit 5b3acc8de8b2bc459afae6e09ada45c7e5b11bbf Author: Alexey Dobriyan Date: Fri Oct 3 02:21:47 2008 +0400 proc: switch /proc/loadavg to seq_file and move it to fs/proc/loadavg.c while I'm at it. Signed-off-by: Alexey Dobriyan commit 6c2f91e077f1b60e7f83b7ee044f965f469cfdb3 Author: Arjan van de Ven Date: Sat Sep 13 19:51:30 2008 -0700 proc: use WARN() rather than printk+backtrace Use WARN() rather than a printk() + backtrace(); this gives a more standard format message as well as complete information (including line numbers etc) that will be collected by kerneloops.org Signed-off-by: Arjan van de Ven Signed-off-by: Alexey Dobriyan commit 1e0edd3f67d5b5c04ef6c0908aac8bd70dffc6f6 Author: Alexey Dobriyan Date: Fri Oct 17 05:07:44 2008 +0400 proc: spread __init Signed-off-by: Alexey Dobriyan commit 5bcd7ff9e1690dbdbccb2a1cb3c2ea8b8381c435 Author: Alexey Dobriyan Date: Fri Oct 17 03:43:55 2008 +0400 proc: proc_init_inodecache() can't fail kmem_cache creation code will panic, don't return anything. Signed-off-by: Alexey Dobriyan commit 7c88db0cb589df980acfb2f73c3595a0653004ec Author: Joe Korty Date: Thu Oct 16 15:27:09 2008 +0400 proc: fix vma display mismatch between /proc/pid/{maps,smaps} Commit 4752c369789250eafcd7813e11c8fb689235b0d2 aka "maps4: simplify interdependence of maps and smaps" broke /proc/pid/smaps, causing it to display some vmas twice and other vmas not at all. For example: grep .- /proc/1/smaps >/tmp/smaps; diff /proc/1/maps /tmp/smaps 1 25d24 2 < 7fd7e23aa000-7fd7e23ac000 rw-p 7fd7e23aa000 00:00 0 3 28a28 4 > ffffffffff600000-ffffffffff601000 r-xp 00000000 00:00 0 [vsyscall] The bug has something to do with setting m->version before all the seq_printf's have been performed. show_map was doing this correctly, but show_smap was doing this in the middle of its seq_printf sequence. This patch arranges things so that the setting of m->version in show_smap is also done at the end of its seq_printf sequence. Testing: in addition to the above grep test, for each process I summed up the 'Rss' fields of /proc/pid/smaps and compared that to the 'VmRSS' field of /proc/pid/status. All matched except for Xorg (which has a /dev/mem mapping which Rss accounts for but VmRSS does not). This result gives us some confidence that neither /proc/pid/maps nor /proc/pid/smaps are any longer skipping or double-counting vmas. Signed-off-by: Joe Korty Cc: Matt Mackall Signed-off-by: Andrew Morton Signed-off-by: Alexey Dobriyan commit fd217f4d70172c526478f2bc76859e909fdfa674 Author: Arjan van de Ven Date: Tue Oct 21 06:47:33 2008 -0700 [PATCH] fs: add a sanity check in d_free Hi Al, remember that debug session we did at KS? You suggested this patch back then.... From 7751eaf30474b8cbfaea64795805a17eab05ac53 Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Tue, 16 Sep 2008 16:51:17 -0700 Subject: [PATCH] fs: add a sanity check in d_free we're seeing some corruption in the dentry->d_alias list that appears like a free of an entry still on the list; this patch adds a WARN_ON() to catch this scenario, as suggested by Al Viro Signed-off-by: Arjan van de Ven commit 08b9fe6b12d32324f311c46b88102b6b9067d434 Author: Mimi Zohar Date: Mon Oct 13 00:09:50 2008 -0400 [PATCH] i_version: remount support Add support for remounting a filesystem with the i_version option. Signed-off-by: Mimi Zohar commit a77b72da24ecfe262760874c55e3f6461f1dec0d Author: Miklos Szeredi Date: Wed Jul 30 14:06:22 2008 +0200 [patch] vfs: make security_inode_setattr() calling consistent Call security_inode_setattr() consistetly before inode_change_ok(). It doesn't make sense to try to "optimize" the i_op->setattr == NULL case, as most filesystem do define their own setattr function. Signed-off-by: Miklos Szeredi commit 2c512397ca060f6dbcb3957174a91e29a3b769be Author: Adrian Bunk Date: Wed Aug 20 16:56:22 2008 -0700 [patch 1/3] FS_MBCACHE: don't needlessly make it built-in Assume you have: - one or more of ext2/3/4 statically built into your kernel - none of these with extended attributes enabled and - want to add onother one of ext2/3/4 modular and with extended attributes enabled then you currently have to reboot to use it since this results in CONFIG_FS_MBCACHE=y. That's not a common issue, but I just ran into it and since there's no reason to get a built-in mbcache in this case this patch fixes it. Signed-off-by: Adrian Bunk Cc: Andreas Gruenbacher Cc: Al Viro Signed-off-by: Andrew Morton commit f696a3659fc4b3a3bf4bc83d9dbec5e5a2ffd929 Author: Miklos Szeredi Date: Thu Jul 31 13:41:58 2008 +0200 [PATCH] move executable checking into ->permission() For execute permission on a regular files we need to check if file has any execute bits at all, regardless of capabilites. This check is normally performed by generic_permission() but was also added to the case when the filesystem defines its own ->permission() method. In the latter case the filesystem should be responsible for performing this check. Move the check from inode_permission() inside filesystems which are not calling generic_permission(). Create a helper function execute_ok() that returns true if the inode is a directory or if any execute bits are present in i_mode. Also fix up the following code: - coda control file is never executable - sysctl files are never executable - hfs_permission seems broken on MAY_EXEC, remove - hfsplus_permission is eqivalent to generic_permission(), remove Signed-off-by: Miklos Szeredi commit 5cec56deb6d41b5b570306b17cd0b1590ebd0897 Author: Qinghuang Feng Date: Mon Oct 13 18:32:42 2008 +0800 [PATCH] fs/dcache.c: update comment of d_validate() Parameters @hash and @len have been removed since 2.4.3, now just to delete them. Signed-off-by: Qinghuang Feng commit 0e55a7cca4b66f625d67b292f80b6a976e77c51b Author: Dan Williams Date: Fri Sep 26 19:01:20 2008 -0700 [RFC PATCH] touch_mnt_namespace when the mount flags change Daemons that need to be launched while the rootfs is read-only can now poll /proc/mounts to be notified when their O_RDWR requests may no longer end in EROFS. Cc: Kay Sievers Cc: Neil Brown Signed-off-by: Dan Williams commit 91efc167d02509ea78abeff6d668065964c67c0b Author: Christoph Hellwig Date: Mon Sep 8 19:42:50 2008 +0200 [PATCH] reiserfs: add missing llseek method Reiserfs currently doesn't set a llseek method for regular files, which means it will fall back to default_llseek. This means no one can seek beyond 2 Gigabytes on reiserfs, and that there's not protection vs the i_size updates from writers. Signed-off-by: Christoph Hellwig commit 3222a3e55f4025acb2a5a4379cf2f2b7df1f1243 Author: Christoph Hellwig Date: Wed Sep 3 21:53:01 2008 +0200 [PATCH] fix ->llseek for more directories With this patch all directory fops instances that have a readdir that doesn't take the BKL are switched to generic_file_llseek. Signed-off-by: Christoph Hellwig commit 4e9ed2f85af7adfa7c3f0efa839a53186254fdcb Author: OGAWA Hirofumi Date: Thu Oct 16 07:50:29 2008 +0900 [PATCH vfs-2.6 6/6] vfs: add LOOKUP_RENAME_TARGET intent This adds LOOKUP_RENAME_TARGET intent for lookup of rename destination. LOOKUP_RENAME_TARGET is going to be used like LOOKUP_CREATE. But since the destination of rename() can be existing directory entry, so it has a difference. Although that difference doesn't matter in my usage, this tells it to user of this intent. Signed-off-by: OGAWA Hirofumi commit 0612d9fb270a474fe6a46cc5b8d3f5b71cf5f580 Author: OGAWA Hirofumi Date: Thu Oct 16 07:50:29 2008 +0900 [PATCH vfs-2.6 5/6] vfs: remove LOOKUP_PARENT from non LOOKUP_PARENT lookup lookup_hash() with LOOKUP_PARENT is bogus. And this prepares to add new intent on those path. The user of LOOKUP_PARENT intent is nfs only, and it checks whether nd->flags has LOOKUP_CREATE or LOOKUP_OPEN, so the result is same. Signed-off-by: OGAWA Hirofumi commit 8f3dfaa5bab767a043c5af5b879fb86c03329f8a Author: OGAWA Hirofumi Date: Thu Oct 16 07:50:29 2008 +0900 [PATCH vfs-2.6 4/6] vfs: remove unnecessary fsnotify_d_instantiate() This calls d_move(), so fsnotify_d_instantiate() is unnecessary like rename path. Signed-off-by: OGAWA Hirofumi commit 360da90029196c9449bc61e5a07ce8404e4cba57 Author: OGAWA Hirofumi Date: Thu Oct 16 07:50:28 2008 +0900 [PATCH vfs-2.6 3/6] vfs: add __d_instantiate() helper This adds __d_instantiate() for users which is already taking dcache_lock, and replace with it. The part of d_add_ci() isn't equivalent. But it should be needed fsnotify_d_instantiate() actually, because the path is to add the inode to negative dentry. fsnotify_d_instantiate() should be called after change from negative to positive. Signed-off-by: OGAWA Hirofumi commit e2761a1167633ed943fea29002f990194923d060 Author: OGAWA Hirofumi Date: Thu Oct 16 07:50:28 2008 +0900 [PATCH vfs-2.6 2/6] vfs: add d_ancestor() This adds d_ancestor() instead of d_isparent(), then use it. If new_dentry == old_dentry, is_subdir() returns 1, looks strange. "new_dentry == old_dentry" is not subdir obviously. But I'm not checking callers for now, so this keeps current behavior. Signed-off-by: OGAWA Hirofumi commit 871c0067d53ba2dc35897c7da1da675bf4c70511 Author: OGAWA Hirofumi Date: Thu Oct 16 07:50:27 2008 +0900 [PATCH vfs-2.6 1/6] vfs: replace parent == dentry->d_parent by IS_ROOT() Signed-off-by: OGAWA Hirofumi commit 9fbb76ce0fe96c07c44ba2aec3dc99f4b8d2b9c6 Author: Al Viro Date: Sun Oct 12 00:15:17 2008 -0400 [PATCH] get rid of on-stack dentry in udf Signed-off-by: Al Viro commit ad76cbc63b9db7c98da49af3182a783ca1c80a5d Author: Alexey Dobriyan Date: Thu Aug 28 06:26:23 2008 +0400 [PATCH 2/2] anondev: switch to IDA Signed-off-by: Alexey Dobriyan commit 6de24f0ed08054b2a202902e4d63beff27654db8 Author: Alexey Dobriyan Date: Thu Aug 28 06:25:49 2008 +0400 [PATCH 1/2] anondev: init IDR statically Signed-off-by: Alexey Dobriyan commit 8966c5e0fc867f5a7da5756b4cd1b8bbbed3d5dd Author: David Woodhouse Date: Mon Aug 18 15:36:47 2008 +0100 [JFFS2] Use d_splice_alias() not d_add() in jffs2_lookup() Now that JFFS2 can be exported by NFS, we need to get this right. Signed-off-by: David Woodhouse Signed-off-by: Al Viro commit c002a6c7977320f95b5edede5ce4e0eeecf291ff Author: David Woodhouse Date: Sun Aug 17 17:21:18 2008 +0100 [PATCH] Optimise NFS readdir hack slightly. Avoid calling the underlying ->readdir() again when we reached the end already; keep going round the loop only if we stopped due to our own buffer being full. [AV: tidy the things up a bit, while we are there] Signed-off-by: David Woodhouse Signed-off-by: Al Viro commit 53c9c5c0e32c69f9df1822e47671c13e3402c82f Author: Al Viro Date: Sun Aug 24 07:29:52 2008 -0400 [PATCH] prepare vfs_readdir() callers to returning filldir result It's not the final state, but it allows moving ->readdir() instances to passing filldir return value to caller of vfs_readdir(). Signed-off-by: Al Viro commit a9885444f7ff6e9156adb1adf5558ded9a39ad0a Author: Al Viro Date: Sun Aug 24 07:28:39 2008 -0400 [PATCH] get rid of on-stack dentry in ext2_get_parent() Signed-off-by: Al Viro commit 734711abac46c8fee4d70cc9876ebc6d9edb4971 Author: Al Viro Date: Sun Aug 24 07:26:48 2008 -0400 [PATCH] get rid of on-stack fake dentry in ext3_get_parent() Better pass parent and qstr to ext3_find_entry() explicitly than use such kludges, especially since the stack footprint is nasty enough and we have every chance to be deep in call chain. Signed-off-by: Al Viro commit 5f556aab907a358c7837cc9a83c3aea4e69cff5b Author: David Woodhouse Date: Thu Jul 31 20:39:25 2008 +0100 [JFFS2] Reinstate NFS exportability Now that the readdir/lookup deadlock issues have been dealt with, we can export JFFS2 file systems again. (For now, you have to specify fsid manually; we should add a method to the export_ops to handle that too.) Signed-off-by: David Woodhouse Signed-off-by: Al Viro commit d88f1833fcbb5663c86253039966f880f8f46b1a Author: David Woodhouse Date: Thu Jul 31 20:38:04 2008 +0100 [PATCH] Remove XFS buffered readdir hack Now that we've moved the readdir hack to the nfsd code, we can remove the local version from the XFS code. Signed-off-by: David Woodhouse Signed-off-by: Al Viro commit 14f7dd632011bb89c035722edd6ea0d90ca6b078 Author: David Woodhouse Date: Thu Jul 31 20:29:12 2008 +0100 [PATCH] Copy XFS readdir hack into nfsd code. Some file systems with their own internal locking have problems with the way that nfsd calls the ->lookup() method from within a filldir function called from their ->readdir() method. The recursion back into the file system code can cause deadlock. XFS has a fairly hackish solution to this which involves doing the readdir() into a locally-allocated buffer, then going back through it calling the filldir function afterwards. It's not ideal, but it works. It's particularly suboptimal because XFS does this for local file systems too, where it's completely unnecessary. Copy this hack into the NFS code where it can be used only for NFS export. In response to feedback, use it unconditionally rather than only for the affected file systems. Signed-off-by: David Woodhouse Signed-off-by: Al Viro commit 2628b766363aa3791e816a7e5807373ef551c776 Author: David Woodhouse Date: Thu Jul 31 17:16:51 2008 +0100 [PATCH] Factor out nfsd_do_readdir() into its own function Signed-off-by: David Woodhouse Signed-off-by: Al Viro commit f3f8e17571934ea253339e15c4ec9b34ea623c6b Author: Al Viro Date: Mon Aug 11 12:39:47 2008 -0400 [PATCH] reduce the stack footprint of exportfs_decode_fh() no need to have _two_ 256-byte arrays on stack... Signed-off-by: Al Viro commit 9308a6128d9074e348d9f9b5822546fe12a794a9 Author: Christoph Hellwig Date: Mon Aug 11 15:49:12 2008 +0200 [PATCH] kill d_alloc_anon Remove d_alloc_anon now that no users are left. Signed-off-by: Christoph Hellwig Signed-off-by: Al Viro commit 440037287c5ebb07033ab927ca16bb68c291d309 Author: Christoph Hellwig Date: Mon Aug 11 15:49:04 2008 +0200 [PATCH] switch all filesystems over to d_obtain_alias Switch all users of d_alloc_anon to d_obtain_alias. Signed-off-by: Christoph Hellwig Signed-off-by: Al Viro commit 4ea3ada2955e4519befa98ff55dd62d6dfbd1705 Author: Christoph Hellwig Date: Mon Aug 11 15:48:57 2008 +0200 [PATCH] new helper: d_obtain_alias The calling conventions of d_alloc_anon are rather unfortunate for all users, and it's name is not very descriptive either. Add d_obtain_alias as a new exported helper that drops the inode reference in the failure case, too and allows to pass-through NULL pointers and inodes to allow for tail-calls in the export operations. Incidentally this helper already existed as a private function in libfs.c as exportfs_d_alloc so kill that one and switch the callers to d_obtain_alias. Signed-off-by: Christoph Hellwig Signed-off-by: Al Viro commit 3a8cff4f026c0b98bee6291eb28d4df42feb76dc Author: Christoph Hellwig Date: Mon Aug 11 15:37:17 2008 +0200 [PATCH] generic_file_llseek tidyups Add kerneldoc for generic_file_llseek and generic_file_llseek_unlocked, use sane variable names and unclutter the code. Signed-off-by: Christoph Hellwig Signed-off-by: Al Viro commit a518ab9329041411526ab8e05edfda7e2715244f Author: Christoph Hellwig Date: Mon Aug 11 15:34:22 2008 +0200 [PATCH] tidy up chrdev_open Use a single goto label for chrdev_put + return error cases. Signed-off-by: Christoph Hellwig Signed-off-by: Al Viro commit ca30bc99527ab968707bafc09e38807de7e70c4a Author: Christoph Hellwig Date: Mon Aug 11 00:27:59 2008 +0200 [PATCH] hpfs: cleanup ->setattr Reformat hpfs_notify_change to standard kernel style to make it readable and rename it to hpfs_setattr as that's what the method is called. Signed-off-by: Christoph Hellwig Signed-off-by: Al Viro commit 72e8264eda02b6ba85a222b9620802ebf23c6a10 Author: Christoph Hellwig Date: Mon Aug 11 00:24:08 2008 +0200 [PATCH] dm: kill lookup_device wrapper Now that lookup_bdev is exported and used by dm just use it directly instead of through a trivial wrapper. Signed-off-by: Christoph Hellwig Signed-off-by: Al Viro commit 3516586a424ea5727be089da6541cbd5644f0497 Author: Al Viro Date: Tue Aug 5 03:00:49 2008 -0400 [PATCH] make O_EXCL in nd->intent.flags visible in nd->flags New flag: LOOKUP_EXCL. Set before doing the final step of pathname resolution on the paths that have LOOKUP_CREATE and O_EXCL. Signed-off-by: Al Viro commit 2c552d81363e0dac66d478046cc8a3948a67eae9 Author: Al Viro Date: Sat Aug 2 22:40:42 2008 -0400 [PATCH] don't pass bogus flags to LOOKUP_PARENT lookup in spufs Signed-off-by: Al Viro commit 8737f3a1b3c6a38a2a064552d4536633a5a16cd3 Author: Al Viro Date: Sat Aug 2 22:36:57 2008 -0400 [PATCH] get rid of path_lookup_create() ... and don't pass bogus flags when we are just looking for parent. Fold __path_lookup_intent_open() into path_lookup_open() while we are at it; that's the only remaining caller. Signed-off-by: Al Viro commit 98bc993f99e51467057ef699e47fec020f24d233 Author: Al Viro Date: Sat Aug 2 01:06:21 2008 -0400 [PATCH] get rid of nameidata in audit_tree Signed-off-by: Al Viro commit 421748ecde8e69a6364e5ae66eb3bf87e1f995c0 Author: Al Viro Date: Sat Aug 2 01:04:36 2008 -0400 [PATCH] assorted path_lookup() -> kern_path() conversions more nameidata eviction Signed-off-by: Al Viro commit a63bb99660d82dfe7c51588e1f9aadefb756ba51 Author: Al Viro Date: Sat Aug 2 01:03:36 2008 -0400 [PATCH] switch nfsd to kern_path() Signed-off-by: Al Viro commit c1a2a4756df01d72b6f7a0563218b23b63a6d4ed Author: Al Viro Date: Sat Aug 2 01:01:02 2008 -0400 [PATCH] sanitize svc_export_parse() clean up the exit paths, get rid of nameidata Signed-off-by: Al Viro commit 8264613def2e5c4f12bc3167713090fd172e6055 Author: Al Viro Date: Sat Aug 2 00:57:06 2008 -0400 [PATCH] switch quota_on-related stuff to kern_path() Signed-off-by: Al Viro commit b63365a2d60268a3988285d6c3c6003d7066f93a Author: Herbert Xu Date: Thu Oct 23 01:11:29 2008 -0700 net: Fix disjunct computation of netdev features My change commit e2a6b85247aacc52d6ba0d9b37a99b8d1a3e0d83 net: Enable TSO if supported by at least one device didn't do what was intended because the netdev_compute_features function was designed for conjunctions. So what happened was that it would simply take the TSO status of the last constituent device. This patch extends it to support both conjunctions and disjunctions under the new name of netdev_increment_features. It also adds a new function netdev_fix_features which does the sanity checking that usually occurs upon registration. This ensures that the computation doesn't result in an illegal combination since this checking is absent when the change is initiated via ethtool. The two users of netdev_compute_features have been converted. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 2e3f92dad6bdbee796274bae5c1c50a6ddd31cbb Author: Wei Yongjun Date: Thu Oct 23 01:01:18 2008 -0700 sctp: Fix to handle SHUTDOWN in SHUTDOWN_RECEIVED state Once an endpoint has reached the SHUTDOWN-RECEIVED state, it MUST NOT send a SHUTDOWN in response to a ULP request. The Cumulative TSN Ack of the received SHUTDOWN chunk MUST be processed. This patch fix to process Cumulative TSN Ack of the received SHUTDOWN chunk in SHUTDOWN_RECEIVED state. Signed-off-by: Wei Yongjun Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit cf896d514a4564027929a6d284872c74987085ef Author: Wei Yongjun Date: Thu Oct 23 01:00:49 2008 -0700 sctp: Fix to handle SHUTDOWN in SHUTDOWN-PENDING state If SHUTDOWN is received in SHUTDOWN-PENDING state, enpoint should enter the SHUTDOWN-RECEIVED state and check the Cumulative TSN Ack field of the SHUTDOWN chunk (RFC 4960 Section 9.2). If the SHUTDOWN chunk can acknowledge all of the send DATA chunks, SHUTDOWN-ACK should be sent. But now endpoint just silently discarded the SHUTDOWN chunk. SHUTDOWN received in SHUTDOWN-PENDING state can happend when the last SACK is lost by network, or the SHUTDOWN chunk can acknowledge all of the received DATA chunks. The packet sequence(SACK lost) is like this: Endpoint A Endpoint B ULP (ESTABLISHED) (ESTABLISHED) <----------- DATA <--- shutdown Enter SHUTDOWN-PENDING state SACK ----lost----> SHUTDOWN(*1) ------------> <----------- SHUTDOWN-ACK (*1) silently discarded now. This patch fix to handle SHUTDOWN in SHUTDOWN-PENDING state as the same as ESTABLISHED state. Signed-off-by: Wei Yongjun Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 898b054f3eec5921320ae8614b5bdd7b07ea5b43 Author: Shaohua Li Date: Sat Sep 27 11:10:28 2008 +0800 dock: make dock driver not a module To avoid dock driver is loaded after other drivers like libata, let's make dock driver not a module. Signed-off-by: Shaohua Li Signed-off-by: Len Brown commit df10eec476f2045a2ef5f85d97c7b47d992d7f7b Author: Wei Yongjun Date: Thu Oct 23 01:00:21 2008 -0700 sctp: Add check for the TSN field of the SHUTDOWN chunk If SHUTDOWN chunk is received Cumulative TSN Ack beyond the max tsn currently send, SHUTDOWN chunk be accepted and the association will be broken. New data is send, but after received SACK it will be drop because TSN in SACK is less than the Cumulative TSN, data will be retrans again and again even if correct SACK is received. The packet sequence is like this: Endpoint A Endpoint B ULP (ESTABLISHED) (ESTABLISHED) <----------- DATA (TSN=x-1) <----------- DATA (TSN=x) SHUTDOWN -----------> (Now Cumulative TSN=x+1000) (TSN=x+1000) <----------- DATA (TSN=x+1) SACK -----------> drop the SACK (TSN=x+1) <----------- DATA (TSN=x+1)(retrans) This patch fix this problem by terminating the association and respond to the sender with an ABORT. Signed-off-by: Wei Yongjun Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 91bd6b1e030266cf87d3f567b49f0fa60a7318ba Author: Wei Yongjun Date: Thu Oct 23 00:59:52 2008 -0700 sctp: Drop ICMP packet too big message with MTU larger than current PMTU If ICMP packet too big message is received with MTU larger than current PMTU, SCTP will still accept this ICMP message and sync the PMTU of assoc with the wrong MTU. Endpoing A Endpoint B (ESTABLISHED) (ESTABLISHED) ICMP ---------> (packet too big, MTU too larger) sync PMTU This patch fixed the problem by drop that ICMP message. Signed-off-by: Wei Yongjun Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit dcc51417e5ee71bc1984825c23616030d57b83a4 Merge: bd28bdb... 4cc683c... Author: David S. Miller Date: Thu Oct 23 00:44:04 2008 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 0a0d8a46757e2063433c8cd52b7d654e02b4682b Author: Al Viro Date: Sat Aug 2 00:55:27 2008 -0400 [PATCH] no need for noinline stuff in fs/namespace.c anymore Stack footprint from hell had been due to many struct nameidata in there. No more. Signed-off-by: Al Viro commit 2d92ab3c6279f8423b20cf91574d0ad6696d2b44 Author: Al Viro Date: Sat Aug 2 00:51:11 2008 -0400 [PATCH] finally get rid of nameidata in namespace.c Signed-off-by: Al Viro commit d181146572c4fa9af2a068b967cb53dcac7da944 Author: Al Viro Date: Sat Aug 2 00:49:18 2008 -0400 [PATCH] new helper - kern_path() Analog of lookup_path(), takes struct path *. Signed-off-by: Al Viro commit 5e1b00758b5a8bee9d42515bffdaf305a32f1b04 Author: H. Peter Anvin Date: Thu Oct 23 00:20:33 2008 -0700 x86: canonicalize remaining header guards Canonicalize a few remaining header guards, with the exception for those which are still in subarchitecture directories. Signed-off-by: H. Peter Anvin commit 05e4d3169bd16229d84a2ef095e1ba2cd3873baa Author: H. Peter Anvin Date: Thu Oct 23 00:01:39 2008 -0700 x86: drop double underscores from header guards Drop double underscores from header guards in arch/x86/include. They are used inconsistently, and are not necessary. Signed-off-by: H. Peter Anvin commit 1965aae3c98397aad957412413c07e97b1bd4e64 Author: H. Peter Anvin Date: Wed Oct 22 22:26:29 2008 -0700 x86: Fix ASM_X86__ header guards Change header guards named "ASM_X86__*" to "_ASM_X86_*" since: a. the double underscore is ugly and pointless. b. no leading underscore violates namespace constraints. Signed-off-by: H. Peter Anvin commit 87e299e5c7508a9443f04703f1d0c7f518f79ea9 Author: Al Viro Date: Sat Oct 11 18:39:18 2008 -0400 x86, um: get rid of uml-config.h Take a few symbols we need into kern_constants.h Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin commit 61bee20445935ee9802d25c261849440497497d3 Author: Al Viro Date: Mon Aug 25 04:51:27 2008 -0400 x86, um: get rid of arch/um/Kconfig.arch Teach scripts/kconfig/Makefile and top-level Makefile that arch/*/Makefile is allowed to say Kconfig := . Rewrite arch/um/Kconfig and arch/um/Kconfig. so that the latter would be top-level one (and include the pieces of the former). Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin commit ec82c32d45644998a28abad0a6a9ccdd721a054e Author: Al Viro Date: Mon Aug 25 04:14:29 2008 -0400 x86, um: get rid of arch/um/os symlink we can get DEV_NULL defined for arch/um/drivers/null.c in less convoluted ways, TYVM... Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin commit 887c57d480ee9dbfec53f2539359dd289f50acab Author: Al Viro Date: Mon Aug 25 04:12:10 2008 -0400 x86, um: get rid of excessive includes of uml-config.h Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin commit aa7bd942498512d6b77d1d0da846a8ecdd5d6186 Author: Al Viro Date: Sat Aug 23 17:28:20 2008 -0400 x86, um: get rid of header symlinks Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin commit 4198426af37e7122f2fda2538fa9dcaa19c5e397 Author: Al Viro Date: Sat Aug 23 17:00:34 2008 -0400 x86, um: merge Kconfig.i386 and Kconfig.x86_64 Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin commit f5ad6a42b700d9687bb97cf461e7f2506e3006d6 Author: Al Viro Date: Mon Aug 18 21:44:32 2008 -0400 x86, um: get rid of sysdep symlink Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin commit 17dcf75d3ea11d7e26110ba85677cfadbccecf45 Author: Al Viro Date: Mon Aug 18 17:47:45 2008 -0400 x86, um: trim the junk from uml ptrace-*.h Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin commit 2985cfdb04002b8e4c003a4008b2580aaebf75fc Author: Al Viro Date: Mon Aug 18 10:20:37 2008 -0400 x86, um: take vm-flags.h to sysdep Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin commit 6b0eed4ef3d024c3a709fbc3bb45ee5b0ac8486d Author: Al Viro Date: Mon Aug 18 04:54:36 2008 -0400 x86, um: get rid of uml asm/arch Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin commit fe1cd9876fa6250a8eb3ae138917a2040eca2c47 Author: Al Viro Date: Mon Aug 18 04:15:12 2008 -0400 x86, um: get rid of uml highmem.h Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin commit ff64b4c18624ca545dd360c4fa65334d19ee7b6f Author: Al Viro Date: Mon Aug 18 04:01:47 2008 -0400 x86, um: get rid of uml unistd.h Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin commit 6a0eec8224db1191876770f7cac31f2a2637a6f5 Author: Al Viro Date: Mon Aug 18 03:25:24 2008 -0400 x86, um: get rid of system.h -> system.h include Long-term we want to split system.h and include barriers part from underlying target; for now copy that part to sysdep. Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin commit 32926b3be19fa4859c02f248a342f2d62822dcfe Author: Al Viro Date: Mon Aug 18 01:36:36 2008 -0400 x86, um: uml atomic.h is not needed anymore Its only difference from underlying atomic.h used to be the include of kernel.h; it's not needed there anymore. Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin commit efb21cc2384e385c4873ac6e7b23f16659469ea9 Author: Al Viro Date: Mon Aug 18 01:26:38 2008 -0400 x86, um: untangle uml ldt.h * turn asm/ldt.h into ldt.h; update the (very few) users * take host_ldt.h into sysdep, kill symlink mess * includes of asm/arch/ldt.h turn into asm/ldt.h now Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin commit 5077c2a9cd43e8db71f8257e745e1d27e7b79d3f Author: Al Viro Date: Mon Aug 18 00:19:01 2008 -0400 x86, um: get rid of more uml asm/arch uses Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin commit 7127da4ee4447cb718c5ae553878458ec5e648f8 Author: Al Viro Date: Mon Aug 18 00:14:39 2008 -0400 x86, um: remove dead header (uml module-generic.h; never used these days) Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin commit 2e074004c6b71a93c8e08c0dd5e3cec0b92ad0e5 Author: Al Viro Date: Mon Aug 18 00:12:41 2008 -0400 x86, um: get rid of uml signal.h the only theoretical reason for it these days is ppc; aside of uml/ppc being dead, do_signal() would be happier in arch/powerpc/kernel/signal.h anyway. Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin commit 3be311e324087d94050010b97821b9d77a45e92f Author: Al Viro Date: Sun Aug 17 23:58:32 2008 -0400 x86, um: sanitize uml sigcontext.h uses a) the only difference between sigcontext and sysdep/sigcontext is that the former contains externs for two long-dead functions. Removed, switched the only user to sysdep/sigcontext b) asm/sigcontext.h is removable - that of underlying architecture would get used. Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin commit 1de1502c96c3c163c06419bfe838c73632fa8d9c Author: Al Viro Date: Sun Aug 17 22:54:55 2008 -0400 x86, um: now we can get rid of trivial uml headers Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin commit bb8985586b7a906e116db835c64773b7a7d51663 Author: Al Viro Date: Sun Aug 17 21:05:42 2008 -0400 x86, um: ... and asm-x86 move Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin commit 8ede0bdb63305d3353efd97e9af6210afb05734e Author: Al Viro Date: Sun Aug 17 19:13:17 2008 -0400 x86, um: initial part of asm-um move Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin commit 8569c9140bd41089f9b6be8837ca421102714a90 Author: Al Viro Date: Sun Aug 17 13:48:37 2008 -0400 x86, um: take arch/um/include/* out of the way We can't just plop asm/* into it - userland helpers are built with it in search path and seeing asm/* show up there suddenly would be a bad idea. Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin commit 3262a8f2bf686ced3a6ce8dee013ddf85511fbb6 Author: Len Brown Date: Thu Oct 23 01:47:29 2008 -0400 ACPI: fix ia64 build warning arch/ia64/sn/kernel/io_acpi_init.c:361: warning: format ‘%lx’ expects type ‘long unsigned int’, but argument 3 has type ‘long long unsigned int’ Signed-off-by: Len Brown commit 1ca2cc728d8060d58518096e5c79f12e3775c33a Merge: 5eaff72... 26adcfb... Author: Len Brown Date: Thu Oct 23 01:28:19 2008 -0400 Merge branch 'bugzilla-11715' into test commit 60b8267338aafde5315fc65ff385f3d4d75eccfe Author: David S. Miller Date: Wed Oct 22 22:09:59 2008 -0700 math-emu: Fix thinko in _FP_DIV In commit 48d6c64311ddb6417b901639530ccbc47bdc7635 ("math-emu: Add support for reporting exact invalid exception") code was added to set the new FP_EX_INVALID_{IDI,ZDZ} exception flag bits. However there is a missing break statement for the _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_INF) switch case, the code just falls into _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_ZERO) which then proceeds to overwrite all of the settings. Fix by adding the missing break. Signed-off-by: David S. Miller commit b1c8d2b421376bc941823ee93e36cb491609b02c Author: Jeff Layton Date: Wed Oct 22 13:57:07 2008 -0400 cifs: handle the TCP_Server_Info->tsk field more carefully cifs: handle the TCP_Server_Info->tsk field more carefully We currently handle the TCP_Server_Info->tsk field without any locking, but with some half-measures to try and prevent races. These aren't really sufficient though. When taking down cifsd, use xchg() to swap the contents of the tsk field with NULL so we don't end up trying to send it more than one signal. Also, don't allow cifsd to exit until the signal is received if we expect one. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 930cc144a043ff95e56b6888fa51c618b33f89e7 Author: Kumar Gala Date: Tue Oct 21 22:19:00 2008 -0700 math-emu: Fix signalling of underflow and inexact while packing result. I'm trying to move the powerpc math-emu code to use the include/math-emu bits. In doing so I've been using TestFloat to see how good or bad we are doing. For the most part the current math-emu code that PPC uses has a number of issues that the code in include/math-emu seems to solve (plus bugs we've had for ever that no one every realized). Anyways, I've come across a case that we are flagging underflow and inexact because we think we have a denormalized result from a double precision divide: 000.FFFFFFFFFFFFF / 3FE.FFFFFFFFFFFFE soft: 001.0000000000000 ..... syst: 001.0000000000000 ...ux What it looks like is the results out of FP_DIV_D are: D: sign: 0 mantissa: 01000000 00000000 exp: -1023 (0) The problem seems like we aren't normalizing the result and bumping the exp. Now that I'm digging into this a bit I'm thinking my issue has to do with the fix DaveM put in place from back in Aug 2007 (commit 405849610fd96b4f34cd1875c4c033228fea6c0f): [MATH-EMU]: Fix underflow exception reporting. 2) we ended up rounding back up to normal (this is the case where we set the exponent to 1 and set the fraction to zero), this should set inexact too ... Another example, "0x0.0000000000001p-1022 / 16.0", should signal both inexact and underflow. The cpu implementations and ieee1754 literature is very clear about this. This is case #2 above. Here is the distilled glibc test case from Jakub Jelinek which prompted that commit: -------------------- #include #include #include volatile double d = DBL_MIN; volatile double e = 0x0.0000000000001p-1022; volatile double f = 16.0; int main (void) { printf ("%x\n", fetestexcept (FE_UNDERFLOW)); d /= f; printf ("%x\n", fetestexcept (FE_UNDERFLOW)); e /= f; printf ("%x\n", fetestexcept (FE_UNDERFLOW)); return 0; } -------------------- It looks like the case I have we are exact before rounding, but think it looks like the rounding case since it appears as if "overflow is set". 000.FFFFFFFFFFFFF / 3FE.FFFFFFFFFFFFE = 001.0000000000000 I think the following adds the check for my case and still works for the issue your commit was trying to resolve. Signed-off-by: David S. Miller commit d41e2d7317cd55cc5135356a05c289537b0f6d70 Author: Martin Habets Date: Tue Oct 21 21:58:29 2008 -0700 sparc: Add checkstack support Add sparc support to checkstack. Signed-off-by: Martin Habets Signed-off-by: David S. Miller commit 8dd9453737822469837d48d5da3785ce70fb2118 Author: Frederic Weisbecker Date: Tue Oct 21 21:56:42 2008 -0700 sparc: correct section of current_pc() Latest mainline gives this section mismatch on sparc: The function current_pc() references the variable __init no_sun4u_here. This is often because current_pc lacks a __init annotation or the annotation of no_sun4u_here is wrong. Since current_pc() is used only in early time, it is correct to put it in .init section. Signed-off-by: Frederic Weisbecker Signed-off-by: David S. Miller commit a1731e5b9aa236dfa51a82799dc91c56611ddaab Author: Frederic Weisbecker Date: Tue Oct 21 21:55:33 2008 -0700 sparc: correct section of apc_no_idle The latest mainline gives this section mismatch on sparc: The function __devinit apc_probe() references a variable __initdata apc_no_idle. If apc_no_idle is only used by apc_probe then annotate apc_no_idle with a matching annotation. Since the commit 7e7e2f035663c5ceb029bfb9d91e75099b0a5625, apc_probe() is on __devinit so we have to correct apc_no_idle which is referenced by this function. Signed-off-by: Frederic Weisbecker Signed-off-by: David S. Miller commit e0037df3852b4b60edbe01f70f4968e4a9fdb272 Author: Andrea Shepard Date: Sun Oct 19 23:33:03 2008 -0700 sparc64: Fix race in arch/sparc64/kernel/trampoline.S Make arch/sparc64/kernel/trampoline.S in 2.6.27.1 lock prom_entry_lock when calling the PROM. This prevents a race condition that I observed causing a hang on startup on a 12-CPU E4500. I am not subscribed to this list, so please CC me on replies. Signed-off-by: Andrea Shepard Signed-off-by: David S. Miller commit 8d281efb67463fe8aac8f6e10b31492fc218bf2b Author: Jeff Layton Date: Wed Oct 22 13:57:01 2008 -0400 cifs: fix unlinking of rename target when server doesn't support open file renames cifs: fix unlinking of rename target when server doesn't support open file renames The patch to make cifs_rename undoable broke renaming one file on top of another when the server doesn't support busy file renames. Remove the code that uses busy file renames to unlink the target file, and just have it call cifs_unlink. If the rename of the source file fails, then the unlink won't be undoable, but hopefully that's rare enough that it won't be a problem. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 5eaff72218b9c2cb7ca7aa284cf0271870c7a7b1 Author: Zhao Yakui Date: Fri Oct 17 16:33:57 2008 +0800 ACPI: hack around sysfs warning with link order There exists the following warning message will appear after the following commit is merged. >commit f2e969acd6d5981e6b1272810002558650d0736e >Author: Zhao Yakui >Date: Mon Aug 11 14:57:50 2008 +0800 >ACPI: Add "acpi.power_nocheck=1" to disable power state check in power transition: >WARNING: at linux-2.6/fs/sysfs/dir.c:463 sysfs_add_one+0x33/0x39() >sysfs: duplicate filename 'acpi' can not be created >kobject_add_internal failed for acpi with -EEXIST, don't try to register things with the same name in the same directory In the above commit the "acpi.power_nocheck" module parameter is defined in drivers/acpi/power.c file. As several module parameters using the same ACPI prefix are defined in the different files(for example: power_nocheck is defined in drivers/acpi/power.c,debug_layer/debug_level are defined in drivers/acpi/debug.c) and there exists another module between them, the warning message will be printed when using the current generic param code. (In the function of param_sysfs_init). In fact when ACPI is selected, the drivers/acpi/power will also be compiled as built-in kernel.So this issue can be fixed by the following approach. workaround it by adjusting the module link order in drivers/acpi/Makefile. In such case the module parameter using the same prefix(ACPI) are put together in the param data section. Of course the better solution is to fix it in generic param code related with sysfs. Signed-off-by: Zhao Yakui Signed-off-by: Len Brown commit b849075c0e08ea43400c1341c78eeca76ab08d8a Author: Len Brown Date: Thu Oct 23 00:45:18 2008 -0400 ACPI suspend: fix build warning when CONFIG_ACPI_SLEEP=n drivers/acpi/sleep/main.c:27: warning: ‘acpi_target_sleep_state’ defined but not used Signed-off-by: Len Brown commit eb83f493ab9f8bd09fb7a99ae6ae565e92470491 Author: Len Brown Date: Thu Oct 23 00:43:47 2008 -0400 intel_menlo: fix build warning drivers/misc/intel_menlow.c:107: warning: format ‘%ld’ expects type ‘long int’, but argument 3 has type ‘long long unsigned int’ Signed-off-by: Len Brown commit 84210e9120a8c01a14379ba1f9a9b0f963641d94 Author: Steve French Date: Thu Oct 23 04:42:37 2008 +0000 [CIFS] improve setlease handling fcntl(F_SETLEASE) currently is not exported by cifs (nor by local file systems) so cifs grants leases based on how other local processes have opened the file not by whether the file is cacheable (oplocked). This adds the check to make sure that the file is cacheable on the client before checking whether we can grant the lease locally (generic_setlease). It also adds a mount option for cifs (locallease) if the user wants to override this and try to grant leases even if the server did not grant oplock. Signed-off-by: Steve French commit 057316cc6a5b521b332a1d7ccc871cd60c904c74 Merge: 3e2dab9... 2515ddc... Author: Len Brown Date: Wed Oct 22 23:57:26 2008 -0400 Merge branch 'linus' into test Conflicts: MAINTAINERS arch/x86/kernel/acpi/boot.c arch/x86/kernel/acpi/sleep.c drivers/acpi/Kconfig drivers/pnp/Makefile drivers/pnp/quirks.c Signed-off-by: Len Brown commit 7e78f72524b794fa8d73dc59aeeacc12a2e937fe Author: Eric Anholt Date: Tue Oct 21 11:53:01 2008 -0700 drm: Avoid oops in DRM_IOCTL_RM_DRAW if a bad handle is supplied. Signed-off-by: Eric Anholt Acked-by: Michel Dänzer Signed-off-by: Dave Airlie commit 49568873705e45a0de77b7824a9a46d3201019a7 Author: Eric Anholt Date: Tue Oct 21 11:38:50 2008 -0700 drm: Add 32-bit compatibility for DRM_IOCTL_UPDATE_DRAW. This fixes vblank support for a 32-bit X Server on a 64-bit kernel. Signed-off-by: Eric Anholt Signed-off-by: Dave Airlie commit 42f52ef8d96b1434f12ad9f895b5412fda392847 Author: Keith Packard Date: Sat Oct 18 19:39:29 2008 -0700 drm/i915: use pipes, not planes to label vblank data vblank in the kernel is far simpler if it deals with pipes instead of planes, so we're changing both user and kernel side. Signed-off-by: Keith Packard Signed-off-by: Eric Anholt Signed-off-by: Dave Airlie commit 9e44af790f8bf8c3aa8a3101fd4f9bca2e932baa Author: Keith Packard Date: Thu Oct 16 21:18:27 2008 -0700 drm/i915: hold dev->struct_mutex and DRM lock during vblank ring operations To synchronize clip lists with the X server, the DRM lock must be held while looking at drawable clip lists. To synchronize with other ring access, the ring mutex must be held while inserting commands into the ring. Failure to do the first resulted in easy visual corruption when moving windows, and the second could have corrupted the ring with DRI2. Grabbing the DRM lock involves using the DRM tasklet mechanism, grabbing the ring mutex means potentially sleeping. Deal with both of these by always running the tasklet from a work handler. Also, protect from clip list changes since the vblank request was queued by making sure the window has at least one rectangle while looking inside, preventing oopses . Signed-off-by: Keith Packard Signed-off-by: Eric Anholt Signed-off-by: Dave Airlie commit fe8133dc07e613587f8e667bce769edce8490f2a Author: Linus Torvalds Date: Fri Oct 17 15:43:02 2008 -0700 i915: Fix format string warnings on x86-64. Signed-off-by: Eric Anholt Signed-off-by: Dave Airlie commit a2d44cca4fc9ae04ed2c9fc2ef16b6989eeae218 Author: Eric Anholt Date: Fri Oct 17 14:41:03 2008 -0700 i915: Don't dereference HWS in /proc debug files when it isn't initialized. Signed-off-by: Eric Anholt Acked-by: Keith Packard Signed-off-by: Dave Airlie commit 053d7f244a8739d96d316c77a97cd063804c8e35 Author: Eric Anholt Date: Fri Oct 17 15:41:26 2008 -0700 i915: Enable IMR passthrough of vblank events before enabling it in pipestat. Otherwise, if we lost the race, the pipestat bit would be set without being reflected in IIR, and we would never clear the pipestat bit so the pipe event would never be generated again, and all vblank waits would time out. Signed-off-by: Eric Anholt Acked-by: Keith Packard Signed-off-by: Dave Airlie commit 35ad68c18148a18938ff4f40e945c9734e7d2265 Author: Eric Anholt Date: Fri Oct 17 11:03:53 2008 -0700 drm: Remove two leaks of vblank reference count in error paths. If the failing paths were hit, the vblank IRQ would never get turned off again. Signed-off-by: Eric Anholt Acked-by: Keith Packard Signed-off-by: Dave Airlie commit 786225eb2f4e55b5dda3cf8c62a145e824aae199 Author: Zhenyu Wang Date: Fri Oct 17 15:48:44 2008 +0800 drm: fix leak of cliprects in drm_rmdraw() Signed-off-by: Zhenyu Wang Signed-off-by: Eric Anholt Signed-off-by: Dave Airlie commit d1ed629f44b3a4108d5c445971535f05f441fce7 Author: Keith Packard Date: Fri Oct 17 00:44:42 2008 -0700 i915: Disable MSI on GM965 (errata says it doesn't work) Current Intel errata for the GM965 says that using MSI may cause interrupts to be delayed or lost. The only workaround offered is to not use it. Signed-off-by: Keith Packard Signed-off-by: Eric Anholt Signed-off-by: Dave Airlie commit 863842736fb4571b22e0f7f4696bf13eeec57166 Author: Zhenyu Wang Date: Fri Oct 17 13:15:48 2008 +0800 drm: Set cliprects to NULL when changing drawable to having 0 cliprects. This avoids setting the cliprects pointer to a zero-sized allocation. Signed-off-by: Zhenyu Wang Signed-off-by: Eric Anholt Signed-off-by: Dave Airlie commit e9d21d7f5ae1e625f3687d88bb50b00478c533ad Author: Keith Packard Date: Thu Oct 16 11:31:38 2008 -0700 i915: Protect vblank IRQ reg access with spinlock This uses the same spinlock as the user_irq code as it shares the same register, ensuring that interrupt registers are updated atomically. Signed-off-by: Keith Packard Signed-off-by: Eric Anholt Signed-off-by: Dave Airlie commit 3e2dab9a1c2deb03c311eb3f83466009147ed4d3 Author: Len Brown Date: Sat Oct 11 02:30:14 2008 -0400 panasonic-laptop: fix build sync with acpi_driver_data(device) and acpi_evaluate_integer(..., long long) changes that happened since this driver was checked in. Signed-off-by: Len Brown commit e4b41dbd60e30463cc8fab21ed45b7d6227fc338 Author: Paul Mundt Date: Thu Oct 23 12:37:20 2008 +0900 sh: asm/gpio.h needs linux/kernel.h for might_sleep()/WARN_ON(). Signed-off-by: Paul Mundt commit f1e6d3173ece6d60b4d5aeacd3b91a33ff8ec9d3 Merge: 1b79b27... 7ba427c... Author: Len Brown Date: Wed Oct 22 23:36:06 2008 -0400 Merge branch 'panasonic' into test commit 1b79b27da172d6c868746135feeb71de4ddd0646 Merge: 7674416... fa89b60... Author: Len Brown Date: Wed Oct 22 23:35:56 2008 -0400 Merge branch 'yinghai' into test commit 61dc6eaeef87048af351c04fd0046a6e3f96f94f Author: Paul Mundt Date: Thu Oct 23 12:35:43 2008 +0900 sh: mach-highlander: Handle SCIF pinmuxing on R7785RP. Signed-off-by: Paul Mundt commit 7674416db4ee3d43813dddb650364ca994755256 Merge: 0ca9413... 27663c5... Author: Len Brown Date: Wed Oct 22 23:33:29 2008 -0400 Merge branch 'ull' into test Conflicts: drivers/acpi/bay.c drivers/acpi/dock.c drivers/ata/libata-acpi.c Signed-off-by: Len Brown commit 0ca9413c234aa5a49ffaf80e46b50721a752e45a Merge: acd41d3... d64c81c... Author: Len Brown Date: Wed Oct 22 23:28:48 2008 -0400 Merge branch 'thinkpad' into test commit acd41d36e5a813501da92156f325ce15ddcd58ff Merge: 4dff4e7... 4fb507b... Author: Len Brown Date: Wed Oct 22 23:28:46 2008 -0400 Merge branch 'suspend' into test commit 4dff4e7f6cbcd2722b02dbb394ba87c4e05f8841 Merge: 5f50ef4... ac88a8f... Author: Len Brown Date: Wed Oct 22 23:28:43 2008 -0400 Merge branch 'pnp-debug' into test commit 5f50ef453dcb05115fc98f244b8f10bfacd4b8b7 Merge: 530bc23... e3deda9... Author: Len Brown Date: Wed Oct 22 23:28:38 2008 -0400 Merge branch 'misc' into test commit 530bc23bfeaa9156003afbeb9708fd03a5f1c73c Merge: ead9039... 27471fd... Author: Len Brown Date: Wed Oct 22 23:28:36 2008 -0400 Merge branch 'i7300_idle' into test commit ead90393438e0100763c6afd58eaae6a8418c6df Merge: b815d7b... 0e6a66e... Author: Len Brown Date: Wed Oct 22 23:28:33 2008 -0400 Merge branch 'fujitsu' into test commit b815d7b3255e455bd83b19b912ef7b0041fe0865 Merge: 3156d1e... fcea94b... Author: Len Brown Date: Wed Oct 22 23:28:03 2008 -0400 Merge branch 'fadt-test' into test commit 3156d1ed68ff387a4f0b86c505ed76368f576c54 Merge: 0fbb372... a195dcd... Author: Len Brown Date: Wed Oct 22 23:28:01 2008 -0400 Merge branch 'eeepc' into test commit 0fbb3726f246aadd1bebc01114100b6e69afa5b9 Merge: 47bf31a... c0ff177... Author: Len Brown Date: Wed Oct 22 23:27:59 2008 -0400 Merge branch 'ec' into test commit 47bf31adc541bef0c20de15e800e0011f1ae70c7 Merge: 4538fad... 0a918a9... Author: Len Brown Date: Wed Oct 22 23:25:26 2008 -0400 Merge branch 'dock' into test Conflicts: drivers/acpi/osl.c Signed-off-by: Len Brown commit 4538fad56ee1c16bce0294b5647d2551f0e03164 Merge: ebd7e45... 89cedfe... Author: Len Brown Date: Wed Oct 22 23:20:05 2008 -0400 Merge branch 'cpuidle' into test commit ebd7e45f6d27556c94216024212a462aaf899ecb Merge: 462af43... 8fd1459... Author: Len Brown Date: Wed Oct 22 23:20:02 2008 -0400 Merge branch 'bugzilla-11481' into test commit 462af435b3d8c682eb86e79d6a42ed62d183c317 Merge: 63e065e... faee816... Author: Len Brown Date: Wed Oct 22 23:20:01 2008 -0400 Merge branch 'bugzilla-10503' into test commit 63e065e5d35b7ca1ba2c71a042dfb602820409b8 Merge: 2285bc3... 20edd74... Author: Len Brown Date: Wed Oct 22 23:19:59 2008 -0400 Merge branch 'bugzilla-10237' into test commit 2285bc3d3d6780ecb786d37ed96d014b289a2902 Merge: bcb631f... c6c38ba... Author: Len Brown Date: Wed Oct 22 23:19:57 2008 -0400 Merge branch 'asus-cleanup' into test commit bcb631f31839cb7c7dd56ab534b6eb4867e9161b Merge: 955ba39... ed37a71... Author: Len Brown Date: Wed Oct 22 23:19:51 2008 -0400 Merge branch 'acpica' into test commit 955ba395616a78780e70dc3f3b0b56ca4db52e5c Merge: aa58329... 383d7a1... Author: Len Brown Date: Wed Oct 22 23:19:50 2008 -0400 Merge branch 'bugfixes' into test commit aa58329fc8ec50b379388fcad55f62c3493730d3 Merge: 6b3c4f8... ae3a1b4... Author: Len Brown Date: Wed Oct 22 23:19:47 2008 -0400 Merge branch 'acer-wmi' into test commit 6b3c4f8b9c417541c561155bf6b2150a81b5d5eb Merge: 3fa8749... 2fd4709... Author: Len Brown Date: Wed Oct 22 23:19:45 2008 -0400 Merge branch 'FW_BUG' into test commit ed37a71eac8ba375d85ab10ed5f5e8bdf1cd72e0 Author: Bob Moore Date: Sat Sep 27 13:39:20 2008 +0800 ACPICA: Update version to 20080926 Update version to 20080926. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 4ca846e9270f305ad19e61f6654664f31459f332 Author: Bob Moore Date: Sat Sep 27 13:27:51 2008 +0800 ACPICA: Add support for zero-length buffer-to-string conversions Allow zero length strings during interpreter buffer-to-string conversions. For example, during the ToDecimalString and ToHexString operaters, as well as implicit conversions. Fiodor Suietov. ACPICA BZ 585. http://www.acpica.org/bugzilla/show_bug.cgi?id=585 Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit e8707b340fb5b6313cde784b944a568dfd770ddd Author: Bob Moore Date: Sun Sep 28 15:26:17 2008 +0800 ACPICA: New: Validation for predefined ACPI methods/objects Validates predefined ACPI objects that appear in the namespace, at the time they are evaluated. The argument count and the type of the returned object are validated. The purpose of this validation is to detect problems with the BIOS-exposed predefined ACPI objects before the results are returned to the ACPI-related drivers. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit b9d1312ad4246e467f333dfe2ac4dc7a79608d59 Author: Lin Ming Date: Sat Sep 27 12:01:12 2008 +0800 ACPICA: Fix for implicit return compatibility Predicate can be used for an implicit return value. This change improves the implicit return mechanism to be more compatible with the MS interpreter. http://www.acpica.org/bugzilla/show_bug.cgi?id=349 Below AML code from http://bugzilla.kernel.org/show_bug.cgi?id=10686 Store(0x07D6, OSYS) Method (_CRT, 0, Serialized) { If (LLess (OSYS, 0x07D6)) { If (LEqual (\_SB.TJ85, Zero)) { Return (Add (0x0AAC, Multiply (TPC, 0x0A))) } Else { Return (Add (0x0AAC, Multiply (TP85, 0x0A))) } } } Previously _CRT returns 0x07D6, now it returns 0 (predicate value of LLess) Signed-off-by: Lin Ming Signed-off-by: Bob Moore Signed-off-by: Len Brown commit d8a0ec914afa1a994d2f6184ac4c6668b5f8068f Author: Lin Ming Date: Sat Sep 27 11:50:24 2008 +0800 ACPICA: Fixed a couple memory leaks associated with "implicit return" Fixed a couple memory leaks associated with "implicit return" objects when the AML Interpreter slack mode is enabled. http://www.acpica.org/bugzilla/show_bug.cgi?id=349 Signed-off-by: Lin Ming Signed-off-by: Bob Moore Signed-off-by: Len Brown commit 68e125c40597802b9789bc696775bf0246e7667d Author: Bob Moore Date: Sat Sep 27 11:34:48 2008 +0800 ACPICA: Optimize buffer allocation procedure Eliminate duplicate code. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit cf058bd1c84df9921ecc517d8a8a413f4d6b5b45 Author: Lin Ming Date: Sat Sep 27 11:29:57 2008 +0800 ACPICA: Fix possible memory leak, error exit path Fixed two possible memory leaks in the error exit paths of acpi_ut_update_objerct_reference() and acpi_ut_walk_package_tree() These functions are similar in that they use a stack of state objects in order to eliminate recursion. The stack must be fully deallocated if an error occurs. http://www.acpica.org/bugzilla/show_bug.cgi?id=383 Signed-off-by: Lin Ming Signed-off-by: Bob Moore Signed-off-by: Len Brown commit c35def2118d3d7cceb0f69d6707f613a7473df15 Author: Lin Ming Date: Sat Sep 27 11:28:46 2008 +0800 ACPICA: Fix fault after mem allocation failure in AML parser Fixes a crash if a memory allocation fails during the Op completion routine acpi_ps_complete_this_op(). http://www.acpica.org/bugzilla/show_bug.cgi?id=492 Signed-off-by: Lin Ming Signed-off-by: Bob Moore Signed-off-by: Len Brown commit bbbbeb8e31af97f11b84294b2e7e5607125829d2 Author: Lin Ming Date: Sat Sep 27 11:26:59 2008 +0800 ACPICA: Remove unused ACPI register bit definition Removed the ACPI_BITREG_WAKE_ENABLE definition and entry in the global register table. This bit does not exist and is unused. http://www.acpica.org/bugzilla/show_bug.cgi?id=442 Signed-off-by: Lin Ming Signed-off-by: Bob Moore Signed-off-by: Len Brown commit 51f52819bd02112a1f61f0741231f14bdb0cae7b Author: Bob Moore Date: Sat Sep 27 11:14:04 2008 +0800 ACPICA: Update version to 20080829 Update version to 20080829. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 393a75d6b7bae59221b2122634eb4cb905e84208 Author: Bob Moore Date: Sat Sep 27 11:12:36 2008 +0800 ACPICA: Fix possible memory leak in acpi_ns_get_external_pathname Fixes a memory leak in the error exit path. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 1044f1f65b7df2aae979e397904c4985eeb99ba2 Author: Bob Moore Date: Sat Sep 27 11:08:41 2008 +0800 ACPICA: Cleanup for internal Reference Object Fix some sloppiness in the Reference object. No longer use AML opcodes to differentiate the types, introduce new reference Class. Cleanup the debug output code. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 2425a0967f29b196fad5d4f726c9502679284656 Author: Bob Moore Date: Sat Sep 27 10:42:02 2008 +0800 ACPICA: Update comments - no functional changes Some formatting and spelling fixes. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 57e664cfd968ec8e4b0bfd80a5e8f903307e598b Author: Bob Moore Date: Sat Sep 27 10:40:39 2008 +0800 ACPICA: Update for Reference ACPI_OPERAND_OBJECT 1) Add new field for use by DdbHandle (Value) 2) Use ACPI_CAST_INDIRECT_PTR to eliminate strict type warnings 3) Cleanup debug output Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 93851b4d13de48753eaae76ed190eef7355e2c19 Author: Lin Ming Date: Sat Sep 27 10:38:07 2008 +0800 ACPICA: Reduce error to warning for incorrect method arg count Previously aborted with error if too few arguments were passed to a control method via the external ACPICA interface. Now issue a warning instead and continue. Handles the case where the method inadvertently declares too many arguments, but does not actually use the extra ones. Applies mainly to the predefined methods. http://bugzilla.kernel.org/show_bug.cgi?id=11032 Signed-off-by: Lin Ming Signed-off-by: Bob Moore Signed-off-by: Len Brown commit b68bacf225e5e9758472e99505d76125ced3ea88 Author: Bob Moore Date: Sat Sep 27 10:29:31 2008 +0800 ACPICA: Disallow evaluation of named object types with no value Return AE_TYPE for objects that have no value and therefore evaluation is undefined: Device, Event, Mutex, Region, Thermal, and Scope. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 65f4692c5220330e1ea044796c4cfa603e349c84 Author: Bob Moore Date: Sat Sep 27 10:28:07 2008 +0800 ACPICA: Remove obsolete exception codes Removed 10 exception codes (and corresponding name strings) that were obsolete for various reasons. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 8d5c54b65b20bf81fa9841a27143e2f71f3a7756 Author: Bob Moore Date: Sat Sep 27 10:22:09 2008 +0800 ACPICA: Add namespace node to operand object union Add ACPI_NAMESPACE_NODE to the ACPI_OPERAND_OBJECT in order to simplify code that accepts both of these objects. A common type field is used to differentiate them. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 23d3e055beb12db2a3b91dfeee474c4d5ecc13b9 Author: Bob Moore Date: Sun Sep 28 15:00:47 2008 +0800 ACPICA: Remove obsolete debug levels (WARN and ERROR) Removed ACPI_DB_WARN and ACPI_DB_ERROR. These debug levels were made obsolete by the ACPI_WARNING and ACPI_ERROR/ACPI_EXCEPTION interfaces. Also added ACPI_DB_EVENTS to correspond with the existing ACPI_LV_EVENTS. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 55ac9a018f83e4f42f3c6ce98a8dbda73b985935 Author: Lin Ming Date: Sun Sep 28 14:51:56 2008 +0800 ACPI: replace ACPI_DEBUG_PRINT((ACPI_DB_ERROR, ...) with printk ACPI_DB_ERROR and ACPI_DB_WARN were removed from ACPICA core. So replace ACPI_DEBUG_PRINT((ACPI_DB_ERROR, ...) with printk(KERN_ERR PREFIX ...) and ACPI_DEBUG_PRINT((ACPI_DB_WARN, ...) with printk(KERN_WARNING PREFIX ...) We do not use ACPI_ERROR/ACPI_WARNING since they're not exported, see ------------------------------------------------------------- commit 6468463abd7051fcc29f3ee7c931f9bbbb26f5a4 Author: Len Brown Date: Mon Jun 26 23:41:38 2006 -0400 ACPI: un-export ACPI_ERROR() -- use printk(KERN_ERR...) Signed-off-by: Len Brown ------------------------------------------------------------- Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 8bd108d14604d9c95000751e6c6ecbd11ea6ed40 Author: Alexey Starikovskiy Date: Thu Sep 25 21:40:30 2008 +0400 ACPICA: add preemption point after each opcode parse Reference: http://marc.info/?l=linux-acpi&m=122236382701062&w=2 Signed-off-by: Alexey Starikovskiy Tested-by: Sitsofe Wheeler Signed-off-by: Len Brown commit eec935490172dbfa1a32647f9deb2b66a66f2741 Author: Bob Moore Date: Mon Aug 4 11:15:11 2008 +0800 ACPICA: Update version to 20080729 Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit 1d7cc03049f7c9c5cced9208a39316c5245ef314 Author: Bob Moore Date: Mon Aug 4 10:42:47 2008 +0800 ACPICA: x2APIC support: changes for MADT and SRAT ACPI tables Support for the x2APIC. There are 2 new subtables for the MADT and one new subtable for the SRAT. Includes disassembler and acpisrc support. Data from the Intel 64 Architecture x2APIC Specification, June 2008. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit c2de3a49454cdc9ca42bbd5d742913421d049f59 Author: Bob Moore Date: Mon Aug 4 10:41:29 2008 +0800 ACPICA: Improve object conversion error messages Better error messages during object conversion from internal to the external ACPI_OBJECT. Used for external calls to acpi_evaluate_object. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit f02a99ac66748f8b62477c86f6df04d3ec6169fd Author: Bob Moore Date: Mon Aug 4 10:40:09 2008 +0800 ACPICA: Add function to decode reference obj types to strings Created for improved error messages. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit d00d23651d17a2848f6923f3b1ec4efe19f5f2f1 Author: Bob Moore Date: Mon Aug 4 10:12:31 2008 +0800 ACPICA: Update version to 20080701 Update version to 20080701. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit 0a1fbf2db0d275f0f8160bb9c3e51c4df5bafdc2 Author: Bob Moore Date: Fri Jul 4 10:53:58 2008 +0800 ACPICA: Return method arg count from acpi_get_object_info Also update the debugger so that the correct number of arguments is passed to the method. Prevents a warning message from the debugger. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit c9bdd8057d706a972d804d2d8614a283641a5660 Author: Bob Moore Date: Mon Aug 4 09:54:17 2008 +0800 ACPICA: Cleanup macro definition file. Removed unused macros. Ensure that multiple parameters always have a space after a comma. Cleanup some comments. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit b7906e324532c1616546f6d4a1306894ba7c0a3d Author: Bob Moore Date: Fri Aug 15 04:32:59 2008 +0200 ACPICA: Fix warning for 64-bit build Fixes warning from exconfig.c on 64-bit build. AK: This actually was fixed earlier in Linux, this just syncs with AK: the version of the fix that went into the ACPCA codebase Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit bbc241340681557a16982f4d1840f00963bc05b4 Author: Lin Ming Date: Mon Aug 4 13:22:10 2008 +0800 ACPICA: Add function to dereference returned reference objects Examines the return object from a call to acpi_evaluate_object. Any Index or RefOf references are automatically dereferenced in an attempt to return something useful (these reference types cannot be converted into an external ACPI_OBJECT.) Lin Ming, Bob Moore. http://bugzilla.kernel.org/show_bug.cgi?id=11105 Signed-off-by: Lin Ming Signed-off-by: Bob Moore Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit b417d40b9a850f12f69aa9d785d2af39c9463bb8 Author: Yi Yang Date: Mon Aug 4 10:30:09 2008 +0800 ACPICA: Return status from global init function Return status from acpi_ut_init_globals. This is used by both the kernel subsystem and the utilities such as iASL compiler. The function could possibly fail when the caches are initialized. Yang Yi. Signed-off-by: Yi Yang Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit a6f30539f31a8129288b0e5640d3eb1174848c15 Author: Bob Moore Date: Fri Jul 4 10:57:51 2008 +0800 ACPICA: Fix table compare code, length then data Split the ACPI table compare. First check that the lengths match exactly. Then compare the data. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit 9db4fcd99f7ef886ded97cd26a8642c70fbe34df Author: Bob Moore Date: Fri Jul 4 10:56:13 2008 +0800 ACPICA: Fix wrong resource descriptor length for 64-bit build The "minimal" descriptors such as EndTag are calculated as 12 bytes long, but the actual length in the internal descriptor is 16 because of the round-up to 8 on 64-bit build. http://www.acpica.org/bugzilla/show_bug.cgi?id=728 Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit e56f561736e340a4e923b0db65f65dabf5d94823 Author: Bob Moore Date: Fri Jul 4 10:48:43 2008 +0800 ACPICA: Allow same ACPI table to be loaded/unloaded more than once Without this change, a table cannot be loaded again once it has been loaded/unloaded one time. The current mechanism does not unregister a table upon an unload. During a load, if the same table is found, this no longer returns an exception. http://www.acpica.org/bugzilla/show_bug.cgi?id=722 Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit 237a927682a63f02adb542dbdaafe8a81566451d Author: Fiodor Suietov Date: Fri Jul 4 10:18:34 2008 +0800 ACPICA: Add check for invalid handle in acpi_get_object_info Return AE_BAD_PARAMETER if input handle is invalid. http://www.acpica.org/bugzilla/show_bug.cgi?id=474 Signed-off-by: Fiodor Suietov Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit f0e0da8a6cca44396c7a711e308d58084e881617 Author: Dennis Noordsij Date: Fri Aug 15 09:37:58 2008 +0800 ACPICA: Copy dynamically loaded tables to local buffer Previously, dynamically loaded tables were simply mapped, but on some machines this memory is corrupted after suspend. Now copy the table to a local buffer. For OpRegion case, added checksum verify. Use the table length from the table header, not the region length. For Buffer case, use the table length also. http://bugzilla.kernel.org/show_bug.cgi?id=10734 Signed-off-by: Dennis Noordsij Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit 0835f127e589f3a946add6a1f508e9402af8e70c Author: Magnus Damm Date: Thu Oct 23 11:30:10 2008 +0900 sh: sh7785 pinmux support This patch implements pinmux tables for the sh7785 processor. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit b78152e9dbab6d6175e2adcbd8c62959e8f0f922 Author: Tejun Heo Date: Wed Oct 22 00:45:57 2008 +0900 sata_via: load DEVICE register when CTL changes VIA controllers clear DEVICE register when IEN changes. Make sure DEVICE is updated along with CTL. This change is separated from Joseph Chan's larger patch. http://thread.gmane.org/gmane.linux.kernel.commits.mm/40640 Signed-off-by: Tejun Heo Cc: Joseph Chan Signed-off-by: Jeff Garzik commit 816ab89782ac139a8b65147cca990822bb7e8675 Author: Tejun Heo Date: Wed Oct 22 00:31:34 2008 +0900 libata: set device class to NONE if phys_offline Reset methods don't have access to phys link status for slave links and may incorrectly indicate device presence causing unnecessary probe failures for unoccupied links. This patch clears device class to NONE during post-reset processing if phys link is offline. As on/offlineness semantics is strictly defined and used in multiple places by the core layer, this won't change behavior for drivers which don't use slave links. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit a568d1d2e2aff4f114b087c06bfd350e945ad6cf Author: Tejun Heo Date: Tue Oct 21 20:37:21 2008 +0900 libata-eh: fix slave link EH action mask handling Slave link action mask is transferred to master link and all the EH actions are taken by the master link. ata_eh_about_to_do() and ata_eh_done() are called with ATA_EH_ALL_ACTIONS to clear the slave link actions during transfer. This always sets ATA_PFLAG_RECOVERED flag causing spurious "EH complete" messages. Don't set ATA_PFLAG_RECOVERED for slave link actions. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 848e4c68c4695beae563f9a3d59fce596b466a74 Author: Tejun Heo Date: Tue Oct 21 14:26:39 2008 +0900 libata: transfer EHI control flags to slave ehc.i ATA_EHI_NO_AUTOPSY and ATA_EHI_QUIET are used to control the behavior of EH. As only the master link is visible outside EH, these flags are set only for the master link although they should also apply to the slave link, which causes spurious EH messages during probe and suspend/resume. This patch transfers those two flags to slave ehc.i before performing slave autopsy and reporting. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 570106df6bdb4907ad7f70793079c762f34d561a Author: Tejun Heo Date: Mon Oct 20 13:10:21 2008 +0900 libata-sff: fix ata_sff_post_internal_cmd() ata_sff_post_internal_cmd() needs to grab port lock before calling ata_bmdma_stop() and also need to clear hsm_task_state. Fix it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit f667fdbbbea8bcce6cf9f7acb51b7cb4c264cc61 Author: Tejun Heo Date: Mon Oct 20 13:11:56 2008 +0900 libata: initialize port_task when !CONFIG_ATA_SFF ap->port_task was not initialized if !CONFIG_ATA_SFF later triggering lockdep warning. Make sure it's initialized. Reported by Larry Finger. Signed-off-by: Tejun Heo Cc: Larry Finger Signed-off-by: Jeff Garzik commit e45c5405e12c7cef93940cb7a541ab459ec0096a Author: Eric Van Hensbergen Date: Wed Oct 22 18:54:47 2008 -0500 9p: fix sparse warnings Several sparse warnings were introduced by patches accepted during the merge window which weren't caught. This patch fixes those warnings. Signed-off-by: Eric Van Hensbergen commit fc79d4b104f0eb8c2a7242150eaf8756ced4c344 Author: Tom Tucker Date: Wed Oct 22 18:47:39 2008 -0500 9p: rdma: RDMA Transport Support for 9P This patch implements the RDMA transport provider for 9P. It allows mounts to be performed over iWARP and IB capable network interfaces. Signed-off-by: Tom Tucker Signed-off-by: Latchesar Ionkov commit ea2e7996fc892e9becfed9145fdcefd59f697718 Author: Eric Van Hensbergen Date: Wed Oct 22 18:48:45 2008 -0500 9p: fix format warning This patch fixes a format warning which appears on 64-bit builds. Signed-off-by: Eric Van Hensbergen commit 0b15a3a5285bac2a2caa4ef970410674b6dd2de5 Author: Eric Van Hensbergen Date: Wed Oct 22 18:47:40 2008 -0500 9p: fix debug build error Fixes build problem with 9p when building with debug disabled. Also contains some fixes for warnings which pop up when CONFIG_NET_9P_DEBUG is disabled. Signed-off-by: Eric Van Hensbergen commit 05a34f51ba451c65773ad6f1acf4cc089cc474d8 Author: Julia Lawall Date: Wed Oct 22 16:44:00 2008 -0700 PCI hotplug: fix logic in Compaq hotplug controller bus speed setup The pattern !E && !E->fld is nonsensical. The patch below updates this according to the assumption that && should be ||. But perhaps another solution was intended. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // @disable and_comm@ expression E; identifier fld; @@ - !E && !E->fld + !E || !E->fld // Signed-off-by: Julia Lawall Reviewed-by: Matthew Wilcox Signed-off-by: Andrew Morton Signed-off-by: Jesse Barnes commit 1388cc964e680c1086ca0edae35be094cb29d51e Author: Stephen Rothwell Date: Wed Oct 22 13:39:55 2008 +1100 PCI: don't export linux/io.h from pci.h Move the include of io.h down into the #ifdef __KERNEL__ protected region. Signed-off-by: Stephen Rothwell Signed-off-by: Jesse Barnes commit 61cfc7e442c52c14e632d9af0e70779cfa04249d Author: Geert Uytterhoeven Date: Wed Oct 22 08:53:25 2008 +0200 PCI: PCI_QUIRKS depends on PCI commit 3d137310245e4cdc3e8c8ba1bea2e145a87ae8e3 ("PCI: allow quirks to be compiled out") introduced CONFIG_PCI_QUIRKS, which now shows up in each and every .config. Fix this by making it depend on PCI. Signed-off-by: Geert Uytterhoeven Signed-off-by: Jesse Barnes commit f18e9625e02bb3e5ba9e81104f14e9d904ab28c4 Author: Kenji Kaneshige Date: Wed Oct 22 14:31:44 2008 +0900 PCI hotplug: pciehp: poll data link layer link active This patch adds polling mechanism for Data Link Layer Link Active bit after turning power on, instead of waiting for 1000 msec. This reduces reduce the unnecessary long wait. Signed-off-by: Kenji Kaneshige Signed-off-by: Jesse Barnes commit b84346ef74cf76793070762b933387729c5df1ed Author: Kenji Kaneshige Date: Wed Oct 22 14:30:15 2008 +0900 PCI hotplug: pciehp: fix possible memory leak in pcie_init Fix the error paths in pcie_init to avoid leaking memory. Signed-off-by: Kenji Kaneshige Signed-off-by: Jesse Barnes commit a1c19894b786f10c76ac40e93c6b5d70c9b946d2 Author: Benjamin Herrenschmidt Date: Tue Oct 21 10:06:29 2008 +1100 PCI: Workaround invalid P2P bridge bus numbers Some firmware fail to properly configure P2P bridges, leaving them with invalid bus numbers. In some cases, this happens on some embedded 4xx boards as the result of the kernel allocating different bus space than the firmware does to host bridges while not setting pcibios_assign_all_busses() for various reasons. In other cases, it can just be bogus firmware. This adds some sanity checking to the PCI probing code. If a bridge is found whose primary bus number doesn't match the bus it's sitting on, or whose secondary bus number not strictly above it's primary bus number, then the bridge bus numbers are deconfigured in the first pass of pci_scan_bridge() to be re-assigned in the second pass. Tested-by: "Ayman El-Khashab" Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Jesse Barnes commit 0b8b0dca9aad94878adaf4520f3f12bf9813f329 Author: Alex Chiang Date: Mon Oct 20 17:42:03 2008 -0600 PCI Hotplug: fakephp: add duplicate slot name debugging The PCI core now manages slot names on behalf of slot detection and slot hotplug drivers, including the handling of duplicate slot names. We can use the fakephp driver to help test the new functionality. Add a 'dup_slots' module param to force fakephp to create multiple slots with the same name. We can then verify that the PCI core correctly renamed the slots. sapphire:/sys/bus/pci/slots # modprobe fakephp dup_slots sapphire:/sys/bus/pci/slots # ls fake fake-10 fake-3 fake-5 fake-7 fake-9 fake-1 fake-2 fake-4 fake-6 fake-8 Cc: kristen.c.accardi@intel.com Cc: matthew@wil.cx Acked-by: Kenji Kaneshige Signed-off-by: Alex Chiang Signed-off-by: Jesse Barnes commit 58319b802a614f10f1b5238fbde7a4b2e9a60069 Author: Alex Chiang Date: Mon Oct 20 17:41:58 2008 -0600 PCI: Hotplug core: remove 'name' Now that the PCI core manages the 'name' for each individual hotplug driver, and all drivers (except rpaphp) have been converted to use hotplug_slot_name(), there is no need for the PCI hotplug core to drag around its own copy of name either. Cc: kristen.c.accardi@intel.com Cc: matthew@wil.cx Acked-by: Kenji Kaneshige Signed-off-by: Alex Chiang Signed-off-by: Jesse Barnes commit 66f1705580f796a3f52c092e9dc92cbe5df41dd6 Author: Alex Chiang Date: Mon Oct 20 17:41:53 2008 -0600 PCI: shcphp: remove 'name' parameter We do not need to manage our own name parameter, especially since the PCI core can change it on our behalf, in the case of duplicate slot names. Remove 'name' from shpchp's version of struct slot. This change also removes the unused struct task_event from the slot structure. Cc: kristen.c.accardi@intel.com Acked-by: Kenji Kaneshige Signed-off-by: Alex Chiang Signed-off-by: Jesse Barnes commit 85234ce86dfa62b779faa19a70364a06e3f7fc32 Author: Alex Chiang Date: Mon Oct 20 17:41:48 2008 -0600 PCI: SGI Hotplug: stop managing bss_hotplug_slot->name We no longer need to manage our version of hotplug_slot->name since the PCI and hotplug core manage it on our behalf. Update the sn_hp_slot_private_alloc() interface to fill in the correct name for us, as that function already has all the parameters needed to determine the name. Cc: kristen.c.accardi@intel.com Cc: jpk@sgi.com Acked-by: Kenji Kaneshige Signed-off-by: Alex Chiang Signed-off-by: Jesse Barnes commit b2132fecca02fa05d509ba4c8c1e51dee6ccd003 Author: Alex Chiang Date: Mon Oct 20 17:41:43 2008 -0600 PCI: rpaphp: kmalloc/kfree slot->name directly rpaphp tends to use slot->name directly everywhere, and doesn't ever need slot->hotplug_slot->name. struct hotplug_slot->name is going away, so convert rpaphp directly manipulate its own slot->name everywhere, and don't bother touching slot->hotplug_slot->name. Acked-by: Kenji Kaneshige Signed-off-by: Alex Chiang Signed-off-by: Jesse Barnes commit e1acb24f059defdaa0264e925f19cc21b0a3e592 Author: Alex Chiang Date: Mon Oct 20 17:41:38 2008 -0600 PCI: pciehp: remove 'name' parameter We do not need to manage our own name parameter, especially since the PCI core can change it on our behalf, in the case of duplicate slot names. Remove 'name' from pciehp's version of struct slot, and remove unused 'task_list' as well. Cc: kristen.c.accardi@intel.com Acked-by: Kenji Kaneshige Signed-off-by: Alex Chiang Signed-off-by: Jesse Barnes commit a32615a1a661f83661e8a26c3bc7763f716da8f3 Author: Alex Chiang Date: Mon Oct 20 17:41:33 2008 -0600 PCI: ibmphp: stop managing hotplug_slot->name We no longer need to manage our version of hotplug_slot->name since the PCI and hotplug core manage it on our behalf. Now, we simply advise the PCI core of the name that we would like, and let the core take care of the rest. Additionally, slightly rearrange the members of struct slot so they are naturally aligned to eliminate holes. Cc: jbarnes@virtuousgeek.org Cc: kristen.c.accardi@intel.com Acked-by: Kenji Kaneshige Signed-off-by: Alex Chiang Signed-off-by: Jesse Barnes commit 43caae884b5a5e2eacb4879225341cb49700e129 Author: Alex Chiang Date: Mon Oct 20 17:41:28 2008 -0600 PCI: fakephp: remove 'name' parameter Remove 'name' from fakephp's struct dummy_slot, as the PCI core will now manage our slot name for us. Cc: jbarnes@virtuousgeek.org Cc: kristen.c.accardi@intel.com Acked-by: Kenji Kaneshige Signed-off-by: Alex Chiang Signed-off-by: Jesse Barnes commit 0ad772ec464d3fcf9d210836b97e654f393606c4 Author: Alex Chiang Date: Mon Oct 20 17:41:07 2008 -0600 PCI, PCI Hotplug: introduce slot_name helpers In preparation for cleaning up the various hotplug drivers such that they don't have to manage their own 'name' parameters anymore, we provide the following convenience functions: pci_slot_name() hotplug_slot_name() These helpers will be used by individual hotplug drivers. Cc: kristen.c.accardi@intel.com Cc: matthew@wil.cx Acked-by: Kenji Kaneshige Signed-off-by: Alex Chiang Signed-off-by: Jesse Barnes commit 30ac7acd05d1449ac784de144c4b5237be25b0b4 Author: Alex Chiang Date: Mon Oct 20 17:41:22 2008 -0600 PCI: cpqphp: stop managing hotplug_slot->name We no longer need to manage our version of hotplug_slot->name since the PCI and hotplug core manage it on our behalf. Now, we simply advise the PCI core of the name that we would like, and let the core take care of the rest. Cc: jbarnes@virtuousgeek.org Cc: kristen.c.accardi@intel.com Acked-by: Kenji Kaneshige Signed-off-by: Alex Chiang Signed-off-by: Jesse Barnes commit d6c479e0b777afcd7a26ca62e122e3f878ccc830 Author: Alex Chiang Date: Mon Oct 20 17:41:17 2008 -0600 PCI: cpci_hotplug: stop managing hotplug_slot->name We no longer need to manage our version of hotplug_slot->name since the PCI and hotplug core manage it on our behalf. Now, we simply advise the PCI core of the name that we would like, and let the core take care of the rest. Cc: kristen.c.accardi@intel.com Cc: scottm@somanetworks.com Acked-by: Kenji Kaneshige Signed-off-by: Alex Chiang Signed-off-by: Jesse Barnes commit df77cd10078e36e1b89964e5e8c206add399a98d Author: Alex Chiang Date: Mon Oct 20 17:41:12 2008 -0600 PCI: acpiphp: remove 'name' parameter We do not need to manage our own name parameter, especially since the PCI core can change it on our behalf, in the case of duplicate slot names. Remove 'name' from acpiphp's version of struct slot. Cc: kristen.c.accardi@intel.com Acked-by: Kenji Kaneshige Signed-off-by: Alex Chiang Signed-off-by: Jesse Barnes commit 5fe6cc60680d29740b85278e17a002fa27b7e642 Author: Alex Chiang Date: Mon Oct 20 17:41:02 2008 -0600 PCI: prevent duplicate slot names Prevent callers of pci_create_slot() from registering slots with duplicate names. This condition occurs most often when PCI hotplug drivers are loaded on platforms with broken firmware that assigns identical names to multiple slots. We now rename these duplicate slots on behalf of the user. If firmware assigns the name N to multiple slots, then: The first registered slot is assigned N The second registered slot is assigned N-1 The third registered slot is assigned N-2 etc. This is the permanent fix mentioned in earlier commits d6a9e9b4 and 167e782e (shpchp/pciehp: Rename duplicate slot name...). We take advantage of the new 'hotplug' parameter in pci_create_slot() to prevent a slot create/rename race between hotplug drivers and detection drivers. Scenario A: hotplug driver detection driver -------------- ---------------- pci_create_slot(hotplug=set) pci_create_slot(hotplug=NULL) The hotplug driver creates the slot with its desired name, and then releases the semaphore. Now, the detection driver tries to create the same slot, but it already exists. We don't care about renaming, so return the existing slot. Scenario B: hotplug driver detection driver -------------- ---------------- pci_create_slot(hotplug=NULL) pci_create_slot(hotplug=set) The detection driver creates the slot with name "X". Then the hotplug driver tries to create the same slot, but wants the name "Y" instead. We detect that we're trying to create the same slot and that we also want a rename, so rename the slot to "Y" and return. Scenario C: hotplug driver hotplug driver -------------- ---------------- pci_create_slot(hotplug=set) pci_create_slot(hotplug=set) Two separate hotplug drivers are attempting to claim the slot and are passing valid hotplug_slot args to pci_create_slot(). We detect that the slot already has a ->hotplug callback, prevent a rename, and return -EBUSY. Cc: kristen.c.accardi@intel.com Cc: matthew@wil.cx Acked-by: Kenji Kaneshige Signed-off-by: Alex Chiang Signed-off-by: Jesse Barnes commit 95cb9093960b6249fdbe7417bf513a1358aaa51a Author: Kenji Kaneshige Date: Mon Oct 20 17:40:57 2008 -0600 PCI Hotplug: serialize pci_hp_register and pci_hp_deregister Convert the pci_hotplug_slot_list_lock, which only protected the list of hotplug slots, to a pci_hp_mutex which now protects both interfaces. Signed-off-by: Kenji Kaneshige Signed-off-by: Alex Chiang Signed-off-by: Jesse Barnes commit 828f37683e6d3ab5912989df0d04201db7ad798e Author: Alex Chiang Date: Mon Oct 20 17:40:52 2008 -0600 PCI: update pci_create_slot() to take a 'hotplug' param Slot detection drivers can co-exist with hotplug drivers. The names of the detected/claimed slots may be different depending on module load order. For legacy reasons, we need to allow hotplug drivers to override the slot name if a detection driver is loaded first (and they find the same slots). Creating and overriding slot names should be an atomic operation, otherwise you get a locking nightmare as various drivers race to call pci_create_slot(). pci_create_slot() is already serialized by grabbing the pci_bus_sem. We update the API and add a 'hotplug' param, which is: set if the caller is a hotplug driver NULL if the caller is a detection driver pci_create_slot() does not actually use the 'hotplug' parameter in this patch. A later patch will add the logic that uses it. Cc: kristen.c.accardi@intel.com Cc: matthew@wil.cx Acked-by: Kenji Kaneshige Signed-off-by: Alex Chiang Signed-off-by: Jesse Barnes commit d25b7c8d6ba2735602003d75a28894772fe8ad6a Author: Alex Chiang Date: Mon Oct 20 17:40:47 2008 -0600 PCI: rename pci_update_slot_number to pci_renumber_slot The GPL exported symbol pci_update_slot_number has been renamed to pci_renumber_slot. Some of the safety checks were unnecessary and were removed. Cc: kristen.c.accardi@intel.com Cc: matthew@wil.cx Acked-by: Kenji Kaneshige Signed-off-by: Alex Chiang Signed-off-by: Jesse Barnes commit 1359f2701b96abd9bb69c1273fb995a093b6409a Author: Alex Chiang Date: Mon Oct 20 17:40:42 2008 -0600 PCI Hotplug core: add 'name' param pci_hp_register interface Update pci_hp_register() to take a const char *name parameter. The motivation for this is to clean up the individual hotplug drivers so that each one does not have to manage its own name. The PCI core should be the place where we manage the name. We update the interface and all callsites first, in a "no functional change" manner, and clean up the drivers later. Cc: kristen.c.accardi@intel.com Acked-by: Kenji Kaneshige Reviewed-by: Matthew Wilcox Signed-off-by: Alex Chiang Signed-off-by: Jesse Barnes commit 48ff96ce0774f7634a9497c3589d49bf9d64e0ba Author: Jesse Barnes Date: Tue Oct 21 12:01:27 2008 -0700 Remove PCI hotplug core MAINTAINERS entry Per discussion w/Kristen at the LPC PCI BoF, the core hotplug code doesn't really need a separate maintainer, so remove the entry (but leave the driver specific ones). Signed-off-by: Kristen Carlson Accardi Signed-off-by: Jesse Barnes commit 64c7f63c1b5c26f057c26f7920f397fed2f590d9 Author: Jesse Barnes Date: Tue Oct 21 10:09:05 2008 -0700 PCI: include io.h in pci.h so that ioremap_nocache is defined Ingo pointed out that the m32r build was broken by pci_ioremap. It looks like some files include pci.h w/o including io.h. The latter defines ioremap_* if present, so it makes sense to include it in pci.h now that we have pci_ioremap there. Reported-by: Ingo Molnar Signed-off-by: Jesse Barnes commit 8dd7f8036c123296fc4214f9d8810eb485570422 Author: Sheng Yang Date: Tue Oct 21 17:38:25 2008 +0800 PCI: add support for function level reset Sometimes, it's necessary to enable software's ability to quiesce and reset endpoint hardware with function-level granularity, so provide support for it. The patch implement Function Level Reset(FLR) feature following PCI-e spec. And this is the first step. We would add more generic method, like D0/D3, to allow more devices support this function. The patch contains two functions. pcie_reset_function() is the new driver API, and, contains some action to quiesce a device. The other function is a helper: pcie_execute_reset_function() just executes the reset for a particular device function. Current the usage model is in KVM. Function reset is necessary for assigning device to a guest, or moving it between partitions. For Function Level Reset(FLR), please refer to PCI Express spec chapter 6.6.2. Signed-off-by: Sheng Yang Signed-off-by: Matthew Wilcox Signed-off-by: Jesse Barnes commit c4ed02fae78bf6cea0b22edd34a67df972f29832 Author: Matthew Wilcox Date: Mon Oct 20 19:13:08 2008 -0600 PCI: Fix reference counting bug pci_get_subsys() will decrement the reference count of the device that it starts searching from. Unfortunately, the pci_find_device() interface will already have decremented the reference count of the device earlier, so the device will end up losing all reference counts and be freed. We can fix this by incrementing the reference count of the device to start searching from before calling pci_get_subsys(). Signed-off-by: Matthew Wilcox Signed-off-by: Jesse Barnes commit d389fec6a2aec1ea7d47833f36a0413a619c8c12 Author: Taku Izumi Date: Fri Oct 17 13:52:51 2008 +0900 ACPI/PCI: Set support bit for MSI in support field of _OSC Currently linux doesn't have any code to set the "MSI supported" bit in Support Fireld of _OSC. This patch adds the code for that. Signed-off-by: Kenji Kaneshige Signed-off-by: Taku Izumi Signed-off-by: Jesse Barnes commit ab20440c376ff0454cb93904a888212d874fbb6b Author: Taku Izumi Date: Fri Oct 17 13:51:53 2008 +0900 ACPI/PCI: Fix return value of acpi_cuery_osc() If acpi_query_osc() returns other than AE_OK, __pci_osc_support_set() stops scanning ACPI objects to evaluate _OSC. This prevents subsequent _OSCs from being evaluated if some of root bridge doesn't have _OSC, for example. So acpi_query_osc() should return always AE_OK to evaluate all _OSC. Signed-off-by: Kenji Kaneshige Signed-off-by: Taku Izumi Signed-off-by: Jesse Barnes commit adf411b819adc9fa96e9b3e638c7480d5e71d270 Author: Taku Izumi Date: Fri Oct 17 13:51:00 2008 +0900 ACPI/PCI: Always query _OSC control field in pci_osc_control_set() In current pci_osc_control_set() implementation, once the _OSC control field is queried, it is never queried again. But the query result can change depending on the _OSC support field. For example, if PCI Express Native Hot Plug control depends on ASPM support on a certain platform, a PCI Express Native Hot Plug Control query would fail before the ASPM driver was loaded, but it would succeed if the ASPM driver was loaded first. Therefore, pci_osc_control_set() should query the _OSC control field every time. Signed-off-by: Kenji Kaneshige Signed-off-by: Taku Izumi Signed-off-by: Jesse Barnes commit 4e39432f4df544d3dfe4fc90a22d87de64d15815 Author: Taku Izumi Date: Fri Oct 17 13:49:46 2008 +0900 ACPI/PCI: Change pci_osc_control_set() to query control bits first Current pci_osc_control_set() evaluates _OSC without query for control bits, unless __pci_osc_support_set() is called beforehand. But as strongly recommended in PCI firmware specification, it should query control bits first. This patch changes pci_osc_control_set() to query control bits first even if __pci_osc_support_set() is not called beforehand. Signed-off-by: Kenji Kaneshige Signed-off-by: Taku Izumi Signed-off-by: Jesse Barnes commit 9778c14b4ca2c81e437fc2fd2b1f3d676937db27 Author: Taku Izumi Date: Fri Oct 17 13:48:36 2008 +0900 ACPI/PCI: Fix possible race condition on _OSC evaluation Fix possible race condition on _OSC evaluation. Current _OSC evaluation code has possible race condition because it maniputes osc_data linked list or its contents without any lock mechanism. Signed-off-by: Kenji Kaneshige Signed-off-by: Taku Izumi Signed-off-by: Jesse Barnes commit 56f2fdaade2a6b91ccd785de938b91172d5c94f2 Merge: 6aea938... dc35fac... 263c24a... 83bb63f... 5280517... 57893d1... 7b49d95... Author: Roland Dreier Date: Wed Oct 22 15:56:41 2008 -0700 Merge branches 'cma', 'cxgb3', 'ehca', 'ipoib', 'mad', 'mlx4' and 'nes' into for-next commit 263c24a2bbbaca75805ed231e8346d86410af9d0 Author: Stefan Roscher Date: Wed Oct 22 15:54:38 2008 -0700 IB/ehca: Reject dynamic memory add/remove when ehca adapter is present Since the ehca device driver does not support dynamic memory add and remove operations, the driver must explicitly reject such requests in order to prevent unpredictable behaviors related to existing memory regions that cover all of memory being used by InfiniBand protocols in the kernel. The solution (for now at least) is to add a memory notifier to the ehca device driver and if a request for dynamic memory add or remove comes in, ehca will always reject it. The user can add or remove memory by hot-removing the ehca adapter, performing the memory operation, and then hot-adding the ehca adapter back. Signed-off-by: Stefan Roscher Signed-off-by: Roland Dreier commit 19f4282149147b4a3e8c670373dc73ddd5d5facc Author: Stefan Roscher Date: Wed Oct 22 15:52:31 2008 -0700 IB/ehca: Fix reported max number of QPs and CQs in systems with >1 adapter Because ehca adapters can differ in the maximum number of QPs and CQs we have to save the maximum number of these ressources per adapter and not globally per ehca driver. This fix introduces 2 new members to the shca structure to store the maximum value for QPs and CQs per adapter. The module parameters are now used as initial values for those variables. If a user selects an invalid number of CQs or QPs we don't print an error any longer, instead we will inform the user with a warning and set the values to the respective maximum supported by the HW. Signed-off-by: Stefan Roscher Signed-off-by: Roland Dreier commit 83bb63f62bda28be88b21216fbb59838a10f2348 Author: Or Gerlitz Date: Wed Oct 22 15:49:49 2008 -0700 IPoIB: Set netdev offload features properly for child (VLAN) interfaces Child devices were created without any offload features set, fix this by moving the code that computes the features into generic function which is now called through non-child and child device creation. Signed-off-by: Or Gerlitz -- v1 has a bug where the 'result' flag in ipoib_vlan_add may be used uninitialized Signed-off-by: Roland Dreier commit 70c9c0db549245a49cabf42d5a74688077254d46 Author: Or Gerlitz Date: Wed Oct 22 15:49:29 2008 -0700 IPoIB: Clean up ethtool support Add a get_rx_csum method. Remove the driver's own get_tso method, as the ethtool kernel code uses the default one if nothing is provided. Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit 57893d1cff4606915c13a4610d4e2d6048633f8e Author: Yevgeny Petrilin Date: Wed Oct 22 15:48:03 2008 -0700 mlx4_core: Add Ethernet PCI device IDs Signed-off-by: Yevgeny Petrilin Signed-off-by: Roland Dreier commit c27a02cd94d6695fbe5858ca364b1e415af02212 Author: Yevgeny Petrilin Date: Wed Oct 22 15:47:49 2008 -0700 mlx4_en: Add driver for Mellanox ConnectX 10GbE NIC The Mellanox ConnectX can operate as an InfiniBand adapter, as an Ethernet NIC, or as a Fibre Channel (FC) HBA. The kernel has a low-level driver, mlx4_core, which handles multiplexing access to the device, and there is also already an InfiniBad driver, mlx4_ib. This patch adds a new driver, mlx4_en, which implements a standard Ethernet NIC driver. Signed-off-by: Liran Liss Signed-off-by: Yevgeny Petrilin Signed-off-by: Roland Dreier commit 7ff93f8b7ecbc36e7ffc5c11a61643821c1bfee5 Author: Yevgeny Petrilin Date: Wed Oct 22 15:38:42 2008 -0700 mlx4_core: Multiple port type support Multi-protocol adapters support different port types. Each consumer of mlx4_core queries for supported port types; in particular mlx4_ib can no longer assume that all physical ports belong to it. Port type is configured through a sysfs interface. When the type of a port is changed, all mlx4 interfaces are unregistered, and then registered again with the new port types. Signed-off-by: Yevgeny Petrilin Signed-off-by: Roland Dreier commit 7ba427c2363d91d4221843a9ae601f90f8d928b9 Author: Randy Dunlap Date: Fri Oct 17 13:46:08 2008 -0700 panasonic-laptop: depends on ACPI panasonic-laptop uses many acpi_*() functions so it should depend on ACPI; otherwise there are approximately 70 warnings/errors generated. Signed-off-by: Randy Dunlap Acked-by: Harald Welte Signed-off-by: Len Brown commit d64c81c4cea0a14e88fc76e2c845e4885e491754 Author: Henrique de Moraes Holschuh Date: Sat Oct 18 14:23:55 2008 -0300 ACPI: thinkpad-acpi: Remove firmware backlight delays for Intel ACPI IGD OpRegion Based on analysis and a patch from Matthew Garrett . Instruct the ThinkPad ACPI firmware to remove delays on the processing of backlight brightness changes. This method is present on ThinkPad Vista-compatible BIOSes with standard ACPI backlight level control. Signed-off-by: Henrique de Moraes Holschuh Cc: Matthew Garrett Cc: Yves-Alexis Perez Signed-off-by: Len Brown commit 396293237cbc964fcedd4208cbc0d0f4880a98bb Author: Pascal Terjan Date: Sat Oct 18 14:23:54 2008 -0300 ACPI: thinkpad-acpi: Remove duplicate line Signed-off-by: Pascal Terjan Acked-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit 4f778b92c9d8d87c670fc063c66edf1aa46f6f1c Author: Mariusz Kozlowski Date: Sat Oct 18 14:23:53 2008 -0300 ACPI: thinkpad-acpi: trivial fix of error message Trivial fix makes the error message match the code before it (ibm->driver vs ibm->acpi-driver) better. Signed-off-by: Mariusz Kozlowski Acked-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit 75700e53cd14ccc7a5a42547497dff11fe209186 Author: Henrique de Moraes Holschuh Date: Sat Oct 18 14:23:52 2008 -0300 ACPI: thinkpad-acpi: attempt to preserve fan state on resume Attempt to preserve fan state across sleep and hibernation if the fan control mode is enabled. For safety reasons, only the PWM OFF (fan at 100%) or maximum closed-loop level (level 7) are preserved. If the fan state was set to anything else, it will not be restored. Also, should the fan be at PWM OFF mode at resume, it will be left at that state (but this is extremely unlikely, no ThinkPad firmware was ever reported to do this). For reference, the known states used for fan control upon resume by the firmware are either "auto" or "level 7" depending on whether the laptop wakes due to normal conditions or a thermal emergency. Fixes: http://bugzilla.kernel.org/show_bug.cgi?id=11331 Signed-off-by: Henrique de Moraes Holschuh Cc: Richard Hartmann Signed-off-by: Len Brown commit 4cc683c9adbe644323e978bc63b2ab12606bb3c8 Author: Christian Lamparter Date: Wed Oct 15 03:30:06 2008 +0200 p54: enable 2.4/5GHz spectrum by eeprom bits. Badness at /home/proski/src/linux-2.6/net/mac80211/rx.c:2200 NIP: c02bc850 LR: c02ab268 CTR: 00000000 REGS: ef01fcc0 TRAP: 0700 Tainted: G W (2.6.27-wl) MSR: 00029032 CR: 22004084 XER: 20000000 TASK = c1a58800[1778] 'p54pci' THREAD: ef01e000 [...] NIP [c02bc850] __ieee80211_rx+0x17c/0x638 LR [c02ab268] ieee80211_tasklet_handler+0x104/0x120 Call Trace: [ef01fd70] [c1a0c020] 0xc1a0c020 (unreliable) [ef01fdb0] [c02ab268] ieee80211_tasklet_handler+0x104/0x120 [...] the problem was that some older cards are mis-identified and didn't support 5GHz rates, while they have the right MAC & Synth chip. This patch changes the way how p54 decides if it should enable 11a channels or not. Reported-by: Pavel Roskin Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 70458259936e723a4ac02c85bdbaf08dc69edfbe Author: Andrey Borzenkov Date: Fri Oct 10 21:26:30 2008 +0400 orinoco: reduce stack usage in firmware download path orinoco_dl_firmware and symbol_dl_mage allocate large local variables (1K); at least orinoco fails with panic or hung kernel if 4K stacks is enabled. Allocate large buffers dynamically at run time. Tested-By: Andrey Borzenkov for Agere case Signed-off-by: Andrey Borzenkov < arvidjaar@mail.ru> Signed-off-by: John W. Linville commit 8bdd5b9c6bd53add260756b6673a0545fbdbba21 Author: Bob Copeland Date: Thu Oct 16 11:02:06 2008 -0400 ath5k: fix suspend-related oops on rmmod Based on a patch by Elias Oltmanns, we call ath5k_init in resume even if we didn't previously open the device. Besides starting up the device unnecessarily, this also causes an oops on rmmod because mac80211 will not invoke ath5k_stop and softirqs are left running after the module has been unloaded. Add a new state bit, ATH_STAT_STARTED, to indicate that we have been started up. Reported-by: Toralf Förster Signed-off-by: Elias Oltmanns Signed-off-by: Bob Copeland Cc: stable@kernel.org Signed-off-by: John W. Linville commit 383d7a11c9989205db44c7f1be339e5097062f03 Author: donald.d.dugger@intel.com Date: Fri Oct 17 07:49:50 2008 -0700 ACPI: Fix possible null ptr dereference Code in `pci_link.c' is calling the internal routine `acpi_ut_evaluate_object' which is dangerous given that it is passing a NULL pointer when it should be passing a pointer to a real object. The patch corrects the issue by having the code call the external routine `acpi_evaluate_object', which correctly handles a NULL pointer. Signed-off-by: Don Dugger Signed-off-by: Len Brown commit ea5c8af9b1241a10dc4ba6cd2d2362c179884b74 Author: Len Brown Date: Sat Oct 11 01:13:12 2008 -0400 ACPI: remove unused acpi_is_child_device() Signed-off-by: Len Brown commit 39a0ad871000d2a016a4fa113a6e53d22aabf25d Author: Zhao Yakui Date: Mon Aug 11 13:40:22 2008 +0800 ACPI : Load device driver according to the status of acpi device According to ACPI spec when the status of some device is not present but functional, the device is valid and the children of this device should be enumerated. It means that the device should be added to linux acpi device tree. But the device driver for this device should not be loaded. The detailed info can be found in the section 6.3.7 of ACPI 3.0b spec. _STA may return bit 0 clear (not present) with bit 3 set (device is functional). This case is used to indicate a valid device for which no device driver should be loaded (for example, a bridge device.). Children of this device may be present and valid. OS should continue enumeration below a device whose _STA returns this bit combination http://bugzilla.kernel.org/show_bug.cgi?id=3358 Signed-off-by: Zhao Yakui Signed-off-by: Li Shaohua Signed-off-by: Zhang Rui Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit 6415e12ba0f92a54f02d9c4ecaa3c82f35f3d335 Author: Zhao Yakui Date: Mon Aug 11 14:59:59 2008 +0800 ACPI: Add DMI check to disable power state check in power transition Add the DMI check to disable power check in the course of device power transistion. http://bugzilla.kernel.org/show_bug.cgi?id=11000 Signed-off-by: Zhao Yakui Signed-off-by: Li Shaohua Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit f5adfaa372c76423b6e8e4727a9701330374f364 Author: Zhao Yakui Date: Mon Aug 11 14:57:50 2008 +0800 ACPI: Add "acpi.power_nocheck=1" to disable power state check in power transition Maybe the incorrect power state is returned on the bogus bios, which is different with the real power state. For example: the bios returns D0 state and the real power state is D3. OS expects to set the device to D0 state. In such case if OS uses the power state returned by the BIOS and checks the device power state very strictly in power transition, the device can't be transited to the correct power state. So the boot option of "acpi.power_nocheck=1" is added to avoid checking the device power in the course of device power transition. http://bugzilla.kernel.org/show_bug.cgi?id=8049 http://bugzilla.kernel.org/show_bug.cgi?id=11000 Signed-off-by: Zhao Yakui Signed-off-by: Zhang Rui Signed-off-by: Li Shaohua Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit eab4b645769fa2f8703f5a3cb0cc4ac090d347af Author: Zhao Yakui Date: Mon Aug 11 14:54:16 2008 +0800 ACPI: Attach the ACPI device to the ACPI handle as early as possible Attach the ACPI device to the ACPI handle as early as possible so that OS can get the corresponding ACPI device by the acpi handle in the course of getting the power/wakeup/performance flags. http://bugzilla.kernel.org/show_bug.cgi?id=8049 http://bugzilla.kernel.org/show_bug.cgi?id=11000 Signed-off-by: Zhao Yakui Signed-off-by: Zhang Rui Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit a51e145f379ae48003129610922595893e8efde0 Author: Zhao Yakui Date: Mon Aug 11 14:55:05 2008 +0800 ACPI: Get the device power state in the course of scanning device Get the device power state in the course of scanning device if the device power flag is power_managable. i.e. The device has the _PSx/_PRx object. At the same time before the drivers/acpi/power module is loaded, there is no relation between acpi_power_resource and acpi device. So the first parameter of acpi_power_get_state is changed to acpi_handle. http://bugzilla.kernel.org/show_bug.cgi?id=8049 http://bugzilla.kernel.org/show_bug.cgi?id=11000 Signed-off-by: Zhao Yakui Signed-off-by: Li Shaohua Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit 08237974af22a97da59869979ef1a515524d5cc3 Author: Lin Ming Date: Fri Aug 8 11:57:11 2008 +0800 ACPI: replace AE_BAD_ADDRESS exception code with AE_ERROR The AE_BAD_ADDRESS exception code is now unused in ACPICA. For linux, it's only used at wmi.c and acer-wmi.c. I checked both wmi.c and acer-wmi.c, the AE_BAD_ADDRESS exception code has no special meaning. The parent functions just call AE_SUCCESS() or AE_FAILURE() to check the return status. So it's safe to replace AE_BAD_ADDRESS with AE_ERROR. Signed-off-by Lin Ming Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit 36eec5e29cf31011a7fbe121badfed7efb2a4ebb Author: Thomas Renninger Date: Mon Aug 11 15:03:20 2008 +0200 ACPI: Add expand acpi.debug_layer in kernel-parameters.txt Signed-off-by: Thomas Renninger Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit e3deda9c87ac5eef2b5d18cd0b5511370979ca26 Author: Corentin Chary Date: Wed Sep 24 10:35:55 2008 +0200 asus-laptop: Fix the led behavior with value > 1 Fix http://bugzilla.kernel.org/show_bug.cgi?id=11613 . Signed-off-by: Corentin Chary Signed-off-by: Len Brown commit 5d1e072b6b9cffebefa681faca1c6d608310d4b2 Author: Rafael J. Wysocki Date: Wed Oct 22 14:58:43 2008 -0400 ACPI suspend: Fix CONFIG_ACPI_SLEEP dependence and some compilation warnings Initially CONFIG_PM_SLEEP was defined as CONFIG_SUSPEND || CONFIG_HIBERNATION and some ACPI code, most importantly the code in drivers/acpi/main.c, was written with this assumption. Currently, however, CONFIG_PM_SLEEP is also set when CONFIG_XEN_SAVE_RESTORE is set. This causes some compilation warnings to appear in drivers/acpi/main.c if both CONFIG_SUSPEND and CONFIG_HIBERNATION are unset and CONFIG_PM_SLEEP is set (this was impossible before). To fix this problem, redefine CONFIG_ACPI_SLEEP do depend directly on CONFIG_SUSPEND || CONFIG_HIBERNATION, as originally intended, and use it instead of CONFIG_PM_SLEEP in drivers/acpi/main.c, wherever appropriate. Additionally, move the acpi_target_sleep_state definition from under the #ifdef to prevent compilation from failing in some cases. Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 2a2336f8228292b8197f4187e54b0748903e6645 Author: Yevgeny Petrilin Date: Wed Oct 22 11:44:46 2008 -0700 mlx4_core: Ethernet MAC/VLAN management Add support for managing MAC and VLAN filters for each port. Signed-off-by: Yevgeny Petrilin Signed-off-by: Oren Duer Signed-off-by: Roland Dreier commit f80a3bb252cbb0959259328b9ab02b019123ed05 Author: Catalin Marinas Date: Wed Oct 22 13:04:30 2008 +0100 [ARM] 5318/1: Swap the PRRR and NMRR values in proc-v7.S A typo caused these values to be swapped leading to incorrect memory type attributes. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 085eefb5948bb43020792f31406da2ee2ef4e924 Author: David Brownell Date: Tue Oct 21 23:34:23 2008 +0100 [ARM] 5316/1: AT91: oops (regression) fix on gpio irq From: David Brownell The "5298/1: Drop desc_handle_irq()" patch went overboard and deleted an essential line of code, causing all AT91 GPIO interrupts to oops (in irq). Trimmed example: Unable to handle kernel NULL pointer dereference at virtual address 000000c4 ... PC is at gpio_irq_handler+0x78/0xd0 LR is at gpio_irq_handler+0x38/0xd0 ... Backtrace: [] (gpio_irq_handler+0x0/0xd0) from [] (__exception_text_start+0x54/0x7c) [] (__exception_text_start+0x0/0x7c) from [] (__irq_svc+0x2c/0x60) Exception stack(0xc1c1de00 to 0xc1c1de48) [] (_spin_unlock_irq+0x0/0x3c) from [] (at91ether_open+0x220/0x318) [] (at91ether_open+0x0/0x318) from [] (dev_open+0xa8/0x10c) [] (dev_open+0x0/0x10c) from [] (dev_change_flags+0x98/0x164) [] (dev_change_flags+0x0/0x164) from [] (ip_auto_config+0x164/0xe28) [] (ip_auto_config+0x0/0xe28) from [] (__exception_text_end+0x60/0x180) [] (__exception_text_end+0x0/0x180) from [] (kernel_init+0x70/0xd8) [] (kernel_init+0x0/0xd8) from [] (do_exit+0x0/0x6ac) This patch restores the missing line'o'code. Signed-off-by: David Brownell Acked-by: Andrew Victor Signed-off-by: Russell King commit f20e3b5fe7ead0615309433260b9784d8da0bbbd Merge: bcbfe66... f030d7b... Author: Russell King Date: Wed Oct 22 19:34:09 2008 +0100 Merge branch 'for-rmk' of git://git.android.com/kernel into devel commit bcbfe664e7af019e698cef2feb85ac2b4f1ac11d Merge: f6335c4... 175854b... Author: Russell King Date: Wed Oct 22 19:33:50 2008 +0100 Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel commit 11f1f2afd6b07729b12aaba479344d7f12d88ff9 Author: Anton Vorontsov Date: Wed Oct 22 20:21:33 2008 +0200 i2c: Add info->archdata field If present the info->archdata is copied into the dev->archdata. Some (OpenFirmware) platforms need it. Signed-off-by: Anton Vorontsov Signed-off-by: Jean Delvare commit 02cf617282c6917484410f86ded3f2d99a05f098 Author: Wolfram Sang Date: Wed Oct 22 20:21:33 2008 +0200 i2c: Inform about deprecated chips directory The chips directory under drivers/i2c is deprecated. Spread the word! Signed-off-by: Wolfram Sang Signed-off-by: Jean Delvare commit c7a5f22d1f15a03d0bfed5b1795e3172b6309d86 Author: Arjan van de Ven Date: Wed Oct 22 20:21:32 2008 +0200 i2c: Use pci_ioremap_bar() Use the newly introduced pci_ioremap_bar() function in drivers/i2c. pci_ioremap_bar() just takes a pci device and a bar number, with the goal of making it really hard to get wrong, while also having a central place to stick sanity checks. Signed-off-by: Arjan van de Ven Signed-off-by: Jean Delvare commit 00155a94a691c25d6672c16c8f2cafa7f9a722a3 Author: Jean Delvare Date: Wed Oct 22 20:21:32 2008 +0200 Schedule removal of the legacy i2c device driver binding model The legacy i2c device driver binding model is superseded by the standard model, so it's time to deprecate it and schedule it for removal. Signed-off-by: Jean Delvare commit 3ae70deef0a5cc34a96aa1972697d01606bc7933 Author: Jean Delvare Date: Wed Oct 22 20:21:32 2008 +0200 i2c: Clean up Fix most checkpatch.pl errors and warnings. This includes replacing spaces with tabs in many places, adding and removing spaces, and folding long lines. Also complete a couple prototypes to make it clearer what the parameters represent. Signed-off-by: Jean Delvare commit 0e47858da4b6825e1f1aede74742c7dd6d4ee476 Author: Jean Delvare Date: Wed Oct 22 20:21:32 2008 +0200 i2c: Update and clean up writing-clients document * Strip trailing white space. * Remove out-of-date or irrelevant parts. * Insist on the fact that command is deprecated. * Fix spelling mistakes and typos. * Reformat code examples and function prototypes to comply with the kernel coding style. Signed-off-by: Jean Delvare commit c0589d4bc19294a49934af1be736eb6e9ad11673 Author: Jean Delvare Date: Wed Oct 22 20:21:31 2008 +0200 i2c: Drop 2-byte address block transfer defines We have no users and no implementers for these transfer types so it makes little sense to define functionality bits for them. Signed-off-by: Jean Delvare commit e313353dd4fcb1ab568ab20339380063307ebec9 Author: Jean Delvare Date: Wed Oct 22 20:21:31 2008 +0200 i2c: Delete legacy model documentation The legacy i2c binding model is deprecated and will be removed soon, so we no longer need to document it. Signed-off-by: Jean Delvare commit 7d1d8999b4bec0ba09f935e648a688bb25596d06 Author: Jean Delvare Date: Wed Oct 22 20:21:31 2008 +0200 i2c: Constify i2c_get_clientdata's parameter i2c_get_clientdata doesn't change the i2c_client it is passed as a parameter, so it can be constified. Same for i2c_get_adapdata. Signed-off-by: Jean Delvare commit d955cafb5c288aee4d71fc8759943e3f6cc9331d Author: Jean Delvare Date: Wed Oct 22 20:21:30 2008 +0200 i2c: Delete outdated client porting guide The document describing how to port i2c chip drivers from Linux 2.4 to Linux 2.6 is outdated. As I suspect that most drivers that had to be ported have already been by now, I do not want to spend time updating it. Let's just delete it instead. Signed-off-by: Jean Delvare commit 14f55f7a033f86a4e8f0310dd4d54b5464322e6e Author: Wolfram Sang Date: Wed Oct 22 20:21:30 2008 +0200 i2c: Make clear what the class field of i2c_adapter is good for Make clear what the class field of i2c_adapter is good for. Signed-off-by: Wolfram Sang Signed-off-by: Jean Delvare commit a672b4c1b27c88062427b32e6392ea9a2a438b15 Author: David Miller Date: Wed Oct 22 20:21:30 2008 +0200 i2c-algo-pcf: Fix typo in debugging log message Fix typo in debugging log message. deteted --> detected Signed-off-by: David S. Miller Signed-off-by: Jean Delvare commit 30091404af5a7cd515e7b565df76932e295d8f6f Author: David Miller Date: Wed Oct 22 20:21:30 2008 +0200 i2c-algo-pcf: Add adapter hooks around xfer begin and end Some I2C bus implementations need to synchronize with external entities, such as system firmware, which might also be programming the same I2C bus. In order to facilitate this add ->xfer_begin() and ->xfer_end() hooks which are invoked around pcf_xfer(). [JD: Make these hooks optional.] Signed-off-by: David S. Miller Signed-off-by: Jean Delvare commit 08e5338d119daeb3c7746fa80fa916b8d3d48e89 Author: David Miller Date: Wed Oct 22 20:21:29 2008 +0200 i2c-algo-pcf: Pass adapter data into ->waitforpin() method Pass adapter data into ->waitforpin() method. Signed-off-by: David S. Miller Signed-off-by: Jean Delvare commit c429a247f56d277f12eaffd6525922353e9539a5 Author: Seth Heasley Date: Wed Oct 22 20:21:29 2008 +0200 i2c-i801: Add support for Intel Ibex Peak Adds the Intel Ibex Peak (PCH) SMBus Controller Device IDs. Signed-off-by: Seth Heasley Signed-off-by: Jean Delvare commit 30bc4dfd3b64eb1fbefe2c63e30d8fc129273e20 Author: J. Bruce Fields Date: Mon Oct 20 16:34:21 2008 -0400 nfsd: clean up expkey_parse error cases We might as well do all of these at the end. Fix up a couple minor style nits while we're there. Signed-off-by: J. Bruce Fields commit 6dfcde98a299196f13dd66417663a819f0ac4156 Author: Krishna Kumar Date: Mon Oct 20 11:44:40 2008 +0530 nfsd: Drop reference in expkey_parse error cases Drop reference to export key on error. Compile tested. Signed-off-by: Krishna Kumar Signed-off-by: J. Bruce Fields commit 6c6a426fdcb374b7641d7cf9eea88410828b9d9a Author: Krishna Kumar Date: Wed Oct 22 14:48:36 2008 +0530 nfsd: Fix memory leak in nfsd_getxattr Fix a memory leak in nfsd_getxattr. nfsd_getxattr should free up memory that it allocated if vfs_getxattr fails. Signed-off-by: Krishna Kumar Signed-off-by: J. Bruce Fields commit b79acb49de6c2ab9ff0245f0f2b573d48b9a2d93 Author: Yevgeny Petrilin Date: Wed Oct 22 10:56:48 2008 -0700 mlx4_core: Get ethernet MTU and default address from firmware Get maximum ethernet MTU and default MAC address from the firmware QUERY_DEV_CAP command. Signed-off-by: Yevgeny Petrilin Signed-off-by: Roland Dreier commit 1cd9cd161c89f569b90583b7797bd972c3bf0cff Author: Chuck Lever Date: Wed Oct 22 13:12:36 2008 -0400 NFSD: Fix BUG during NFSD shutdown processing The Linux NFS server can be started via a user-space write to /proc/fs/nfs/threads or to /proc/fs/nfs/portlist. In the first case, all default listeners are started (both UDP and TCP). In the second, a listener is started only for one specified transport. The NFS server has to make sure lockd stays up until the last listener transport goes away. To support both start-up interfaces, it should do one lockd_up() for each NFSD listener. The nfsd_init_socks() function used to do one lockd_up() call for each svc_create_xprt(). Recently commit 26a414092353590ceaa5955bcb53f863d6ea7549 mistakenly changed nfsd_init_socks() to do only one lockd_up() call even though it still does two svc_create_xprt() calls. The end result is a lockd_down() BUG during NFSD shutdown processing because nfsd_last_threads() does a lockd_down() call for each entry on the sv_permsocks list, but the start-up code doesn't do a matching number of lockd_up() calls. Add a second lockd_up() in nfsd_init_socks() to make sure the number of lockd_up() calls matches the number of entries on the NFS servers's sv_permsocks list. Signed-off-by: Chuck Lever Signed-off-by: J. Bruce Fields commit 93fc9e1bb6507dde945c2eab68c93e1066ac3691 Author: Yevgeny Petrilin Date: Wed Oct 22 10:25:29 2008 -0700 mlx4_core: Support multiple pre-reserved QP regions For ethernet support, we need to reserve QPs for the ethernet and fibre channel driver. The QPs are reserved at the end of the QP table. (This way we assure that they are aligned to their size) We need to consider these reserved ranges in bitmap creation, so we extend the mlx4 bitmap utility functions to allow reserved ranges at both the bottom and the top of the range. Signed-off-by: Yevgeny Petrilin Signed-off-by: Roland Dreier commit 6c6409459a18a825ce12ecb003d5686af61f7a2f Author: Alan Stern Date: Tue Oct 21 15:40:03 2008 -0400 USB: don't rebind drivers after failed resume or reset This patch (as1152) may help prevent some problems associated with the new policy of unbinding drivers that don't support suspend/resume or pre_reset/post_reset. If for any reason the resume or reset fails, and the device is logically disconnected, there's no point in trying to rebind the driver. So the patch checks for success before carrying out the unbind/rebind. There was a report from one user that this fixed a problem he was experiencing, but the details never became fully clear. In any case, adding these tests can't hurt. Signed-off-by: Alan Stern Cc: stable Signed-off-by: Greg Kroah-Hartman commit a496c64f1363ec4d67ebdc1e1f619ad6372a574c Author: Oliver Neukum Date: Tue Oct 21 10:39:04 2008 +0200 USB: fix memory leak in cdc-acm This fixes a memory leak on disconnect in cdc-acm Thanks to 施金前 for finding it. Signed-off-by: Oliver Neukum Cc: stable Signed-off-by: Greg Kroah-Hartman commit e8fab4ce763c36869624c5388714ff19c30a91a7 Author: Frédéric Marchal Date: Mon Oct 13 14:00:11 2008 +0200 USB: Unusual dev for Mio moov 330 gps Here is an entry for the unusual_devs.h file to handle a Mio Moov 330 GPS that stops responding when it is requested to transfer more than 64KB. The patch is taken against kernel-2.6.27-git3. Signed-off-by: Frédéric Marchal Signed-off-by: Greg Kroah-Hartman commit aa5380b904e7f896db0931320160bdea93e41f6a Author: Oliver Neukum Date: Mon Oct 13 14:05:20 2008 +0200 USB: cdc-wdm: make module autoload work this fixes an omission that led to no alias being computed for the cdc-wdm module. Signed-off-by: Oliver Neukum Cc: stable Signed-off-by: Greg Kroah-Hartman commit 3131f7b0ab9ed461daa2464fffd9df784d1f730d Author: Robert Jarzmik Date: Mon Oct 13 20:06:00 2008 +0200 USB: Fix unneeded endpoint check in pxa27x_udc The request allocation code doesn't need to check if the endpoint is not NULL, as the only caller in include/linux/usb/gadget.h, usb_ep_alloc_request() needs the endpoint pointer to have a correct value to trigger the allocation code. Signed-off-by: Robert Jarzmik Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit dd9ebf1421902df806c0ed6fac296badaca06161 Author: Randy Dunlap Date: Mon Oct 13 09:14:52 2008 -0700 usb/gadget: fix kernel-doc warning Fix kernel-doc warning, wrong parameter name listed: Warning(lin2627-g3-kdocfixes//drivers/usb/gadget/config.c:183): No description found for parameter 'match' Signed-off-by: Randy Dunlap Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 8fc7aeab3851ed8c3ecf28901ca2c6f0400955c7 Author: Alan Stern Date: Mon Oct 20 09:52:12 2008 -0400 USB: Speedtouch: add pre_reset and post_reset routines This patch (as1150) fixes a problem in the speedtch driver. When it resets the modem during probe it will be unbound from the other interfaces it has claimed, because it doesn't define a pre_reset and a post_reset method. The patch defines "do-nothing" methods. This fixes Bugzilla #11767. Signed-off-by: Alan Stern Cc: stable Signed-off-by: Greg Kroah-Hartman commit 8aafdf6a1528b0672a0527be473d9be5a12289d3 Author: roel kluin Date: Tue Oct 21 00:36:44 2008 -0400 USB: usbtest.c: length, sglen and vary are unsigned, so cannot be negative length, sglen and vary are unsigned, so cannot be negative see vi drivers/usb/misc/usbtest.c +18 struct usbtest_param { ... unsigned iterations; unsigned length; unsigned vary; unsigned sglen; ... }; Signed-off-by: Roel Kluin Signed-off-by: Greg Kroah-Hartman commit 1460e5e44cc5ecad7704f63b10dcb3a59d0e008b Author: fangxiaozhi Date: Wed Oct 15 14:15:36 2008 +0800 USB: support Huawei data card product IDs In this patch, we want to do one thing: add more Huawei product IDs into the USB driver. Then it can support more Huawei data card devices. So to declare the unusual device for new Huawei data card devices in unusual_devs.h and to declare more new product IDs in option.c. To modify the data value and length in the function of usb_stor_huawei_e220_init in initializers.c That's because based on the USB standard, while sending SET_FETURE_D to the device, it requires the corresponding data to be zero, and its sending length also must be zero. In our old solution, it can be compatible with our WCDMA data card devices, but can not support our CDMA data card devices. But in this new solution, it can be compatible with all of our data card devices. Signed-off-by: fangxiaozhi Signed-off-by: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman commit bfd8408d68975759aba1b466af6f5388d7adb836 Author: Mikhail Gusarov Date: Sat Oct 18 18:20:02 2008 +0700 USB: add ZTE MF626 USB GSM modem entry Signed-off-by: Mikhail Gusarov Signed-off-by: Greg Kroah-Hartman commit 3030ca4cf4abbdd2dd850a14d20e9fca5937ffb5 Author: Phil Dibowitz Date: Sun Oct 19 08:17:54 2008 +0200 USB: storage: Avoid I/O errors when issuing SCSI ioctls to JMicron USB/ATA bridge Here's the patch that implements the fix you suggested to avoid the I/O errors that I was running into with my new USB enclosure with a JMicron USB/ATA bridge, while issuing scsi-io USN or other such queries used by Fedora's mkinitrd. http://bugzilla.kernel.org/show_bug.cgi?id=9638#c85 /proc/bus/usb/devices: T: Bus=01 Lev=01 Prnt=01 Port=07 Cnt=04 Dev#= 5 Spd=480 MxCh= 0 D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 P: Vendor=152d ProdID=2329 Rev= 1.00 S: Manufacturer=JMicron S: Product=USB to ATA/ATAPI Bridge S: SerialNumber=DE5088854FFF C:* #Ifs= 1 Cfg#= 1 Atr=c0 MxPwr= 2mA I:* If#= 0 Alt= 0 #EPs= 2 Cls=08(stor.) Sub=06 Prot=50 Driver=usb-storage E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms (patch applied and retested on a modified 2.6.27.2-libre.24.rc1.fc10) Signed-off-by: Phil Dibowitz Cc: Alexandre Oliva Signed-off-by: Greg Kroah-Hartman commit d66937d71a67724870e03fa35af686e7efe85caf Author: Zhaolei Date: Mon Oct 20 18:53:04 2008 +0800 USB: Fix debugfs_create_file's error checking method for usb/gadget/s3c2410_udc debugfs_create_file() returns NULL if an error occurs, returns -ENODEV when debugfs is not enabled in the kernel. Signed-off-by: Zhao Lei Signed-off-by: Greg Kroah-Hartman commit 78c73414f4f6744e2ea5a07b263a9698aa6f2416 Author: Dmitry Baryshkov Date: Wed Oct 8 16:14:23 2008 +0400 USB: ohci: add support for tmio-ohci cell Some Toshiba Mobile I/O chips have OHCI controller built in. E.g. the tc6393xb chip found in several Toshiba e-Series PDAs and in Sharp Zaurus SL-6000 PDA. This adds platform glue to support OHCI function of the chip. Signed-off-by: Dmitry Baryshkov Acked-by: Ian Molton Cc: Ian Molton Signed-off-by: Greg Kroah-Hartman commit 51b90540dd03f605122937a999e6d0430238c266 Author: Greg Kroah-Hartman Date: Tue Apr 9 12:14:34 2002 -0700 Staging: usbip: fix build warning on 64bit kernels Signed-off-by: Greg Kroah-Hartman commit c0429bd7dfb001e1549855d43819c595a1e6149e Author: Greg Kroah-Hartman Date: Tue Oct 21 15:44:25 2008 -0500 Staging: me4000: remove some compiler warnings Signed-off-by: Greg Kroah-Hartman commit 68ab0c960f23ed438c0a1556b4d39e6e094e9277 Author: Greg Kroah-Hartman Date: Tue Oct 21 10:41:45 2008 -0700 Staging: wbusb: fix a bunch of compiler warnings First cut at removing some obvious compiler warnings. Signed-off-by: Greg Kroah-Hartman commit dd38da4617471cd8a46243318e2a14922240c711 Author: Pekka Enberg Date: Tue Oct 21 13:01:42 2008 +0300 Staging: w35und: module init cleanup This patch cleans up the module init functions a bit and removes the redundant device ID check from wb35_probe() function. Acked-by: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit dc7e04fe28e3354e8b2e13146b2d6a5da1002ff4 Author: Pekka Enberg Date: Tue Oct 21 12:14:58 2008 +0300 Staging: w35und: use gotos for error handling The driver code uses do { } while (0) together with the break statement to emulate gotos for error handling. Fix that up by using the goto statement instead. Acked-by: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit a1eb2ba6be72988b2479f749acfdc3bdce41654b Author: Pekka Enberg Date: Tue Oct 21 11:45:02 2008 +0300 Staging: w35und: remove spinlock wrappers This patch removes the OS_SPIN_LOCK and related wrappers from the driver code. Acked-by: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit d78404cc24dfababd0b594cdca3ecfdd8710869d Author: Greg Kroah-Hartman Date: Tue Oct 21 10:41:45 2008 -0700 Staging: sxg: fix compiler warnings. sizeof() isn't an unsigned long :( Signed-off-by: Greg Kroah-Hartman commit c6c25ed0bcd8c5d6caf6091e2714b7ccc87316a6 Author: Greg Kroah-Hartman Date: Tue Oct 21 10:41:45 2008 -0700 Staging: sxg: fix up unused function warnings These functions aren't used yet, so put them behind the proper #define so the compiler doesn't complain about them. Signed-off-by: Greg Kroah-Hartman commit b243c4aaf8d470a99101521c9197ed5b38084793 Author: J.R. Mauro Date: Mon Oct 20 19:28:58 2008 -0400 Staging: sxg: clean up C99 comments Change C99 comments to C89 comments Some nested comments seem to have been missed and some blocks are redundantly commented, but at least most of the //'s are gone Signed-off by: J.R. Mauro Signed-off-by: Greg Kroah-Hartman commit 4460a860f728983f685cb23140c241c10dca0d32 Author: J.R. Mauro Date: Mon Oct 20 19:01:31 2008 -0400 Staging: Lindent the echo driver Lindent drivers/staging/echo* Signed-off by: J.R. Mauro Signed-off-by: Greg Kroah-Hartman commit 786ed801ac9607a98fdeb8230ea05202a41fc1c7 Author: Lior Dotan Date: Sun Oct 12 08:43:33 2008 +0200 Staging: SLICOSS: Free multicast list at driver exit The multicast address list is allocated in slic_mcast_add_list() but never freed. Signed-off-by: Lior Dotan commit 9b2126db35bd7546c5998a06dcbac96c6ec21e4f Author: Lior Dotan Date: Tue Oct 14 10:43:57 2008 +0200 Staging: PCC-ACPI: Fix all checkpatch errors Fix all complaints that checkpatch had regarding this patch Signed-off-by: Lior Dotan Signed-off-by: Greg Kroah-Hartman commit f2d86100d95274bd85a36b7b7c0efa9af0d82b2b Author: Greg Kroah-Hartman Date: Tue Oct 21 22:21:51 2008 -0700 Staging: pcc-acpi: update to latest version Import the changes from the upstream driver into this version to keep things up to date. Cc: Yokota Hiroshi Signed-off-by: Greg Kroah-Hartman commit bc36e6559c32374b7f9cf18e9461cd51998c41d3 Author: J.R. Mauro Date: Tue Oct 14 18:00:15 2008 -0400 Staging: Clean up sxg driver Lindent the rest of the files in drivers/staging/sxg Signed off by: J.R. Mauro Signed-off-by: Greg Kroah-Hartman commit 2ae5a6d20eae3651eade5165ae2a30ea6c3a1812 Author: Harvey Harrison Date: Mon Oct 20 15:45:25 2008 -0700 Staging: remove remaining uses of __FUNCTION__ __FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison Signed-off-by: Greg Kroah-Hartman commit a14edddac99eff625cfcb44829ce206ec04be71a Author: Vijay Kumar Date: Sun Oct 19 08:58:46 2008 +0530 Staging: add poch driver This is the first cut at a driver for the Redrapids Pocket Change CardBus devices. Receiving data seems to work properly, but overflows happen on transmit. Still needs more hardware debugging to work properly. (cleaned up to use proper driver core api functions by Greg) From: Vijay Kumar Cc: Alexey Zaytsev Cc: Jaya Kumar Cc: Ken Sienski Signed-off-by: Greg Kroah-Hartman commit 0c74433e319dfd67eadc645bb90192d618024a87 Author: Greg Kroah-Hartman Date: Mon Oct 20 14:32:33 2008 -0700 Staging: wlan-ng: fix build error if wireless networking is not enabled Thanks to Ingo for pointing this out. Cc: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit 1781ad2f6338d1c0636a47faf34958da7861be1c Author: Pekka Enberg Date: Fri Oct 17 20:57:08 2008 +0300 Staging: echo: remove annoying "end of function" markers This patch removes the very noisy "end of function" markers that are very annoying when reading the driver code. Cc: David Rowe Cc: Steve Underwood Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 6675fe3f92ad3b433e55744ef96d775b4875997e Author: Pekka Enberg Date: Fri Oct 17 20:56:00 2008 +0300 Staging: echo: remove __cplusplus macro magic The kernel is written in C, so remove the __cplusplus macro magic from the driver. Cc: David Rowe Cc: Steve Underwood Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit f07639adebd573709ea0d6b67bec9b620fe3083e Author: Pekka Enberg Date: Fri Oct 17 20:55:32 2008 +0300 Staging: echo: remove dead code This patch removes dead code that is wrapped in #ifndef __KERNEL__. Cc: David Rowe Cc: Steve Underwood Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit db2af149bd0c798ce599365ee4320dd30dda852c Author: Pekka Enberg Date: Fri Oct 17 20:55:03 2008 +0300 Staging: echo: fix kmalloc()/kfree() uses This patch removes the malloc()/free() macro wrappers and converts call-sites to use kcalloc() and kzalloc() where appropriate. I also fixed up out-of-memory error handling in couple of places where it was broken. Cc: David Rowe Cc: Steve Underwood Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit f55ccbf6bc5e5e857b15f51d481aa7b1cd993ae0 Author: Tzafrir Cohen Date: Sun Oct 12 08:13:21 2008 +0200 Staging: echo: Replace __BLACKFIN__ASM__ with __bfin__ Signed-off-by: Tzafrir Cohen Signed-off-by: Greg Kroah-Hartman commit 9d8f2d5dfbcc9d2229f5e93653988d98360e248c Author: Tzafrir Cohen Date: Sun Oct 12 07:17:26 2008 +0200 Staging: echo: Changed preffix from echo_can_ to oslec_ Signed-off-by: Tzafrir Cohen Signed-off-by: Greg Kroah-Hartman commit 5b97de8c63efb179064cc422e9748d422e02677d Author: Tzafrir Cohen Date: Sun Oct 12 07:00:24 2008 +0200 Staging: echo: Replace echo_can_state_t with struct echo_can_state Signed-off-by: Tzafrir Cohen Signed-off-by: Greg Kroah-Hartman commit 68b8d9f6e5293eb342697f6edf319541a2c1b9b5 Author: Tzafrir Cohen Date: Sun Oct 12 06:55:40 2008 +0200 Staging: echo: Export interface functions. Add module headers. Signed-off-by: Tzafrir Cohen Signed-off-by: Greg Kroah-Hartman commit 17f8c114944de27e2fd9402fa2a75bccdac18502 Author: Tzafrir Cohen Date: Sun Oct 12 06:03:14 2008 +0200 Staging: echo: A separate oslec.h for external interface Split out the external interface to a separate file called oslec.h . Give the struct a name while we're at it. Signed-off-by: Tzafrir Cohen Signed-off-by: Greg Kroah-Hartman commit e88bd231e4f00f050c4cf385f7cb2fde12f2a101 Author: Harvey Harrison Date: Fri Oct 17 14:46:10 2008 -0700 Staging: sxg: replace __FUNCTION__ with __func__ __FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison Signed-off-by: Greg Kroah-Hartman commit 8b384e0c3f85065a4986013d74d5585ed595cfa0 Author: Pekka Enberg Date: Tue Oct 21 00:03:41 2008 +0300 Staging: w35und: remove some typedefs This patch removes some obfuscating typedefs from the driver code. Cc: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 58be3fb09b0a140e086475e8d34f72e366c6994b Author: Huang Weiyi Date: Sat Oct 18 12:41:57 2008 +0800 Staging: SLICOSS: remove unused #include The file(s) below do not use LINUX_VERSION_CODE nor KERNEL_VERSION. drivers/staging/slicoss/slicoss.c This patch removes the said #include . Signed-off-by: Huang Weiyi Signed-off-by: Greg Kroah-Hartman commit 2eb3882889ed1caff152e853ebb4d979ed8aae1c Author: Huang Weiyi Date: Sat Oct 18 12:41:55 2008 +0800 Staging: go7007: remove unused #include The file(s) below do not use LINUX_VERSION_CODE nor KERNEL_VERSION. drivers/staging/go7007/go7007-driver.c drivers/staging/go7007/go7007-fw.c drivers/staging/go7007/go7007-i2c.c drivers/staging/go7007/go7007-usb.c drivers/staging/go7007/snd-go7007.c drivers/staging/go7007/wis-ov7640.c drivers/staging/go7007/wis-saa7113.c drivers/staging/go7007/wis-saa7115.c drivers/staging/go7007/wis-sony-tuner.c drivers/staging/go7007/wis-tw2804.c drivers/staging/go7007/wis-tw9903.c drivers/staging/go7007/wis-uda1342.c This patch removes the said #include . Signed-off-by: Huang Weiyi Signed-off-by: Greg Kroah-Hartman commit ec7c35b852e3f7d85e21093f4f5034f91f28ee8f Author: Huang Weiyi Date: Sat Oct 18 11:53:07 2008 +0800 staging: wlan-ng: prism2: remove more duplicated #include Removed duplicated #include "version.h" in drivers/staging/wlan-ng/p80211wep.c. Signed-off-by: Huang Weiyi Signed-off-by: Greg Kroah-Hartman commit 5667f35aea044f1da14eb63777ea66d16a70ee48 Author: Huang Weiyi Date: Sat Oct 18 11:53:05 2008 +0800 Staging: wlan-ng: prism2: remove duplicated #include Removed duplicated #include "wlan_compat.h" in drivers/staging/wlan-ng/prism2mib.c. Signed-off-by: Huang Weiyi Signed-off-by: Greg Kroah-Hartman commit fc049612ad7e65ee825b16f98219a862516f0e7a Author: Huang Weiyi Date: Sat Oct 18 11:52:13 2008 +0800 Staging: et131x: remove duplicated #include's Removed duplicated #include's in file(s) below, - drivers/staging/et131x/et1310_phy.c et1310_jagcore.h linux/delay.h - drivers/staging/et131x/et131x_debug.c et1310_jagcore.h - drivers/staging/et131x/et131x_initpci.c et1310_jagcore.h Signed-off-by: Huang Weiyi Signed-off-by: Greg Kroah-Hartman commit f39277d7615e04b2493b62f4a6ff7c9b470f789c Author: Huang Weiyi Date: Sat Oct 18 11:52:11 2008 +0800 Staging: SLICOSS: remove duplicated #include's Removed duplicated #include's in drivers/staging/slicoss/slicoss.c. linux/delay.h linux/etherdevice.h linux/init.h linux/netdevice.h linux/pci.h linux/skbuff.h linux/slab.h linux/string.h Signed-off-by: Huang Weiyi Signed-off-by: Greg Kroah-Hartman commit 0b65d3cc773f29354090cca865732308f675e1ef Author: Lior Dotan Date: Fri Oct 17 11:30:07 2008 +0200 Staging: Fixes for me4000 pci data collection driver Following Andrew Morton's review for this patch I made a patch that fixes most of the remarks. I've converted the sleep_on_timeout to wait_event_timeout but I probably not in the right way. Also I don't know what's the problem with the calls for get_user() so I left them untouched. Signed-off-by: Lior Dotan Cc: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit b4c0ed116928d59b00cd162bb0083629829fab8c Author: Mariusz Kozlowski Date: Sat Oct 18 15:46:39 2008 +0200 staging: balance parenthesis in wlan-ng headers Balance parenthesis in HFA384x_CMD_QOS_GET macro. Signed-off-by: Mariusz Kozlowski Signed-off-by: Greg Kroah-Hartman commit dffe5a5d975ec1bdc9bbc2169957ccdcfd816d8a Author: Mariusz Kozlowski Date: Sat Oct 18 15:43:27 2008 +0200 staging: fix potential build error in slicoss driver This hides under DEBUG_REGISTER_TRACE so probably not visible to many people. Signed-off-by: Mariusz Kozlowski Signed-off-by: Greg Kroah-Hartman commit f31158c9f86bf5619ab2e1c54f82f04ad2f47435 Author: Diego Calleja Date: Sat Oct 18 16:53:37 2008 +0200 Staging: Fix leak in drivers/staging/at76_usb.c Fix leak in at76_usb as reported in: http://bugzilla.kernel.org/show_bug.cgi?id=11778 Reported-by: Daniel Marjamäki Signed-off-by: Diego Calleja Signed-off-by: Greg Kroah-Hartman commit 19cbd3d7d564513be97a0651173f5572eae3d52b Author: Greg Kroah-Hartman Date: Mon Oct 20 13:45:15 2008 -0700 Staging: document 4k stack problem for winbond driver As noticed by Arjan Cc: Arjan van de Ven Cc: Pavel Machek Signed-off-by: Greg Kroah-Hartman commit 83454a285714f8365a4d391d8f2be3a956b32498 Author: Stephen Rothwell Date: Mon Oct 20 22:59:18 2008 +1100 linux-next: build failure sxghif.h has code that explicitly will not build fo other architecures. Signed-off-by: Stephen Rothwell Signed-off-by: Greg Kroah-Hartman commit 88f0aee6bdc477352b5f6e9d72e449da9bdb2dd2 Author: Geert Uytterhoeven Date: Sat Oct 18 22:55:41 2008 +0200 Staging: W35UND should depend on USB W35UND should depend on USB Signed-off-by: Geert Uytterhoeven Signed-off-by: Greg Kroah-Hartman commit c2bf092e02dcd51f46c6415b9df8606ed2d1e6f7 Author: Hiroshi Miura Date: Wed Oct 22 09:56:28 2008 -0700 Staging: add pcc-acpi driver Adds the pcc-acpi driver to the staging tree. From: Hiroshi Miura Cc: YOKOTA Hiroshi Signed-off-by: Greg Kroah-Hartman commit da6320becf31c40b60d4b1dc6b339c9a766b671c Author: Jarkko Nikula Date: Wed Oct 22 15:00:29 2008 +0300 ALSA: ASoC: OMAP: Continue fixing DSP DAI format in McBSP DAI driver Fix "ASoC: OMAP: Fix DSP DAI format in McBSP DAI driver" was not correct due misunderstanding of DSP_A format and similar error in TLV320AIC33 codec which was used to test the original fix. This patch corrects now DSP_A format in OMAP McBSP DAI driver and is verified with TLV320AIC23 codec that's implementing DSP_A correctly. Signed-off-by: Jarkko Nikula Cc: Arun KS Signed-off-by: Takashi Iwai commit 3cfba0892585d4c8e7b4122b5dc0d206a76936de Author: Marcin Slusarz Date: Sun Oct 12 11:46:23 2008 +0200 x86: fix section mismatch warning - apic_x2apic_phys Impact: cleanup only, no functionality changed WARNING: vmlinux.o(.data+0xc008): Section mismatch in reference from the variable apic_x2apic_phys to the function .init.text:x2apic_acpi_madt_oem_check() The variable apic_x2apic_phys references the function __init x2apic_acpi_madt_oem_check() Signed-off-by: Marcin Slusarz Signed-off-by: Ingo Molnar commit 2caa37150d7aa110b6155cb77b07e581c103fef4 Author: Marcin Slusarz Date: Sun Oct 12 11:44:11 2008 +0200 x86: fix section mismatch warning - apic_x2apic_cluster Impact: cleanup only, no functionality changed WARNING: vmlinux.o(.data+0xbf88): Section mismatch in reference from the variable apic_x2apic_cluster to the function .init.text:x2apic_acpi_madt_oem_check() The variable apic_x2apic_cluster references the function __init x2apic_acpi_madt_oem_check() Signed-off-by: Marcin Slusarz Signed-off-by: Ingo Molnar commit f8827c017f19e1cd8834821f4303d5f163feab84 Author: Marcin Slusarz Date: Sun Oct 12 11:44:10 2008 +0200 x86: fix section mismatch warning - apic_x2apic_uv_x Impact: cleanup only, no functionality changed WARNING: vmlinux.o(.data+0xbf08): Section mismatch in reference from the variable apic_x2apic_uv_x to the function .init.text:uv_acpi_madt_oem_check() The variable apic_x2apic_uv_x references the function __init uv_acpi_madt_oem_check() Signed-off-by: Marcin Slusarz Signed-off-by: Ingo Molnar commit fae1721601a008fc83a809fdd76085a56f2275f0 Author: Marcin Slusarz Date: Sun Oct 12 11:44:09 2008 +0200 x86: fix section mismatch warning - apic_physflat Impact: cleanup only, no functionality changed WARNING: vmlinux.o(.data+0xbe88): Section mismatch in reference from the variable apic_physflat to the function .init.text:physflat_acpi_madt_oem_check() The variable apic_physflat references the function __init physflat_acpi_madt_oem_check() Signed-off-by: Marcin Slusarz Signed-off-by: Ingo Molnar commit 983f91ff949d9008eb7fb73ba4e35f9decc182b3 Author: Marcin Slusarz Date: Sun Oct 12 11:44:08 2008 +0200 x86: fix section mismatch warning - apic_flat Impact: cleanup only, no functionality changed WARNING: vmlinux.o(.data+0xbe08): Section mismatch in reference from the variable apic_flat to the function .init.text:flat_acpi_madt_oem_check() The variable apic_flat references the function __init flat_acpi_madt_oem_check() This is harmless, because the .acpi_madt_oem_check is only called during init time. But we keep the function pointer around in a .data function pointer template, so it's better we do not keep that stale - so mark this function non-__init. Signed-off-by: Marcin Slusarz Signed-off-by: Ingo Molnar commit 13095c37b29b90ec96070cb63400a79737b4a185 Author: Mark Brown Date: Wed Oct 22 13:27:49 2008 +0100 ALSA: Ensure PXA runtime data is initialised The rest of the code relies on the runtime data being zero initialised so we need to use kzalloc() to allocate it. Reported-by: Oliver Ford Signed-off-by: Mark Brown Signed-off-by: Takashi Iwai commit 2cb0ebeeb664e6eefe06951709949203e04f7c7b Author: Daniele Calore Date: Mon Oct 13 10:34:12 2008 +0200 x86: memtest fix use of reserve_early() Hi all, Wrong usage of 2nd parameter in reserve_early call. 66/75: reserve_early(start_bad, last_bad - start_bad, "BAD RAM"); ^^^^^^^^^^^^^^^^^^^^ The correct way is to use 'end' address and not 'size'. As a bonus a fix to the printk format. Signed-off-by: Daniele Calore Acked-by: Yinghai Lu Signed-off-by: Ingo Molnar commit 746e7cef1b3de5516e07f16a448f0d2a092e3d36 Author: Roland McGrath Date: Mon Oct 13 18:40:04 2008 -0700 x86 syscall.h: fix argument order Petr Tesarik noticed that I'd bungled the syscall_get_arguments code for 64-bit kernels, so it inverted the order of the syscall argument registers. Petr wrote a patch to fix that, and I've amended it to fix the same braino in the syscall_set_arguments code. Original-by: Petr Tesarik Signed-off-by: Roland McGrath Signed-off-by: Ingo Molnar commit aef8f5b8c2da706cb3efe701e2a35e11221ea5bd Author: Jeremy Fitzhardinge Date: Tue Oct 14 21:43:43 2008 -0700 x86/tlb_uv: remove strange mc146818rtc include For some reason tlb_uv was including linux/mc146818rtc.h. It really just needs linux/seq_file.h Signed-off-by: Jeremy Fitzhardinge Cc: Cliff Wickman Signed-off-by: Ingo Molnar commit 55410791c91f448737c90585d2e280edd3c4d5c7 Author: Gustavo F. Padovan Date: Wed Oct 15 10:37:04 2008 -0300 x86: remove redundant KERN_DEBUG on pr_debug pr_debug don't need KERN_DEBUG. Signed-off-by: Gustavo F. Padovan Signed-off-by: Ingo Molnar commit db96b0a0e4158806fcf03945a870f9320e6bac9b Author: Cyrill Gorcunov Date: Wed Oct 22 18:00:09 2008 +0400 x86: do_boot_cpu - check if we have ESR register Impact: fix APIC IRQ irregularities on certain older boxes We should touch the APIC ESR register if only we have it. The patch fixes the problem mentioned by Max Kellermann: http://lkml.org/lkml/2008/10/17/147 Bisected-by: Max Kellermann Signed-off-by: Cyrill Gorcunov [ mingo@elte.hu: build fix ] Signed-off-by: Ingo Molnar commit 8d433c407dea248c8db09edbc0b3c245977d596f Author: Peter Oruba Date: Thu Oct 16 18:43:48 2008 +0200 x86: MAINTAINERS change for AMD microcode patch loader Changed MAINTAINERS entry for AMD microcode patch loader. Signed-off-by: Peter Oruba Cc: Andreas Herrmann Signed-off-by: Ingo Molnar commit bc8bcc79ea4203c7d04309f1307ab88c86f0b0cf Author: Lai Jiangshan Date: Wed Oct 22 12:42:30 2008 +0800 x86/proc: fix /proc/cpuinfo cpu offline bug Impact: fix missing CPUs in /proc/cpuinfo after CPU hotunplug/hotreplug In my test, I found that if a cpu has been offline, the next cpus may not be shown in the /proc/cpuinfo. if one read() cannot consume the whole /proc/cpuinfo, c_start() will be called again in the next read() calls. And *pos has been increased by 1 by the caller(seq_read()). if this time the cpu#*pos is offline, c_start() will return NULL, and the next cpus can not be shown. this fix use next_cpu_nr(*pos - 1, cpu_online_map) to search the next unshown cpu. the most easy way to reproduce this bug: 1) offline cpu#1 (cpu#0 is online) 2) dd ibs=2 if=/proc/cpuinfo the result is that only cpu#0 is shown. cpu#2 and cpu#3 .... cannot be shown in /proc/cpuinfo it's bug. Signed-off-by: Lai Jiangshan Signed-off-by: Ingo Molnar commit 35af28219e684a36cc8b1ff456c370ce22be157d Author: Andreas Herrmann Date: Wed Oct 22 13:08:31 2008 +0200 x86: call dmi-quirks for HP Laptops after early-quirks are executed Impact: make warning message disappear - functionality unchanged Problems with bogus IRQ0 override of those laptops should be fixed with commits x86: SB600: skip IRQ0 override if it is not routed to INT2 of IOAPIC x86: SB450: skip IRQ0 override if it is not routed to INT2 of IOAPIC that introduce early-quirks based on chipset configuration. For further information, see http://bugzilla.kernel.org/show_bug.cgi?id=11516 Instead of removing the related dmi-quirks completely we'd like to keep them for (at least) one kernel version -- to double-check whether the early-quirks really took effect. But the dmi-quirks need to be called after early-quirks are executed. With this patch calling sequence for dmi-quriks is changed as follows: acpi_boot_table_init() (dmi-quirks) ... early_quirks() (detect bogus IRQ0 override) ... acpi_boot_init() (late dmi-quirks and setup IO APIC) Note: Plan is to remove the "late dmi-quirks" with next kernel version. Signed-off-by: Andreas Herrmann Signed-off-by: Ingo Molnar commit cf52ebedba77ee494b495dedd3a1f55944611275 Author: Neil Horman Date: Fri Oct 17 17:00:13 2008 -0400 x86, kexec: fix hang on i386 when panic occurs while console_sem is held There's a corner case in 32 bit x86 kdump at the moment. When the box panics via nmi, we call bust_spinlocks(1) to disable sensitivity to the console_sem (allowing us to print to the console in all cases), but we don't call crash_kexec, until after we call bust_spinlocks(0), which re-enables console_sem sensitivity. The result is that, if we get an nmi while the console_sem is held and kdump is configured, and we try to print something to the console during kdump shutdown (which we often do) we deadlock the box. The fix is to simply do what 64 bit die_nmi does which is to not call bust_spinlocks(0) until after we call crash_kexec. Patch below tested successfully by me. Signed-off-by: Neil Horman Signed-off-by: Ingo Molnar commit bd28bdb18f1028f8f0a3f83291336529b2cb5b7a Author: Jon Smirl Date: Sat Oct 18 11:40:59 2008 +0000 [netdrvr] fec_mpc52xx: Implement polling, to make netconsole work. Implement polling for 5200FEC to make netconsole work. Tested on Phytec pcm030 and Efika. Signed-off-by: Jon Smirl Signed-off-by: Jeff Garzik commit d2f6f7aeee890df445be29a60e34925ec15f620c Author: Andi Kleen Date: Tue Oct 21 22:45:22 2008 +0200 MCE: Don't run 32bit machine checks with interrupts on Running machine checks with interrupt on is a extremly bad idea. The machine check handler only runs when the system is broken and needs to finish as quickly as possible. Remove the respective bogus post 2.6.27 regression and call the machine check vector directly again. This removes only code. Signed-off-by: Andi Kleen [Cherry-picked from x86/mce] Signed-off-by: Thomas Gleixner commit 4bb273e95578436bedf44741c97c2b7812fa8ada Author: Paul Mundt Date: Wed Oct 22 20:05:11 2008 +0900 sh: update defconfigs. Signed-off-by: Paul Mundt commit bb0d215c8f970345746129d4c110159b099e032f Author: Ron Mercer Date: Mon Oct 20 10:30:26 2008 -0700 qlge: Fix MSI/legacy single interrupt bug. The chip can issue spurious interrupts for single interrupt modes. We use disable to clear the condition and allow processing to continue. Also got rid of legacy specific code since it now needs to be done on MSI single irq also. Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit b891a9023bc4fc639b31c234a705e7e51104cf22 Author: Catalin Marinas Date: Mon Oct 20 18:15:37 2008 +0100 smc911x: Make the driver safer on SMP This patch extends the critical regions covered by lp->lock to make it safer on SMP. The main failure point was the smc911x_hard_start_xmit function being called from different CPUs. It was tested on the ARM SMP platforms. Signed-off-by: Catalin Marinas Signed-off-by: Jeff Garzik commit 319edafef64406c971035c56bd68480e5a82b581 Author: Catalin Marinas Date: Mon Oct 20 18:15:30 2008 +0100 smc911x: Add IRQ polarity configuration Platforms like ARM Ltd's RealView require the IRQ polarity bit to be set for the SMC9118 chip. This patch allows the dynamic configuration via the smc911x_platdata structure. This patch also changes the smc91x_platdata structure name to the correct smc911x_platdata in the smc911x_drv_probe() function. Signed-off-by: Catalin Marinas Signed-off-by: Jeff Garzik commit bd2c4972fff2d621383bc2c3389a7b1ac7eca8f1 Author: Catalin Marinas Date: Mon Oct 20 18:15:17 2008 +0100 smc911x: Allow Kconfig dependency on ARM Since more ARM platforms use this device, it is easier to add a dependency on ARM rather than individual platforms. Signed-off-by: Catalin Marinas Signed-off-by: Jeff Garzik commit 708f6e27c3f75166433b69174a8348308e55d073 Author: Francois Romieu Date: Mon Oct 20 23:37:55 2008 +0200 sis190: add identifier for Atheros AR8021 PHY Fixes http://bugzilla.kernel.org/show_bug.cgi?id=10994 Contributed by pablomme@googlemail.com, coenraad@wish.org.za and a few others. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit de4549cae088a74262834178b71fb25dbec2c376 Author: Stephen Hemminger Date: Tue Oct 21 18:04:27 2008 -0700 8139x: reduce message severity on driver overlap The 8139 drivers are a source of error messages that confuse users. Since this device can not be disambiguated by normal PCI device id's two drivers match the same info. But the module utilities seem to correctly handle this overlap, they try one driver, then if that doesn't load try the other. Therefore there is no need for a message to be logged with error level severity, just using info level instead. Can't be completely silent because user might have configure one driver and forgot the other one. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 421e02f0e9c3335028750ee411e5534dab82efbd Author: Jeff Kirsher Date: Fri Oct 17 11:08:31 2008 -0700 igb: add IGB_DCA instead of selecting INTEL_IOATDMA Add a bool IGB_DCA defined to y if IGB and DCA are enabled, but IGB isn't y while DCA=m. And thus remove the need to select INTEL_IOATDMA when IGB is enabled, so that non-x86 architectures can build the igb driver. Based on work/patch from Brice Goglin Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit c54106bb3856a7726a814d54aa0eb32f5419a743 Author: Alexander Duyck Date: Thu Oct 16 21:26:57 2008 -0700 igb: fix tx data corruption with transition to L0s on 82575 The 82575 has an issue in which the DMA will go out of sync if the link partner goes into an L0s state. To prevent this we set the pci-e link partner capability bits to disable the L0s transition on the hw. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit 6f8f6daa6db4c6b5ef8b7f9e62518fed91414670 Author: Paul Mundt Date: Wed Oct 22 19:38:30 2008 +0900 sh: Kill off unused p1fc divisors from SH7763 clk fwk. Signed-off-by: Paul Mundt commit d4f12daf7ba4efc506c377a9591ecdb692641fe5 Author: Hannes Hering Date: Thu Oct 16 11:36:42 2008 +0200 ehea: Fix memory hotplug support This patch implements the memory notifier to update the busmap instantly instead of rebuilding the whole map. This is necessary because walk_memory_resource provides different information than required during memory hotplug. Signed-off-by: Hannes Hering Signed-off-by: Jeff Garzik commit 93fbaae188fba7c2a6e458f62e1f61439caebfc8 Author: Bryan Wu Date: Fri Oct 17 01:40:44 2008 +0800 netdev: DM9000: remove BLACKFIN hacking in DM9000 netdev driver remove integer casting in the read/write IO accessors, because Blackfin now provides those functions Tested-by: Javier Herrero Signed-off-by: Bryan Wu Signed-off-by: Jeff Garzik commit 6d329af9967e7ab3f4a3d7f1e8ef87539c3a069f Author: Roland Dreier Date: Fri Oct 17 14:18:26 2008 -0700 cxgb3: Fix kernel crash caused by uninitialized l2t_entry.arpq Commit 147e70e6 ("cxgb3: Use SKB list interfaces instead of home-grown implementation.") causes a crash in t3_l2t_send_slow() when an iWARP connection request is received. This is because the new l2t_entry.arpq skb queue is never initialized, and therefore trying to add an skb to it causes a NULL dereference. With the old code there was no need to initialize the queues because the l2t_entry structures were zeroed, and the code used NULL to mean empty. Fix this by adding __skb_queue_head_init() when all the l2t_entry structures get allocated. Signed-off-by: Roland Dreier Signed-off-by: Jeff Garzik commit d766a4eda65b80afb50a39ce15c0ca424115bc07 Author: Dmitry Baryshkov Date: Tue Oct 21 04:36:29 2008 +0400 SMC911x: unbreak PXA builds Currently SMC911x driver is broken on ARM/PXA builds. Unbreak such configurations. Signed-off-by: Dmitry Baryshkov Signed-off-by: Jeff Garzik commit 051d36f3fbd013a73cb42a6762e5bf339a3732aa Author: Brice Goglin Date: Mon Oct 20 13:54:12 2008 +0200 myri10ge: disable NAPI on failure to setup the interface Disable NAPI if a failure occurs when setting up the interface. Leaving it enabled could cause a BUG the next time an ifconfig up is issued. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit cde0d910b9185519f7f2cfe015f9039e02c2f25b Author: Atsushi Nemoto Date: Tue Oct 21 00:00:29 2008 +0900 net: Make SMC91X selectable on other MIPS boards RBTX4939 board has SMC91X chip and there can be other MIPS boards with that chip. Make SMC91X selectable on all MIPS board would be better than enumerating each boards in Kconfig. Signed-off-by: Atsushi Nemoto Cc: jeff@garzik.org Signed-off-by: Jeff Garzik commit ced1cbacc0557eda31ab59317c09f774cff865bb Author: roel kluin Date: Tue Oct 21 01:44:02 2008 -0400 AX88796: ax_probe() fix irq assignment dev->irq is unsigned Signed-off-by: Roel Kluin Signed-off-by: Jeff Garzik commit d51894f4979e941a86309f29898579cbb591514e Author: roel kluin Date: Tue Oct 21 01:35:34 2008 -0400 gianfar: fix handle errors returned by platform_get_irq*() platform_get_irq*() returns on -ENXIO when the resource cannot be found, but this remains unnoticed if stored in an unsigned. Signed-off-by: Roel Kluin Signed-off-by: Jeff Garzik commit e1564ec938b759268d6e67f24b5d6f429da4a5a9 Author: Francois Romieu Date: Thu Oct 16 22:46:13 2008 +0200 r8169: checks against wrong mac addresse init Checking the signature of the eeprom and the validity of the MAC address should be enough to filter out the bad addresses observed so far. Contributed by Ivan Vecera and Martin Capitanio. Tested on 8102el, 8168b and 8169 for a start. Signed-off-by: Francois Romieu Cc: Edward Hsu commit cd926c7330ae76b620853533e68654a1ef0c2347 Author: Francois Romieu Date: Thu Oct 16 22:04:07 2008 +0200 r8169: verbose mac address init I prefer the debug information to be displayed until the issue is properly handled. Signed-off-by: Francois Romieu Cc: Edward Hsu commit df13b31c286b3e91c556167954eda088d90a4295 Merge: 9b1f261... 818273a... Author: Robert Richter Date: Wed Oct 22 12:12:06 2008 +0200 Merge branch 'oprofile/x86-oprofile-for-tip' into oprofile/for-linus commit 2bfef69d9e8cc056aa4dbc13f2136747340b4515 Author: Andreas Herrmann Date: Wed Oct 15 11:51:53 2008 +0200 x86: SB600: skip IRQ0 override if it is not routed to INT2 of IOAPIC Impact: fix hung bootup and other misbehavior on certain laptops On some more HP laptops BIOS reports an IRQ0 override but the SB600 chipset is configured such that timer interrupts go to INT0 of IOAPIC. Check IRQ0 routing and if it is routed to INT0 of IOAPIC skip the timer override. See following bug reports: http://bugzilla.kernel.org/show_bug.cgi?id=11715 http://bugzilla.kernel.org/show_bug.cgi?id=11516 Signed-off-by: Andreas Herrmann Cc: Signed-off-by: Ingo Molnar commit f030d7b65e4e6399f23de2a41a58d1b607b6bd89 Author: Brian Swetland Date: Mon Sep 29 14:07:14 2008 -0700 [ARM] msm: vreg interface to msm7k pmic The baseband cpu owns the pmic, so voltage regulator control is only available via a relatively limited interface through the proc_comm transport. Signed-off-by: Brian Swetland commit 8a0f6f17c43933a4768ab79b9ac3ad24cd3c2c3f Author: Brian Swetland Date: Wed Sep 10 14:58:25 2008 -0700 [ARM] msm: dma: various basic dma improvements and bugfixes San: - Propagate DM errors to the originator of the request. - Implement msm_dmov_stop_cmd() - Add return value to init code - Modify msm_dmov_stop_cmd() to support ungraceful flushing Arve: - Disable datamover interrupt when not in use. We turn off the interrrupt to allow power collapse from idle. Signed-off-by: San Mehat Signed-off-by: Arve Hjønnevåg Signed-off-by: Brian Swetland commit 600f7cfebeef74a6ba961c507079e3629da5dd7a Author: Brian Swetland Date: Tue Sep 9 11:04:14 2008 -0700 [ARM] msm: clock: provide clk_*() api support for Makes use of the proc_comm interface to provide clock control on MSM7X01A family SoCs. Signed-off-by: Brian Swetland commit bcc0f6af0798e60e7527485f7125ed26632ce698 Author: Brian Swetland Date: Wed Sep 10 14:00:53 2008 -0700 [ARM] msm: clean up iomap and devices - Add some more peripherals (sdcc, etc) to the iomap. - Remove virtual base addresses for devices that we should be passing physical addresses to drivers via resources and ioremap()ing. - don't try to use uarts for ll debug once the mmu is enabled due to problems with the peripheral window - make base addresses void __iomem * and fixup irq.c and timer.c - Remove common.c and bring in devices.c/devices.h similar to the PXA architecture. Signed-off-by: Brian Swetland commit b8a16e1fdfe9caed734df0e157ad74ae2b13e3bd Author: Brian Swetland Date: Tue Sep 9 09:36:50 2008 -0700 [ARM] msm: add proc_comm support, necessary for clock and power control The proc_comm protocol is the lowest level protocol available for communicating with the modem core. It provides access to clock and power control, among other things, and is safe for use from atomic contexts, unlike the higher level SMD and RPC transports. Signed-off-by: Brian Swetland commit 1637de0c9b4dbac0f185e94b2b8cd2c2db78700d Author: Brian Swetland Date: Tue Sep 9 07:13:33 2008 -0700 [ARM] msm: rename ARCH_MSM7X00A to ARCH_MSM The MSM architecture covers a wider family of chips than just the MSM7X00A. Move to a more generic name, in perparation for supporting the specific SoC variants as sub-architectures (ARCH_MSM7X01A, ARCH_MSM722X, etc). This gives us ARCH_MSM for the (many) common peripherals. This also removes the unused/obsolete config item MSM7X00A_IDLE. Signed-off-by: Brian Swetland commit 42eed42bac41c8106ed52b6b84409d84c0981e36 Author: Magnus Damm Date: Wed Oct 22 18:29:17 2008 +0900 sh: improve pinmux support for single direction pins This patch improves the support for gpio pins that are hard wired to either input or output and lack control register association. A special force enum id is used to allow use without control register but still mark the gpio pin as input or output. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 22ee3ba611e0aa73228ae64fa68d89c52367702a Author: Magnus Damm Date: Wed Oct 22 18:25:39 2008 +0900 sh: use 10MHz VIO_CLK for ov772x on Migo-R Use a slower VIO_CKO clock frequency for the ov772x on Migo-R. This improves the camera picture quality on Panel Board V2.1. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 268a3dcfea2077fca60d3715caa5c96f9b5e6ea7 Merge: c4bd822... 592aa99... Author: Thomas Gleixner Date: Wed Oct 22 09:48:06 2008 +0200 Merge branch 'timers/range-hrtimers' into v28-range-hrtimers-for-linus-v2 Conflicts: kernel/time/tick-sched.c Signed-off-by: Thomas Gleixner commit da74ae3e32374755e0fbdfed4074cf839a82f615 Author: Harvey Harrison Date: Tue Oct 21 20:28:04 2008 -0700 ALSA: hda - correct bracketing in spdif test in patch_sigmatel.c Noticed by sparse: sound/pci/hda/patch_sigmatel.c:1285:43: warning: dubious: !x & y Signed-off-by: Harvey Harrison Acked-by: Matthew Ranostay Signed-off-by: Takashi Iwai commit 8bcad30f2e6d4c20f7e71d2e2ac77acc0f0931e5 Author: roel kluin Date: Tue Oct 21 19:49:09 2008 -0400 x86: make variables static These variables are only used in their source files, so make them static. Signed-off-by: Roel Kluin Signed-off-by: Ingo Molnar commit 54622f10a6aabb8bb2bdacf3dd070046f03dc246 Author: Mohan Kumar M Date: Tue Oct 21 17:38:10 2008 +0000 powerpc: Support for relocatable kdump kernel This adds relocatable kernel support for kdump. With this one can use the same regular kernel to capture the kdump. A signature (0xfeed1234) is passed in r6 from panic code to the next kernel through kexec_sequence and purgatory code. The signature is used to differentiate between kdump kernel and non-kdump kernels. The purgatory code compares the signature and sets the __kdump_flag in head_64.S. During the boot up, kernel code checks __kdump_flag and if it is set, the kernel will behave as relocatable kdump kernel. This kernel will boot at the address where it was loaded by kexec-tools ie. at the address reserved through crashkernel boot parameter. CONFIG_CRASH_DUMP depends on CONFIG_RELOCATABLE option to build kdump kernel as relocatable. So the same kernel can be used as production and kdump kernel. This patch incorporates the changes suggested by Paul Mackerras to avoid GOT use and to avoid two copies of the code. Signed-off-by: Paul Mackerras Signed-off-by: Mohan Kumar M Signed-off-by: Michael Ellerman Signed-off-by: Benjamin Herrenschmidt commit 4792adbac9eb41cea77a45ab76258ea10d411173 Author: Jon Tollefson Date: Tue Oct 21 15:27:36 2008 +0000 powerpc: Don't use a 16G page if beyond mem= limits If mem= is used on the boot command line to limit memory then the memory block where a 16G page resides may not be available. Thanks to Michael Ellerman for finding the problem. Signed-off-by: Jon Tollefson Signed-off-by: Benjamin Herrenschmidt commit 71773f0337bee8a3701aaaec22581c18a5f44679 Author: Mike Ditto Date: Tue Oct 21 11:32:29 2008 +0000 powerpc: Add del_node() for early boot code to prune inapplicable devices. Some platforms have variants that can share most of a flat device tree but need a few devices selectively pruned at boot time. This adds del_node() to ops.h to allow access to the existing fdt_del_node(). Signed-off-by: Mike Ditto Signed-off-by: Benjamin Herrenschmidt commit 27471fdb32e77ecb92f09d4ac5757785b4dc33bc Author: Andy Henroid Date: Thu Oct 9 11:45:22 2008 -0700 i7300_idle driver v1.55 The Intel 7300 Memory Controller supports dynamic throttling of memory which can be used to save power when system is idle. This driver does the memory throttling when all CPUs are idle on such a system. Refer to "Intel 7300 Memory Controller Hub (MCH)" datasheet for the config space description. Signed-off-by: Andy Henroid Signed-off-by: Len Brown Signed-off-by: Venkatesh Pallipadi commit c7d87d79d14cecab7a34dedf1b133377cf5a0203 Author: Venkatesh Pallipadi Date: Thu Oct 16 16:34:43 2008 -0400 x86 allow modules to register idle notifiers needed if the i7300_idle driver is to be modular. Signed-off-by: Venkatesh Pallipadi Acked-by: Ingo Molnar Signed-off-by: Len Brown commit 201bdc868d9e3122bbe4491aa6b5fc4dee4cdb96 Author: David Gibson Date: Mon Oct 20 17:55:29 2008 +0000 powerpc: Further compile fixup for STRICT_MM_TYPECHECKS A patch of mine was recently committed to fix up STRICT_MM_TYPECHECKS behaviour on powerpc (f5ea64dcbad89875d130596df14c9b25d994a737). However, something which breaks it again seems to have slipped in afterwards. So, here's another small fix. Signed-off-by: David Gibson Signed-off-by: Benjamin Herrenschmidt commit 8873d93b4bf0bd270c3fc7e178211633e7a1d5e8 Author: Michael Neuling Date: Wed Oct 15 18:21:07 2008 +0000 powerpc: Remove empty #else from signal_64.c Remove empty/bogus #else from signal_64.c Signed-off-by: Michael Neuling Signed-off-by: Benjamin Herrenschmidt commit f465df81a80df92dbde0029b277f31b5e787b5df Author: Becky Bruce Date: Wed Oct 15 08:25:28 2008 +0000 powerpc: Move memory size print into common show_cpuinfo for 32-bit Most of the platforms were printing the size of the memory in their show_cpuinfo implementations. This moves that to the common show_cpuinfo, so that all 32-bit platforms will now print the size of memory. I also update the code to deal with the fact that total_memory is now a phys_addr_t. Signed-off-by: Becky Bruce Signed-off-by: Benjamin Herrenschmidt commit 934752d8a4aaae4bee7a1b46944f30a55178ec91 Author: Hendrik Brueckner Date: Mon Oct 13 23:12:52 2008 +0000 hvc_console: Remove __devexit annotation of hvc_remove() Removed __devexit annotation of hvc_remove() to avoid a section mismatch if the backend initialization fails and hvc_remove() must be used to clean up allocated hvc structs (called in section __init or __devinit). Acked-by: Christian Borntraeger Signed-off-by: Hendrik Brueckner Signed-off-by: Benjamin Herrenschmidt commit febde3711992a64ea83a47a719f68a90c4b0927a Author: Hendrik Brueckner Date: Tue Oct 14 05:02:09 2008 +0000 hvc_console: Add support for tty window resizing The patch provides the hvc_resize() function to update the terminal window dimensions (struct winsize) for a specified hvc console. The function stores the new window size and schedules a function that finally updates the tty winsize and signals the change to user space (SIGWINCH). Because the winsize update must acquire a mutex and might sleep, the function is scheduled instead of being called from hvc_poll() or khvcd. This patch uses the tty_do_resize() routine from the tty layer. A pending resize work is canceled in hvc_close() and hvc_hangup(). Signed-off-by: Hendrik Brueckner Signed-off-by: Benjamin Herrenschmidt commit 3feebbb5492e9e463467cefb633e23a3dfcec132 Author: Hendrik Brueckner Date: Mon Oct 13 23:12:50 2008 +0000 hvc_console: Fix loop if put_char() returns 0 If put_char() routine of a hvc console backend returns 0, then the hvc console starts looping in the following scenarios: 1. hvc_console_print() If put_char() returns 0 then the while loop may loop forever. I have added the missing check for 0 to throw away console messages. 2. khvcd may loop: The thread calls hvc_poll() --> hvc_push()... if there are still buffered data then the HVC_POLL_WRITE bit is set and causes the khvcd thread to loop (if yield() returns immediately). However, instead of looping, the khvcd thread could sleep for MIN_TIMEOUT (doing the same as for get_chars()). The MIN_TIMEOUT is set if hvc_push() was not able to write data to the backend. If data has been written, the timeout is set to 0 to immediately re-schedule hvc_poll(). Reviewed-by: Christian Borntraeger Tested-by: Christian Borntraeger (virtio_console) Signed-off-by: Hendrik Brueckner Signed-off-by: Benjamin Herrenschmidt commit 56ce9e2b2463b3b257098aa966586701d9967f1e Author: Hendrik Brueckner Date: Mon Oct 13 23:12:49 2008 +0000 hvc_console: Add tty driver flag TTY_DRIVER_RESET_TERMIOS After a tty hangup() or close() operation, processes might not reset the termio settings to a sane state. In order to reset the termios to its default settings the tty driver flag TTY_DRIVER_RESET_TERMIOS has been added. TTY driver flag description from include/linux/tty_driver.h: TTY_DRIVER_RESET_TERMIOS --- requests the tty layer to reset the termios setting when the last process has closed the device. Used for PTY's, in particular. Acked-by: Christian Borntraeger Signed-off-by: Hendrik Brueckner Signed-off-by: Benjamin Herrenschmidt commit fc362e2e0efd8b652ebfb409a4e43e6189c04f6f Author: Hendrik Brueckner Date: Mon Oct 13 23:12:48 2008 +0000 hvc_console: Add a hangup notifier for backends I have added a hangup notifier that can be used by hvc console backends to handle a tty hangup. The default irq hangup notifier calls the notifier_del_irq() for compatibility. Acked-by: Christian Borntraeger Signed-off-by: Hendrik Brueckner Signed-off-by: Benjamin Herrenschmidt commit 7cf5244ce4a0ab3f043f2e9593e07516b0df5715 Author: Roel Kluin Date: Wed Oct 22 01:39:55 2008 +0200 mfd: check for platform_get_irq() return value in sm501 sm501_devdata->irq is unsigned, while platform_get_irq() returns a signed int. Signed-off-by: Roel Kluin Signed-off-by: Samuel Ortiz commit 75e3d8db531b462b875c1adb13eeb6b0be7374c0 Author: Ilpo Järvinen Date: Tue Oct 21 16:28:36 2008 -0700 tcp: should use number of sack blocks instead of -1 While looking for the recent "sack issue" I also read all eff_sacks usage that was played around by some relevant commit. I found out that there's another thing that is asking for a fix (unrelated to the "sack issue" though). This feature has probably very little significance in practice. Opposite direction timeout with bidirectional tcp comes to me as the most likely scenario though there might be other cases as well related to non-data segments we send (e.g., response to the opposite direction segment). Also some ACK losses or option space wasted for other purposes is necessary to prevent the earlier SACK feedback getting to the sender. Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit 7ab18995e11089ea33c99fd586e8bad4932369e4 Author: Arjan van de Ven Date: Sun Sep 28 16:14:52 2008 -0700 mfd: use pci_ioremap_bar() in sm501 Use the newly introduced pci_ioremap_bar() function in drivers/mfd. pci_ioremap_bar() just takes a pci device and a bar number, with the goal of making it really hard to get wrong, while also having a central place to stick sanity checks. Signed-off-by: Arjan van de Ven Signed-off-by: Samuel Ortiz commit e76f7558d89868bc295fe1220c2e5a0a82f698f6 Author: Mark Brown Date: Mon Oct 20 23:58:50 2008 +0200 mfd: Don't store volatile bits in WM8350 register cache This makes the contents of the cache clearer and fixes incorrect initialisation of the cache for partially volatile registers. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 799f9e3267b0938c8059ed78d7e39e00b6aa6bd2 Author: Stephen Rothwell Date: Mon Oct 20 23:55:30 2008 +0200 mfd: don't export wm3850 static functions October 10th linux-next build (powerpc allyesconfig) failed like this: drivers/mfd/wm8350-core.c:1131: error: __ksymtab_wm8350_create_cache causes a section type conflict Caused by commit 89b4012befb1abca5e86d232bc0e2a797b0d9825 ("mfd: Core support for the WM8350 AudioPlus PMIC"). wm8350_create_cache is not used elsewhere, so remove the EXPORT_SYMBOL. Signed-off-by: Stephen Rothwell Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit e9d359471dfed51a1bdeaa484ee7dac0679d0a20 Author: David Brownell Date: Mon Oct 20 23:51:46 2008 +0200 mfd: twl4030-gpio driver This adds basic support for the GPIOs in the twl4030 power management chip. That includes two open drain LED drivers, and the use of GPIO-0 (and GPIO-1) as MMC/SD card detect switches which can control whether the VMMC1 (and VMMC2) regulators are active. This version of the code has a debounce call that will probably be replaced before long, when a more generic interface exists. Signed-off-by: David Brownell Signed-off-by: Tony Lindgren Signed-off-by: Samuel Ortiz commit f96411ab73647ebf9485d77546c0c1f554bafcd7 Author: David Brownell Date: Mon Oct 20 23:50:05 2008 +0200 mfd: rtc-twl4030 driver This adds a driver for the RTC inside the TWL4030 multi-function device. It's a fairly basic RTC, with a wake-capable alarm. Note that many of the pre-release Overo boards now in circulation can't effectively use this RTC, because of a wiring error that puts its TWL chip into "secure" mode. (As in "secure yourself against tampering".) This isn't an issue on other OMAP3 boards now supported in mainline, such as Beagle and Labrador. Signed-off-by: David Brownell Signed-off-by: Tony Lindgren Acked-by: Alessandro Zummo Signed-off-by: Samuel Ortiz commit a30d46c042c8a17ef25de02f439fbd120ab8a8de Author: David Brownell Date: Mon Oct 20 23:46:28 2008 +0200 mfd: twl4030 IRQ handling update - Move it into a separate file; clean and streamline it - Restructure the init code for reuse during secondary dispatch - Support both levels (primary, secondary) of IRQ dispatch - Use a workqueue for irq mask/unmask and trigger configuration Code for two subchips currently share that secondary handler code. One is the power subchip; its IRQs are now handled by this core, courtesy of this patch. The other is the GPIO module, which will be supported through a later patch. There are also minor changes to the header file, mostly related to GPIO support; nothing yet in mainline cares about those. A few references to OMAP-specific symbols are disabled; when they can all be removed, the TWL4030 support ceases being OMAP-specific. Signed-off-by: David Brownell Signed-off-by: Tony Lindgren Signed-off-by: Samuel Ortiz commit 8163bcac779f62c6bf847caed9bce905db0693fb Author: Heiko Carstens Date: Wed Oct 22 10:00:26 2008 -0500 stop_machine: fix error code handling on multiple cpus Using |= for updating a value which might be updated on several cpus concurrently will not always work since we need to make sure that the update happens atomically. To fix this just use a write if the called function returns an error code on a cpu. We end up writing the error code of an arbitrary cpu if multiple ones fail but that should be sufficient. Signed-off-by: Heiko Carstens Signed-off-by: Rusty Russell commit c9583e55fa2b08a230c549bd1e3c0bde6c50d9cc Author: Heiko Carstens Date: Mon Oct 13 23:50:10 2008 +0200 stop_machine: use workqueues instead of kernel threads Convert stop_machine to a workqueue based approach. Instead of using kernel threads for stop_machine we now use a an rt workqueue to synchronize all cpus. This has the advantage that all needed per cpu threads are already created when stop_machine gets called. And therefore a call to stop_machine won't fail anymore. This is needed for s390 which needs a mechanism to synchronize all cpus without allocating any memory. As Rusty pointed out free_module() needs a non-failing stop_machine interface as well. As a side effect the stop_machine code gets simplified. Signed-off-by: Heiko Carstens Signed-off-by: Rusty Russell commit 0d557dc97f4bb501f086a03d0f00b99a7855d794 Author: Heiko Carstens Date: Mon Oct 13 23:50:09 2008 +0200 workqueue: introduce create_rt_workqueue create_rt_workqueue will create a real time prioritized workqueue. This is needed for the conversion of stop_machine to a workqueue based implementation. This patch adds yet another parameter to __create_workqueue_key to tell it that we want an rt workqueue. However it looks like we rather should have something like "int type" instead of singlethread, freezable and rt. Signed-off-by: Heiko Carstens Signed-off-by: Rusty Russell Cc: Ingo Molnar commit a802dd0eb5fc97a50cf1abb1f788a8f6cc5db635 Author: Heiko Carstens Date: Mon Oct 13 23:50:08 2008 +0200 Call init_workqueues before pre smp initcalls. This allows to create workqueues from within the context of a pre smp initcall (aka early_initcall). Signed-off-by: Heiko Carstens Signed-off-by: Rusty Russell commit f44dd164f37336f7e17fabf5740698fd10635172 Author: Rusty Russell Date: Wed Oct 22 10:00:24 2008 -0500 Make panic= and panic_on_oops into core_params This allows them to be examined and set after boot, plus means they actually give errors if they are misused (eg. panic=yes). Signed-off-by: Rusty Russell commit d0ea3d7d286aeda2a9216d76424abc285b87b7b4 Author: Rusty Russell Date: Wed Oct 22 10:00:23 2008 -0500 Make initcall_debug a core_param This is the one I really wanted: now it effects module loading, it makes sense to be able to flip it after boot. Signed-off-by: Rusty Russell Acked-by: Arjan van de Ven commit 67e67ceaac5bf55dbdceb704ff2d763d438b5373 Author: Rusty Russell Date: Wed Oct 22 10:00:23 2008 -0500 core_param() for genuinely core kernel parameters There are a lot of one-liner uses of __setup() in the kernel: they're cumbersome and not queryable (definitely not settable) via /sys. Yet it's ugly to simplify them to module_param(), because by default that inserts a prefix of the module name (usually filename). So, introduce a "core_param". The parameter gets no prefix, but appears in /sys/module/kernel/parameters/ (if non-zero perms arg). I thought about using the name "core", but that's more common than "kernel". And if you create a module called "kernel", you will die a horrible death. Signed-off-by: Rusty Russell commit 9b473de87209fa86eb421b23386693b461612f30 Author: Rusty Russell Date: Wed Oct 22 10:00:22 2008 -0500 param: Fix duplicate module prefixes Instead of insisting each new module_param sysfs entry is unique, handle the case where it already exists (for builtin modules). The current code assumes that all identical prefixes are together in the section: true for normal uses, but not necessarily so if someone overrides MODULE_PARAM_PREFIX. More importantly, it's not true with the new "core_param()" code which uses "kernel" as a prefix. This simplifies the caller for the builtin case, at a slight loss of efficiency (we do the lookup every time to see if the directory exists). Signed-off-by: Rusty Russell Cc: Greg Kroah-Hartman commit 730b69d225259565c705f5f5a11cb1aba69568f1 Author: Rusty Russell Date: Wed Oct 22 10:00:22 2008 -0500 module: check kernel param length at compile time, not runtime The kparam code tries to handle over-length parameter prefixes at runtime. Not only would I bet this has never been tested, it's not clear that truncating names is a good idea either. So let's check at compile time. We need to move the #define to moduleparam.h to do this, though. Signed-off-by: Rusty Russell commit d72b37513cdfbd3f53f3d485a8c403cc96d2c95f Author: Andi Kleen Date: Sat Aug 30 10:09:00 2008 +0200 Remove stop_machine during module load v2 Remove stop_machine during module load v2 module loading currently does a stop_machine on each module load to insert the module into the global module lists. Especially on larger systems this can be quite expensive. It does that to handle concurrent lock lessmodule list readers like kallsyms. I don't think stop_machine() is actually needed to insert something into a list though. There are no concurrent writers because the module mutex is taken. And the RCU list functions know how to insert a node into a list with the right memory ordering so that concurrent readers don't go off into the wood. So remove the stop_machine for the module list insert and just do a list_add_rcu() instead. Module removal will still do a stop_machine of course, it needs that for other reasons. v2: Revised readers based on Paul's comments. All readers that only rely on disabled preemption need to be changed to list_for_each_rcu(). Done that. The others are ok because they have the modules mutex. Also added a possible missing preempt disable for print_modules(). [cc Paul McKenney for review. It's not RCU, but quite similar.] Acked-by: Paul E. McKenney Signed-off-by: Rusty Russell commit 5e458cc0f4770eea45d3c07110f01b3a94c72aa5 Author: Rusty Russell Date: Wed Oct 22 10:00:13 2008 -0500 module: simplify load_module. Linus' recent catch of stack overflow in load_module lead me to look at the code. A couple of helpers to get a section address and get objects from a section can help clean things up a little. (And in case you're wondering, the stack size also dropped from 328 to 284 bytes). Signed-off-by: Rusty Russell commit f6335c43f3d7816ba2e69abce4f29c41f65bb27e Author: Russell King Date: Tue Oct 21 23:29:56 2008 +0100 [ARM] clps711x: add sparsemem definitions Fix the edb7211_defconfig build errors. Signed-off-by: Russell King commit 5d43839ab9988f236cdda1ed073d6916857bc3c5 Author: Kristoffer Ericson Date: Tue Oct 21 19:47:22 2008 +0100 [ARM] 5315/1: Fix section mismatch warning (sa1111) This patch fixes the section mismatch warning from sa1111.o at buildtime. CC arch/arm/common/sa1111.o LD arch/arm/common/built-in.o LD vmlinux.o MODPOST vmlinux.o WARNING: vmlinux.o(.text+0x87f4): Section mismatch in reference from the function sa1111_probe() to the function .devinit.text:sa1110_mb_enable() The function sa1111_probe() references the function __devinit sa1110_mb_enable(). This is often because sa1111_probe lacks a __devinit annotation or the annotation of sa1110_mb_enable is wrong. Signed-off-by: Kristoffer Ericson Signed-off-by: Russell King commit 2bfba3c444fe8b2ab1c38112a89d8f03b61136ca Author: Bartlomiej Zolnierkiewicz Date: Tue Oct 21 20:57:23 2008 +0200 ide: remove useless subdirs from drivers/ide/ Suggested-by: Ralf Baechle Signed-off-by: Bartlomiej Zolnierkiewicz commit c4bd822e7b12a9008241d76db45b665f2fef180c Author: Thomas Gleixner Date: Tue Oct 21 20:17:35 2008 +0200 NOHZ: fix thinko in the timer restart code path commit fb02fbc14d17837b4b7b02dbb36142c16a7bf208 (NOHZ: restart tick device from irq_enter()) solves the problem of stale jiffies when long running softirqs happen in a long idle sleep period, but it has a major thinko in it: When the interrupt which came in _is_ the timer interrupt which should expire ts->sched_timer then we cancel and rearm the timer _before_ it gets expired in hrtimer_interrupt() to the next period. That means the call back function is not called. This game can go on for ever :( Prevent this by making sure to only rearm the timer when the expiry time is more than one tick_period away. Otherwise keep it running as it is either already expired or will expiry at the right point to update jiffies. Signed-off-by: Thomas Gleixner Tested-by: Venkatesch Pallipadi commit b876d08f816527af257e13d89fb0d3b4b849223c Merge: b364776... 2515ddc... Author: David Woodhouse Date: Tue Oct 21 19:42:20 2008 +0100 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: drivers/pci/dmar.c commit 51157b4ab47e1376c2b93cb854b14b637efeaff2 Author: Kiyoshi Ueda Date: Tue Oct 21 17:45:08 2008 +0100 dm: tidy local_init This patch tidies local_init() in preparation for request-based dm. No functional change. Signed-off-by: Kiyoshi Ueda Signed-off-by: Jun'ichi Nomura Signed-off-by: Alasdair G Kergon commit f431d9666fd6e69fbaf305cebc7278d1428950c2 Author: Kiyoshi Ueda Date: Tue Oct 21 17:45:07 2008 +0100 dm: remove unused flush_all This patch removes the DM_WQ_FLUSH_ALL state that is unnecessary. The dm_queue_flush(md, DM_WQ_FLUSH_ALL, NULL) in dm_suspend() is never invoked because: - 'goto flush_and_out' is the same as 'goto out' because the 'goto flush_and_out' is called only when '!noflush' - If r is non-zero, then the code above will invoke 'goto out' and skip this code. No functional change. Signed-off-by: Kiyoshi Ueda Signed-off-by: Jun'ichi Nomura Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon commit 1f965b19437017cea6d3f3f46acdc5acae5fd011 Author: Heinz Mauelshagen Date: Tue Oct 21 17:45:06 2008 +0100 dm raid1: separate region_hash interface part1 Separate the region hash code from raid1 so it can be shared by forthcoming targets. Use BUG_ON() for failed async dm_io() calls. Signed-off-by: Heinz Mauelshagen Signed-off-by: Alasdair G Kergon commit f3e1d26ede3fb15c06904d700f1d7b21bba2215e Author: Martin K. Petersen Date: Tue Oct 21 17:45:04 2008 +0100 dm: mark split bio as cloned When a bio gets split, mark its fragments with the BIO_CLONED flag. Signed-off-by: Martin K. Petersen Signed-off-by: Alasdair G Kergon commit 0a4a1047a445062793d9004bcb0d52756726fdf5 Author: Milan Broz Date: Tue Oct 21 17:45:03 2008 +0100 dm crypt: remove waitqueue Remove waitqueue no longer needed with the async crypto interface. Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon commit 393b47ef23bbcf16890c907d0144b5a8ec4caebf Author: Milan Broz Date: Tue Oct 21 17:45:02 2008 +0100 dm crypt: fix async split When writing io, dm-crypt has to allocate a new cloned bio and encrypt the data into newly-allocated pages attached to this bio. In rare cases, because of hw restrictions (e.g. physical segment limit) or memory pressure, sometimes more than one cloned bio has to be used, each processing a different fragment of the original. Currently there is one waitqueue which waits for one fragment to finish and continues processing the next fragment. But when using asynchronous crypto this doesn't work, because several fragments may be processed asynchronously or in parallel and there is only one crypt context that cannot be shared between the bio fragments. The result may be corruption of the data contained in the encrypted bio. The patch fixes this by allocating new dm_crypt_io structs (with new crypto contexts) and running them independently. The fragments contains a pointer to the base dm_crypt_io struct to handle reference counting, so the base one is properly deallocated after all the fragments are finished. In a low memory situation, this only uses one additional object from the mempool. If the mempool is empty, the next allocation simple waits for previous fragments to complete. Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon commit b635b00e0e159d858486fd899c4021d1d67757e2 Author: Milan Broz Date: Tue Oct 21 17:45:00 2008 +0100 dm crypt: tidy sector Prepare local sector variable (offset) for later patch. Do not update io->sector for still-running I/O. No functional change. Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon commit 586e80e6ee0d137c7d79fbae183bb37bc60ee97e Author: Mikulas Patocka Date: Tue Oct 21 17:44:59 2008 +0100 dm: remove dm header from targets Change #include "dm.h" to #include in all targets. Targets should not need direct access to internal DM structures. Signed-off-by: Mikulas Patocka Signed-off-by: Alasdair G Kergon commit d63a5ce3c0d25c96bdadc78792e5b48b846e899d Author: Mikulas Patocka Date: Tue Oct 21 17:44:57 2008 +0100 dm: publish array_too_big Move array_too_big to include/linux/device-mapper.h because it is used by targets. Remove the test from dm-raid1 as the number of mirror legs is limited such that it can never fail. (Even for stripes it seems rather unlikely.) Signed-off-by: Mikulas Patocka Signed-off-by: Alasdair G Kergon commit 7acedc5b98a2fcff64f00c21110aae7d3ac2f7df Author: Mikulas Patocka Date: Tue Oct 21 17:44:56 2008 +0100 dm exception store: fix misordered writes We must zero the next chunk on disk *before* writing out the current chunk, not after. Otherwise if the machine crashes at the wrong time, the "end of metadata" marker may be missing. Signed-off-by: Mikulas Patocka Signed-off-by: Alasdair G Kergon Cc: stable@kernel.org commit 7c9e6c17325fab380fbe9c9787680ff7d4a51abd Author: Alasdair G Kergon Date: Tue Oct 21 17:44:55 2008 +0100 dm exception store: refactor zero_area Use a separate buffer for writing zeroes to the on-disk snapshot exception store, make the updating of ps->current_area explicit and refactor the code in preparation for the fix in the next patch. No functional change. Signed-off-by: Alasdair G Kergon Signed-off-by: Mikulas Patocka Cc: stable@kernel.org commit f68d4f3d394da5b1f69d855b8513f4256ccc803e Author: Mikulas Patocka Date: Tue Oct 21 17:44:53 2008 +0100 dm snapshot: drop unused last_percent The last_percent field is unused - remove it. (It dates from when events were triggered as each X% filled up.) Signed-off-by: Mikulas Patocka Signed-off-by: Alasdair G Kergon commit 7c5f78b9d7f21937e46c26db82976df4b459c95c Author: Mikulas Patocka Date: Tue Oct 21 17:44:51 2008 +0100 dm snapshot: fix primary_pe race Fix a race condition with primary_pe ref_count handling. put_pending_exception runs under dm_snapshot->lock, it does atomic_dec_and_test on primary_pe->ref_count, and later does atomic_read primary_pe->ref_count. __origin_write does atomic_dec_and_test on primary_pe->ref_count without holding dm_snapshot->lock. This opens the following race condition: Assume two CPUs, CPU1 is executing put_pending_exception (and holding dm_snapshot->lock). CPU2 is executing __origin_write in parallel. primary_pe->ref_count == 2. CPU1: if (primary_pe && atomic_dec_and_test(&primary_pe->ref_count)) origin_bios = bio_list_get(&primary_pe->origin_bios); ... decrements primary_pe->ref_count to 1. Doesn't load origin_bios CPU2: if (first && atomic_dec_and_test(&primary_pe->ref_count)) { flush_bios(bio_list_get(&primary_pe->origin_bios)); free_pending_exception(primary_pe); /* If we got here, pe_queue is necessarily empty. */ return r; } ... decrements primary_pe->ref_count to 0, submits pending bios, frees primary_pe. CPU1: if (!primary_pe || primary_pe != pe) free_pending_exception(pe); ... this has no effect. if (primary_pe && !atomic_read(&primary_pe->ref_count)) free_pending_exception(primary_pe); ... sees ref_count == 0 (written by CPU 2), does double free !! This bug can happen only if someone is simultaneously writing to both the origin and the snapshot. If someone is writing only to the origin, __origin_write will submit kcopyd request after it decrements primary_pe->ref_count (so it can't happen that the finished copy races with primary_pe->ref_count decrementation). If someone is writing only to the snapshot, __origin_write isn't invoked at all and the race can't happen. The race happens when someone writes to the snapshot --- this creates pending_exception with primary_pe == NULL and starts copying. Then, someone writes to the same chunk in the snapshot, and __origin_write races with termination of already submitted request in pending_complete (that calls put_pending_exception). This race may be reason for bugs: http://bugzilla.kernel.org/show_bug.cgi?id=11636 https://bugzilla.redhat.com/show_bug.cgi?id=465825 The patch fixes the code to make sure that: 1. If atomic_dec_and_test(&primary_pe->ref_count) returns false, the process must no longer dereference primary_pe (because someone else may free it under us). 2. If atomic_dec_and_test(&primary_pe->ref_count) returns true, the process is responsible for freeing primary_pe. Signed-off-by: Mikulas Patocka Signed-off-by: Alasdair G Kergon Cc: stable@kernel.org commit b673c3a8192e28f13e2050a4b82c1986be92cc15 Author: Kazuo Ito Date: Tue Oct 21 17:44:50 2008 +0100 dm kcopyd: avoid queue shuffle Write throughput to LVM snapshot origin volume is an order of magnitude slower than those to LV without snapshots or snapshot target volumes, especially in the case of sequential writes with O_SYNC on. The following patch originally written by Kevin Jamieson and Jan Blunck and slightly modified for the current RCs by myself tries to improve the performance by modifying the behaviour of kcopyd, so that it pushes back an I/O job to the head of the job queue instead of the tail as process_jobs() currently does when it has to wait for free pages. This way, write requests aren't shuffled to cause extra seeks. I tested the patch against 2.6.27-rc5 and got the following results. The test is a dd command writing to snapshot origin followed by fsync to the file just created/updated. A couple of filesystem benchmarks gave me similar results in case of sequential writes, while random writes didn't suffer much. dd if=/dev/zero of= bs=4096 count=... [conv=notrunc when updating] 1) linux 2.6.27-rc5 without the patch, write to snapshot origin, average throughput (MB/s) 10M 100M 1000M create,dd 511.46 610.72 11.81 create,dd+fsync 7.10 6.77 8.13 update,dd 431.63 917.41 12.75 update,dd+fsync 7.79 7.43 8.12 compared with write throughput to LV without any snapshots, all dd+fsync and 1000 MiB writes perform very poorly. 10M 100M 1000M create,dd 555.03 608.98 123.29 create,dd+fsync 114.27 72.78 76.65 update,dd 152.34 1267.27 124.04 update,dd+fsync 130.56 77.81 77.84 2) linux 2.6.27-rc5 with the patch, write to snapshot origin, average throughput (MB/s) 10M 100M 1000M create,dd 537.06 589.44 46.21 create,dd+fsync 31.63 29.19 29.23 update,dd 487.59 897.65 37.76 update,dd+fsync 34.12 30.07 26.85 Although still not on par with plain LV performance - cannot be avoided because it's copy on write anyway - this simple patch successfully improves throughtput of dd+fsync while not affecting the rest. Signed-off-by: Jan Blunck Signed-off-by: Kazuo Ito Signed-off-by: Alasdair G Kergon Cc: stable@kernel.org commit becd43056c8f65e3b8510b1a8a0940683ee185a2 Author: Darron Broad Date: Tue Oct 21 11:47:50 2008 -0300 V4L/DVB (9336): cx88: always de-alloc frontends on fault condition De-alloc frontends on fault condition. Signed-off-by: Darron Broad Signed-off-by: Mauro Carvalho Chehab commit 878595f6e7225c996523965b61ce3fe29addca9d Author: Darron Broad Date: Tue Oct 21 11:28:46 2008 -0300 V4L/DVB (9335): videobuf: split unregister bus creating self-contained frontend de-allocator This creates a self contained frontend de-allocator for the instances where an adapter has not been registered yet frontend de-allocation may be required. Signed-off-by: Darron Broad Signed-off-by: Mauro Carvalho Chehab commit 0fcd488d8d90d2332f9ff463929ec4b7676102b6 Author: Darron Broad Date: Tue Oct 21 11:18:47 2008 -0300 V4L/DVB (9334): cx88: dvb_remove debug output Add debug output for dvb_remove enter. Signed-off-by: Darron Broad Signed-off-by: Mauro Carvalho Chehab commit 3007703db804b7e6e9f5e3cca9e3a661e0ff3eb2 Author: Mauro Carvalho Chehab Date: Tue Oct 21 10:43:10 2008 -0300 V4L/DVB (9333): cx88: Not all boards that requires cx88-mpeg has frontends The multifrontend changes on cx88 assumed that all boards that use cx88-mpeg supports DVB. This is not true. There also a few analog-only boards based on Blackboard design that also uses cx88-mpeg. For those boards, there's no need to allocate dvb frontends. This patch fixes videobuf allocation for those devices. Signed-off-by: Mauro Carvalho Chehab commit 9212a572dd5ecc69f9b9985ba3e92c6f2504f0fc Author: Darron Broad Date: Tue Oct 21 10:42:00 2008 -0300 V4L/DVB (9332): cx88: initial fix for analogue only compilation Initial fix for when analogue only is selected for compilation (ie, !CX88_DVB) Signed-off-by: Darron Broad Signed-off-by: Mauro Carvalho Chehab commit 8a522c916d3c3b29a38bd3c8fc3df826d22a9444 Author: Mauro Carvalho Chehab Date: Tue Oct 21 11:58:39 2008 -0300 V4L/DVB (9331): Remove unused inode parameter from video_ioctl2 inode is never used on video_ioctl2. Remove it and rename the function to __video_ioctl2. This allows its usage directly as a callback at fops.unlocked_ioctl. Since we still need a callback with inode to be used with fops.ioctl, this patch adds video_ioctl2() that is just a call to __video_ioctl2(). Also, this patch adds some comments about video_ioctl2 and __video_ioctl2 usage at v4l2-ioctl.h. Signed-off-by: Mauro Carvalho Chehab commit b1f88407f3767f924cae1d521e815e568996a4ef Author: Mauro Carvalho Chehab Date: Tue Oct 21 11:27:20 2008 -0300 V4L/DVB (9330): Get rid of inode parameter at v4l_compat_translate_ioctl() The inode parameter at v4l_compat_translate_ioctl() were just passed over several places just to keep compatible with fops.ioctl. However, it weren't used anywere. This patch gets hid of this unused parameter. Cc: Laurent Pinchart Cc: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 4e7ca40dbff522691b13dd9b5ed41891e6c68e1a Author: Ian Armstrong Date: Sun Oct 19 18:58:26 2008 -0300 V4L/DVB (9328): ivtvfb: FB_BLANK_POWERDOWN turns off video output When using FBIOBLANK, FB_BLANK_POWERDOWN will now switch off the video output. Since some televisions turn themselves off after a while with no signal, this is the closest we can get to power-saving. Signed-off-by: Ian Armstrong Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit c6330fb86fd0fed98b7e0d5792881a77b778fefc Author: Hans Verkuil Date: Sun Oct 19 18:54:26 2008 -0300 V4L/DVB (9327): v4l: use video_device.num instead of minor in video%d The kernel number of a v4l2 node (e.g. videoX, radioX or vbiX) is now independent of the minor number. So instead of using the minor field of the video_device struct one has to use the num field: this always contains the kernel number of the device node. I forgot about this when I did the v4l2 core change, so this patch converts all drivers that use it in one go. Luckily the change is trivial. Cc: michael@mihu.de Cc: mchehab@infradead.org Cc: corbet@lwn.net Cc: luca.risolia@studio.unibo.it Cc: isely@pobox.com Cc: pe1rxq@amsat.org Cc: royale@zerezo.com Cc: mkrufky@linuxtv.org Cc: stoth@linuxtv.org Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 323a491a29d0bb1e91263ca347cb42c4de28adfc Author: Martin Dauskardt Date: Sat Oct 18 14:59:09 2008 -0300 V4L/DVB (9326): ivtv: avoid green flashing when loading ivtv When loading ivtv the TV-out of the PVR-350 will flash green since the saa712x is activated before the MPEG decoder has been initialized. Deactivate the saa712x until the MPEG decoder has been initialized. Signed-off-by: Martin Dauskardt Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 09882f0044b7cf6e506c82a5182ad768ebb660f2 Author: Hans Verkuil Date: Sat Oct 18 13:42:24 2008 -0300 V4L/DVB (9325): ivtv: switch to unlocked_ioctl. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit d5fbf32f381ad841d9d9537aa1b6f74796703361 Author: Hans Verkuil Date: Sat Oct 18 13:39:53 2008 -0300 V4L/DVB (9324): v4l2: add video_ioctl2_unlocked for unlocked_ioctl support. Based on an older patch from Sakari Ailus. Cc: Sakari Ailus Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit f496bc716613378f2a3f9097a8e3ea4e4e30e79d Author: Sakari Ailus Date: Sat Oct 18 12:29:15 2008 -0300 V4L/DVB (9323): v4l2-int-if: Add enum_framesizes and enum_frameintervals ioctls. Signed-off-by: Sakari Ailus Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 36499e525f6d2c0aba7c7f619d7a6081c56707ca Author: Sakari Ailus Date: Sat Oct 18 12:28:36 2008 -0300 V4L/DVB (9322): v4l2-int-if: Export more interfaces to modules Export v4l2_int_device_try_attach_all. This allows initiating the initialisation of int if device after the drivers have been registered. Also allow drivers to call ioctls if v4l2-int-if was compiled as module. Signed-off-by: Sakari Ailus Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 84389910d0f760cea22a5e58ee16b3b9713d456d Author: Sakari Ailus Date: Sat Oct 18 12:27:50 2008 -0300 V4L/DVB (9321): v4l2-int-if: Define new power state changes Use enum v4l2_power instead of int as second argument to vidioc_int_s_power. The new functionality is that standby state is also recognised. Signed-off-by: Sakari Ailus Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 733d710b09748a79f70cbb58547d036d28ec566e Author: Sergio Aguirre Date: Sat Oct 18 12:26:47 2008 -0300 V4L/DVB (9320): v4l2: Add 10-bit RAW Bayer formats Add 10-bit raw bayer format expanded to 16 bits. Adds also definition for 10-bit raw bayer format dpcm-compressed to 8 bits. Signed-off-by: Sergio Aguirre Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 621a3739f3b8c7427a789d3b2fe86a80ff234225 Author: Sameer Venkatraman Date: Sat Oct 18 12:25:28 2008 -0300 V4L/DVB (9319): v4l2-int-if: Add cropcap, g_crop and s_crop commands. Signed-off-by: Sameer Venkatraman Signed-off-by: Mohit Jalori Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 96014a957c7a39392315ce117466549d69eb63b2 Author: Sakari Ailus Date: Sat Oct 18 12:23:45 2008 -0300 V4L/DVB (9318): v4l2-int-if: Add command to get slave private data. vidioc_int_g_priv is used to get master's slave-related private data structure. The structure can contain for example master's configuration specific to slave. Signed-off-by: Sakari Ailus Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 11fc9a4a440112b5afc1a99d86ba92d70205a688 Author: Devin Heitmueller Date: Mon Oct 20 10:33:22 2008 -0300 V4L/DVB (9316): s5h1411: Power down s5h1411 when not in use Power down the s5h1411 demodulator when not in use (on the Pinnacle 801e, this brings idle power from 123ma down to 84ma). Signed-off-by: Devin Heitmueller Acked-by: Steven Toth Signed-off-by: Mauro Carvalho Chehab commit 50eac6bc466f69e1ecb3a1b64346ed7b979547ac Author: Devin Heitmueller Date: Mon Oct 20 10:19:07 2008 -0300 V4L/DVB (9315): s5h1411: Skip reconfiguring demod modulation if already at the desired modulation If we are already at the desired modulation, there is no need to reconfigure the demod (at a tuning time cost) Note that this change revealed that although the datasheet says the demod starts out in VSB-8 mode, the first tuning was failing consistently unless we went through the work of setting the registers. So add a field to denote this case so we always do the enable_frontend call, even if the first tuning request is for VSB-8. Signed-off-by: Devin Heitmueller Reviewed-by: Michael Krufky Acked-by: Steven Toth Signed-off-by: Mauro Carvalho Chehab commit f0d041e50bc6c8a677922d72b010f80af9b23b18 Author: Devin Heitmueller Date: Mon Oct 20 10:17:08 2008 -0300 V4L/DVB (9314): s5h1411: Perform s5h1411 soft reset after tuning If you instruct the tuner to change frequencies, it can take up to 2500ms to get a demod lock. By performing a soft reset after the tuning call (which is consistent with how the Pinnacle 801e Windows driver behaves), you get a demod lock inside of 300ms Signed-off-by: Devin Heitmueller Reviewed-by: Michael Krufky Acked-by: Steven Toth Signed-off-by: Mauro Carvalho Chehab commit 1874c443280d61bef1466a30c1e2819656d54eea Author: Steven Toth Date: Sat Oct 18 11:19:31 2008 -0300 V4L/DVB (9313): s5h1411: Add the #define for an existing supporting I/F s5h1411: Add the #define for an existing supporting I/F Signed-off-by: Steven Toth Signed-off-by: Mauro Carvalho Chehab commit 5bd47311fe8965980469b45904fefd9afe6ca5b3 Author: Steven Toth Date: Thu Oct 16 23:26:05 2008 -0300 V4L/DVB (9312): s5h1411: Remove meaningless code s5h1411: Remove meaningless code Signed-off-by: Steven Toth Signed-off-by: Mauro Carvalho Chehab commit 1af46b450fa49c57d73764d66f267335ccd807e2 Author: Steven Toth Date: Thu Oct 16 23:18:49 2008 -0300 V4L/DVB (9311): s5h1411: bugfix: Setting serial or parallel mode could destroy bits Adding a serialmode function to read/and/or/write the register for safety. Signed-off-by: Steven Toth Signed-off-by: Mauro Carvalho Chehab commit e16c63de928f00075f0ea466581e04b44bb33f75 Author: Steven Toth Date: Thu Oct 16 23:17:42 2008 -0300 V4L/DVB (9310): s5h1411: read_status() locking detection fixes. This includes new bit definitions for previously unknown bits. Signed-off-by: Steven Toth Signed-off-by: Mauro Carvalho Chehab commit c96de5197d038cd1c5538085109c7329434ee94b Author: Steven Toth Date: Thu Oct 16 23:16:50 2008 -0300 V4L/DVB (9309): s5h1411: I/F related bugfix for 3.25 and remove spurious define This should improve performance. Signed-off-by: Steven Toth Signed-off-by: Mauro Carvalho Chehab commit f4ef033ee03b36ba1b1d39007d740f2786a93f2b Author: Steven Toth Date: Thu Oct 16 23:15:10 2008 -0300 V4L/DVB (9308): s5h1411: Improvements to the default registers s5h1411: Improvements to the default registers Signed-off-by: Steven Toth Signed-off-by: Mauro Carvalho Chehab commit b9f3573731e63116712eb5ea28bd6ded09232afa Author: Alexey Klimov Date: Mon Oct 20 00:00:03 2008 -0300 V4L/DVB (9306): dsbr100: Add frequency check Add checking for frequency and printk if -1 returned. Signed-off-by: Alexey Klimov Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab commit 0fabb78332aee7d5dd4a0a31228b9266de71182f Author: Alexey Klimov Date: Sun Oct 19 23:56:23 2008 -0300 V4L/DVB (9305): radio-mr800: Add BKL for usb_amradio_open() Added BKL for usb_amradio_open() Signed-off-by: Alexey Klimov Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab commit 223377e76d68c8015f1c809d3c831423de7b1fb6 Author: Alexey Klimov Date: Sun Oct 19 23:50:27 2008 -0300 V4L/DVB (9304): dsbr100: CodingStyle issue Fixed few coding style issues in dsbr100 Signed-off-by: Alexey Klimov Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab commit 448441cf2f97da478c51852fac153ae6bb3430d8 Author: Alexey Klimov Date: Sun Oct 19 23:20:47 2008 -0300 V4L/DVB (9303): dsbr100: Correct bus_info string Replaced bus_info string from ISA to USB Signed-off-by: Alexey Klimov Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab commit 3f93d1adca658201c64251c43a147cc79d468c3f Author: Boris Dores Date: Sun Oct 19 17:00:30 2008 -0300 V4L/DVB (9301): pvrusb2: Keep MPEG PTSs from drifting away (Mike Isely) This change was empirically figured out by Boris Dores after empirically comparing against behavior in the Windows driver. Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit c82732a42896364296599b0f73f01c5e3fd781ae Author: Mike Isely Date: Sun Oct 19 16:26:05 2008 -0300 V4L/DVB (9300): pvrusb2: Fix deadlock problem Fix deadlock problem in 2.6.27 caused by new USB core behavior in response to a USB device reset request. With older kernels, the USB device reset was "in line"; the reset simply took place and the driver retained its association with the hardware. However now this reset triggers a disconnect, and worse still the disconnect callback happens in the context of the caller who asked for the device reset. This results in an attempt by the pvrusb2 driver to recursively take a mutex it already has, which deadlocks the driver's worker thread. (Even if the disconnect callback were to happen on a different thread we'd still have problems however - because while the driver should survive and correctly disconnect / reconnect, it will then trigger another device reset during the repeated initialization, which will then cause another disconect, etc, forever.) The fix here is simply to not attempt the device reset (it was of marginal value anyway). Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 9b4a7c8a83899ef7742f63c0e9a8a28cbff2c29a Author: Andy Walls Date: Sat Oct 18 10:20:25 2008 -0300 V4L/DVB (9299): cx18: Don't mask many real init error codes by mapping them to ENOMEM Changes to let error return codes bubble up to the user visible error message on card initialization. A number of them were being remapped to ENOMEM when no memory or array resource shortage existed. That hampered diagnosis of user trouble reports. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 06869713de3e6380b2f24d9eac30426b4e471375 Author: Andy Walls Date: Sat Oct 18 09:00:26 2008 -0300 V4L/DVB (9298): cx18: Add __iomem address space qualifier to cx18_log_*_retries() argument cx18: Add __iomem address space qualifier to cx18_log_*_retries() addr argument to clean up sparse build warnings. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit ff086575b7fbfcf48c1e2bc6f8914cbfc2c4ea37 Author: Andy Walls Date: Sat Oct 18 08:51:28 2008 -0300 V4L/DVB (9297): cx18: Fix memory leak on card initialization failure On error exit, the cx18_probe() function did not use the proper entry in cx18_cards[] with kfree() when card init failed; leaking memory. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 0025427eee4b5c005b4ac7a6489adc773e38611d Author: Chris Zankel Date: Tue Oct 21 09:11:43 2008 -0700 xtensa: Add config files for Diamond 232L - Rev B processor variant The Diamond 232L processor is a pre-configured Xtensa processor tailored for Linux application. Signed-off-by: Chris Zankel commit 00c81d23d330207d0fb99ca0c6682265d287816c Author: Chris Zankel Date: Tue Oct 21 09:08:31 2008 -0700 xtensa: Fix io regions The uncached area starts at e000.0000 and spans 1GB. Also add an IOADDR macro to determine the bypass region to access the IO space. Signed-off-by: Chris Zankel commit 863b45180ef541a1990e4986d30fb7a93022a733 Author: Takashi Iwai Date: Tue Oct 21 17:01:47 2008 +0200 ALSA: hda - Fix conflicting volume controls on ALC260 ALC260 auto-parsing mode may create multiple controls for the same volume widget (0x08 and 0x09) depending on the pin. For example, Front and Headphone volumes may control the same volume, just the latter one wins. This patch adds a proper check of the existing of the volume control and avoid the doulbed creation of the same volume controls. Signed-off-by: Takashi Iwai commit 74f2a5f0ef643b7b277f7a270f85573f88d930d1 Author: Chris Zankel Date: Mon May 5 23:36:35 2008 -0700 xtensa: Add support for the Sonic Ethernet device for the XT2000 board. Add support for the on-board Sonic Ethernet device for the XT2000 evaluation board. Signed-off-by: Chris Zankel commit 175854be81dc42b70591760c193113e4898b3e6f Author: Mariusz Kozlowski Date: Sat Oct 18 14:56:43 2008 +0200 [ARM] pxa/spitz: fix unbalance parenthesis in header file spitz.h Hello, Introduced by: commit fff147208b48680cb7b627a144113a6585828a0e Author: Eric Miao Date: Fri Sep 5 22:15:23 2008 +0800 Signed-off-by: Mariusz Kozlowski Signed-off-by: Eric Miao commit 737fd10618a424370a5374bf1ba3df4134dbe35d Author: Eric Miao Date: Mon Oct 20 10:35:19 2008 +0800 [ARM] pxa: update {corgi,spitz}_defconfig to favor SPI-based drivers Recent changes have been made to use the generic SPI-based ads7846 touch screen driver and a generic SPI-based corgi-type LCD/backlight driver. Update the {corgi,spitz}_defconfig to favor the use of these drivers instead of the legacy ones. Signed-off-by: Eric Miao commit a364bc0b37f14ffd66c1f982af42990a9d77fa43 Author: Jeff Layton Date: Tue Oct 21 14:42:13 2008 +0000 [CIFS] fix saving of resume key before CIFSFindNext We recently fixed the cifs readdir code so that it saves the resume key before calling CIFSFindNext. Unfortunately, this assumes that we have just done a CIFSFindFirst (or FindNext) and have resume info to save. This isn't necessarily the case. Fix the code to save resume info if we had to reinitiate the search, and after a FindNext. This fixes connectathon basic test6 against NetApp filers. Signed-off-by: Jeff Layton CC: Stable Signed-off-by: Steve French commit 5f86515158ca86182c1dbecd546f1848121ba135 Author: Lai Jiangshan Date: Fri Oct 17 14:40:30 2008 +0800 rcupdate: fix bug of rcu_barrier*() current rcu_barrier_bh() is like this: void rcu_barrier_bh(void) { BUG_ON(in_interrupt()); /* Take cpucontrol mutex to protect against CPU hotplug */ mutex_lock(&rcu_barrier_mutex); init_completion(&rcu_barrier_completion); atomic_set(&rcu_barrier_cpu_count, 0); /* * The queueing of callbacks in all CPUs must be atomic with * respect to RCU, otherwise one CPU may queue a callback, * wait for a grace period, decrement barrier count and call * complete(), while other CPUs have not yet queued anything. * So, we need to make sure that grace periods cannot complete * until all the callbacks are queued. */ rcu_read_lock(); on_each_cpu(rcu_barrier_func, (void *)RCU_BARRIER_BH, 1); rcu_read_unlock(); wait_for_completion(&rcu_barrier_completion); mutex_unlock(&rcu_barrier_mutex); } The inconsistency of the code and the comments show a bug here. rcu_read_lock() cannot make sure that "grace periods for RCU_BH cannot complete until all the callbacks are queued". it only make sure that race periods for RCU cannot complete until all the callbacks are queued. so we must use rcu_read_lock_bh() for rcu_barrier_bh(). like this: void rcu_barrier_bh(void) { ...... rcu_read_lock_bh(); on_each_cpu(rcu_barrier_func, (void *)RCU_BARRIER_BH, 1); rcu_read_unlock_bh(); ...... } and also rcu_barrier() rcu_barrier_sched() are implemented like this. it will bring a lot of duplicate code. My patch uses another way to fix this bug, please see the comment of my patch. Thank Paul E. McKenney for he rewrote the comment. Signed-off-by: Lai Jiangshan Reviewed-by: Paul E. McKenney Signed-off-by: Ingo Molnar commit b6f3b7803a9231eddc36d0a2a6d2d8105ef89344 Author: Dean Nelson Date: Sat Oct 18 16:06:56 2008 -0700 genirq: NULL struct irq_desc's member 'name' in dynamic_irq_cleanup() If the member 'name' of the irq_desc structure happens to point to a character string that is resident within a kernel module, problems ensue if that module is rmmod'd (at which time dynamic_irq_cleanup() is called) and then later show_interrupts() is called by someone. It is also not a good thing if the character string resided in kmalloc'd space that has been kfree'd (after having called dynamic_irq_cleanup()). dynamic_irq_cleanup() fails to NULL the 'name' member and show_interrupts() references it on a few architectures (like h8300, sh and x86). Signed-off-by: Dean Nelson Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Ingo Molnar commit e9f95e637320efe1936b647308ddf4ec5b8e0311 Author: Ingo Molnar Date: Tue Oct 21 15:49:59 2008 +0200 genirq: fix off by one and coding style Fix off-by-one in for_each_irq_desc_reverse(). Impact is near zero in practice, because nothing substantial wants to iterate down to IRQ#0 - but fix it nevertheless. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit ed0b2ef55a393b96211e209f26544f2f180b0fe8 Author: Magnus Damm Date: Tue Oct 21 21:31:07 2008 +0900 sh: Update gpio_set_value() pin value handling This patch updates the pinmux code to use the boolean value for the function gpio_set_value(). Without this patch values other than 0 and 1 will result in incorrect GPIO settings. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 3b495513a2a033d401eba213327c1525d863eb9b Author: Magnus Damm Date: Tue Oct 21 21:29:03 2008 +0900 sh: update ov772x byte order on Migo-R Update the ov772x byte sequence to enable byte swap. This to reflect the recent CEU driver change to follow incoming byte order. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 56b26add02b4bdea81d5e0ebda60db1fe3311ad4 Author: Al Viro Date: Fri Sep 19 03:17:36 2008 -0400 [PATCH] kill the rest of struct file propagation in block ioctls Now we can switch blkdev_ioctl() block_device/mode Signed-off-by: Al Viro commit 6af3a56e1dd4d95836a47214e5c60d5b749a5501 Author: Al Viro Date: Fri Sep 19 03:08:13 2008 -0400 [PATCH] get rid of struct file use in blkdev_ioctl() BLKBSZSET We need to do bd_claim() only if file hadn't been opened with O_EXCL and then we have no need to use file itself as owner. Signed-off-by: Al Viro commit 45048d0961cdbf7ddfba906797ad8cb42489e070 Author: Al Viro Date: Thu Sep 18 15:53:24 2008 -0400 [PATCH] get rid of blkdev_locked_ioctl() Most of that stuff doesn't need BKL at all; expand in the (only) caller, merge the switch into one there and leave BKL only around the stuff that might actually need it. Signed-off-by: Al Viro commit e436fdae70a31102d2be32969b80fe8545edebd9 Author: Al Viro Date: Thu Sep 18 03:38:12 2008 -0400 [PATCH] get rid of blkdev_driver_ioctl() convert remaining callers to __blkdev_driver_ioctl() Signed-off-by: Al Viro commit 572c48921574dbe6dceb958cf965aa962baefde4 Author: Al Viro Date: Mon Oct 8 13:24:05 2007 -0400 [PATCH] sanitize blkdev_get() and friends * get rid of fake struct file/struct dentry in __blkdev_get() * merge __blkdev_get() and do_open() * get rid of flags argument of blkdev_get() Signed-off-by: Al Viro commit e5eb8caa83a76191feb9705c1a0a689ca260b91e Author: Al Viro Date: Mon Oct 8 13:24:05 2007 -0400 [PATCH] remember mode of reiserfs journal Signed-off-by: Al Viro commit c2dd0dae185423fb243b13d490c3fcfaa18ff333 Author: Al Viro Date: Mon Oct 8 13:21:10 2007 -0400 [PATCH] propagate mode through swsusp_close() Signed-off-by: Al Viro commit 30c40d2c01f68c7eb1a41ab3552bdaf5dbf300d4 Author: Al Viro Date: Fri Feb 22 19:50:45 2008 -0500 [PATCH] propagate mode through open_bdev_excl/close_bdev_excl replace open_bdev_excl/close_bdev_excl with variants taking fmode_t. superblock gets the value used to mount it stored in sb->s_mode Signed-off-by: Al Viro commit 9a1c3542768b5a58e45a9216921cd10a3bae1205 Author: Al Viro Date: Fri Feb 22 20:40:24 2008 -0500 [PATCH] pass fmode_t to blkdev_put() Signed-off-by: Al Viro commit 511de73ff09034fb89c8d54bed201a10d057328c Author: Al Viro Date: Mon Oct 8 12:10:13 2007 -0400 [PATCH] kill the unused bsize on the send side of /dev/loop Signed-off-by: Al Viro commit 33c2dca4957bd0da3e1af7b96d0758d97e708ef6 Author: Al Viro Date: Fri Feb 22 22:02:50 2008 -0500 [PATCH] trim file propagation in block/compat_ioctl.c ... and remove the handling of cases when it falls back to native without changing arguments. Signed-off-by: Al Viro commit 90b8f2824ce68dd87d304641a1d5a048dfff39f5 Author: Al Viro Date: Sun Mar 2 10:43:36 2008 -0500 [PATCH] end of methods switch: remove the old ones Signed-off-by: Al Viro commit 40cc51be699e37b78102ce7b2196ec9c32fe1908 Author: Al Viro Date: Sun Mar 2 10:41:28 2008 -0500 [PATCH] switch sr Signed-off-by: Al Viro commit 0338e29178795f0df0e1f3705b5d3effe9c95ff7 Author: Al Viro Date: Sun Mar 2 10:41:04 2008 -0500 [PATCH] switch sd Signed-off-by: Al Viro commit 3e3c9c6f3d31ac6eca7ec59f28f3cbc2ee45ff6e Author: Al Viro Date: Sun Mar 2 10:40:39 2008 -0500 [PATCH] switch ide-scsi Signed-off-by: Al Viro commit 4e999af9b25d30461ae54debce92803f1b064383 Author: Al Viro Date: Sun Mar 2 10:39:59 2008 -0500 [PATCH] switch tape_block Signed-off-by: Al Viro commit 46d74326e660b2878005d222fb3efbc4eaa1ea4a Author: Al Viro Date: Sun Mar 2 10:37:41 2008 -0500 [PATCH] switch dcssblk Signed-off-by: Al Viro commit 57a7c0bca009059d1d85bec608af70aa6c5f344c Author: Al Viro Date: Sun Mar 2 10:36:08 2008 -0500 [PATCH] switch dasd ->compat_ioctl() actually had been useless here; generic logics works fine. Signed-off-by: Al Viro commit af0e2a0a87a7daeff9b77d82376c98fc6de3443f Author: Al Viro Date: Sun Mar 2 10:35:06 2008 -0500 [PATCH] switch mtd_blkdevs Signed-off-by: Al Viro commit a5a1561f88fe8bfd7fdceed1d942ad494500b8a9 Author: Al Viro Date: Sun Mar 2 10:33:30 2008 -0500 [PATCH] switch mmc Signed-off-by: Al Viro commit f3f6015bff7a15671bcadfac7215eb33a2bccc9d Author: Al Viro Date: Sun Mar 2 10:33:08 2008 -0500 [PATCH] switch i2o Signed-off-by: Al Viro commit 5d9a54b66584bdae90e88198ce763702545a68e7 Author: Al Viro Date: Sun Mar 2 10:31:38 2008 -0500 [PATCH] switch memstick Signed-off-by: Al Viro commit a39907fa2fdb73d3c0fb06eff06d855c3298d707 Author: Al Viro Date: Sun Mar 2 10:31:15 2008 -0500 [PATCH] switch md Signed-off-by: Al Viro commit fe5f9f2cd57c2ce56f36c66e87a10d4b7a158505 Author: Al Viro Date: Sun Mar 2 10:29:31 2008 -0500 [PATCH] switch dm ioctl() doesn't need BKL here Signed-off-by: Al Viro commit a4600f81393d685043fe2d485cf2b123301f467d Author: Al Viro Date: Sun Mar 2 10:27:58 2008 -0500 [PATCH] switch ide-tape Signed-off-by: Al Viro commit b2f21e057dfbaa12acca1e79d9aeb3d9169d2e2e Author: Al Viro Date: Thu Oct 16 10:34:00 2008 -0400 [PATCH] switch ide-gd Signed-off-by: Al Viro commit 488ca606f1277ae183c9c6a328adaecae54e1930 Author: Al Viro Date: Sun Mar 2 10:26:23 2008 -0500 [PATCH] switch ide-cd Signed-off-by: Al Viro commit 4e379ae6a6b6c7b0c4274476af807ffffe42534f Author: Al Viro Date: Sun Mar 2 10:25:44 2008 -0500 [PATCH] switch viocd Signed-off-by: Al Viro commit 8389feb4a8b9c29836c320e51677bd4650713fa8 Author: Al Viro Date: Sun Mar 2 10:25:18 2008 -0500 [PATCH] switch gdrom Signed-off-by: Al Viro commit ab746cb9386313201f2e0060e85a30781047dee1 Author: Al Viro Date: Sun Mar 2 10:24:45 2008 -0500 [PATCH] switch z2ram Signed-off-by: Al Viro commit f3f68b367389bcbe1823e6e775f4ec32d7d69b40 Author: Al Viro Date: Sun Mar 2 10:24:18 2008 -0500 [PATCH] switch xyspace Signed-off-by: Al Viro commit a63c848b04052acac653d6164160488d6c52ff9e Author: Al Viro Date: Sun Mar 2 10:23:47 2008 -0500 [PATCH] switch xen Signed-off-by: Al Viro commit 961846ca5aae2f39d061e057ae6ad0b54b134008 Author: Al Viro Date: Sun Mar 2 10:23:12 2008 -0500 [PATCH] switch xd Signed-off-by: Al Viro commit 4e1098529816994fc1513050cd52bbe6e0dbf2cc Author: Al Viro Date: Sun Mar 2 10:22:33 2008 -0500 [PATCH] switch virtio_blk Signed-off-by: Al Viro commit f115a14ae43242b485ed5995a0746e6db59951f2 Author: Al Viro Date: Sun Mar 2 10:22:07 2008 -0500 [PATCH] switch viodasd Signed-off-by: Al Viro commit 4099a96693ab58a95b3ecf19704973cd0f1bdf9d Author: Al Viro Date: Sun Mar 2 10:21:43 2008 -0500 [PATCH] switch ub Signed-off-by: Al Viro commit b4d9a4425bde774ab30f0f43da60bb4ed3508903 Author: Al Viro Date: Sun Mar 2 10:20:44 2008 -0500 [PATCH] switch swim3 Signed-off-by: Al Viro commit 5e5e007c25009c304af693b7fc49bab8d1d25801 Author: Al Viro Date: Sun Mar 2 10:15:10 2008 -0500 [PATCH] switch pktdvdcd Signed-off-by: Al Viro commit 8cfc7ca40c41e6cb9ee96c149d5b928564d635e4 Author: Al Viro Date: Sun Mar 2 09:36:16 2008 -0500 [PATCH] switch pf Signed-off-by: Al Viro commit b6a895307a6a8d8c294c57d319ec05286d181dac Author: Al Viro Date: Sun Mar 2 09:35:54 2008 -0500 [PATCH] switch pd Signed-off-by: Al Viro commit c9acf903e0312dcac3a135c37303adc15e6162a9 Author: Al Viro Date: Sun Mar 2 09:35:06 2008 -0500 [PATCH] switch pcd Signed-off-by: Al Viro commit a8cdc308c0ca3809e37e2be62174906a45b92670 Author: Al Viro Date: Sun Mar 2 09:33:33 2008 -0500 [PATCH] switch nbd NB: nbd_ioctl() appears to be racy; BKL is held, but doesn't really help, AFAICS. Left as-is for now, but it'll need fixing. Signed-off-by: Al Viro commit bb21488482bd36eae6b30b014d93619063773fd4 Author: Al Viro Date: Sun Mar 2 09:29:48 2008 -0500 [PATCH] switch loop ioctl doesn't need BKL here Signed-off-by: Al Viro commit a4af9b48cb480f5016947bbd3f396c265c7cb368 Author: Al Viro Date: Sun Mar 2 09:27:55 2008 -0500 [PATCH] switch floppy Signed-off-by: Al Viro commit 47844fadb5050a6fb90924e73eb2dea1afd7fe33 Author: Al Viro Date: Sun Mar 2 09:27:11 2008 -0500 [PATCH] switch cpqarray Signed-off-by: Al Viro commit ef7822c2fbbb004e30e1fb6f79d6f8a1a1a144d7 Author: Al Viro Date: Sun Mar 2 09:26:41 2008 -0500 [PATCH] switch cciss Signed-off-by: Al Viro commit 2b9ecd03335c7be9b8ce84f4499f4b6785a655ee Author: Al Viro Date: Sun Mar 2 09:24:35 2008 -0500 [PATCH] switch brd Signed-off-by: Al Viro commit 60ad23400717f70b8f0ee623b50d343d45f7b135 Author: Al Viro Date: Sun Mar 2 09:23:54 2008 -0500 [PATCH] switch ataflop Signed-off-by: Al Viro commit 94562c175113cf91204a77269eabeea32e1f38db Author: Al Viro Date: Sun Mar 2 09:23:18 2008 -0500 [PATCH] switch aoeblk Signed-off-by: Al Viro commit 47225db519f9d54377b8598129b53a63fcc2f4e2 Author: Al Viro Date: Sun Mar 2 09:22:38 2008 -0500 [PATCH] switch amiflop Signed-off-by: Al Viro commit b564f027ad90ab11ed668984af3ae9e0a0f27359 Author: Al Viro Date: Sun Mar 2 09:18:16 2008 -0500 [PATCH] switch DAC960 Signed-off-by: Al Viro commit a625c998e638c5648600828ca1cc282d97c7ebfd Author: Al Viro Date: Sun Mar 2 09:16:26 2008 -0500 [PATCH] switch ubd ubd_ioctl() doesn't need BKL, so unlocked_ioctl() it becomes... Signed-off-by: Al Viro commit d4430d62fa77208824a37fe6f85ab2831d274769 Author: Al Viro Date: Sun Mar 2 09:09:22 2008 -0500 [PATCH] beginning of methods conversion To keep the size of changesets sane we split the switch by drivers; to keep the damn thing bisectable we do the following: 1) rename the affected methods, add ones with correct prototypes, make (few) callers handle both. That's this changeset. 2) for each driver convert to new methods. *ALL* drivers are converted in this series. 3) kill the old (renamed) methods. Note that it _is_ a flagday; all in-tree drivers are converted and by the end of this series no trace of old methods remain. The only reason why we do that this way is to keep the damn thing bisectable and allow per-driver debugging if anything goes wrong. New methods: open(bdev, mode) release(disk, mode) ioctl(bdev, mode, cmd, arg) /* Called without BKL */ compat_ioctl(bdev, mode, cmd, arg) locked_ioctl(bdev, mode, cmd, arg) /* Called with BKL, legacy */ Signed-off-by: Al Viro commit badf8082c33d18b118d3a6f1b32d5ea6b97d3839 Author: Al Viro Date: Thu Oct 16 10:23:20 2008 -0400 [PATCH] switch ide_disk_ops ->ioctl() to sane prototype Signed-off-by: Al Viro commit 83ff6fe8580a7c834dba4389d742332fff9b9929 Author: Al Viro Date: Sun Mar 2 08:15:49 2008 -0500 [PATCH] don't mess with file in scsi_nonblockable_ioctl() Signed-off-by: Al Viro commit 633a08b81206122469365b4c72eaeb71f04f2cb4 Author: Al Viro Date: Wed Aug 29 20:34:12 2007 -0400 [PATCH] introduce __blkdev_driver_ioctl() Analog of blkdev_driver_ioctl() with sane arguments. For now uses fake struct file, by the end of the series it won't and blkdev_driver_ioctl() will become a wrapper around it. Signed-off-by: Al Viro commit a0eb62a0a4470fef5a5f41e7f1442fdd667220ef Author: Al Viro Date: Wed Aug 29 00:56:32 2007 -0400 [PATCH] switch pktcdvd to blkdev_driver_ioctl() Signed-off-by: Al Viro commit bbc1cc978404105da23d505163ce9fd5598ed5b1 Author: Al Viro Date: Sun Oct 7 17:54:28 2007 -0400 [PATCH] switch cdrom_{open,release,ioctl} to sane APIs ... convert to it in callers Signed-off-by: Al Viro commit 08f85851215100d0eebf026810955ee6ad456c38 Author: Al Viro Date: Mon Oct 8 13:26:20 2007 -0400 [PATCH] move block_device_operations to blkdev.h Signed-off-by: Al Viro commit 647b3d0084158c47b1aea8f34d13cab9cd0a5b49 Author: Al Viro Date: Tue Aug 28 22:15:59 2007 -0400 [PATCH] lose unused arguments in dm ioctl callbacks Signed-off-by: Al Viro commit 1bddd9e6453ef1c7bc5b6f4ddbf7d31f4aee7a44 Author: Al Viro Date: Tue Sep 2 17:19:43 2008 -0400 [PATCH] lose the unused file argument in generic_ide_ioctl() Signed-off-by: Al Viro commit 74f3c8aff36ad6552ea609c8b20bfd588fa16f38 Author: Al Viro Date: Mon Aug 27 15:38:10 2007 -0400 [PATCH] switch scsi_cmd_ioctl() to passing fmode_t Signed-off-by: Al Viro commit e915e872ed921d707bc32b3f2184d43abfa8c9e2 Author: Al Viro Date: Tue Sep 2 17:16:41 2008 -0400 [PATCH] switch sg_scsi_ioctl() to passing fmode_t Signed-off-by: Al Viro commit 5842e51ff2e8d660756248db80ad24e4f41977d9 Author: Al Viro Date: Tue Sep 2 16:35:55 2008 -0400 [PATCH] pass mode instead of file to sg_io() Signed-off-by: Al Viro commit 86d434dede14108dd917b25af0f29c0cb28b8d18 Author: Al Viro Date: Sun Aug 26 19:50:05 2007 -0400 [PATCH] eliminate use of ->f_flags in block methods store needed information in f_mode Signed-off-by: Al Viro commit aeb5d727062a0238a2f96c9c380fbd2be4640c6f Author: Al Viro Date: Tue Sep 2 15:28:45 2008 -0400 [PATCH] introduce fmode_t, do annotations Signed-off-by: Al Viro commit 5d4529be5e6365029d33044d383c2f527afa5734 Author: Paul Mundt Date: Tue Oct 21 20:12:59 2008 +0900 rtc: Add R2025S/D comment to rs5c372 Kconfig entry. This was accidentally left out when the R2025S/D support was merged earlier. Signed-off-by: Paul Mundt commit 2bba37e64a0803e2a5d0751f4bdbf2b13d1dd0d7 Author: Paul Mundt Date: Tue Oct 21 19:45:08 2008 +0900 sh: Export cache flush routines needed by sh_eth on SH7619. Signed-off-by: Paul Mundt commit c9306f0efbfbe65a6e9212082f1d1fc19fdc3094 Author: Paul Mundt Date: Tue Oct 21 18:33:36 2008 +0900 sh: Wire up oops reporting in the die notifier chain. Commit 3f5a54e371ca20b119b73704f6c01b71295c1714 ("ftrace: dump out ftrace buffers to console on panic") added an ftrace buffer dumper that hooks in to the die notifier chain and dumps out data in the oops path. Unfortunately SH supported ftrace but didn't support DIE_OOPS, so add that in and get it building again. Signed-off-by: Paul Mundt commit f7141d5884828f733cf9d13ed693135954b0c189 Author: Paul Mundt Date: Tue Oct 21 18:13:15 2008 +0900 sh: ap325rxa: Kill off unused port definitions. Signed-off-by: Paul Mundt commit 7dd0558d700133249ffa484b67ea51d59f9c49f4 Author: Paul Mundt Date: Tue Oct 21 18:09:43 2008 +0900 sh: Hook up PB0->PB7 input-only pins in SH7203 PFC. Signed-off-by: Paul Mundt commit dd0e20e58837dfef0d0c34c247bede86ae34d99b Author: Paul Mundt Date: Tue Oct 21 18:08:10 2008 +0900 sh: ap325rxa: Move off of hardcoded pinmux for flctl initialization. Signed-off-by: Paul Mundt commit 908978acbe2fb0e9aedaded5119dc663ae0d7015 Author: Yoshihiro Shimoda Date: Tue Sep 9 17:17:42 2008 +0900 sh: add support FLCTL for ap325rxa board This patch adds platform_device for sh_flctl driver, NAND Flash simple partition, and GPIO setting. Signed-off-by: Yoshihiro Shimoda Signed-off-by: Paul Mundt commit 550109378450e7982101f299d41a80e8efc759ea Author: Paul Mundt Date: Tue Oct 21 17:48:40 2008 +0900 sh: gpio: Stub in dummy GPIO<->IRQ mapping routines. IRQ modes are not presently supported, so stub in dummy definitions for now (taken from linux/gpio.h). Signed-off-by: Paul Mundt commit 0b3682ba33c59a362901b478bdab965da888b350 Author: Chris Friesen Date: Mon Oct 20 12:41:58 2008 -0600 genirq: fix set_irq_type() when recording trigger type Impact: fix boot hang on a G5 In set_irq_type() we want to pass the type rather than the current interrupt state. Signed-off-by: Chris Friesen Acked-by: Benjamin Herrenschmidt Acked-by: David Brownell Signed-off-by: Ingo Molnar commit bbc97411d11b3a835c62904fddb5ce9ff457f5fa Author: Paul Mundt Date: Tue Oct 21 14:27:51 2008 +0900 sh: rsk7203: leds-gpio support for RSK+ LEDs. Signed-off-by: Paul Mundt commit 10bfc6e190c55b583ec312a6a8ef274924e16d8a Author: Paul Mundt Date: Tue Oct 21 14:27:05 2008 +0900 sh: gpio: Include asm-generic/gpio.h for non-gpiolib stubs. Signed-off-by: Paul Mundt commit a02efb906d12c9d4eb2ab7c59049ba9545e5412d Merge: 84dfcb4... 2515ddc... Author: Benjamin Herrenschmidt Date: Tue Oct 21 15:52:04 2008 +1100 Merge commit 'origin' into master Manual merge of: arch/powerpc/Kconfig arch/powerpc/include/asm/page.h commit 84dfcb4b318463cd4883b6a19937824f49aee564 Merge: 34d81f8... 672e806... Author: Benjamin Herrenschmidt Date: Tue Oct 21 15:49:55 2008 +1100 Merge commit 'kumar/kumar-for-2.6.28' commit 672e806ee103c1709bcdcafabe65ba9c8ab5a63d Author: Anton Vorontsov Date: Fri Oct 17 22:56:59 2008 +0400 powerpc/83xx: Add DS1339 RTC support for MPC8349E-mITX boards .dts The RTC is sitting on the I2C2 bus at address 0x68. RTC interrupt signal is connected to the IPIC's EXT2 interrupt line, the line is shared with Vitesse 8201 Ethernet PHY. Signed-off-by: Anton Vorontsov Signed-off-by: Kumar Gala commit 442746989d92afc125040e0f29b33602ad94da99 Author: Anton Vorontsov Date: Fri Oct 17 22:57:09 2008 +0400 powerpc/83xx: Add support for MCU microcontroller in .dts files MCU is an external Freescale MC9S08QG8 microcontroller, mainly used to provide soft power-off function, but also exports two GPIOs (wired to the LEDs and also available from the external headers). Added the MCU on mpc8349emitx, mpc837xrdb and mpc8315erdb boards. Signed-off-by: Anton Vorontsov Signed-off-by: Kumar Gala commit 66eb988406df0f675c3133aedaf2773ba68866ff Author: Kumar Gala Date: Mon Oct 20 23:02:26 2008 -0500 powerpc/85xx: Move mpc8572ds.dts to address-cells/size-cells = <2> Change the top-level #address-cells and #size-cells to <2> so the mpc8572ds.dts is easier to deal with both a true 32-bit physical or 36-bit physical address space. Signed-off-by: Kumar Gala commit f618ebfcbf9616a0fa9a78f5ecb69762f0fa3c59 Author: Wolfgang Ocker Date: Wed Oct 15 15:00:47 2008 +0200 of/spi: Support specifying chip select as active high via device tree The patch allows to specify that an SPI device needs an active high chip select. Signed-off-by: Wolfgang Ocker Signed-off-by: Kumar Gala commit fd657efc67dbd70f422285101a50c2e84d03463d Author: Anton Vorontsov Date: Sat Oct 18 04:23:52 2008 +0400 powerpc: Remove device_type = "board_control" properties in .dts files We don't want to encourage the bogus device_type usage. The device type isn't used in the code, so we can simply remove it from the documentation and dts files. Boards should specify proper compatible entries instead. Signed-off-by: Anton Vorontsov Acked-by: David Gibson Signed-off-by: Kumar Gala commit 0a346dacee18ff69f6162d9860d723a058f47321 Author: Wolfram Sang Date: Thu Oct 16 21:12:00 2008 +0200 i2c-cpm: Suppress autoprobing for devices Similar to commit 618b26d52843c0f85b8eb143cf2695d7f6fd072d, also remove automatic probing for this i2c controller. Might need updates to dts files using it. Signed-off-by: Wolfram Sang Acked-by: Jochen Friedrich Acked-by: Jean Delvare Signed-off-by: Kumar Gala commit 13690332a315128ba8936297137d33aff5b2ad7b Author: Ed Swarthout Date: Fri Oct 17 00:41:32 2008 -0500 powerpc/85xx: Fix mpc8536ds dma interrupt numbers Signed-off-by: Ed Swarthout Signed-off-by: Kumar Gala commit ba556ed23c73796efd58ac348cc33773935bb3b9 Author: Jason Jin Date: Thu Oct 16 17:31:32 2008 +0800 powerpc/85xx: Enable enhanced functions for 8536 TSEC Signed-off-by: Jason Jin Signed-off-by: Kumar Gala commit 34d81f858a3bdec568bf08c4feb997ccd3d40b94 Author: Milton Miller Date: Mon Oct 20 18:03:18 2008 +0000 powerpc: Delete unused prom_strtoul and prom_memparse These functions should have been static, and inspection shows they are no longer used. (We used to parse mem= but we now defer that to early_param). Signed-off-by: Milton Miller Signed-off-by: Benjamin Herrenschmidt commit 0dcd440120ef12879ff34fc78d7e4abf171c79e4 Author: Paul Mackerras Date: Mon Oct 20 17:42:42 2008 +0000 powerpc: Revert CHRP boot wrapper to real-base = 12MB on 32-bit Commit 9b09c6d909dfd8de96b99b9b9c808b94b0a71614 ("powerpc: Change the default link address for pSeries zImage kernels") changed the real-base value in the CHRP note added by addnote to the zImage from 12MB to 32MB. It turns out that this causes unnecessary extra reboots on old 32-bit CHRP machines. This therefore adds a -r flag to addnote to allow us to specify what real-base value it should put in the CHRP note, and adjusts the wrapper script to pass -r c00000 to addnote when making a zImage for a CHRP machine. Also, CHRP machines ignore the RPA note, so we don't need to arrange for it to be the same as the kernel's. Signed-off-by: Paul Mackerras Signed-off-by: Benjamin Herrenschmidt commit fe55249d17f7979cf9bbc58e38e9ceaf1918b415 Author: Milton Miller Date: Mon Oct 20 15:37:04 2008 +0000 powerpc: Always trim numa memory to lmb_end_of_DRAM() numa_enforce_memory_limit tried to be smart and only call lmb_end_of_DRAM when a memory limit was set via mem= on the command line. However, the early boot code will also limit memory added to the lmb system when iommu=off is specified. When this happens, the page allocator is given pages not in the linear mapping and this results in a fatal data reference to the unmapped page. Signed-off-by: Milton Miller Signed-off-by: Benjamin Herrenschmidt commit 6a75a6b8e85e92cc774d42a4e113c76c30b5a539 Author: Milton Miller Date: Mon Oct 20 15:37:03 2008 +0000 powerpc: Use cpu_thread_in_core in smp_init for of_spin_map We used to assume that even numbered threads were the primary threads, ie those that would be listed and started as a cpu from open firmware. Replace a left over is even (% 2) check with a check for it being a primary thread and update the comments. Tested with a debug print on pseries, identical code found for cell. Signed-off-by: Milton Miller Signed-off-by: Benjamin Herrenschmidt commit ed7b2144bcc87b2b097553f15a2f96e18ede21b0 Author: Milton Miller Date: Mon Oct 20 15:37:03 2008 +0000 powerpc: Find and destroy possible stale kernel added properties 64 bit powerpc requires the kexec user space tools avoid overwriting the static kernel image and translation hash table when choosing where to put memory image data because it copies the data into place using the kernels virtual memory system. Kexec userspace determines these and other areas blocked by reading properties the kernel adds, but does not filter these properties when creating the device tree for the next kernel. When the second kernel tries to add its values for these properties, the export via /proc/device-tree is hidden by the pre-existing but stale values from the flat tree. Kexec userspace reads the old property, allocates the new kernel at the old kernel's end, and gets rejected by the overlap check. Search and remove these stale properties before adding the new values. Signed-off-by: Milton Miller Signed-off-by: Benjamin Herrenschmidt commit dbc1c5c250cbedccf3571597d156e581e34b2944 Author: Kumar Gala Date: Mon Oct 20 08:03:46 2008 +0000 powerpc: Remove Kconfig support for PPC_MERGE There are no users of PPC_MERGE in tree so we can get rid of it. It was a hold over from the arch/ppc days. Signed-off-by: Kumar Gala Signed-off-by: Benjamin Herrenschmidt commit a3ba68f969b2407b6809a840f6ff45ab0eb06f84 Author: Kumar Gala Date: Mon Oct 20 03:16:55 2008 +0000 powerpc: Fix build issue with CONFIG_RELOCATABLE=y There are two issues when we enable CONFIG_RELOCATABLE. The first is due to the fact that phys_addr_t is now defined in linux/types.h. The second is due to the fact that the DMA code changes expose memstart_addr to prom_init.c Signed-off-by: Kumar Gala Signed-off-by: Benjamin Herrenschmidt commit 0721357d4d04563b6e5c7ffd6b5685df275d5ff9 Author: Jon Smirl Date: Mon Oct 20 02:13:15 2008 +0000 of: Format string bug in drivers/of/of_i2c.c Format string bug. Not exploitable, as this is only writable by root, but worth fixing all the same. See 326f6a5c9c9e1a62aec37bdc0c3f8d53adabe77b Signed-off-by: Benjamin Herrenschmidt commit a4292d7ae6fabcdbc41c3e0f0eb790a1429b985f Author: Grant Likely Date: Fri Oct 17 19:12:07 2008 +0000 powerpc: Add missing cuImage.initrd.% target This target is needed to build cuImages with an embedded ramdisk image. Signed-off-by: Grant Likely Signed-off-by: Benjamin Herrenschmidt commit 59fd6b8cc0975b88e35f6ca2318b8cee77d3a508 Author: Mike Ditto Date: Fri Oct 17 09:27:51 2008 +0000 powerpc: Fix boot wrapper memcmp() called with zero length argument I noticed, when trying to use, e.g., node = find_node_by_prop_value(prev, "booleanprop", "", 0)) to search for all nodes with a certain boolean property, that memcmp() returns garbage when comparing zero bytes. It should return zero. Signed-off-by: Benjamin Herrenschmidt commit e81703724a966120ace6504c993bda9e084cbf3e Author: Jon Tollefson Date: Thu Oct 16 18:59:43 2008 +0000 powerpc/numa: Make memory reserve code more robust Adjust amount to reserve based on previous nodes for reserves spanning multiple nodes. Check if the node active range is empty before attempting to pass the reserve to bootmem. In practice the range shouldn't be empty, but to be sure we check. Signed-off-by: Jon Tollefson Signed-off-by: Benjamin Herrenschmidt commit a5598ca0d49821912a5053c05f07fd650671eb6d Author: Carl Love Date: Tue Oct 14 23:37:01 2008 +0000 powerpc/oprofile: Fix mutex locking for cell spu-oprofile The issue is the SPU code is not holding the kernel mutex lock while adding samples to the kernel buffer. This patch creates per SPU buffers to hold the data. Data is added to the buffers from in interrupt context. The data is periodically pushed to the kernel buffer via a new Oprofile function oprofile_put_buff(). The oprofile_put_buff() function is called via a work queue enabling the funtion to acquire the mutex lock. The existing user controls for adjusting the per CPU buffer size is used to control the size of the per SPU buffers. Similarly, overflows of the SPU buffers are reported by incrementing the per CPU buffer stats. This eliminates the need to have architecture specific controls for the per SPU buffers which is not acceptable to the OProfile user tool maintainer. The export of the oprofile add_event_entry() is removed as it is no longer needed given this patch. Note, this patch has not addressed the issue of indexing arrays by the spu number. This still needs to be fixed as the spu numbering is not guarenteed to be 0 to max_num_spus-1. Signed-off-by: Carl Love Signed-off-by: Maynard Johnson Signed-off-by: Arnd Bergmann Acked-by: Acked-by: Robert Richter Signed-off-by: Benjamin Herrenschmidt commit bb5e6491cae4c5d6ddfa3e173e22efb35f595949 Author: roel kluin Date: Tue Oct 14 14:36:31 2008 +0000 powerpc: Unsigned speed cannot be negative in udbg_16559.c "unsigned int" speed cannot be negative, it's thus pointless to test if it is. Signed-off-by: Roel Kluin Signed-off-by: Benjamin Herrenschmidt commit 04badfd2936333a23e0fc233f31a760d0dc9424f Author: Nathan Fontenot Date: Mon Oct 13 08:42:00 2008 +0000 powerpc/pseries: Validate PFN in pseries_remove_lmb() The pfn of the memory to be removed should be validated prior to attempting to remove the memory. In cases where the probe of a memory section fails during hotplug add, the pfn for the lmb may not be valid. Signed-off-by: Badari Pulavarty Signed-off-by: Nathan Fontenot Signed-off-by: Benjamin Herrenschmidt commit c10c178a92b032ea3dd7259dcbbd1b9331c05c41 Author: Sebastian Siewior Date: Sun Oct 12 23:15:26 2008 +0000 powerpc/boot: Compare _start against ei.loadsize instead ei.memsize If the vmlinux binary in memory is larger than 4 MiB than it collides with the initial boot code which is linked at 4 MiB in case of cuBoot. If the the uncompressed image size (on disk size) is less than 4 MiB then it would fit. The difference between those two sizes is the bss section. In cuBoot we have the dtb embedded right after the data section so it is very likely that the reset of the bss section (in kernel's start up code) will overwrite the dtb blob. Therefore we reallocate the dtb. Something similar is allready done to the initrd. Signed-off-by: Sebastian Andrzej Siewior Acked-by: David Gibson Signed-off-by: Benjamin Herrenschmidt commit 58419abd507dd9cc20644b99f122bc7b5507a261 Author: Guennadi Liakhovetski Date: Tue Oct 21 12:44:38 2008 +0900 sh: fix soc-camera compile breakage on Migo-R. Fix Migo-R compile breakage caused by incomplete merge. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit b56050ae5e53ab8c5efedce7f4ec3923b6e42054 Author: Paul Mundt Date: Tue Oct 21 12:39:24 2008 +0900 sh: arch/sh/kernel/smp.c needs linux/cpu.h for notify_cpu_starting(). Signed-off-by: Paul Mundt commit 5e451d9c9d2c20c4f037a0854d3ecca0a69aa56a Author: Andrew Morton Date: Tue Oct 21 12:37:36 2008 +0900 sh: Kill off duplicate remove_memory() definition. Use the generic remove_memory() provided by mm/memory_hotplug.c instead. Signed-off-by: Andrew Morton Signed-off-by: Paul Mundt commit a51413a65f14e8e872d4da21f7a83656c7abb603 Author: Paul Mundt Date: Tue Oct 21 09:52:02 2008 +0900 sh: Fix up the SH7203 build. The sh7203.h include paths were missed in the previous update, so switch the include path to cpu/ as with the rest. Signed-off-by: Paul Mundt commit 45e2a9b48538ac7ce4ed557f31a0618782a72aa1 Author: Eric Miao Date: Tue Oct 21 11:36:19 2008 +0800 [ARM] pxa: fix the corgi_ssp.c dependency issue in {corgi,spitz}_defconfig Separate building of corgi_ssp.c, and introduce a new hidden config option CONFIG_CORGI_SSP_DEPRECATED for this. Aslo mark corgi_ts.c and corgi_bl.c as deprecated. This unbreaks the legacy configs in {corgi,spitz}_defconfig, however, SPI based ADS7846 touchscreen driver and a new SPI-based corgi_lcd.c driver with integrated backlight support are recommended. Signed-off-by: Eric Miao commit 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 Author: Paul Mundt Date: Tue Oct 21 12:07:40 2008 +0900 binfmt_elf_fdpic: Update for cputime changes. Commit f06febc96ba8e0af80bcc3eaec0a109e88275fac ("timers: fix itimer/ many thread hang") introduced a new task_cputime interface and subsequently only converted binfmt_elf over to it. This results in the build for binfmt_elf_fdpic blowing up given that p->signal->{u,s}time have disappeared from underneath us. Apply the same trivial fix from binfmt_elf to binfmt_elf_fdpic. Signed-off-by: Paul Mundt Signed-off-by: Linus Torvalds commit c1075fb7ec62b7ac0ac6baee2ceeb77270206aef Merge: dfe218b... 51d9861... Author: Benjamin Herrenschmidt Date: Tue Oct 21 13:14:33 2008 +1100 Merge commit 'gcl/gcl-next' commit dfe218b7ef0c1d561a0d5ce294c173f1551985ff Merge: 34318c2... 1ff0fcf... Author: Benjamin Herrenschmidt Date: Tue Oct 21 13:14:22 2008 +1100 Merge commit 'jwb/jwb-next' commit 25af3b0f757d4ce833c1df9b64b7357a9fc8f4a5 Author: Eric Miao Date: Tue Oct 21 09:42:29 2008 +0800 Revert "[ARM] pxa/corgi: remove now unused corgi_ssp.c and corgi_lcd.c" This reverts commit 68677ab3d08ed6d57be0c1ae4e4d364bb2d104b6. A smoother migration path would be making corgi_ts.c and other drivers depending on corgi_ssp.c and corgi_lcd.c to depend on BROKEN instead, and still allows those to exist around for some time. Signed-off-by: Eric Miao commit 34318c253b861f82bd4a2956e6c8ae8ee2c3aae7 Author: Andre Detsch Date: Tue Oct 21 11:16:09 2008 +1100 powerpc/spufs: Explain conditional decrement of aff_sched_count This patch adds a comment to clarify why atomic_dec_if_positive is being used to decrement gang's aff_sched_count on SPU context unbind. Signed-off-by: Andre Detsch Signed-off-by: Jeremy Kerr commit 10baa26c8ccba6f100397c9ba6534be175762e8d Author: Andre Detsch Date: Tue Oct 21 11:15:23 2008 +1100 powerpc/spufs: Improve search of node for contexts with SPU affinity This patch improves redability of the code responsible for trying to find a node with enough SPUs not committed to other affinity gangs. An additional check is also added, to avoid taking into account gangs that have no SPU affinity. Signed-off-by: Andre Detsch Signed-off-by: Jeremy Kerr commit 837ef884b702edd1c4514eaed1dbecd48721bd22 Author: Jeremy Kerr Date: Fri Oct 17 12:02:31 2008 +1100 powerpc/spufs: Use kmalloc rather than kzalloc for switch log buffer No need to zero the entire buffer, just the head and tail indices. Signed-off-by: Jeremy Kerr commit f027faa231f38c02e949352735eac76f29090809 Author: Jeremy Kerr Date: Thu Oct 16 11:11:12 2008 +1100 powerpc/spufs: Don't spu_acquire_saved unnecessarily in regs read With most file readers (eg cat, dd), reading a context's regs file will result in two reads: the first to read the data, and the second to return EOF. Because each read performs a spu_acquire_saved, we end up descheduling and re-scheduling the context twice. This change does a simple check to see if we'd return EOF before calling spu_acquire_saved(), saving the extra schedule operation. Signed-off-by: Jeremy Kerr commit 14f693eeb5b16bc47ffa38d8b8838a654aedd53f Author: Jeremy Kerr Date: Thu Oct 16 10:51:46 2008 +1100 powerpc/spufs: Don't require full buffer in switch_log read Currently, read() on the sputrace log will block until the read buffer is full. This makes it difficult to retrieve the end of the buffer, as the user will need to read with the right-sized buffer. In a similar method as 91553a1b5e0df006a3573a88d98ee7cd48a3818a, this change makes the switch_log return if there has already been data read. Signed-off-by: Jeremy Kerr commit f5ed0eb6fe131e8f3847323b4aa569a6f7b36f56 Author: Jeremy Kerr Date: Thu Oct 16 10:03:46 2008 +1100 powerpc/spufs: Use state_mutex for switch_log locking, and prevent multiple openers Currently, we use ctx->mapping_lock and ctx->switch_log->lock for the context switch log. The mapping lock only prevents concurrent open()s, so we require the switch_lock->lock for reads. Since writes to the switch log buffer occur on context switches, we're better off synchronising with the state_mutex, which is held during a switch. Since we're serialised througout the buffer reads and writes, we can use the state mutex to protect open and release too, and can now kfree() the log buffer on release. This allows us to perform the switch log notify without taking any extra locks. Because the buffer is only present while the file is open, we can use it to prevent multiple simultaneous openers. Signed-off-by: Jeremy Kerr commit e869446bb6db209e6092f7cba6cdfc2a5e637177 Author: Jeremy Kerr Date: Wed Oct 15 13:20:42 2008 +1100 powerpc/spufs: sputrace: Don't block until the read buffer is full Currently, read() on the sputrace buffer will only return data when the user buffer is exhausted. This may mean that we never see the end of the event log, unless we read() with exactly the right-sized buffer. This change makes sputrace_read not block if we have data ready to return. Signed-off-by: Jeremy Kerr commit baf399273f2ea38e2fcbd4d0b6cc7ba7f7db43eb Author: Jeremy Kerr Date: Wed Oct 15 13:16:18 2008 +1100 powerpc/spufs: sputrace: Only enable logging on open(), prevent multiple openers Currently, sputrace will start logging to the event buffer before the log buffer has been open()ed. This results in a heap of "lost samples" warnings if the sputrace file hasn't yet been opened. Since the buffer is reset on open() anyway, there's no need to enable logging when no-one has opened the log. Because open clears the log, make it return EBUSY for mutliple open calls. Signed-off-by: Jeremy Kerr commit 1ff0fcfcb1a6d0a4c4d065ed230be7beae087b83 Author: Josh Boyer Date: Thu Oct 16 04:38:40 2008 +0000 ibm_newemac: Fix new MAL feature handling Support for new features needed by the PPC 405EZ boards introduced some errors in the MAL and EMAC feature handling. This broke 'allmodconfig' builds as CONFIG_PPC_DCR_NATIVE is not set for those. This patch fixes these errors by wrapping the code in the appropriate #ifdefs. Acked-by: Benjamin Herrenschmidt Signed-off-by: Josh Boyer commit d03ebb12981e80de99e9b482639ec3b5795741f3 Author: Claudio Nieder Date: Mon Oct 20 23:35:40 2008 +0100 backlight: Add driver for Tabletkiosk Sahara TouchIT-213 Tablet PC [akpm@linux-foundation.org: coding-style fixes] [rpurdie@linux.intel.com: minor tweaks] Signed-off-by: Claudio Nieder Signed-off-by: Andrew Morton Signed-off-by: Richard Purdie commit 923ae48b5a92591c844ebdb21276b56093f4e5da Author: Mike Rapoport Date: Mon Oct 13 09:03:44 2008 +0100 backlight: da903x: Add backlight driver for DA9030/DA9034 Signed-off-by: Mike Rapoport Signed-off-by: Eric Miao Signed-off-by: Richard Purdie commit 14b7b4018f90bc5e306adc59bfe8887934367ac2 Author: Dmitry Baryshkov Date: Sat Sep 13 21:06:41 2008 +0400 tosa: add support for bl/lcd driver Signed-off-by: Dmitry Baryshkov commit fbd1b17b43b8783a5408ec18c293dd8ebdc7e2cd Author: Dmitry Baryshkov Date: Sat Sep 13 20:58:51 2008 +0400 backlight: add support for Sharp SL-6000 LCD and backlight drivers On Sharp SL-6000 lcd/backlight is a bit complex, so add two drivers one for lcd-driving chip, other one for dac regulating the backlight LEDS. Signed-off-by: Dmitry Baryshkov Cc: Richard Purdie commit a50c22eed593f474e75f693381e4d42e81762de8 Author: Huang Weiyi Date: Tue Oct 21 06:43:33 2008 +0800 mm: remove duplicated #include's Removed duplicated #include in mm/vmalloc.c and "internal.h" in mm/memory.c. Signed-off-by: Huang Weiyi Signed-off-by: Linus Torvalds commit e798ba57e9f423dddbf1bdeb20a62bdd0593890f Author: Hugh Dickins Date: Tue Oct 21 00:04:04 2008 +0100 Export tiny shmem_file_setup for DRM-GEM We're trying to keep the !CONFIG_SHMEM tiny-shmem.c (using ramfs without swap) in synch with CONFIG_SHMEM shmem.c (and mpm is preparing patches to combine them). I was glad to see EXPORT_SYMBOL_GPL(shmem_file_setup) go into shmem.c, but why not support DRM-GEM when !CONFIG_SHMEM too? But caution says still depend on MMU, since !CONFIG_MMU is.. different. Signed-off-by: Hugh Dickins Acked-by: Matt Mackall Acked-by: Dave Airlie Signed-off-by: Linus Torvalds commit 653c03168348ac7aebb969931f87ba281749d7dd Author: Harvey Harrison Date: Mon Oct 20 16:00:08 2008 -0700 misc: replace remaining __FUNCTION__ with __func__ __FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison Acked-by: Randy Dunlap Signed-off-by: Linus Torvalds commit e8848a170fd432bdda176a2d568919d4bba90467 Author: Thomas Gleixner Date: Tue Oct 21 00:47:45 2008 +0200 fix CONFIG_HIGHMEM compile error in drivers/gpu/drm/i915/i915_gem.c commit 9b7530cc329eb036cfa589930c270e85031f554c ("i915: cleanup coding horrors in i915_gem_gtt_pwrite()") broke the i386 build for CONFIG_HIGHMEM=y. Caught by automatic testing http://www.tglx.de/autoqa-logs/000137-0006-0001.log Signed-off-by: Thomas Gleixner [ My bad. It's the same patch I sent out earlier, nobody noticed then either.. ] Signed-off-by: Linus Torvalds commit fbf0baee84cd31d3a800010139fcd01b8b11cbf9 Author: Richard Purdie Date: Mon Oct 20 23:46:15 2008 +0100 leds: Simplify logic in leds-ams-delta Simplify logic in leds-ams-delta after various new drivers writers misunderstood it. Signed-off-by: Richard Purdie commit f6f286f33e843862c559bfea9281318c4cdec6b0 Author: Arjan van de Ven Date: Mon Oct 20 14:41:03 2008 -0700 fix WARN() for PPC powerpc doesn't use the generic WARN_ON infrastructure. The newly introduced WARN() as a result didn't print the message, this patch adds the printk for this specific case. Signed-off-by: Arjan van de Ven Signed-off-by: Linus Torvalds commit 5f41b8cdc6ef33b3432cee36264d628a80398362 Author: Luck, Tony Date: Mon Oct 20 15:23:40 2008 -0700 kexec: fix crash_save_vmcoreinfo_init build problem This fixes kernel/kexec.c: In function 'crash_save_vmcoreinfo_init': kernel/kexec.c:1374: error: 'vmlist' undeclared (first use in this function) kernel/kexec.c:1374: error: (Each undeclared identifier is reported only once kernel/kexec.c:1374: error: for each function it appears in.) kernel/kexec.c:1410: error: invalid use of undefined type 'struct vm_struct' make[1]: *** [kernel/kexec.o] Error 1 Signed-off-by: Tony Luck Signed-off-by: Linus Torvalds commit 270c3957dbc5bedf093dc864840be0cc6dbda1f6 Author: Richard Purdie Date: Mon Oct 20 23:16:17 2008 +0100 leds: Fix trigger registration race Fix a race during trigger registration where we could try and use a lock before it was initialised. Signed-off-by: Richard Purdie commit d1a7fddf420b1f5a7d9a899b3388026084a67d33 Merge: 778c4c8... c0e1936... Author: Russell King Date: Mon Oct 20 23:06:15 2008 +0100 Merge branch 'for-rmk' of git://git.marvell.com/orion into devel commit 0266a45896a53b1261e9657aa3fbf9ca3d2fd07b Author: Qinghuang Feng Date: Mon Oct 20 23:04:36 2008 +0100 leds: Fix leds-class.c comment led_classdev_unregister() has no "__" prefix, remove it. Signed-off-by: Qinghuang Feng Signed-off-by: Richard Purdie commit 9c78ff6e65cad9f9fcf0bbde2bfbbf3a544fb704 Author: Pavel Machek Date: Mon Oct 20 23:02:43 2008 +0100 leds: Add driver for HP harddisk protection LEDs HP notebooks contain accelerometer-based disk protection subsystem, and LED that indicates hard disk is protected. This is driver for the LED part. Signed-off-by: Pavel Machek Signed-off-by: Richard Purdie commit 0adaf6e4c23dd8a7ab20fb3acaa58e3f8422ac60 Author: Sven Wegener Date: Mon Oct 20 22:57:56 2008 +0100 leds: leds-pca955x - Mark pca955x_led_set() static Mark pca955x_led_set() as static Signed-off-by: Sven Wegener Signed-off-by: Richard Purdie commit 85b064b66400abf626b0e9754118c2a8a212c19b Author: Richard Purdie Date: Mon Oct 20 22:55:00 2008 +0100 leds: Remove uneeded leds-cm-x270 driver The cm-x270 board uses leds-gpio so remove the now unneeded driver. Acked-by: Mike Rapoport Signed-off-by: Richard Purdie commit e3d2f927f788adcdabc42f8a1616f6cc56c53bbe Merge: a9b6148... 81e192d... Author: Linus Torvalds Date: Mon Oct 20 14:38:14 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6: parisc: convert to generic compat_sys_ptrace parisc: add rtc platform driver parisc: initialize unwinder much earlier parisc: add new syscalls parisc: hijack jump to start_kernel parisc: add pdc_coproc_cfg_unlocked and set_firmware_width_unlocked parisc: move include/asm-parisc to arch/parisc/include/asm parisc: move pdc_result to real2.S parisc: unify CCIO_COLLECT_STATS implementation parisc: add arch/parisc/kernel/.gitignore parisc: ropes.h - fix -> parisc: parisc-agp - fix -> Resolve remove/rename conflict: include/asm-parisc/a.out.h is no longer relevant. commit dd8e5a2039607e0f79c33549726a2415d977c938 Author: Sven Wegener Date: Mon Oct 13 10:41:39 2008 +0100 leds: Remove uneeded strlen calls There's no need for the additional call to strlen(), we can directly return the value returned by sprintf(). We now return a length value that doesn't include the final '\0', but user space shouldn't bother about it anyway. Signed-off-by: Sven Wegener Signed-off-by: Andrew Morton Signed-off-by: Richard Purdie commit 6af4f55c31764c2d97ddf59ae2149cd1769e2e25 Author: Sven Wegener Date: Mon Oct 13 10:43:47 2008 +0100 leds: Add leds-wrap default-trigger The power led is normally lit after boot, let's use the default-on trigger as the default trigger for it. This gets the initial brightness value right and being on is the default behaviour we expect for a power led. Signed-off-by: Sven Wegener Signed-off-by: Andrew Morton Signed-off-by: Richard Purdie commit 326bb8a5a12c6298a6bf6c74af490b1858b2f12c Author: Trent Piepho Date: Mon Oct 13 10:13:01 2008 +0100 leds: Make default trigger fields const The default_trigger fields of struct gpio_led and thus struct led_classdev are pretty much always assigned from a string literal, which means the string can't be modified. Which is fine, since there is no reason to modify the string and in fact it never is. But they should be marked const to prevent such code from being added, to prevent warnings if -Wwrite-strings is used, when assigned from a constant string other than a string literal (which produces a warning under current kernel compiler flags), and for general good coding practices. Signed-off-by: Trent Piepho Signed-off-by: Richard Purdie commit 132e9306beedd049bc5de037f1996731a2ca3eed Author: Rodolfo Giometti Date: Mon Oct 13 09:25:24 2008 +0100 leds: Add backlight LED trigger This allows LEDs to be controlled as a backlight device where they turn off and on when the display is blanked and unblanked. This is useful where you need various key backlight LEDs to dim at the same time as the backlight. Signed-off-by: Rodolfo Giometti Signed-off-by: Richard Purdie commit 9e84561c8c8671d9e58d1893cc524a71b20c9183 Author: Mike Rapoport Date: Mon Oct 13 09:06:10 2008 +0100 leds: da903x: Add support for LEDs found on DA9030/DA9034 Signed-off-by: Mike Rapoport Signed-off-by: Eric Miao Signed-off-by: Richard Purdie commit a9b6148d25f15ddfe9d7a7f3e526fdb64e7cf7da Author: Linus Torvalds Date: Mon Oct 20 14:23:29 2008 -0700 USB: Fix unused label warnings in drivers/usb/host/ehci-hcd.c This gets rid of an annoying warning in ehci-hcd.c when DEBUG isn't enabled: warning: label 'err_debug' defined but not used by moving it inside the already-existing #ifdef DEBUG, so that it matches the goto. And now my regular build is warning-free again. Signed-off-by: Linus Torvalds commit 9b7530cc329eb036cfa589930c270e85031f554c Author: Linus Torvalds Date: Mon Oct 20 14:16:43 2008 -0700 i915: cleanup coding horrors in i915_gem_gtt_pwrite() Yes, this will probably be switched over to a cleaner model anyway, but in the meantime I don't want to see the 'unused variable' warnings that come from the disgusting #ifdef code. Make the special case be a nice inlien function of its own, clean up the code, and make the warning go away. I wish people didn't write code that gets (valid) warnings from the compiler, but I'll limit my fixes to code that I actually care about (in this case just because I see the warning and it annoys me). Signed-off-by: Linus Torvalds commit 1ae87786800b5e0411847974b211797b6ada63c4 Author: Linus Torvalds Date: Mon Oct 20 14:14:25 2008 -0700 Fix sprintf format warnings in drm_proc.c Use "%zd" for size_t, and make sure to have a space between the numbers instead of depending on the field width. I don't like warnings in my default targeted build. Signed-off-by: Linus Torvalds commit 2bea2e4abf2fe8bc7384103aeaad91089109cfba Merge: a0bfb67... 0d4a7bc... Author: Linus Torvalds Date: Mon Oct 20 13:42:14 2008 -0700 Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6 * 'bkl-removal' of git://git.lwn.net/linux-2.6: UIO: BKL removal commit a0bfb673dca8a2b4324fe11e678ec6d6a9ad67e0 Merge: 92b29b8... 9649987... Author: Linus Torvalds Date: Mon Oct 20 13:40:47 2008 -0700 Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (41 commits) PCI: fix pci_ioremap_bar() on s390 PCI: fix AER capability check PCI: use pci_find_ext_capability everywhere PCI: remove #ifdef DEBUG around dev_dbg call PCI hotplug: fix get_##name return value problem PCI: document the pcie_aspm kernel parameter PCI: introduce an pci_ioremap(pdev, barnr) function powerpc/PCI: Add legacy PCI access via sysfs PCI: Add ability to mmap legacy_io on some platforms PCI: probing debug message uniformization PCI: support PCIe ARI capability PCI: centralize the capabilities code in probe.c PCI: centralize the capabilities code in pci-sysfs.c PCI: fix 64-vbit prefetchable memory resource BARs PCI: replace cfg space size (256/4096) by macros. PCI: use resource_size() everywhere. PCI: use same arg names in PCI_VDEVICE comment PCI hotplug: rpaphp: make debug var unique PCI: use %pF instead of print_fn_descriptor_symbol() in quirks.c PCI: fix hotplug get_##name return value problem ... commit 92b29b86fe2e183d44eb467e5e74a5f718ef2e43 Merge: b9d7ccf... 98d9c66... Author: Linus Torvalds Date: Mon Oct 20 13:35:07 2008 -0700 Merge branch 'tracing-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'tracing-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (131 commits) tracing/fastboot: improve help text tracing/stacktrace: improve help text tracing/fastboot: fix initcalls disposition in bootgraph.pl tracing/fastboot: fix bootgraph.pl initcall name regexp tracing/fastboot: fix issues and improve output of bootgraph.pl tracepoints: synchronize unregister static inline tracepoints: tracepoint_synchronize_unregister() ftrace: make ftrace_test_p6nop disassembler-friendly markers: fix synchronize marker unregister static inline tracing/fastboot: add better resolution to initcall debug/tracing trace: add build-time check to avoid overrunning hex buffer ftrace: fix hex output mode of ftrace tracing/fastboot: fix initcalls disposition in bootgraph.pl tracing/fastboot: fix printk format typo in boot tracer ftrace: return an error when setting a nonexistent tracer ftrace: make some tracers reentrant ring-buffer: make reentrant ring-buffer: move page indexes into page headers tracing/fastboot: only trace non-module initcalls ftrace: move pc counter in irqtrace ... Manually fix conflicts: - init/main.c: initcall tracing - kernel/module.c: verbose level vs tracepoints - scripts/bootgraph.pl: fallout from cherry-picking commits. commit b9d7ccf56be1ac77b71a284a1c0e6337f9a7aff0 Merge: 9301975... 3038eda... Author: Linus Torvalds Date: Mon Oct 20 13:27:05 2008 -0700 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86 ACPI: fix breakage of resume on 64-bit UP systems with SMP kernel Introduce is_vmalloc_or_module_addr() and use with DEBUG_VIRTUAL commit 9301975ec251bab1ad7cfcb84a688b26187e4e4a Merge: 7110879... dd3a1db... Author: Linus Torvalds Date: Mon Oct 20 13:22:50 2008 -0700 Merge branch 'genirq-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip This merges branches irq/genirq, irq/sparseirq-v4, timers/hpet-percpu and x86/uv. The sparseirq branch is just preliminary groundwork: no sparse IRQs are actually implemented by this tree anymore - just the new APIs are added while keeping the old way intact as well (the new APIs map 1:1 to irq_desc[]). The 'real' sparse IRQ support will then be a relatively small patch ontop of this - with a v2.6.29 merge target. * 'genirq-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (178 commits) genirq: improve include files intr_remapping: fix typo io_apic: make irq_mis_count available on 64-bit too genirq: fix name space collisions of nr_irqs in arch/* genirq: fix name space collision of nr_irqs in autoprobe.c genirq: use iterators for irq_desc loops proc: fixup irq iterator genirq: add reverse iterator for irq_desc x86: move ack_bad_irq() to irq.c x86: unify show_interrupts() and proc helpers x86: cleanup show_interrupts genirq: cleanup the sparseirq modifications genirq: remove artifacts from sparseirq removal genirq: revert dynarray genirq: remove irq_to_desc_alloc genirq: remove sparse irq code genirq: use inline function for irq_to_desc genirq: consolidate nr_irqs and for_each_irq_desc() x86: remove sparse irq from Kconfig genirq: define nr_irqs for architectures with GENERIC_HARDIRQS=n ... commit 7110879cf2afbfb7af79675f5ff109e63d631c25 Merge: 99ebcf8... 3baf63a... Author: Linus Torvalds Date: Mon Oct 20 13:21:24 2008 -0700 Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: m32r: fix build due to notify_cpu_starting() change powerpc: fix linux-next build failure commit 99ebcf8285df28f32fd2d1c19a7166e70f00309c Merge: 72558dd... c465a76... Author: Linus Torvalds Date: Mon Oct 20 13:19:56 2008 -0700 Merge branch 'v28-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'v28-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (36 commits) fix documentation of sysrq-q really Fix documentation of sysrq-q timer_list: add base address to clock base timer_list: print cpu number of clockevents device timer_list: print real timer address NOHZ: restart tick device from irq_enter() NOHZ: split tick_nohz_restart_sched_tick() NOHZ: unify the nohz function calls in irq_enter() timers: fix itimer/many thread hang, fix timers: fix itimer/many thread hang, v3 ntp: improve adjtimex frequency rounding timekeeping: fix rounding problem during clock update ntp: let update_persistent_clock() sleep hrtimer: reorder struct hrtimer to save 8 bytes on 64bit builds posix-timers: lock_timer: make it readable posix-timers: lock_timer: kill the bogus ->it_id check posix-timers: kill ->it_sigev_signo and ->it_sigev_value posix-timers: sys_timer_create: cleanup the error handling posix-timers: move the initialization of timer->sigq from send to create path posix-timers: sys_timer_create: simplify and s/tasklist/rcu/ ... Fix trivial conflicts due to sysrq-q description clahes in Documentation/sysrq.txt and drivers/char/sysrq.c commit 72558dde738b06cc01e16b3247a9659ca739e22d Merge: b913852... 769b49c... Author: Linus Torvalds Date: Mon Oct 20 13:12:39 2008 -0700 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: (36 commits) ide: re-add TRM290 fix lost during ide_build_dmatable() cleanup scc_pata: kill unused variables sgiioc4: kill duplicate ioremap() sgiioc4: kill useless address checks delkin_cb: add PM support ide: remove broken hpt34x driver ide-floppy: remove idefloppy_floppy_t typedef sgiioc4: remove maskproc() method hpt366: cleanup maskproc() method ide: mask interrupt in ide_config_drive_speed() hpt366: fix compile warning ide: remove unused macros from ide: remove M68K_IDE_SWAPW define from ide: remove dead ide: fix support for IDE PCI controllers using MMIO on frv ide-cd: remove stale comment ide-cd: small drive type print fix ide-cd: debug log enhancements ide: add generic ATA/ATAPI disk driver ide: allow device drivers to specify per-device type /proc settings ... commit b91385236c00031c64b42b44db8068ad38a5ea11 Merge: d67ae20... 77cd62e... Author: Linus Torvalds Date: Mon Oct 20 12:54:30 2008 -0700 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: fsldma: allow Freescale Elo DMA driver to be compiled as a module fsldma: remove internal self-test from Freescale Elo DMA driver drivers/dma/dmatest.c: switch a GFP_ATOMIC to GFP_KERNEL dmatest: properly handle duplicate DMA channels drivers/dma/ioat_dma.c: drop code after return async_tx: make async_tx_run_dependencies() easier to read commit d67ae206ef05198824c2a306c0c0edf2d2088920 Merge: 1d9a8a4... 7c2500f... Author: Linus Torvalds Date: Mon Oct 20 12:53:40 2008 -0700 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] ib700wdt.c - fix buffer_underflow bug commit 1d9a8a47d659f053abeca9ece45651b4d94780c8 Merge: f07767f... a7c1b99... Author: Linus Torvalds Date: Mon Oct 20 12:53:27 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: fuse: implement nonseekable open fuse: add include protectors fuse: config description improvement fuse: add missing fuse_request_free fuse: fix SEEK_END incorrectness commit f07767fd0f95c385108fa4c456a9cb216a424fec Author: Harvey Harrison Date: Mon Oct 20 10:23:38 2008 -0700 byteorder: remove direct includes of linux/byteorder/swab[b].h A consolidated implementation will provide this generically through asm/byteorder, remove direct includes to avoid breakage when the changeover to the new implementation occurs. This hunk was lost from commit 1d8cca44b6a244b7e378546d719041819049a0f9 ("byteorder: provide swabb.h generically in asm/byteorder.h") Signed-off-by: Harvey Harrison Signed-off-by: Linus Torvalds commit f4432c5caec5fa95ea7eefd00f8e6cee17e2e023 Author: Dave Jones Date: Mon Oct 20 13:31:45 2008 -0400 Update email addresses. Update assorted email addresses and related info to point to a single current, valid address. additionally - trivial CREDITS entry updates. (Not that this file means much any more) - remove arjans dead redhat.com address from powernow driver Signed-off-by: Dave Jones Signed-off-by: Linus Torvalds commit b364776ad1208a71f0c53578c84619a395412a8d Merge: 6da0b38... 6c8909b... Author: David Woodhouse Date: Mon Oct 20 20:16:53 2008 +0100 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: drivers/pci/intel-iommu.c commit 14121bdccc17b8c0e4368a9c0e4f82c3dd47f240 Author: Jeff Layton Date: Mon Oct 20 14:45:22 2008 -0400 cifs: make cifs_rename handle -EACCES errors cifs: make cifs_rename handle -EACCES errors Some servers seem to return -EACCES when attempting to rename one open file on top of another. Refactor the cifs_rename logic to attempt to rename the target file out of the way in this situation. This also fixes the "unlink_target" logic to be undoable if the subsequent rename fails. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 6da0b38f4433fb0f24615449d7966471b6e5eae0 Author: Alexey Dobriyan Date: Mon Oct 20 22:28:45 2008 +0400 fs/Kconfig: move ext2, ext3, ext4, JBD, JBD2 out Use fs/*/Kconfig more, which is good because everything related to one filesystem is in one place and fs/Kconfig is quite fat. Signed-off-by: Alexey Dobriyan Signed-off-by: Linus Torvalds commit 0d468300dc97d6aec084799ffe39253ac366f1e4 Author: Linus Torvalds Date: Mon Oct 20 11:32:09 2008 -0700 Remove empty imacfb.c file Commit 7c08c9ae0c145807c0dae4a55f240fa3d4fd5262 ("efifb/imacfb consolidation + hardware support") claimed to remove imacfb entirely and merge its DMI table into the efifb driver. So far so good, but the diff actually ended up just generating an empty file instead of removing it. [ Technical reason: the patch header looked like diff -puN drivers/video/imacfb.c~efifb-imacfb-consolidation-hardware-support drivers/video/imacfb.c --- a/drivers/video/imacfb.c~efifb-imacfb-consolidation-hardware-support +++ a/drivers/video/imacfb.c @@ -1,376 +0,0 @@ which git will think is a truncation, not a delete. Git wants to see a target of /dev/null to consider it a delete. ] So remove it properly. Signed-off-by: Linus Torvalds commit 96499871f45b9126157b1a5c512d6e30f1635225 Author: Heiko Carstens Date: Mon Oct 20 19:45:43 2008 +0200 PCI: fix pci_ioremap_bar() on s390 s390 doesn't have ioremap_*, so protect the definition of the new pci_ioremap_bar function with CONFIG_HAS_IOMEM to avoid build breakage. Acked-by: Arjan van de Ven Signed-off-by: Heiko Carstens Signed-off-by: Jesse Barnes commit 413460980ea7796582bce672be85879be0865ada Author: Steve French Date: Mon Oct 20 18:24:42 2008 +0000 [CIFS] fix build error Signed-off-by: Steve French commit db7a6d8d01b21829d28638258cbbc9553210bac1 Author: Linus Torvalds Date: Mon Oct 20 11:24:31 2008 -0700 Update .gitignore files for generated targets The generated 'capflags.c' file wasn't properly ignored, and the list of files in scripts/basic/ wasn't up-to-date. Signed-off-by: Linus Torvalds commit 270c66be9b4a6f2be53ef3aec5dc8e7b07782ec9 Author: Yu Zhao Date: Sun Oct 19 20:35:20 2008 +0800 PCI: fix AER capability check The 'use pci_find_ext_capability everywhere' cleanup brought a new bug, which makes the AER stop working. Fix it by actually using find_ext_cap instead of just find_cap. Drop the unused config space size define while we're at it. Signed-off-by: Yu Zhao Signed-off-by: Jesse Barnes commit 0927678f55c9a50c296f7e6dae85e87b8236e155 Author: Jesse Barnes Date: Sat Oct 18 17:33:19 2008 -0700 PCI: use pci_find_ext_capability everywhere Remove some open coded (and buggy) versions of pci_find_ext_capability in favor of the real routine in the PCI core. Tested-by: Tomasz Czernecki Acked-by: Andrew Vasquez Reviewed-by: Matthew Wilcox Signed-off-by: Jesse Barnes commit 1543c90c39360df333a21bfbbdfe812ae23b8167 Author: Jesse Barnes Date: Sat Oct 18 17:19:38 2008 -0700 PCI: remove #ifdef DEBUG around dev_dbg call No longer needed since we don't use the function symbol stuff anymore. Signed-off-by: Jesse Barnes commit bd1d9855be3ab8a5c2b31053d464b7fe63e6963b Author: Kenji Kaneshige Date: Mon Sep 29 17:37:05 2008 +0900 PCI hotplug: fix get_##name return value problem The commit 356a9d6f3dd283f83861adf1ac909879f0e66411 (PCI: fix hotplug get_##name return value problem) doesn't seem to be merged properly. Because of this, PCI hotplug no longer works (Read/Write PCI hotplug files always returns -ENODEV). This patch fixes wrong check of try_module_get() return value check in get_##name(). Signed-off-by: Kenji Kaneshige Signed-off-by: Jesse Barnes commit e5665a45fa28d0114f61b5d534a3b2678592219d Author: Chuck Ebbert Date: Wed Sep 24 20:40:34 2008 -0400 PCI: document the pcie_aspm kernel parameter It can be handy so make sure people know about it. Signed-off-by: Chuck Ebbert Signed-off-by: Jesse Barnes commit aa42d7c6138afdc54f74e971456a0fbfec16b77b Author: Arjan van de Ven Date: Sun Sep 28 16:36:11 2008 -0700 PCI: introduce an pci_ioremap(pdev, barnr) function A common thing in many PCI drivers is to ioremap() an entire bar. This is a slightly fragile thing right now, needing both an address and a size, and many driver writers do.. various things there. This patch introduces an pci_ioremap() function taking just a PCI device struct and the bar number as arguments, and figures this all out itself, in one place. In addition, we can add various sanity checks to this function (the patch already checks to make sure that the bar in question really is a MEM bar; few to no drivers do that sort of thing). Hopefully with this type of API we get less chance of mistakes in drivers with ioremap() operations. Signed-off-by: Arjan van de Ven Signed-off-by: Jesse Barnes commit e9f82cb75096ae30658a72d473bf170bf4d3bb2e Author: Benjamin Herrenschmidt Date: Tue Oct 14 11:55:31 2008 +1100 powerpc/PCI: Add legacy PCI access via sysfs This patch adds support for legacy_io and legacy_mem files in bus class directories in sysfs for powerpc Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Jesse Barnes commit f19aeb1f3638b7bb4ca21eb361f004fac2bfe259 Author: Benjamin Herrenschmidt Date: Fri Oct 3 19:49:32 2008 +1000 PCI: Add ability to mmap legacy_io on some platforms This adds the ability to mmap legacy IO space to the legacy_io files in sysfs on platforms that support it. This will allow to clean up X to use this instead of /dev/mem for legacy IO accesses such as those performed by Int10. While at it I moved pci_create/remove_legacy_files() to pci-sysfs.c where I think they belong, thus making more things statis in there and cleaned up some spurrious prototypes in the ia64 pci.h file Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Jesse Barnes commit f393d9b130423a7a47c751b26df07ceaa5dc76a9 Author: Vincent Legoll Date: Sun Oct 12 12:26:12 2008 +0200 PCI: probing debug message uniformization This patch uniformizes PCI probing debug boot messages with dev_printk() intead of manual printk() It changes adress range output from [%llx, %llx] to [%#llx-%#llx], like in pci_request_region(). For example, it goes from the mixed-style: PCI: 0000:00:1b.0 reg 10 64bit mmio: [f4280000, f4283fff] pci 0000:00:1b.0: PME# supported from D0 D3hot D3cold to uniform: pci 0000:00:1b.0: reg 10 64bit mmio: [0xf4280000-0xf4283fff] pci 0000:00:1b.0: PME# supported from D0 D3hot D3cold This patch has been runtime tested, boot log messages diffed, everything looks OK. Acked-by: Bjorn Helgaas Signed-off-by: Vincent Legoll Signed-off-by: Jesse Barnes commit 58c3a727cb73b75a9104d295f096cca12959a5a5 Author: Yu Zhao Date: Tue Oct 14 14:02:53 2008 +0800 PCI: support PCIe ARI capability This patch adds support for PCI Express Alternative Routing-ID Interpretation (ARI) capability. The ARI capability extends the Function Number field of the PCI Express Endpoint by reusing the Device Number which is otherwise hardwired to 0. With ARI, an Endpoint can have up to 256 functions. Signed-off-by: Yu Zhao Signed-off-by: Jesse Barnes commit 201de56eb22f1ff3f36804bc70cbff220b50f067 Author: Zhao, Yu Date: Mon Oct 13 19:49:55 2008 +0800 PCI: centralize the capabilities code in probe.c This patch centralizes the initialization and release functions of various PCI capabilities in probe.c, which makes the introduction of new capability support functions cleaner in the future. Signed-off-by: Yu Zhao Signed-off-by: Jesse Barnes commit 280c73d3691fb182fa55b0160737c2c0feb79471 Author: Zhao, Yu Date: Mon Oct 13 20:01:00 2008 +0800 PCI: centralize the capabilities code in pci-sysfs.c This patch centralizes functions used to add and remove sysfs entries for various capabilities. With this cleanup, the code is more readable and easier for adding new capability related functions. Signed-off-by: Yu Zhao Signed-off-by: Jesse Barnes commit e354597cce8d219d135d65e585dc4f30323486b9 Author: Peter Chubb Date: Mon Oct 13 11:49:04 2008 +1100 PCI: fix 64-vbit prefetchable memory resource BARs Since patch 6ac665c63dcac8fcec534a1d224ecbb8b867ad59 my infiniband controller hasn't worked. This is because it has 64-bit prefetchable memory, which was mistakenly being taken to be 32-bit memory. The resource flags in this case are PCI_BASE_ADDRESS_MEM_TYPE_64 | PCI_BASE_ADDRESS_MEM_PREFETCH. This patch checks only for the PCI_BASE_ADDRESS_MEM_TYPE_64 bit; thus whether the region is prefetchable or not is ignored. This fixes my Infiniband. Reviewed-by: Matthew Wilcox Signed-off-by: Peter Chubb Signed-off-by: Jesse Barnes commit 557848c3c03ad1d1e66cb3b5b06698e3a9ebc33c Author: Zhao, Yu Date: Mon Oct 13 19:18:07 2008 +0800 PCI: replace cfg space size (256/4096) by macros. This is a cleanup that changes all PCI configuration space size representations to the macros (PCI_CFG_SPACE_SIZE and PCI_CFG_SPACE_EXP_SIZE). And the macros are also moved from drivers/pci/probe.c to drivers/pci/pci.h. Signed-off-by: Yu Zhao Signed-off-by: Jesse Barnes commit 022edd86d7c864bc8fadc3c8ac4e6a464472ab05 Author: Zhao, Yu Date: Mon Oct 13 19:24:28 2008 +0800 PCI: use resource_size() everywhere. This is a cleanup that replaces the resource calculation formula with resource_size(). Signed-off-by: Yu Zhao Signed-off-by: Jesse Barnes commit c322b28a04c084a467a862766f74c40c917a721c Author: Zhao, Yu Date: Mon Oct 13 19:36:05 2008 +0800 PCI: use same arg names in PCI_VDEVICE comment This cleanup makes the argument names in PCI_VDEVICE comment consistent with those used in its definition. Signed-off-by: Yu Zhao Signed-off-by: Jesse Barnes commit 5d9bc1fa47f0c1561f1d7c0bdff5e24860852b42 Author: Kristen Carlson Accardi Date: Mon Oct 13 09:59:12 2008 -0700 PCI hotplug: rpaphp: make debug var unique Change debug variable name to one more unique to this driver. Signed-off-by: Kristen Carlson Accardi Signed-off-by: Jesse Barnes commit c9bbb4abb658daf6cc6f92fb4751a7796a5aab75 Author: Yinghai Lu Date: Wed Sep 24 19:04:33 2008 -0700 PCI: use %pF instead of print_fn_descriptor_symbol() in quirks.c Use %pF instead of print_fn_descriptor_symbol() in quirks.c to get the name of the hook we're calling. Signed-off-by: Yinghai Lu Signed-off-by: Jesse Barnes commit c8761fe80ed052634153438405c9048611ae7ae1 Author: Zhao, Yu Date: Mon Sep 22 14:26:05 2008 +0800 PCI: fix hotplug get_##name return value problem Currently, get_##name in pci_hotplug_core.c will return 0 if module unload wins the race between unload & reading the hotplug file. Fix that case to return -ENODEV like it should. Reviewed-by: Alex Chiang Reviewed-by: Matthew Wilcox Signed-off-by: Yu Zhao Signed-off-by: Jesse Barnes commit 11d587429e9cbb40ac20d7ed8126c66da0d7aba5 Author: Stephen Hemminger Date: Fri Sep 5 21:45:36 2008 -0700 PCI: fix sparse warning in pci_remove_behind_bridge Get rid of the second definition of dev which hides the earlier one in the argument list and causes a warning from sparse. Signed-off-by: Stephen Hemminger Signed-off-by: Jesse Barnes commit 50cbfa511a21cac1909b6b4c955fa39d1da81457 Author: Roland Dreier Date: Mon Sep 22 14:55:24 2008 -0700 PCI: fix MSI-HOWTO.txt info about MSI-X MMIO space The current MSI-HOWTO.txt says that device drivers should not request the memory space that contains MSI-X tables. This is because the original MSI-X implementation did a request_mem_region() on this space, but that code was removed long ago (in the pre-git era, in fact). Years after the code was changed, we might as well clean up the documention to avoid a confusing mention of requesting regions: drivers using MSI-X can just use pci_request_regions() just like any other driver, and so there's no need for MSI-HOWTO.txt to talk about this at all. Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Jesse Barnes commit ec84f1268fcf16c4a852fdb38b3a541748644918 Author: Jesse Barnes Date: Tue Sep 23 11:43:34 2008 -0700 PCI: fix -Wakpm warnings in pci_pm_init debug output Checkpatch would have complained about this but neither Bjorn nor myself ran it prior to pushing. Fixup the issues Andrew pointed out. Signed-off-by: Jesse Barnes commit cef354db0d7a7207ea78c716753d9216a9c2b7e1 Author: Alex Chiang Date: Tue Sep 2 09:40:51 2008 -0600 PCI: connect struct pci_dev to struct pci_slot The introduction of struct pci_slot (f46753c5e354b857b20ab8e0fe7b25) added a struct pci_slot pointer to struct pci_dev, but we forgot to associate the two. Connect the two structs together; the interesting portions of the object lifetimes are: - when a new pci_slot is created, connect it to the appropriate pci_dev's. A single pci_slot may be associated with multiple pci_dev's, e.g. any multi-function PCI device. - when a pci_slot is released, look for all the pci_dev's it was associated with, and set their pci_slot pointers to NULL - when a pci_dev is created, look for slots to associate with. Note -- when a pci_dev is released, we don't need to do any bookkeeping, since pci_slot's do not have pointers to pci_dev's. Signed-off-by: Alex Chiang Signed-off-by: Jesse Barnes commit 93ff68a55aa92180a765d6c51c3303f6200167a6 Author: Mike Travis Date: Sat Sep 6 05:46:42 2008 -0700 PCI: make CPU list affinity visible Stephen Hemminger wrote: > Looks like Mike created cpulistaffinty in sysfs but never completed > the job. This patch hooks things up correctly, taking care to remove the new file when the bus is destroyed. Signed-off-by: Stephen Hemminger Signed-off-by: Mike Travis Signed-off-by: Jesse Barnes commit 5993760f7fc75b77e4701f1e56dc84c0d6cf18d5 Author: Jike Song Date: Tue Sep 9 23:42:03 2008 +0800 PCI: utilize calculated results when detecting MSI features In msi_capability_init, we can make use of the calculated results instead of calling is_mask_bit_support and is_64bit_address twice. Signed-off-by: Jike Song Signed-off-by: Jesse Barnes commit 7f2feec140f1f1e4f701e013a2bf8284a9ec2a3c Author: Taku Izumi Date: Fri Sep 5 12:11:26 2008 +0900 PCI: pciehp: replace printk with dev_printk This patch replaces printks within pciehp module with dev_printks. Signed-off-by: Taku Izumi Signed-off-by: Jesse Barnes commit 83e9ad540b9ee23919961f9500ca254220b78d09 Author: Taku Izumi Date: Fri Sep 5 12:09:43 2008 +0900 PCI: pciehp: change name tag of "hpdriver_portdrv" variable I think an appropriate name tag of "hpdriver_portdrv" variable is "pciehp" rather than "hpdriver". Signed-off-by: Taku Izumi Signed-off-by: Jesse Barnes commit 37a84ec668ba251ae02cf2c2c664baf6b247ae1f Author: Seth Heasley Date: Thu Aug 28 15:40:59 2008 -0700 x86/PCI: irq and pci_ids patch for Intel Ibex Peak DeviceIDs This patch updates the Intel Ibex Peak (PCH) LPC and SMBus Controller DeviceIDs. The LPC Controller ID is set by Firmware within the range of 0x3b00-3b1f. This range is included in pci_ids.h using min and max values, and irq.c now has code to handle the range (in lieu of 32 additions to a SWITCH statement). The SMBus Controller ID is a fixed-value and will not change. Signed-off-by: Seth Heasley Acked-by: Jean Delvare Signed-off-by: Jesse Barnes commit f7a10e32a1a7ae240fa3925c5727d224eba3e31d Author: Kenji Kaneshige Date: Fri Aug 22 17:16:48 2008 +0900 PCI: pciehp: fix irq initialization Current pciehp driver gets irq number from pci_dev->irq. But because pciehp driver is a pci express port service driver, it should get irq number from pcie_device->irq. Signed-off-by: Kenji Kaneshige Signed-off-by: Jesse Barnes commit c01156061bdd5976397dfb173f8c70ae351a6cb6 Author: Andi Kleen Date: Fri Aug 22 09:53:39 2008 +0200 PCI: Document that most pci options are shared between i386 and x86-64 Since the code is shared pretty much most of the pci= options are shared, but kernel-parameters.txt marked most of them as i386 only. Signed-off-by: Andi Kleen Signed-off-by: Jesse Barnes commit c9ed77eeba8ec2541a40918210bcc676acacd43a Author: Bjorn Helgaas Date: Fri Aug 22 09:37:02 2008 -0600 PCI: tidy PME support messages This patch changes these two messages: pci 0000:00:03.0: supports D1 pci 0000:00:03.0: supports D2 to this: pci 0000:00:03.0: supports D1 D2 It also trivially converts a "dev_printk(KERN_INFO, ...)" to "dev_info(...)". Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes commit 2fd39aa7c2f3d696814abb3e8962c759eee484f3 Author: akpm@linux-foundation.org Date: Fri Aug 22 13:30:14 2008 -0700 PCI: ibmphp: list_for_each to list_for_each_entry-checkpatch cleanups Please run checkpatch prior to sending patches, this one fixes several style issues with the list_for_each conversion patch. Cc: Cordelia Sam Cc: Cordelia Sam Cc: Kristen Carlson Accardi Signed-off-by: Andrew Morton Signed-off-by: Jesse Barnes commit a8d2dbd38481e0c35c6bdd8196dd38a42ae45d02 Author: akpm@linux-foundation.org Date: Fri Aug 22 13:28:17 2008 -0700 PCI: ibmphp: list_for_each to list_for_each_entry Make code more readable with list_for_each_entry(). Signed-off-by: Cordelia Sam Cc: Kristen Carlson Accardi Signed-off-by: Andrew Morton Signed-off-by: Jesse Barnes commit 34a2e15e95fce6d6f4d30162f53a0ceb25d5bbaf Author: Bjorn Helgaas Date: Mon Aug 25 15:45:20 2008 -0600 PCI: follow lspci device/vendor style Use "[%04x:%04x]" for PCI vendor/device IDs to follow the format used by lspci(8). Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes commit d768cb6929773060171eee8397a63883f60ddc07 Author: Bjorn Helgaas Date: Mon Aug 25 15:44:59 2008 -0600 x86/PCI: follow lspci device/vendor style Use "[%04x:%04x]" for PCI vendor/device IDs to follow the format used by lspci(8). Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes commit 16dbef4a831782466b10d4ae56837c5ba17d1948 Author: Yinghai Lu Date: Fri Aug 15 19:36:45 2008 -0700 PCI: change MSI-x vector to 32bit We are using 28bit pci (bus/dev/fn + 12 bits) as irq number, so the cache for irq number should be 32 bit too. Signed-off-by: Yinghai Lu Cc: Andrew Vasquez Signed-off-by: Jesse Barnes commit 0235c4fc7fc6f621dc0dd89eba102ad5aa373390 Author: Rafael J. Wysocki Date: Mon Aug 18 21:38:00 2008 +0200 PCI PM: Introduce function pci_wake_from_d3 Many device drivers use the following sequence of statements to enable the device to wake up the system while being in the D3_hot or D3_cold low power state: pci_enable_wake(pdev, PCI_D3hot, 1); pci_enable_wake(pdev, PCI_D3cold, 1); However, the second call is not necessary if the first one succeeds (the ordering of the statements above doesn't matter here) and it may even be harmful, because we are not supposed to enable PME# after the wake-up power has been enabled for the device. To allow drivers to overcome this problem, introduce function pci_wake_from_d3() that will enable the device to wake up the system from any of D3_hot and D3_cold as long as the wake-up from at least one of them is supported. Acked-by: Pavel Machek Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes commit 3d137310245e4cdc3e8c8ba1bea2e145a87ae8e3 Author: Thomas Petazzoni Date: Tue Aug 19 10:28:24 2008 +0200 PCI: allow quirks to be compiled out This patch adds the CONFIG_PCI_QUIRKS option which allows to remove all the PCI quirks, which are not necessarily used on embedded systems when PCI is working properly. As this is a size-reduction option, it depends on CONFIG_EMBEDDED. It allows to save almost 12 kilobytes of kernel code: text data bss dec hex filename 1287806 123596 212992 1624394 18c94a vmlinux.old 1275854 123596 212992 1612442 189a9a vmlinux -11952 0 0 -11952 -2EB0 +/- This patch has originally been written by Zwane Mwaikambo and is part of the Linux Tiny project. Signed-off-by: Thomas Petazzoni Signed-off-by: Jesse Barnes commit b41d6cf38e27a940d998d989526a9748de1bf028 Author: Jean Delvare Date: Sun Aug 17 21:06:59 2008 +0200 PCI: Check dynids driver_data value for validity Only accept dynids whose driver_data value matches one of the driver's pci_driver_id entries. This prevents the user from accidentally passing values the drivers do not expect. Cc: Milton Miller Acked-by: Greg Kroah-Hartman Signed-off-by: Jean Delvare Signed-off-by: Jesse Barnes commit edbc25caaa492a82e19baa915f1f6b0a0db6554d Author: Milton Miller Date: Thu Jul 10 16:29:37 2008 -0500 PCI: remove dynids.use_driver_data The driver flag dynids.use_driver_data is almost consistently not set, and causes more problems than it solves. It was initially intended as a flag to indicate whether a driver's usage of driver_data had been carefully inspected and was ready for values from userspace. That audit was never done, so most drivers just get a 0 for driver_data when new IDs are added from userspace via sysfs. So remove the flag, allowing drivers to see the data directly (a followon patch validates the passed driver_data value against what the drivers expect). Acked-by: Greg Kroah-Hartman Acked-by: Jean Delvare Signed-off-by: Milton Miller Signed-off-by: Jesse Barnes commit 921974982a7aab561a1c3ff1763af7470874ba8e Merge: 7d67474... 08c55e2... Author: Linus Torvalds Date: Mon Oct 20 10:17:42 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: s3cmci: Add Ben Dooks/Simtec Electronics to header & copyright s3cmci: fix continual accesses to host->pio_ptr s3cmci: Support transfers which are not multiple of 32 bits. s3cmci: cpufreq support s3cmci: Make general protocol errors less noisy mmc_block: tell block layer there is no seek penalty commit 7d67474e506598fe26e0c262acf02132dc730517 Merge: 252883e... ed8c317... Author: Linus Torvalds Date: Mon Oct 20 09:44:30 2008 -0700 Merge git://git.infradead.org/battery-2.6 * git://git.infradead.org/battery-2.6: bq27x00_battery: use unaligned access helper power_supply: fix dependency of tosa_battery power_supply: Support for Texas Instruments BQ27200 battery managers power_supply: Add function to return system-wide power state pda_power: Check and handle return value of set_irq_wake commit 252883e512c6d8fbc03b6738f1620fda44c4d472 Author: Alan Cox Date: Fri Oct 17 20:28:25 2008 +0100 epca: Add infinite break support The EPCA can support indefinte break lengths and with info from digi that can now be added Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 45e4a24f7b6b23810142112b5850fe75696a1155 Merge: 52c6738... 7eb923b... Author: Linus Torvalds Date: Mon Oct 20 09:39:47 2008 -0700 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs: (26 commits) 9p: add more conservative locking 9p: fix oops in protocol stat parsing error path. 9p: fix device file handling 9p: Improve debug support 9p: eliminate depricated conv functions 9p: rework client code to use new protocol support functions 9p: remove unnecessary tag field from p9_req_t structure 9p: remove 9p fcall debug prints 9p: add new protocol support code 9p: encapsulate version function 9p: move dirread to fs layer 9p: adjust 9p vfs write operation 9p: move readn meta-function from client to fs layer 9p: consolidate read/write functions 9p: drop broken unused error path from p9_conn_create() 9p: make rpc code common and rework flush code 9p: use the rcall structure passed in the request in trans_fd read_work 9p: apply common request code to trans_fd 9p: apply common tagpool handling to trans_fd 9p: move request management to client code ... commit 52c6738b7f46255217942062dfa60daa7cf72510 Merge: 3b72e44... ec9a05c... Author: Linus Torvalds Date: Mon Oct 20 09:39:20 2008 -0700 Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6 * git://git.linux-nfs.org/projects/trondmy/nfs-2.6: NFS: use correct fs type for v4 submounts and referrals Make nfs_file_cred more robust. NFS: Enable NFSv4 callback server to listen on AF_INET6 sockets commit 3b72e4415438538c0967fd1aee930f688ccdf6dd Merge: 396b122... 64c12e9... Author: Linus Torvalds Date: Mon Oct 20 09:22:47 2008 -0700 Merge branch 'for-next' of git://git.o-hand.com/linux-mfd * 'for-next' of git://git.o-hand.com/linux-mfd: mfd: further unbork the ucb1400 ac97_bus dependencies mfd: ucb1400 needs GPIO mfd: ucb1400 sound driver uses/depends on AC97_BUS: mfd: Don't use NO_IRQ in WM8350 mfd: update TMIO drivers to use the clock API mfd: twl4030-core irq simplification mfd: add base support for Dialog DA9030/DA9034 PMICs mfd: TWL4030 core driver mfd: support tmiofb cell on tc6393xb mfd: add OHCI cell to tc6393xb mfd: Fix htc-egpio compile warning mfd: do tcb6393xb state restore on resume only if requested mfd: provide and use setup hook for tc6393xb mfd: update sm501 debugging/low information messages mfd: reduce stack usage in mfd-core.c commit 396b122f6af3d329df3b4d688f6e66de3e2a399a Merge: ed402af... 54779aa... Author: Linus Torvalds Date: Mon Oct 20 09:19:03 2008 -0700 Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 * 'linux-next' of git://git.infradead.org/ubifs-2.6: (25 commits) UBIFS: fix ubifs_compress commentary UBIFS: amend printk UBIFS: do not read unnecessary bytes when unpacking bits UBIFS: check buffer length when scanning for LPT nodes UBIFS: correct condition to eliminate unecessary assignment UBIFS: add more debugging messages for LPT UBIFS: fix bulk-read handling uptodate pages UBIFS: improve garbage collection UBIFS: allow for sync_fs when read-only UBIFS: commit on sync_fs UBIFS: correct comment for commit_on_unmount UBIFS: update dbg_dump_inode UBIFS: fix commentary UBIFS: fix races in bit-fields UBIFS: ensure data read beyond i_size is zeroed out correctly UBIFS: correct key comparison UBIFS: use bit-fields when possible UBIFS: check data CRC when in error state UBIFS: improve znode splitting rules UBIFS: add no_chk_data_crc mount option ... commit ed402af3c23a4804b3f8899263e8d0f97c62ab49 Merge: 096e6f6... 40e24c4... Author: Linus Torvalds Date: Mon Oct 20 09:13:34 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (112 commits) sh: Move SH-4 CPU headers down one more level. sh: Only build in gpio.o when CONFIG_GENERIC_GPIO is selected. sh: Migrate common board headers to mach-common/. sh: Move the CPU definition headers from asm/ to cpu/. serial: sh-sci: Add support SCIF of SH7723 video: add sh_mobile_lcdc platform flags video: remove unused sh_mobile_lcdc platform data sh: remove consistent alloc cruft sh: add dynamic crash base address support sh: reduce Migo-R smc91x overruns sh: Fix up some merge damage. Fix debugfs_create_file's error checking method for arch/sh/mm/ Fix debugfs_create_dir's error checking method for arch/sh/kernel/ sh: ap325rxa: Add support RTC RX-8564LC in AP325RXA board sh: Use sh7720 GPIO on magicpanelr2 board sh: Add sh7720 pinmux code sh: Use sh7203 GPIO on rsk7203 board sh: Add sh7203 pinmux code sh: Use sh7723 GPIO on AP325RXA board sh: Add sh7723 pinmux code ... commit 096e6f673dc02a6394dc9a7d8f8735c6978f5b91 Author: Benjamin Herrenschmidt Date: Mon Oct 20 15:07:37 2008 +1100 pci: Use new %pR to print resource ranges This converts things in drivers/pci to use %pR to printout the content of a struct resource instead of hand-casted %llx or other variants. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 332d2e7834986a9326ec3fa6a91641daef81746c Author: Linus Torvalds Date: Mon Oct 20 15:07:34 2008 +1100 Implement %pR to print struct resource content Add a %pR option to the kernel vsnprintf that prints the range of addresses inside a struct resource passed by pointer. Signed-off-by: Linus Torvalds Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 88e366217e8f75bd7eab64f4aa4ff9583070b0af Merge: a1cf649... 975f6b0... Author: Linus Torvalds Date: Mon Oct 20 09:09:56 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: ASoC: OMAP: Fix DSP DAI format in McBSP DAI driver go7007 - Add missing dependency on sound subsystem ALSA: ps3: Add support for SPDIF/HDMI passthru ps3: Add passthru support for non-audio streams ps3: Add ps3av_audio_mute_analog() ALSA: misc typo fixes sound: add missing pcm kernel-doc commit a1cf64944f6f2ffe5ef30a0ee4d529db771f7db2 Author: Stephen Rothwell Date: Mon Oct 20 22:59:18 2008 +1100 staging: sxg depends on X86 sxghif.h has code that explicitly will not build fo other architecures. Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit 5fdf11283e26719543eb5f9b68707e1af77eb875 Merge: 2be508d... fdc9314... Author: Linus Torvalds Date: Mon Oct 20 09:06:35 2008 -0700 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: netfilter: replace old NF_ARP calls with NFPROTO_ARP netfilter: fix compilation error with NAT=n netfilter: xt_recent: use proc_create_data() netfilter: snmp nat leaks memory in case of failure netfilter: xt_iprange: fix range inversion match netfilter: netns: use NFPROTO_NUMPROTO instead of NUMPROTO for tables array netfilter: ctnetlink: remove obsolete NAT dependency from Kconfig pkt_sched: sch_generic: Fix oops in sch_teql dccp: Port redirection support for DCCP tcp: Fix IPv6 fallout from 'Port redirection support for TCP' netdev: change name dropping error codes ipvs: Update CONFIG_IP_VS_IPV6 description and help text commit 2be508d847392e431759e370d21cea9412848758 Merge: 01e8ef1... 8a1a627... Author: Linus Torvalds Date: Mon Oct 20 09:03:12 2008 -0700 Merge git://git.infradead.org/mtd-2.6 * git://git.infradead.org/mtd-2.6: (69 commits) Revert "[MTD] m25p80.c code cleanup" [MTD] [NAND] GPIO driver depends on ARM... for now. [MTD] [NAND] sh_flctl: fix compile error [MTD] [NOR] AT49BV6416 has swapped erase regions [MTD] [NAND] GPIO NAND flash driver [MTD] cmdlineparts documentation change - explain where mtd-id comes from [MTD] cfi_cmdset_0002.c: Add Macronix CFI V1.0 TopBottom detection [MTD] [NAND] Fix compilation warnings in drivers/mtd/nand/cs553x_nand.c [JFFS2] Write buffer offset adjustment for NOR-ECC (Sibley) flash [MTD] mtdoops: Fix a bug where block may not be erased [MTD] mtdoops: Add a magic number to logged kernel oops [MTD] mtdoops: Fix an off by one error [JFFS2] Correct parameter names of jffs2_compress() in comments [MTD] [NAND] sh_flctl: add support for Renesas SuperH FLCTL [MTD] [NAND] Bug on atmel_nand HW ECC : OOB info not correctly written [MTD] [MAPS] Remove unused variable after ROM API cleanup. [MTD] m25p80.c extended jedec support (v2) [MTD] remove unused mtd parameter in of_mtd_parse_partitions() [MTD] [NAND] remove dead Kconfig associated with !CONFIG_PPC_MERGE [MTD] [NAND] driver extension to support NAND on TQM85xx modules ... commit 01e8ef11bc1a74e65678ed55795f59266d4add01 Author: Parag Warudkar Date: Sat Oct 18 20:28:50 2008 -0700 x86: sysfs: kill owner field from attribute Tejun's commit 7b595756ec1f49e0049a9e01a1298d53a7faaa15 made sysfs attribute->owner unnecessary. But the field was left in the structure to ease the merge. It's been over a year since that change and it is now time to start killing attribute->owner along with its users - one arch at a time! This patch is attempt #1 to get rid of attribute->owner only for CONFIG_X86_64 or CONFIG_X86_32 . We will deal with other arches later on as and when possible - avr32 will be the next since that is something I can test. Compile (make allyesconfig / make allmodconfig / custom config) and boot tested. akpm: the idea is that we put the declaration of sttribute.owner inside `#ifndef CONFIG_X86'. But that proved to be too ambitious for now because new usages kept on turning up in subsystem trees. [akpm: remove the ifdef for now] Signed-off-by: Parag Warudkar Cc: Greg KH Cc: Ingo Molnar Cc: Tejun Heo Cc: Len Brown Cc: Jens Axboe Cc: Jean Delvare Cc: Roland Dreier Cc: David Brownell Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bb26b963d8343bb1bde842fba0b6e00cad841f31 Author: Alexey Dobriyan Date: Sat Oct 18 20:28:49 2008 -0700 fs/Kconfig: move CIFS out Signed-off-by: Alexey Dobriyan Cc: Steven French Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a85a7dda15f88b7f9c96c67fe826b5d0486d601 Author: Adrian Bunk Date: Sat Oct 18 20:28:48 2008 -0700 include/linux/bcd.h: remove comments - the macros are gone - there's no more code in this file, LGPL + GPL = GPL, and the code that was moved to lib/bcd.c is anyway trivial Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a0098efd6ee4e8c04d82d761aa1bb9ec7a0aa32d Author: Adrian Bunk Date: Sat Oct 18 20:28:47 2008 -0700 remove the obsolete BCD*BIN/BIN*BCD macros Remove the following obsolete macros: - BCD2BIN - BIN2BCD - BCD_TO_BIN - BIN_TO_BCD Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2cee5dfa8b01524a1d937d56ee518677b7acfb38 Author: Adrian Bunk Date: Sat Oct 18 20:28:47 2008 -0700 drivers/scsi/sr_vendor.c: use bcd2bin Change sr_vendor.c to use the new bcd2bin function instead of the obsolete BCD2BIN macro. Signed-off-by: Adrian Bunk Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e4d33969c2d0a9b92c7a2853e3f890dcb4ea37d1 Author: Adrian Bunk Date: Sat Oct 18 20:28:46 2008 -0700 i2c: use bcd2bin/bin2bcd Change i2c to use the new bcd2bin/bin2bcd functions instead of the obsolete BCD2BIN/BIN2BCD macros. Signed-off-by: Adrian Bunk Cc: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f6a2298c5fd1f074aa3626febea33f48cd3b5a94 Author: Adrian Bunk Date: Sat Oct 18 20:28:45 2008 -0700 mn10300: use bcd2bin/bin2bcd Change mn10300 to use the new bcd2bin/bin2bcd functions instead of the obsolete BCD_TO_BIN/BIN_TO_BCD macros. Signed-off-by: Adrian Bunk Acked-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 02112dbc925f664bc4d24ff098686b9d21bfbfb1 Author: Adrian Bunk Date: Sat Oct 18 20:28:44 2008 -0700 mips: use bcd2bin/bin2bcd Changes mips to use the new bcd2bin/bin2bcd functions instead of the obsolete BCD_TO_BIN/BIN_TO_BCD/BCD2BIN/BIN2BCD macros. Signed-off-by: Adrian Bunk Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e232cfdc3d087d435c9ee767ddd4e6f52457d02a Author: Andrew Morton Date: Sat Oct 18 20:28:43 2008 -0700 drivers/rtc/rtc-bq4802.c: don't use BIN_2_BCD and BCD_2_BIN These are going away. Cc: Takashi Iwai Cc: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 357c6e63590895dc87cc9300f5a1c27544ea69e8 Author: Adrian Bunk Date: Sat Oct 18 20:28:42 2008 -0700 rtc: use bcd2bin/bin2bcd Change various rtc related code to use the new bcd2bin/bin2bcd functions instead of the obsolete BCD_TO_BIN/BIN_TO_BCD/BCD2BIN/BIN2BCD macros. Signed-off-by: Adrian Bunk Acked-by: Alessandro Zummo Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fe20ba70abf7d6e5855c3dacc729490b3d0d077f Author: Adrian Bunk Date: Sat Oct 18 20:28:41 2008 -0700 drivers/rtc/: use bcd2bin/bin2bcd Change drivers/rtc/ to use the new bcd2bin/bin2bcd functions instead of the obsolete BCD_TO_BIN/BIN_TO_BCD/BCD2BIN/BIN2BCD macros. Signed-off-by: Adrian Bunk Acked-by: Alessandro Zummo Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4110a0d6206bd175419cc5503f80cc296d184cbf Author: Adrian Bunk Date: Sat Oct 18 20:28:40 2008 -0700 cris: use bcd2bin/bin2bcd Change cris to use the new bcd2bin/bin2bcd functions instead of the obsolete BCD_TO_BIN/BIN_TO_BCD macros. Signed-off-by: Adrian Bunk Cc: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 18b1bd054991266d19413e155e371b5e25c98cb7 Author: Adrian Bunk Date: Sat Oct 18 20:28:39 2008 -0700 alpha: use bcd2bin/bin2bcd Change alpha to use the new bcd2bin/bin2bcd functions instead of the obsolete BCD_TO_BIN/BIN_TO_BCD macros. Signed-off-by: Adrian Bunk Cc: Richard Henderson Cc: Ivan Kokshaysky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab527d75787c16114bcf2bc1b98bef18c67bb57c Author: Adrian Bunk Date: Sat Oct 18 20:28:39 2008 -0700 acpi: use bcd2bin/bin2bcd Change ACPI to use the new bcd2bin/bin2bcd functions instead of the obsolete BCD_TO_BIN/BIN_TO_BCD macros. Signed-off-by: Adrian Bunk Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fdd2e5f88a259a537bb239e0c03c973cb6ea402a Author: Adrian Bunk Date: Sat Oct 18 20:28:38 2008 -0700 make mm/rmap.c:anon_vma_cachep static This patch makes the needlessly global anon_vma_cachep static. Signed-off-by: Adrian Bunk Reviewed-by: KOSAKI Motohiro Acked-by: Rik van Riel Acked-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a651a00e20fd4997f0b91258f6f95b7d96edcd9 Author: Harvey Harrison Date: Sat Oct 18 20:28:37 2008 -0700 byteorder: remove direct includes of linux/byteorder/swab[b].h A consolidated implementation will provide this generically through asm/byteorder, remove direct includes to avoid breakage when the changeover to the new implementation occurs. Signed-off-by: Harvey Harrison Acked-by: Mauro Carvalho Chehab Acked-by: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d8cca44b6a244b7e378546d719041819049a0f9 Author: Harvey Harrison Date: Sat Oct 18 20:28:37 2008 -0700 byteorder: provide swabb.h generically in asm/byteorder.h This is needed during the transition to the new byteorder headers as the swabb.h functionality will be provided from asm/byteorder.h in the new version. To avoid breakage on arches still using the old implementation, provide swabb.h from asm/byteorder.h as well. Signed-off-by: Harvey Harrison Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit acf0108a84edae22b99655eb2f6f6c9f7ec4d449 Author: Harvey Harrison Date: Sat Oct 18 20:28:36 2008 -0700 byteorder: use generic C version for value byteswapping This makes the new implementation of the byteorder helpers match the old in how it degraded when an arch-defined version was not available: 1) swab() - look for arch defined - if not, use generic c version 2) swabp() - look for arch-defined - if not, deref pointer and use swab() 3) swabs() - look for arch defined - if not, use swabp Signed-off-by: Harvey Harrison Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b8e465f4945bc0e9f324e3bbe15f5180a8e9a6fe Author: Harvey Harrison Date: Sat Oct 18 20:28:35 2008 -0700 byteorder: add new headers for make headers-install Signed-off-by: Harvey Harrison Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b274f44d2ca05f719fe39947b6a5293a2dbd8fd Author: Benjamin Herrenschmidt Date: Sat Oct 18 20:28:35 2008 -0700 edac cell: fix incorrect edac_mode The cell_edac driver is setting the edac_mode field of the csrow's to an incorrect value, causing the sysfs show routine for that field to go out of an array bound and Oopsing the kernel when used. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Doug Thompson Cc: [2.6.27.x, 2.6.26.x. 2.6.25.x] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b64fd291acd8c921b4757faed1d4dded31c27edf Author: Andre Haupt Date: Sat Oct 18 20:28:33 2008 -0700 pc8736x_gpio: add support for PC87365 chips This is only compile tested, because I do not own appropriate hardware. Signed-off-by: Andre Haupt Cc: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b231cca4381ee15ec99afbfb244fbc0324869927 Author: Joe Korty Date: Sat Oct 18 20:28:32 2008 -0700 message queues: increase range limits Increase the range of various posix message queue limits. Posix gives the message queue user the ability to 'trade off' the maximum size of messages with the number of possible messages that can be 'in flight'. Linux currently makes this trade off more restrictive than it needs to be. In particular, the maximum message size today can be made no smaller than 8192. This greatly restricts those applications that would like to have the ability to post large numbers of very small messages. So this task lowers the limit that the maximum message size can be set to, from 8192 to 128. It also lowers the limit that the maximum #number of messages in flight can be set to, from 10 to 1. With these changes the message queue user can make better trade offs between #messages and message size, in order to get everything to fit within the setrlimit(RLIMIT_MSGQUEUE) limit for that particular user. This patch also applies the values in /proc/sys/fs/mqueue/msg_max /proc/sys/fs/mqueue/msgsize_max as the defaults for the max #messages allowed and the max message size allowed, respectively, for those applications that do not supply these. Previously, the defaults were hardwired to 10 and 8192, respectively. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Joe Korty Cc: Al Viro Cc: Manfred Spraul Cc: Nadia Derbey Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit acd99dbf54020f5c80b9aa2f2ea86f43cb285b02 Author: Ken'ichi Ohmichi Date: Sat Oct 18 20:28:30 2008 -0700 kdump: add vmlist.addr to vmcoreinfo for x86 vmalloc translation. Add the symbols 'vmlist' and offset 'vm_struct.addr' to the vmcoreinfo[1] data for i386 vmalloc translation. makedumpfile[2] needs VMALLOC_START value for distinguishing a vmalloc address or not, because it should choose suitable translation method. If applying this patch, makedumpfile will be able to take VMALLOC_START value from 'vmlist.addr'. vmcoreinfo[1]: The vmcoreinfo data has the minimum debugging information only for dump filtering. makedumpfile[2] uses it to distinguish unnecessary pages and creates a small dumpfile. makedumpfile[2]: dump filtering command https://sourceforge.net/projects/makedumpfile/ Signed-off-by: Ken'ichi Ohmichi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d9a9855d0b06ca6d6cc92596fedcc03f8512e062 Author: Simon Horman Date: Sat Oct 18 20:28:29 2008 -0700 always reserve elfcore header memory in crash kernel elfcore header memory needs to be reserved in a crash kernel. This means that the relevant code should be protected by CONFIG_CRASH_DUMP rather than CONFIG_PROC_VMCORE. Signed-off-by: Simon Horman Cc: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 85a0ee342e0c06c19d78fdf48307211c6cf18fcb Author: Simon Horman Date: Sat Oct 18 20:28:29 2008 -0700 kdump: add is_vmcore_usable() and vmcore_unusable() The usage of elfcorehdr_addr has changed recently such that being set to ELFCORE_ADDR_MAX is used by is_kdump_kernel() to indicate if the code is executing in a kernel executed as a crash kernel. However, arch/ia64/kernel/setup.c:reserve_elfcorehdr will rest elfcorehdr_addr to ELFCORE_ADDR_MAX on error, which means any subsequent calls to is_kdump_kernel() will return 0, even though they should return 1. Ok, at this point in time there are no subsequent calls, but I think its fair to say that there is ample scope for error or at the very least confusion. This patch add an extra state, ELFCORE_ADDR_ERR, which indicates that elfcorehdr_addr was passed on the command line, and thus execution is taking place in a crashdump kernel, but vmcore can't be used for some reason. This is tested for using is_vmcore_usable() and set using vmcore_unusable(). A subsequent patch makes use of this new code. To summarise, the states that elfcorehdr_addr can now be in are as follows: ELFCORE_ADDR_MAX: not a crashdump kernel ELFCORE_ADDR_ERR: crashdump kernel but vmcore is unusable any other value: crash dump kernel and vmcore is usable Signed-off-by: Simon Horman Cc: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 630bf20747e27391b20f137a5be2edb4235ca8fa Author: Simon Horman Date: Sat Oct 18 20:28:28 2008 -0700 kdump: use is_kdump_kernel() in sba_init() o Make use of is_kdump_kernel() rather than checking elfcorehdr_addr directly. o Remove CONFIG_CRASH_DUMP as is_kdump_kernel() is safe to call anywhere o Remove CONFIG_PROC_FS as it is bogus, the check should occur regardless of if CONFIG_PROC_FS is set or not. Signed-off-by: Simon Horman Acked-by: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e515a0d60066c802cc605a5d9c446948f7691519 Author: Simon Horman Date: Sat Oct 18 20:28:27 2008 -0700 kdump: update elfcorehdr documentation to reflect supported architectures IA64, PPC and SH also support the elfcorehdr command line. Signed-off-by: Simon Horman Acked-by: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 57cac4d1880527e0baf6c2fda529d2ad1d815aec Author: Vivek Goyal Date: Sat Oct 18 20:28:25 2008 -0700 kdump: make elfcorehdr_addr independent of CONFIG_PROC_VMCORE o elfcorehdr_addr is used by not only the code under CONFIG_PROC_VMCORE but also by the code which is not inside CONFIG_PROC_VMCORE. For example, is_kdump_kernel() is used by powerpc code to determine if kernel is booting after a panic then use previous kernel's TCE table. So even if CONFIG_PROC_VMCORE is not set in second kernel, one should be able to correctly determine that we are booting after a panic and setup calgary iommu accordingly. o So remove the assumption that elfcorehdr_addr is under CONFIG_PROC_VMCORE. o Move definition of elfcorehdr_addr to arch dependent crash files. (Unfortunately crash dump does not have an arch independent file otherwise that would have been the best place). o kexec.c is not the right place as one can Have CRASH_DUMP enabled in second kernel without KEXEC being enabled. o I don't see sh setup code parsing the command line for elfcorehdr_addr. I am wondering how does vmcore interface work on sh. Anyway, I am atleast defining elfcoredhr_addr so that compilation is not broken on sh. Signed-off-by: Vivek Goyal Acked-by: "Eric W. Biederman" Acked-by: Simon Horman Acked-by: Paul Mundt Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 293adee601bcd4cdb5076a9bda187137de17e96e Author: Oleg Nesterov Date: Sat Oct 18 20:28:24 2008 -0700 kthread_bind: use wait_task_inactive(TASK_UNINTERRUPTIBLE) Now that wait_task_inactive(task, state) checks task->state == state, we can simplify the code and make this debugging check more robust. Signed-off-by: Oleg Nesterov Cc: Roland McGrath Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 656eb2cd5da153762f2e8419ca117ce12ef522c3 Author: Roland McGrath Date: Sat Oct 18 20:28:23 2008 -0700 add CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS This adds a kconfig option to change the /proc/PID/coredump_filter default. Fedora has been carrying a trivial patch to change the hard-wired value for this default, since Fedora 8. The default default can't change safely because there are old GDB versions out there (all before 6.7) that are confused by the core dump files created by the MMF_DUMP_ELF_HEADERS setting. Signed-off-by: Roland McGrath Cc: Michael Kerrisk Cc: Oleg Nesterov Cc: Alan Cox Cc: Andi Kleen Cc: KOSAKI Motohiro Cc: Kawai Hidehiro Cc: Ingo Molnar Cc: David Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6409324b385f3f63a03645b4422e3be67348d922 Author: Oleg Nesterov Date: Sat Oct 18 20:28:22 2008 -0700 coredump: format_corename: don't append .%pid if multi-threaded If the coredumping is multi-threaded, format_corename() appends .%pid to the corename. This was needed before the proper multi-thread core dump support, now all the threads in the mm go into a single unified core file. Remove this special case, it is not even documented and we have "%p" and core_uses_pid. Signed-off-by: Oleg Nesterov Cc: Michael Kerrisk Cc: Oleg Nesterov Cc: Alan Cox Cc: Roland McGrath Cc: Andi Kleen Cc: La Monte Yarroll Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b747c8c102cc0677a7a8056a093f58d7c9b500e7 Author: Adrian Bunk Date: Sat Oct 18 20:28:21 2008 -0700 make ptrace_untrace() static ptrace_untrace() can now become static. Signed-off-by: Adrian Bunk Cc: Oleg Nesterov Cc: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c4596435404976b0ded9cdf18b456ca2e1408ddd Author: Lai Jiangshan Date: Sat Oct 18 20:28:21 2008 -0700 bitmask: remove bitmap_scnprintf_len() bitmap_scnprintf_len() is not used now, so we remove it. Otherwise we have to maintain it and make its return value always equal to bitmap_scnprintf()'s return value. Signed-off-by: Lai Jiangshan Cc: Alexey Dobriyan Cc: Paul Menage Cc: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 30e8e13603c247c301fdacabef2a765c84840994 Author: Lai Jiangshan Date: Sat Oct 18 20:28:20 2008 -0700 cpuset: use seq_*mask_* to print masks 1) seq_file excepts that m->count == m->size when it's buf is full, so current code will causes bugs when buf is overflow. 2) There is not too good that cpuset accesses struct seq_file's fields directly. Signed-off-by: Lai Jiangshan Cc: Alexey Dobriyan Acked-by: Paul Menage Cc: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3eda20118000941e7e8994fc5fac8706d8c10f00 Author: Lai Jiangshan Date: Sat Oct 18 20:28:19 2008 -0700 seq_file: add seq_cpumask_list(), seq_nodemask_list() seq_cpumask_list(), seq_nodemask_list() are very like seq_cpumask(), seq_nodemask(), but they print human readable string. Signed-off-by: Lai Jiangshan Cc: Alexey Dobriyan Cc: Paul Menage Cc: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 85dd030edb174376ef43bc95e5fae4755af1ec98 Author: Lai Jiangshan Date: Sat Oct 18 20:28:18 2008 -0700 seq_file: don't call bitmap_scnprintf_len() "m->count + len < m->size" is true commonly, so bitmap_scnprintf() is commonly called. this fix saves a call to bitmap_scnprintf_len(). Signed-off-by: Lai Jiangshan Cc: Alexey Dobriyan Cc: Paul Menage Cc: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 40b6a76237563c70466ec7315f644ba87d57dbe5 Author: Rakib Mullick Date: Sat Oct 18 20:28:18 2008 -0700 cpuset.c: remove extra variable Remove the use of int cpus_nonempty variable from 'update_flag' function. Signed-off-by: Md.Rakib H. Mullick Acked-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52d4b9ac0b985168009c2a57098324e67bae171f Author: KAMEZAWA Hiroyuki Date: Sat Oct 18 20:28:16 2008 -0700 memcg: allocate all page_cgroup at boot Allocate all page_cgroup at boot and remove page_cgroup poitner from struct page. This patch adds an interface as struct page_cgroup *lookup_page_cgroup(struct page*) All FLATMEM/DISCONTIGMEM/SPARSEMEM and MEMORY_HOTPLUG is supported. Remove page_cgroup pointer reduces the amount of memory by - 4 bytes per PAGE_SIZE. - 8 bytes per PAGE_SIZE if memory controller is disabled. (even if configured.) On usual 8GB x86-32 server, this saves 8MB of NORMAL_ZONE memory. On my x86-64 server with 48GB of memory, this saves 96MB of memory. I think this reduction makes sense. By pre-allocation, kmalloc/kfree in charge/uncharge are removed. This means - we're not necessary to be afraid of kmalloc faiulre. (this can happen because of gfp_mask type.) - we can avoid calling kmalloc/kfree. - we can avoid allocating tons of small objects which can be fragmented. - we can know what amount of memory will be used for this extra-lru handling. I added printk message as "allocated %ld bytes of page_cgroup" "please try cgroup_disable=memory option if you don't want" maybe enough informative for users. Signed-off-by: KAMEZAWA Hiroyuki Reviewed-by: Balbir Singh Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c05555b572921c464d064d9267f7f7bc06d424fa Author: KAMEZAWA Hiroyuki Date: Sat Oct 18 20:28:11 2008 -0700 memcg: atomic ops for page_cgroup->flags This patch makes page_cgroup->flags to be atomic_ops and define functions (and macros) to access it. Before trying to modify memory resource controller, this atomic operation on flags is necessary. Most of flags in this patch is for LRU and modfied under mz->lru_lock but we'll add another flags which is not for LRU soon. For example, we'll place LOCK bit on flags field. We need atomic operation to modify LRU bit without LOCK. Signed-off-by: KAMEZAWA Hiroyuki Acked-by: Balbir Singh Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit addb9efebb2ee2202d324e75b593b39868528f68 Author: KAMEZAWA Hiroyuki Date: Sat Oct 18 20:28:10 2008 -0700 memcg: optimize per-cpu statistics Some obvious optimization to memcg. I found mem_cgroup_charge_statistics() is a little big (in object) and does unnecessary address calclation. This patch is for optimization to reduce the size of this function. And res_counter_charge() is 'likely' to succeed. Signed-off-by: KAMEZAWA Hiroyuki Acked-by: Balbir Singh Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5b4e655e948d8b6e9b0d001616d4c9d7e7ffe924 Author: KAMEZAWA Hiroyuki Date: Sat Oct 18 20:28:10 2008 -0700 memcg: avoid accounting special pages There are not-on-LRU pages which can be mapped and they are not worth to be accounted. (becasue we can't shrink them and need dirty codes to handle specical case) We'd like to make use of usual objrmap/radix-tree's protcol and don't want to account out-of-vm's control pages. When special_mapping_fault() is called, page->mapping is tend to be NULL and it's charged as Anonymous page. insert_page() also handles some special pages from drivers. This patch is for avoiding to account special pages. Signed-off-by: KAMEZAWA Hiroyuki Cc: Daisuke Nishimura Cc: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b7abea9630bc8ffc663a751e46680db25c4cdf8d Author: KAMEZAWA Hiroyuki Date: Sat Oct 18 20:28:09 2008 -0700 memcg: make page->mapping NULL before uncharge This patch tries to make page->mapping to be NULL before mem_cgroup_uncharge_cache_page() is called. "page->mapping == NULL" is a good check for "whether the page is still radix-tree or not". This patch also adds BUG_ON() to mem_cgroup_uncharge_cache_page(); Signed-off-by: KAMEZAWA Hiroyuki Reviewed-by: Daisuke Nishimura Cc: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 073e587ec2cc377867e53d8b8959738a8e16cff6 Author: KAMEZAWA Hiroyuki Date: Sat Oct 18 20:28:08 2008 -0700 memcg: move charge swapin under lock While page-cache's charge/uncharge is done under page_lock(), swap-cache isn't. (anonymous page is charged when it's newly allocated.) This patch moves do_swap_page()'s charge() call under lock. I don't see any bad problem *now* but this fix will be good for future for avoiding unnecessary racy state. Signed-off-by: KAMEZAWA Hiroyuki Reviewed-by: Daisuke Nishimura Acked-by: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 47c59803becb55b72b26cdab3838d621a15badc8 Author: Lai Jiangshan Date: Sat Oct 18 20:28:07 2008 -0700 devcgroup: remove spin_lock() Since we introduced rcu for read side, spin_lock is used only for update. But we always hold cgroup_lock() when update, so spin_lock() is not need. Additional cleanup: 1) include linux/rcupdate.h explicitly 2) remove unused variable cur_devcgroup in devcgroup_update_access() Signed-off-by: Lai Jiangshan Acked-by: "Serge E. Hallyn" Cc: Paul Menage Cc: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c012a54ae0b2ee2c73499f54596e0f5257288fec Author: Li Zefan Date: Sat Oct 18 20:28:07 2008 -0700 devcgroup: remove unused variable Signed-off-by: Li Zefan Acked-by: Serge Hallyn Cc: Paul Menage Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2cdc7241a290bb2b9ef4c2e2969a4a3ed92abb63 Author: Li Zefan Date: Sat Oct 18 20:28:06 2008 -0700 devcgroup: use kmemdup() This saves 40 bytes on my x86_32 box. Signed-off-by: Li Zefan Acked-by: Serge Hallyn Cc: Paul Menage Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 886465f407e57d6c3c81013c919ea670ce1ae0d0 Author: Paul Menage Date: Sat Oct 18 20:28:05 2008 -0700 cgroups: fix declaration of cgroup_mm_owner_callbacks The choice of real/dummy declaration for cgroup_mm_owner_callbacks() shouldn't be based on CONFIG_MM_OWNER, but on CONFIG_CGROUPS. Otherwise kernel/exit.c fails to compile when something other than a cgroups controller selects CONFIG_MM_OWNER Signed-off-by: Paul Menage Acked-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cc31edceee04a7b87f2be48f9489ebb72d264844 Author: Paul Menage Date: Sat Oct 18 20:28:04 2008 -0700 cgroups: convert tasks file to use a seq_file with shared pid array Rather than pre-generating the entire text for the "tasks" file each time the file is opened, we instead just generate/update the array of process ids and use a seq_file to report these to userspace. All open file handles on the same "tasks" file can share a pid array, which may be updated any time that no thread is actively reading the array. By sharing the array, the potential for userspace to DoS the system by opening many handles on the same "tasks" file is removed. [Based on a patch by Lai Jiangshan, extended to use seq_file] Signed-off-by: Paul Menage Reviewed-by: Lai Jiangshan Cc: Serge Hallyn Cc: Balbir Singh Cc: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 146aa1bd0511f88ddb4e92fafa2b8aad4f2f65f3 Author: Lai Jiangshan Date: Sat Oct 18 20:28:03 2008 -0700 cgroups: fix probable race with put_css_set[_taskexit] and find_css_set put_css_set_taskexit may be called when find_css_set is called on other cpu. And the race will occur: put_css_set_taskexit side find_css_set side | atomic_dec_and_test(&kref->refcount) | /* kref->refcount = 0 */ | .................................................................... | read_lock(&css_set_lock) | find_existing_css_set | get_css_set | read_unlock(&css_set_lock); .................................................................... __release_css_set | .................................................................... | /* use a released css_set */ | [put_css_set is the same. But in the current code, all put_css_set are put into cgroup mutex critical region as the same as find_css_set.] [akpm@linux-foundation.org: repair comments] [menage@google.com: eliminate race in css_set refcounting] Signed-off-by: Lai Jiangshan Cc: Balbir Singh Cc: KAMEZAWA Hiroyuki Signed-off-by: Paul Menage Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 248736c2a57206388c86f8cdd3392ee986e84f9f Author: Eric Sesterhenn Date: Sat Oct 18 20:28:02 2008 -0700 hfsplus: fix possible deadlock when handling corrupted extents A corrupted extent for the extent file itself may try to get an impossible extent, causing a deadlock if I see it correctly. Check the inode number after the first_blocks checks and fail if it's the extent file, as according to the spec the extent file should have no extent for itself. Signed-off-by: Eric Sesterhenn Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e7152944426be786c6c232990914e4565290d35 Author: Alan Cox Date: Sat Oct 18 20:28:01 2008 -0700 hfsplus: missing O_LARGEFILE check hfsplus: O_LARGEFILE checking is missing Addresses http://bugzilla.kernel.org/show_bug.cgi?id=8490 From: Alan Cox Reported-by: didier Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cdbf6dba28e8e6268c8420857696309470009fd9 Author: Eric Sandeen Date: Sat Oct 18 20:28:00 2008 -0700 ext3: avoid printk floods in the face of directory corruption A very large directory with many read failures (either due to storage problems, or due to invalid size & blocks from corruption) will generate a printk storm as the filesystem continues to try to read all the blocks. This flood of messages can tie up the box until it is complete - which may be a very long time, especially for very large corrupted values. This is fixed by only reporting the corruption once each time we try to read the directory. Signed-off-by: Eric Sandeen Signed-off-by: "Theodore Ts'o" Cc: Eugene Teo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ec8b75e3a2a94860ee99b5456fe1a963c8680e5 Author: Aneesh Kumar K.V Date: Sat Oct 18 20:28:00 2008 -0700 ext3: truncate block allocated on a failed ext3_write_begin For blocksize < pagesize we need to remove blocks that got allocated in block_write_begin() if we fail with ENOSPC for later blocks. block_write_begin() internally does this if it allocated page locally. This makes sure we don't have blocks outside inode.i_size during ENOSPC. Signed-off-by: Aneesh Kumar K.V Signed-off-by: "Theodore Ts'o" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a897cf447a83c9c3fd1b85a1e525c02d6eada7d Author: Eugene Dashevsky Date: Sat Oct 18 20:27:59 2008 -0700 ext3: fix ext3_dx_readdir hash collision handling This fixes a bug where readdir() would return a directory entry twice if there was a hash collision in an hash tree indexed directory. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Eugene Dashevsky Signed-off-by: Mike Snitzer Signed-off-by: "Theodore Ts'o" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 960a22ae60c8a723bd17da3b929fe0bcea6d007e Author: Hidehiro Kawai Date: Sat Oct 18 20:27:58 2008 -0700 jbd: ordered data integrity fix In ordered mode, if a file data buffer being dirtied exists in the committing transaction, we write the buffer to the disk, move it from the committing transaction to the running transaction, t