commit f695baf2df9e0413d3521661070103711545207a Author: Linus Torvalds Date: Sun Jul 22 13:41:00 2007 -0700 Linux 2.6.23-rc1 Signed-off-by: Linus Torvalds commit 037e20a3c5c206efdf63f1b45c8b082fc57253d2 Author: Andi Kleen Date: Sun Jul 22 21:13:11 2007 +0200 x86_64: Rename CF Makefile variable in vdso This avoids a conflict with sparse builds. Reported by Alexey Dobriyan, fix suggested by Al Viro Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit b053c204edbc82b068fe8cfc809b7f90b885fae0 Author: Eric W. Biederman Date: Sat Jul 21 12:53:19 2007 -0600 9p: Don't use binary sysctl numbers. The recent 9p commit: bd238fb431f31989898423c8b6496bc8c4204a86 that supposedly only moved files also introduced a new 9p sysctl interface that did not properly register it's sysctl binary numbers. And since it was only for debugging clearly did not need a binary fast path in any case. So this patch just remove the binary numbers. See Documentation/sysctl/ctl_unnumbered.txt for more details. While I was at it I cleaned up the sysctl initializers a little as well so there is less to read. Cc: Latchesar Ionkov Cc: Eric Van Hensbergen Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit f56d35e7aa78ac56a93ff43da90e8d90a37a1362 Author: Linus Nilsson Date: Sat Jul 21 17:49:06 2007 +0200 Documentation: Fix a mispelt "probably" in SubmittingPatches. Fix a typo in SubmittingPatches where "probably" was spelt "probabally". Signed-off-by: Linus Nilsson Signed-off-by: Linus Torvalds commit e3202262eccf9b5669abea848303e79bd84dc1bb Author: Linus Nilsson Date: Sat Jul 21 17:25:34 2007 +0200 DocBook: Change a headline in kernel-locking to list all three main types of locking. Change a headline to reflect that there are three main types of kernel locking, not two. Signed-off-by: Linus Nilsson Signed-off-by: Linus Torvalds commit e9ed7e722e3f4cea07cf3c4bfe98c18180a17793 Author: Al Viro Date: Sat Jul 21 23:29:12 2007 +0100 take declarations of enable_irq() et.al. to linux/interrupt.h Now that the last inlined instances are gone, all that is left to do is turning disable_irq_nosync on arm26 and m68k from defines to aliases and we are all set - we can make these externs in linux/interrupt.h uncoditional and kill remaining instances in asm/irq.h Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit b91421749a1840148d8c81637c03c0ace3f35269 Author: James Bottomley Date: Sun Jul 22 13:15:55 2007 -0500 [SCSI] libsas: make ATA functions selectable by a config option Not everyone wants libsas automatically to pull in libata. This patch makes the behaviour configurable, so you can build libsas with or without ATA support. Signed-off-by: James Bottomley commit 0f760f13012322c81714812d852429fe23b16dcf Author: Andi Kleen Date: Sun Jul 22 13:21:42 2007 +0200 x86_64: Fix xen section warnings Fix WARNING: vmlinux.o(.data+0x99): Section mismatch: reference to .init.text:xen_start_kernel (between 'startup_xen' and 'boot_gdt_descr') Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 5f3f7cc6ad3b548ba5f61051426df28f79fc0ee8 Author: Andi Kleen Date: Sun Jul 22 13:21:41 2007 +0200 x86_64: Fix paravirt compilation Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 41089644c110756a6d09ace77c8d7624660d086a Author: Al Viro Date: Sun Jul 22 10:59:06 2007 +0100 fix broken handling of port=... in NFS option parsing Obviously broken on little-endian; fortunately, the option is not frequently used... Signed-off-by: Al Viro [ Hey, sparse is wonderful, but even better than sparse is having people like Al that actually _run_ it and fix bugs using it. - Linus ] Signed-off-by: Linus Torvalds commit 77668791d96436f48fca94255934b67dab924a0f Author: Avi Kivity Date: Sun Jul 22 12:40:30 2007 +0300 KVM: Require CONFIG_ANON_INODES Found by Sebastian Siewior and randconfig. Signed-off-by: Avi Kivity Signed-off-by: Linus Torvalds commit 83e2b5ef056cba890750436bc9aa37b2c4f58314 Author: Andi Kleen Date: Sun Jul 22 11:12:47 2007 +0200 x86_64: Share msidef.h and hypertransport.h includes with i386 They are identical Indirectly pointed out by Thomas Gleixner Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit b5d009ca6b36632b5f7c0ccdac30301e014ab616 Author: Andi Kleen Date: Sun Jul 22 11:12:46 2007 +0200 x86_64: Remove outdated comment in boot decompressor Makefile 64bit code in there now since some time. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 92417df076f75738ae22956f7ea1b9b98f59fa7a Author: Andi Kleen Date: Sun Jul 22 11:12:45 2007 +0200 x86_64: Squash initial_code modpost warnings Get rid of warnings like WARNING: vmlinux.o(.bootstrap.text+0x1a8): Section mismatch: reference to .init.text:x86_64_start_kernel (between 'initial_code' and 'init_rsp') - Move initialization code into .text.head like i386 because modpost knows about this already - Mark initial_code .initdata Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit dec2e6b7aa5d45bc3508e19907a7716b0c5307e5 Author: Sam Ravnborg Date: Sun Jul 22 11:12:44 2007 +0200 x86_64: fix section mismatch warning in init.c Fix following warning: WARNING: vmlinux.o(.text+0x188ea): Section mismatch: reference to .init.text:__alloc_bootmem_core (between 'alloc_bootmem_high_node' and 'get_gate_vma') alloc_bootmem_high_node() is only used from __init scope so declare it __init. And in addition declare the weak variant __init too. Signed-off-by: Sam Ravnborg Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 7aa6ec56b9e9e95eb6c83516ddbb6159fd11c224 Author: Sam Ravnborg Date: Sun Jul 22 11:12:42 2007 +0200 x86_64: fix section mismatch warning in hpet.c Fix following warnings: WARNING: vmlinux.o(.text+0x945e): Section mismatch: reference to .init.text:__set_fixmap (between 'hpet_arch_init' and 'hpet_mask_rtc_irq_bit') WARNING: vmlinux.o(.text+0x9474): Section mismatch: reference to .init.text:__set_fixmap (between 'hpet_arch_init' and 'hpet_mask_rtc_irq_bit') hpet_arch_init is only used from __init context so mark it __init. Signed-off-by: Sam Ravnborg Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit a284b0518d2fe27cdde19485c8fe077a128cd827 Author: Björn Steinbrink Date: Sun Jul 22 11:12:41 2007 +0200 i386: Fix the K7 NMI watchdog checkbit The performance counters on K7 are only 48 bits wide, so using bit 63 to check if the counter overflowed is wrong. Let's use bit 47 instead. Signed-off-by: Björn Steinbrink Cc: Don Zickus Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e05aff854c9f348629bb66c191eee87e4d002900 Author: Andi Kleen Date: Sun Jul 22 11:12:40 2007 +0200 i386: Use patchable lock prefix in set_64bit Previously lock was unconditionally used, but shouldn't be needed on UP systems. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 57c22f49e4c7d27a03e109a317c30b12f1bae0b2 Author: Andi Kleen Date: Sun Jul 22 11:12:39 2007 +0200 i386: Handle P6s without performance counters in nmi watchdog I got an oops while booting a 32bit kernel on KVM because it doesn't implement performance counters used by the NMI watchdog. Handle this case. Cc: Avi Kivity Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit f25f64ed5bd3c2932493681bdfdb483ea707da0a Author: Juergen Beisert Date: Sun Jul 22 11:12:38 2007 +0200 x86: Replace NSC/Cyrix specific chipset access macros by inlined functions. Due to index register access ordering problems, when using macros a line like this fails (and does nothing): setCx86(CX86_CCR2, getCx86(CX86_CCR2) | 0x88); With inlined functions this line will work as expected. Note about a side effect: Seems on Geode GX1 based systems the "suspend on halt power saving feature" was never enabled due to this wrong macro expansion. With inlined functions it will be enabled, but this will stop the TSC when the CPU runs into a HLT instruction. Kernel output something like this: Clocksource tsc unstable (delta = -472746897 ns) This is the 3rd version of this patch. - Adding missed arch/i386/kernel/cpu/mtrr/state.c Thanks to Andres Salomon - Adding some big fat comments into the new header file Suggested by Andi Kleen AK: fixed x86-64 compilation Signed-off-by: Juergen Beisert Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit bdda1561ffda764583a295229db66d94cf6038a3 Author: Mathieu Desnoyers Date: Sun Jul 22 11:12:37 2007 +0200 x86_64: x86_64 - Use non locked version for local_cmpxchg() local_cmpxchg() should not use any LOCK prefix. This change probably got lost in the move to cmpxchg.h. Signed-off-by: Mathieu Desnoyers Acked-by: Christoph Lameter Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 20fe1d30e7e1c2ee36f11856f090613b0ad58b48 Author: Keith Owens Date: Sun Jul 22 11:12:36 2007 +0200 i386: Do not include other cpus' interrupt 0 in nmi_watchdog kstat_irqs(0) includes the count of interrupt 0 from all cpus, not just the current cpu. The updated interrupt 0 on other cpus can stop the nmi_watchdog from tripping, so only include the current cpu's int 0. Signed-off-by: Keith Owens Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 398cf2abdb51fc96bc08f2a007b1aa25ba6adfba Author: Andi Kleen Date: Sun Jul 22 11:12:35 2007 +0200 i386: Tune AMD Fam10h/11h like K8 This mainly changes the nops for alternative, so not very revolutionary. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 0bd8acd1a7fbb5492c1de8af271b6964a7fd5274 Author: Andi Kleen Date: Sun Jul 22 11:12:34 2007 +0200 x86_64: Set K8 CPUID flag for K8/Fam10h/Fam11h Previously this flag was only used on 32bit, but some shared code can use it now. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit fbab6e7a5cdcc53c2f56404ae0f7f5a3fd48f609 Author: Andi Kleen Date: Sun Jul 22 11:12:33 2007 +0200 i386: Fix cpu_llc_id section mismatch warning Fix WARNING: arch/i386/kernel/built-in.o(.text+0xdd0d): Section mismatch: reference to .init.data:cpu_llc_id (between 'set_cpu_sibling_map' and 'initialize_secondary') WARNING: arch/i386/kernel/built-in.o(.text+0xdd1b): Section mismatch: reference to .init.data:cpu_llc_id (between 'set_cpu_sibling_map' and 'initialize_secondary') Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 8f4e956b313dcccbc7be6f10808952345e3b638c Author: Andi Kleen Date: Sun Jul 22 11:12:32 2007 +0200 x86: Stop MCEs and NMIs during code patching When a machine check or NMI occurs while multiple byte code is patched the CPU could theoretically see an inconsistent instruction and crash. Prevent this by temporarily disabling MCEs and returning early in the NMI handler. Based on discussion with Mathieu Desnoyers. Cc: Mathieu Desnoyers Cc: Jeremy Fitzhardinge Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 19d36ccdc34f5ed444f8a6af0cbfdb6790eb1177 Author: Andi Kleen Date: Sun Jul 22 11:12:31 2007 +0200 x86: Fix alternatives and kprobes to remap write-protected kernel text Reenable kprobes and alternative patching when the kernel text is write protected by DEBUG_RODATA Add a general utility function to change write protected text. The new function remaps the code using vmap to write it and takes care of CPU synchronization. It also does CLFLUSH to make icache recovery faster. There are some limitations on when the function can be used, see the comment. This is a newer version that also changes the paravirt_ops code. text_poke also supports multi byte patching now. Contains bug fixes from Zach Amsden and suggestions from Mathieu Desnoyers. Cc: Jan Beulich Cc: Jeremy Fitzhardinge Cc: Mathieu Desnoyers Cc: Zach Amsden Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit f51c94528a9bc73504928926ca4d791a2b7ddd7c Author: Glauber de Oliveira Costa Date: Sun Jul 22 11:12:29 2007 +0200 x86_64: Use read and write crX in .c files This patch uses the read and write functions provided at system.h for control registers instead of writting raw assembly over and over again in .c files. Functions to manipulate cr2 and cr8 were provided, as they were lacking. Also, removed some extra space after closing brackets Signed-off-by: Glauber de Oliveira Costa Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit abd4f7505bafdd6c5319fe3cb5caf9af6104e17a Author: Masoud Asgharifard Sharbiani Date: Sun Jul 22 11:12:28 2007 +0200 x86: i386-show-unhandled-signals-v3 This patch makes the i386 behave the same way that x86_64 does when a segfault happens. A line gets printed to the kernel log so that tools that need to check for failures can behave more uniformly between debug.show_unhandled_signals sysctl variable to 0 (or by doing echo 0 > /proc/sys/debug/exception-trace) Also, all of the lines being printed are now using printk_ratelimit() to deny the ability of DoS from a local user with a program like the following: main() { while (1) if (!fork()) *(int *)0 = 0; } This new revision also includes the fix that Andrew did which got rid of new sysctl that was added to the system in earlier versions of this. Also, 'show-unhandled-signals' sysctl has been renamed back to the old 'exception-trace' to avoid breakage of people's scripts. AK: Enabling by default for i386 will be likely controversal, but let's see what happens AK: Really folks, before complaining just fix your segfaults AK: I bet this will find a lot of silent issues Signed-off-by: Masoud Sharbiani Signed-off-by: Andi Kleen [ Personally, I've found the complaints useful on x86-64, so I'm all for this. That said, I wonder if we could do it more prettily.. -Linus ] Signed-off-by: Linus Torvalds commit 5fa63fccc579ac609fc7f86d29ccb3a2edf910d7 Author: Al Viro Date: Sun Jul 22 08:10:35 2007 +0100 Fix ppc64 mismerge Fix a mismerge in commit 8b6f50ef1d5cc86b278eb42bc91630fad455fb10: "spufs: make signal-notification files readonly for NOSCHED contexts", where structs got duplicated. Signed-off-by: Al Viro Acked-by: Jeremy Kerr Signed-off-by: Linus Torvalds commit 06cfa556949ead5d3c00dc68108c443be8dd8d17 Author: Ben Dooks Date: Sun Jul 22 16:23:02 2007 +0100 [ARM] 4524/1: S3C: Move register out of include/asm-arm/arch-s3c2410 Move register and other definitions out of the include/asm-arm/arch-s3c2410 into the the arch directories of include/asm-arm/plat-s3c24xx and include/asm-arm/plat-s3c. This move is in preperation of the merging of s3c2400 and s3c6400. The following git mv commands are needed before this patch can be applied: git mv include/asm-arm/arch-s3c2410/regs-ac97.h include/asm-arm/plat-s3c/regs-ac97.h git mv include/asm-arm/arch-s3c2410/regs-adc.h include/asm-arm/plat-s3c/regs-adc.h git mv include/asm-arm/arch-s3c2410/regs-iis.h include/asm-arm/plat-s3c24xx/regs-iis.h git mv include/asm-arm/arch-s3c2410/regs-spi.h include/asm-arm/plat-s3c24xx/regs-spi.h git mv include/asm-arm/arch-s3c2410/regs-udc.h include/asm-arm/plat-s3c24xx/regs-udc.h git mv include/asm-arm/arch-s3c2410/udc.h include/asm-arm/plat-s3c24xx/udc.h Signed-off-by: Ben Dooks Signed-off-by: Russell King commit dd1313a167a9d29c349b3244dffac274bb0bf486 Author: Ben Dooks Date: Sun Jul 22 16:22:06 2007 +0100 [ARM] 4523/1: S3C: Remove FIFO_MAX from uncompression headers We've fixed up a number of faults with the uncompressors so remove the now unused FIFO_MAX as it is not needed. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 0d685cad354b773fbb6a698e73097f8b5aa4a342 Author: Ben Dooks Date: Sun Jul 22 16:21:21 2007 +0100 [ARM] 4522/1: S3C: split include/asm-arm/arch/memory.h Split the S3C2400 out of S3C2410 memory.h files ready for S3C2400 support to be added. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 530ef3c2a92b3c6a9901ac7e04d1e6c0077a9f2d Author: Ben Dooks Date: Sun Jul 22 16:59:44 2007 +0100 [ARM] 4521/2: S3C: Reorganise VA mapping headers Reorganise the definition of the virtual addresses used into a common header and update the users to rename S3C2410 items into a more common S3C defined macros. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit bf2a3a26d18679c94eca973cb8741e3c1ac53c43 Author: Ben Dooks Date: Sun Jul 22 16:20:04 2007 +0100 [ARM] 4520/1: S3C: Remove old VA values from static map Remove the static maps for the LCD and USB devices. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit ae39ae0b0030d7f96a6b7b06d9c77c8ad2a07673 Author: Ben Dooks Date: Sun Jul 22 16:18:22 2007 +0100 [ARM] 4519/1: S3C: split S3C2400 values out of S3C24XX map.h Move the S3C2400 values to their own include directory series in include/asm-arm/arch-s3c2400 as the support for the S3C2400 is best placed in its own arch directory. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit a45f82616eaa7e7fcd365ced78d3f0974b991800 Author: Ben Dooks Date: Sun Jul 22 16:16:51 2007 +0100 [ARM] 4518/1: S3C: Rename watchdog configuration options Rename the S3C24XX configuration options for the watchdog boot controls for moving to the arch/arm/plat-s3c moves. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 1197b4cd5098fb862180f013a086a81507196a69 Author: Ben Dooks Date: Sun Jul 22 16:15:44 2007 +0100 [ARM] 4517/1: S3C: Fix debug macros for ARM926 output Check for ARM926 based S3C24XX based devices as these only have 64 byte FIFOs, and do not have the model detection refisters in the same place as the ARM920 based CPUs Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 5c49218a15188cc036364c4cda325bae3cb138ae Author: Ben Dooks Date: Sun Jul 22 16:14:02 2007 +0100 [ARM] 4516/1: S3C: Fix uncompressor serial output for ARM926 Ensure we check for ARM926 in the uncompressor, as all current ARM926s do not have an ID register and all have S3C2440 style UARTs. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit a14a26aca610bbd09fb62fb9fd5dbf6b41321972 Author: Ben Dooks Date: Sun Jul 22 16:13:29 2007 +0100 [ARM] 4515/1: S3C: Move uncompress code to plat-s3c Move the uncompress.h to plat-s3c Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 3ec20520ddfb654b1e60f51ff5e4769afde51b36 Author: Ben Dooks Date: Sun Jul 22 16:12:04 2007 +0100 [ARM] 4514/1: S3C: Rename DEBUG_S3C2410_PORT and DEBUG_S3C_UART Rename DEBUG_S3C2410_PORT to DEBUG_S3C_PORT as well as DEBUG_S3C2410_UART to DEBUG_S3C_UART as part of the updates to moving to plat-s3c for S3C base support. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit c76578460f1a0c4b77c33b2e8e295ccdfa893cdc Author: Ben Dooks Date: Sun Jul 22 16:11:20 2007 +0100 [ARM] 4513/1: S3C: Rename CONFIG_S3C2410_LOWLEVEL_UART_PORT Rename CONFIG_S3C2410_LOWLEVEL_UART_PORT to be CONFIG_S3C_LOWLEVEL_UART_PORT as we move to using plat-s3c for base of S3C operations. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit cbc4dbffc89fbaada94ae7873ad6631a701fd00e Author: Ben Dooks Date: Sun Jul 22 16:10:23 2007 +0100 [ARM] 4512/1: S3C: rename the debug macros for per-cpu updates Update the debug macros for use with the new per-cpu configuration and usage. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit b2627588cbeb70364357048854affd52bf02fe64 Author: Ben Dooks Date: Sun Jul 22 16:09:44 2007 +0100 [ARM] 4511/1: S3C: updated LLSERIAL Kconfig defines for CPU support Update the Kconfig to create configuration options based on which CPUs are supported for the low level serial code. This means that the debug macros can be optimised for the type(s) of CPU that are being used. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 498e03b619638826a7364faed61eb0a3d2a0f0c8 Author: Ben Dooks Date: Sun Jul 22 16:08:48 2007 +0100 [ARM] 4510/1: S3C: split debug-macro support into plat-s3c Move the common parts of the debug macros into include/asm-arm/plat-s3c ready to be used for the common S3C support. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit d58153d86589b6bba2dd19f4c178252f8cf2ed4f Author: Ben Dooks Date: Sun Jul 22 16:07:09 2007 +0100 [ARM] 4509/1: S3C: Create initial arch/arm/plat-s3c Create the initial arch/arm/plat-s3c directory and start linking it into the arch/arm build heirarchy ready to receive the generic parts of the S3C24XX support to be used when adding S3C6400 devices. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 531b617c71e780b14af5931428e0611f930c2134 Author: Ben Dooks Date: Sun Jul 22 16:05:25 2007 +0100 [ARM] 4508/1: S3C: Move items to include/asm-arm/plat-s3c This patch moves items of the s3c24xx support into a new plat-s3c directory for items that use the s3c24xx support but are not directly s3c24xx compatible, such as the s3c2400 and s3c6400. git mv commands: git mv include/asm-arm/arch-s3c2410/iic.h include/asm-arm/plat-s3c/iic.h git mv include/asm-arm/arch-s3c2410/nand.h include/asm-arm/plat-s3c/nand.h git mv include/asm-arm/arch-s3c2410/regs-iic.h include/asm-arm/plat-s3c/regs-iic.h git mv include/asm-arm/arch-s3c2410/regs-nand.h include/asm-arm/plat-s3c/regs-nand.h git mv include/asm-arm/arch-s3c2410/regs-rtc.h include/asm-arm/plat-s3c/regs-rtc.h git mv include/asm-arm/arch-s3c2410/regs-serial.h include/asm-arm/plat-s3c/regs-serial.h git mv include/asm-arm/arch-s3c2410/regs-timer.h include/asm-arm/plat-s3c/regs-timer.h git mv include/asm-arm/arch-s3c2410/regs-watchdog.h include/asm-arm/plat-s3c/regs-watchdog.h Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 52c543f90c4095dff71dc125017594b61a753069 Author: Quinn Jensen Date: Mon Jul 9 22:06:53 2007 +0100 [ARM] 4461/1: MXC platform and i.MX31ADS core support This patch adds the foundation pieces for the Freescale MXC platforms, including i.MX2 and i.MX3 based systems. The bare-bones MX31 support in this patch boots to the rootdev panic with 8250 serial console configured "console=ttyS0,115200". It assumes that Redboot is the boot loader. Signed-off-by: Quinn Jensen Acked-by: Lennert Buytenhek Signed-off-by: Russell King commit 7bbb18c9f4783b6fb3bf27af71625b590cf4f00b Author: Bill Gatliff Date: Sat Jul 21 03:39:36 2007 +0100 [ARM] 4507/1: pxa2xx clock_event_device Reimplements arch/arm/mach-pxa/time.c using a clock_event_device based on OSMR0. Tested on PXA270, linux-2.6.22+arm:pxa patches. Signed-off-by: Bill Gatliff Signed-off-by: Russell King commit 4259fa01a2d2aa3e589b34ba7624080232d9c1ff Author: Al Viro Date: Thu Jun 7 11:13:31 2007 -0400 [PATCH] get rid of AVC_PATH postponed treatment Selinux folks had been complaining about the lack of AVC_PATH records when audit is disabled. I must admit my stupidity - I assumed that avc_audit() really couldn't use audit_log_d_path() because of deadlocks (== could be called with dcache_lock or vfsmount_lock held). Shouldn't have made that assumption - it never gets called that way. It _is_ called under spinlocks, but not those. Since audit_log_d_path() uses ab->gfp_mask for allocations, kmalloc() in there is not a problem. IOW, the simple fix is sufficient: let's rip AUDIT_AVC_PATH out and simply generate pathname as part of main record. It's trivial to do. Signed-off-by: Al Viro Acked-by: James Morris commit 74f2345b6be1410f824cb7dd638d2c10a9709379 Author: Eric Paris Date: Mon Jun 4 17:00:14 2007 -0400 [PATCH] allow audit filtering on bit & operations Right now the audit filter can match on = != > < >= blah blah blah. This allow the filter to also look at bitwise AND operations, & Signed-off-by: Eric Paris Signed-off-by: Al Viro commit c926e4f432af0f61ac2b9b637fb51a4871a3fc91 Author: Klaus Weidner Date: Wed May 16 17:45:42 2007 -0500 [PATCH] audit: fix broken class-based syscall audit The sanity check in audit_match_class() is wrong. We are able to audit 2048 syscalls but in audit_match_class() we were accidentally using sizeof(_u32) instead of number of bits in _u32 when deciding how many syscalls were valid. On ia64 in particular we were hitting syscall numbers over the (wrong) limit of 256. Fixing the audit_match_class check takes care of the problem. Signed-off-by: Klaus Weidner Signed-off-by: Al Viro commit 5b9a4262232d632c28990fcdf4f36d0e0ade5f18 Author: Steve Grubb Date: Tue May 29 10:38:18 2007 -0400 [PATCH] Make IPC mode consistent The mode fields for IPC records are not consistent. Some are hex, others are octal. This patch makes them all octal. Signed-off-by: Steve Grubb Signed-off-by: Al Viro commit 41e1703b9b88cf9b5e91cdd2f7dcded3ec3917cb Author: FUJITA Tomonori Date: Sun Jul 22 10:06:50 2007 +0900 [SCSI] bsg: unexport sg v3 helper functions blk_fill_sghdr_rq, blk_unmap_sghdr_rq, and blk_complete_sghdr_rq were exported for bsg, however bsg was changed to support only sg v4. Signed-off-by: FUJITA Tomonori Signed-off-by: James Bottomley commit 7bd02a20d5fcb69e1623c3bf2b68959fe7a77fa4 Author: Jesper Juhl Date: Sun Jul 22 01:02:30 2007 +1000 [POWERPC] Clean up duplicate includes in drivers/macintosh/ Signed-off-by: Jesper Juhl Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit a2b7390af4f6a9aec079dfc15874528c3adaeccb Author: Stephen Rothwell Date: Sun Jul 22 00:37:38 2007 +1000 [POWERPC] Quiet section mismatch warning on pcibios_setup WARNING: vmlinux.o(.text+0x1cefcc): Section mismatch: reference to .init.text:.pcibios_setup (between '.pci_setup' and '.pci_init') pci_setup() is marked __devinit and calls pcibios_setup. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 1ad528ebfd1a32e33a7ade23a7e4eeb250ef64a7 Author: Stephen Rothwell Date: Sun Jul 22 00:33:11 2007 +1000 [POWERPC] init and exit markings for hvc_iseries Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit a6dfe1dc074cc2218b2e32f67ce3a1ed4f89b200 Author: Stephen Rothwell Date: Sun Jul 22 00:31:28 2007 +1000 [POWERPC] Quiet section mismatch in hvc_rtas.c WARNING: vmlinux.o(.text+0x2066f0): Section mismatch: reference to .init.text:.add_preferred_console (between '.hvc_rtas_console_init' and '.hvc_beat_put_chars') Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 51d261122d0ffac8cf91cc6e74ffcfea23faeb1c Author: Stephen Rothwell Date: Sun Jul 22 00:27:01 2007 +1000 [POWERPC] Constify of_platform_driver match_table Signed-off-by: Stephen Rothwell Acked-by: David S. Miller Signed-off-by: Paul Mackerras commit b1c30115f4861c9dd2dcaaac2a01acc67dd4cf94 Author: Stephen Rothwell Date: Sun Jul 22 00:25:00 2007 +1000 [POWERPC] hvcs: Make some things static and const Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 8bf8df7120006b8c97ad3a9fcc79e2ba894c46dd Author: Stephen Rothwell Date: Sun Jul 22 00:23:03 2007 +1000 [POWERPC] Constify of_platform_driver name Signed-off-by: Stephen Rothwell Acked-by: David S. Miller Signed-off-by: Paul Mackerras commit 7fd7218610600b16f6f0af3f9d9353ba0265c09f Author: Benjamin Herrenschmidt Date: Sat Jul 21 09:55:21 2007 +1000 [POWERPC] MPIC protected sources Some HW platforms, such as the new cell blades, requires some MPIC sources to be left alone by the operating system. This implements support for a "protected-sources" property in the mpic controller node containing a list of source numbers to be protected against operating system interference. For those interested in the gory details, the MPIC on the southbridge of those blades has some of the processor outputs routed to the cell, and at least one routed as a GPIO to the service processor. It will be used in the GA product for routing some of the southbridge error interrupts to the service processor which implements some of the RAS stuff, such as checkstopping when fatal errors occurs before they can propagate. Signed-off-by: Benjamin Herrenschmidt Acked-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 34f329db54e8154cf7faf0e7c45e7c16facfbbfe Author: Segher Boessenkool Date: Fri Jul 20 15:58:38 2007 +1000 [POWERPC] of_detach_node()'s device node argument cannot be const ...since it modifies it (when it sets the OF_DETACHED flag). Signed-off-by: Segher Boessenkool Signed-off-by: Paul Mackerras commit dd68c048d7a41b725ca3c2e23155598a5781dcbb Author: Josh Boyer Date: Fri Jul 20 13:11:10 2007 +1000 [POWERPC] Fix ARCH=ppc builds The recent signal rework broke ARCH=ppc builds with the following error: CC arch/powerpc/kernel/signal.o arch/powerpc/kernel/signal.c: In function ‘do_signal’: arch/powerpc/kernel/signal.c:142: error: implicit declaration of function ‘set_dabr’ make[1]: *** [arch/powerpc/kernel/signal.o] Error 1 This fixes it by including a function prototype in asm-ppc/system.h. Acked-by: Kumar Gala Signed-off-by: Josh Boyer Signed-off-by: Paul Mackerras commit 461e666723b6669bc6f7ef90b49b615396d70eb8 Author: Christoph Hellwig Date: Fri Jul 20 07:50:49 2007 +1000 [POWERPC] mv64x60: Use mutex instead of semaphore Signed-off-by: Christoph Hellwig Acked-by: Mark A. Greer Signed-off-by: Paul Mackerras commit adff093d6c545c882f1503607f6af14ddd90bb89 Author: Avi Kivity Date: Fri Jul 20 01:33:48 2007 +1000 [POWERPC] Allow smp_call_function_single() to current cpu This removes the requirement for callers to get_cpu() to check in simple cases. i386 and x86_64 already received a similar treatment. Signed-off-by: Avi Kivity Signed-off-by: Paul Mackerras commit 08ae6cc15db201fa20cc4893d9500c1f6b20e560 Author: Paul Mackerras Date: Thu Jul 19 10:00:20 2007 +1000 [POWERPC] Allow exec faults on readable areas on classic 32-bit PowerPC Classic 32-bit PowerPC CPUs, and the early 64-bit PowerPC CPUs, don't provide a way to prevent execution from readable pages, that is, the MMU doesn't distinguish between data reads and instruction reads, although a different exception is taken for faults in data accesses and instruction accesses. Commit 9ba4ace39fdfe22268daca9f28c5df384ae462cf, in the course of fixing another bug, added a check that meant that a page fault due to an instruction access would fail if the vma did not have the VM_EXEC flag set. This gives an inconsistent enforcement on these CPUs of the no-execute status of the vma (since reading from the page is sufficient to allow subsequent execution from it), and causes old versions of ppc32 glibc (2.2 and earlier) to fail, since they rely on executing the word before the GOT but don't have it marked executable. This fixes the problem by allowing execution from readable (or writable) areas on CPUs which do not provide separate control over data and instruction reads. Signed-off-by: Paul Mackerras Acked-by: Jon Loeliger commit ca8ffc974d43033be6e1d4277a45822d2c3656f4 Author: Michael Neuling Date: Thu Jul 19 07:56:32 2007 +1000 [POWERPC] Fix future firmware feature fixups function failure Move firmware feature initialisation from pSeries_init_early to the earlier pSeries_probe_hypertas so they are initialised before firmware feature fixups are applied. Currently firmware feature sections are only used for iSeries which initialises the these features much earlier. This is a bug in waiting on pSeries. Also adds some whitespace fixups. Signed-off-by: Michael Neuling Acked-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 4d404edce30f911004850d472e05a31efd751662 Author: Ishizaki Kou Date: Wed Jul 18 19:26:40 2007 +1000 [POWERPC] fix showing xmon help In some configuration, xmon help string is larger than xmon_printf buffer. We need not to use printf. This patch adds xmon_puts and change to use it to show help string. Signed-off-by: Kou Ishizaki Signed-off-by: Paul Mackerras commit 776568d4c93fe8def5ab4060344af554fe2b44be Author: Ishizaki Kou Date: Wed Jul 18 19:30:29 2007 +1000 [POWERPC] Make xmon_write accept a const buffer Because xmon_write doesn't change the buffer, we should add 'const' qualifier to the argument which points it. Signed-off-by: Kou Ishizaki Signed-off-by: Paul Mackerras commit f8eb77d6fbdf13b94bcea48023d4e1dce4b3bffe Author: Robert P. J. Day Date: Wed Jul 18 08:21:29 2007 +1000 [POWERPC] Fix misspelled "CONFIG_CHECK_CACHE_COHERENCY" Kconfig option. Signed-off-by: Robert P. J. Day Signed-off-by: Paul Mackerras commit 1e57ba8dddcbb384b293f948cba190c5199cf945 Author: Geert Uytterhoeven Date: Tue Jul 17 02:35:38 2007 +1000 [POWERPC] cell: CONFIG_SPE_BASE is a typo The config symbol for SPE support is called CONFIG_SPU_BASE, not CONFIG_SPE_BASE. Signed-off-by: Geert Uytterhoeven Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit ce8c47cf88af4da2ff429933c07f203a55d5d0a1 Author: Andrew Morton Date: Sun Jul 22 10:36:31 2007 +0100 leds: cr_bllcd.c: build fix Build fix for cr_bllcd.c Signed-off-by: Andrew Morton Signed-off-by: Richard Purdie commit d4c5f047ae2a33296774e41abc2ac5c89283f736 Author: Zhang Rui Date: Thu Jun 14 17:43:07 2007 +0800 ACPI: Populate /sys/firmware/acpi/tables/ The file name is the signature, such as DSDT, and the contents are the binary table image. Some tables, such as the SSDT, can have multiple instances. If just one, the file is SSDT, but if 3 instances, for example, it will be SSDT1, SSDT2, SSDT3 All static tables (besides teh RSDP and RSDT themselves are exported. Dynamic tables, such as SSDT op-regions that are not declared in the RSDT, will be added in a subsequent patch. Signed-off-by: Zhang Rui Signed-off-by: Len Brown commit 798d91039849486c7a4f1a458a5680cb55a65408 Author: Thomas Renninger Date: Thu May 31 17:20:39 2007 +0200 ACPI: create CONFIG_ACPI_DEBUG_FUNC_TRACE Split ACPI_DEBUG into function trace enabled and not enabled. Function trace is most of the ACPI_DEBUG costs, but is not much of use for kernel ACPI debugging. Size of kernel image increased on test compile: + 48k (Full ACPI_DEBUG) + 35k (ACPI_DEBUG with function trace compiled out) Performance without function trace is also much better. Also remove ACPI_LV_DEBUG_OBJECT from default debug level as a lot vendors let Store (value, debug) in their code and this might confuse users when it pops up in syslog. Signed-off-by: Thomas Renninger Signed-off-by: Len Brown commit 8b8eb7d8cfc6cd95ed00cd58754e8493322505bd Author: Zhang Rui Date: Wed Jul 18 17:23:24 2007 +0800 ACPI: update ACPI proc I/F removal schedule ACPI sysfs conversion is not finished yet and some user space tools still depend on the ACPI proc I/F. We plan to finish all the sysfs conversion by January 2008 and remove the ACPI proc I/F in July 2008. Signed-off-by: Zhang Rui Signed-off-by: Len Brown commit 7a9b9068b8c7b526894904c0b9b90354825b8fbd Author: Zhang Rui Date: Fri Jul 13 13:42:47 2007 +0800 ACPI: update feature-removal-schedule.txt, /sys/firmware/acpi/namespace is gone The /sys/firmware/acpi/namespace has already been removed in 2.6.21. Signed-off-by: Zhang Rui Signed-off-by: Len Brown commit 9c977a453ed62396d067b75f3f272b3fb1ea3acc Author: Zhang Rui Date: Fri Jul 20 16:41:14 2007 +0800 ACPI: export ACPI events via acpi_mc_group multicast group This is an incremental patch for the recent genetlink multicast changes. Now ACPI events are exported via generic netlink multicast group. Thanks for Johannes' help on developing this patch Signed-off-by: Zhang Rui Signed-off-by: Len Brown commit 4ebf83c8cf89ab13bc23e46b0fcb6178ca23b43c Author: Dave Jones Date: Mon Jul 9 11:33:14 2007 -0700 ACPI: fix empty macros found by -Wextra ACPI has a ton of macros which make a bunch of empty if's when configured in non-debug mode. [lenb: The code it complaines about is functionally correct, so this patch is just to make -Wextra happier] #define DBG() if(...) DBG(); next_c_statement which turns into if(...) ; next_c_statement Signed-off-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 0dc070bb0242481a6100c95e5deaa07b267399a8 Author: Dan Aloni Date: Mon Jul 9 11:33:18 2007 -0700 ACPI: drivers/acpi/pci_link.c: lower printk severity Signed-off-by: Dan Aloni Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 22a17780584173635dae11bb83884952b00e5181 Author: Mattia Dongili Date: Mon Jul 16 02:34:39 2007 +0900 sony-laptop: Fix event reading in sony-laptop The rewritten event reading code from sonypi was absolutely wrong, this patche makes things functional for type2 and type1 models. Cc: Andrei Paskevich Signed-off-by: Mattia Dongili Signed-off-by: Len Brown commit 89892d153d0d46018241afc7944910912bcd9688 Author: Mattia Dongili Date: Mon Jul 16 02:34:38 2007 +0900 sony-laptop: Add Vaio FE to the special init sequence The Vaio FE series uses the same sequence as Vaio C series Signed-off-by: Mattia Dongili Signed-off-by: Len Brown commit bc57f865fa2282ad2b7efe02da0a752e602e982e Author: Mattia Dongili Date: Fri Jul 20 02:01:57 2007 +0900 sony-laptop: Make the driver use MSC_SCAN and a setkeycode and getkeycode key table. The following is the only way I could think of to hide some events as per Dmitry suggestions while still using the default {set,get}keycode implementation. Make the driver use MSC_SCAN and a setkeycode and getkeycode key table. Cc: Dmitry Torokhov Signed-off-by: Richard Hughes Signed-off-by: Mattia Dongili Signed-off-by: Len Brown commit b25b732a16e4e035247fa729f931ed173f9fc8e2 Author: Mattia Dongili Date: Mon Jul 16 02:34:36 2007 +0900 sony-laptop: Invoke _INI for SNC devices that provide it Signed-off-by: Mattia Dongili Signed-off-by: Len Brown commit 6315fd1c9cd6870a253699f07c5ada85cfe8fecb Author: Mattia Dongili Date: Mon Jul 16 02:34:35 2007 +0900 sony-laptop: Add support for recent Vaios Fn keys (C series for now) Recent Vaios (C, AR, N, FE) need some special initialization sequence to enable Fn keys interrupts through the Embedded Controller. Moreover Fn keys have to be decoded internally using ACPI methods to get the key code. Thus a new DMI table to add SNC init time callbacks and new mappings for model-specific key code to generic sony-laptop code have been added. Signed-off-by: Mattia Dongili Signed-off-by: Len Brown commit 8538c3686c895f9334a3c22997b51b5a82de7550 Author: Mattia Dongili Date: Mon Jul 16 02:34:34 2007 +0900 sony-laptop: map wireless switch events to KEY_WLAN Signed-off-by: Mattia Dongili Signed-off-by: Len Brown commit 044847e02d46c0a9430e19249fd68777bb1d3c98 Author: Mattia Dongili Date: Mon Jul 16 02:34:33 2007 +0900 sony-laptop: add new SNC handlers - lid state: GLID - indicator lamp: GILS/SILS - multimedia bass gain: GMGB/CMGB Signed-off-by: Mattia Dongili Signed-off-by: Len Brown commit f432255e936a892a6896e5032e2b4897423076f2 Author: Henrique de Moraes Holschuh Date: Wed Jul 18 23:45:48 2007 -0300 ACPI: thinkpad-acpi: add locking to brightness subdriver The backlight class does all the locking needed for sysfs access, but offers no API to interface to that locking without an layer violation. Since we need to mutex-lock procfs access, implement in-driver locking for brightness. It will go away the day thinkpad-acpi procfs goes away, or the backlight class gives us a way to use its locks without a layer violation. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit c78d5c96bb65b71a54b7551b404fbaf4763ed6e4 Author: Henrique de Moraes Holschuh Date: Wed Jul 18 23:45:47 2007 -0300 ACPI: thinkpad-acpi: bump up version to 0.15 Name it thinkpad-acpi version 0.15. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit 3d6f99ca00ccf861305fd8630a21f2e696886708 Author: Henrique de Moraes Holschuh Date: Wed Jul 18 23:45:46 2007 -0300 ACPI: thinkpad-acpi: make EC-based thermal readings non-experimental Reading the 16 thermal sensors directly from the EC has been stable for about one year, in all supported ThinkPad models. Remove its "experimental" label. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit a8fba3da3d11d808137be7ebeb3b6938a42f011f Author: Henrique de Moraes Holschuh Date: Wed Jul 18 23:45:45 2007 -0300 ACPI: thinkpad-acpi: make sure DSDT TMPx readings don't return +128 We get +128 instead of -128 from the DSDT TMPx methods, due to errors when converting a EC byte return that is a s8 to an ACPI handler return that is an int. Fix it once and for all, by clamping acceptable temperature readings from DSDT TMPx so that anything outside the [-127,+127] range is converted to TP_EC_THERMAL_TMP_NA (-128). Signed-off-by: Henrique de Moraes Holschuh Cc: Michael Olbrich Signed-off-by: Len Brown commit edf0e0e56904f794c97ca6c4562d8256e3d8d8e3 Author: Henrique de Moraes Holschuh Date: Wed Jul 18 23:45:44 2007 -0300 ACPI: thinkpad-acpi: react to Lenovo ThinkPad differences in hot key Lenovo ThinkPads have a slightly different key map layout from IBM ThinkPads (fn+f2 and fn+f3 are swapped). Knowing which one we are dealing with, we can properly set a few more hot keys up by default. Also, export the correct vendor in the input device, as that information might be useful to userspace. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit 24d3b77467b6aaf59e38dce4aa86d05541858195 Author: Henrique de Moraes Holschuh Date: Wed Jul 18 23:45:43 2007 -0300 ACPI: thinkpad-acpi: allow use of CMOS NVRAM for brightness control It appears that Lenovo decided to break the EC brightness control interface in a weird way in their latest BIOSes. Fortunately, the old CMOS NVRAM interface works just fine in such BIOSes. Add a module parameter that allows the user to select which strategy to use for brightness control: EC, NVRAM, or both. By default, do both (which is the way thinkpad-acpi used to work until now) on IBM ThinkPads, and use NVRAM only on Lenovo ThinkPads. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit d5a2f2f1d68e2da538ac28540cddd9ccc733b001 Author: Henrique de Moraes Holschuh Date: Wed Jul 18 23:45:42 2007 -0300 ACPI: thinkpad-acpi: store ThinkPad model information Keep note of ThinkPad model, BIOS and EC firmware information, and log it on startup. Makes for far more readable code in places, too. This patch also adds Lenovo's PCI ID to the pci ids table. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit 86cc9445e86bef9da44f933e3849e6eb43cbf626 Author: Henrique de Moraes Holschuh Date: Wed Jul 18 23:45:41 2007 -0300 ACPI: thinkpad_acpi: use bool for boolean parameters Some of the module parameters are boolean in nature. Make it so in fact. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit 996fba08db7faf46b1a674957f60cd772ecd29ec Author: Henrique de Moraes Holschuh Date: Wed Jul 18 23:45:40 2007 -0300 ACPI: thinkpad-acpi: rename pci HID constant Rename an internal driver constant, on request by Len Brown. Also, document exactly what it is for. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit 741553c2d29b4075d636a38792c05cd2fc62bd8a Author: Henrique de Moraes Holschuh Date: Wed Jul 18 23:45:39 2007 -0300 ACPI: thinkpad-acpi: checkpoint sysfs interface version due to input layer The change in the way hotkey events are handled by default, and the use of the input layer for the hotkey events are important enough features to warrant increasing the major field of the sysfs interface version. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit 5c29d58f471099401513e2e567f6c28001bb0f13 Author: Henrique de Moraes Holschuh Date: Wed Jul 18 23:45:38 2007 -0300 ACPI: thinkpad-acpi: export EV_SW SW_RADIO events The expected user case for the radio slider switch on a ThinkPad includes interfacing to applications, so that the user gets an offer to find and associate with a wireless network when the switch is changed from disabled to enabled (ThinkVantage suite). Export the information about the switch state, and switch change events as an EV_SW SW_RADIO event over the input layer. Signed-off-by: Henrique de Moraes Holschuh Cc: Dmitry Torokhov Cc: Ivo van Doorn Cc: Richard Hughes Signed-off-by: Len Brown commit e295e8508c1dd56e06c73e78a2f67f2eb563e74f Author: Henrique de Moraes Holschuh Date: Wed Jul 18 23:45:37 2007 -0300 ACPI: thinkpad-acpi: add power-management handler capability Some subdrivers could benefit from resume handling, so add the infrastructure for simple resume handling. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit 1a343760b516ca5466d201bec32b1794858b18a5 Author: Henrique de Moraes Holschuh Date: Wed Jul 18 23:45:36 2007 -0300 ACPI: thinkpad-acpi: make the input event mode the default Make the input layer the default way to deal with thinkpad-acpi hot keys, but add a kernel config option to retain the old way of doing things. This means we map a lot more keys to useful stuff by default, and also that we enable hot key handling by default on driver load (like Windows does). The documentation for proper use of this resource is also updated. Signed-off-by: Henrique de Moraes Holschuh Cc: Richard Hughes Signed-off-by: Len Brown commit 6a38abbf2b68e37493f2d5e8702b895a6c23ba0f Author: Henrique de Moraes Holschuh Date: Wed Jul 18 23:45:35 2007 -0300 ACPI: thinkpad-acpi: add input device support to hotkey subdriver Add input device support to the hotkey subdriver. Hot keys that have a valid keycode mapping are reported through the input layer if the input device is open. Otherwise, they will be reported as ACPI events, as they were before. Scan codes are reported (using EV_MSC MSC_SCAN events) along with EV_KEY KEY_UNKNOWN events. For backwards compatibility purposes, hot keys that used to be reported through ACPI events are not mapped to anything meaningful by default. Userspace is supposed to remap them if it wants to use the input device for hot key reporting. This patch is based on a patch by Richard Hughes . Signed-off-by: Henrique de Moraes Holschuh Cc: Richard Hughes Cc: Dmitry Torokhov Signed-off-by: Len Brown commit 7f5d1cd6287b7b29d210f85e2343207ac4310da2 Author: Henrique de Moraes Holschuh Date: Wed Jul 18 23:45:34 2007 -0300 ACPI: thinkpad-acpi: register input device Register an input device to send input events to userspace. This patch is based on a patch by Richard Hughes . Signed-off-by: Henrique de Moraes Holschuh Cc: Richard Hughes Cc: Dmitry Torokhov Signed-off-by: Len Brown commit d54b7d7f8026300c612dd733d501fcbc22fd0370 Author: Henrique de Moraes Holschuh Date: Wed Jul 18 23:45:33 2007 -0300 ACPI: thinkpad-acpi: update CMOS commands documentation The CMOS set of commands is often just used to keep the CMOS NVRAM in sync with whatever the ACPI BIOS has been doing in modern ThinkPads. In older ThinkPads, it actually carried out real actions. Document this. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit 94b08713186cc47a5c367a866cc0a0a762721455 Author: Henrique de Moraes Holschuh Date: Wed Jul 18 23:45:32 2007 -0300 ACPI: thinkpad-acpi: checkpoint sysfs interface version due to hotkey The change in the size of the hotkey mask, the hability to report the keys that use the higher bits, and the addition of the hotkey_radio_sw attribute are important enough features to warrant increasing the minor field of the sysfs interface version. Also, document a bit better how and when the thinkpad-acpi sysfs interface version will be updated. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit 74941a69afcc06722685d492784414ec042ab492 Author: Henrique de Moraes Holschuh Date: Wed Jul 18 23:45:31 2007 -0300 ACPI: thinkpad-acpi: export to sysfs the state of the radio slider switch Some ThinkPad models, notably the T60 and X60, have a slider switch to enable and disable the radios. The switch has the capability of force-disabling the radios in hardware on most models, and it is supposed to affect all radios (WLAN, WWAN, BlueTooth). Export the switch state as a sysfs attribute, on ThinkPads where it is available. Thanks to Henning Schild for asking for this feature, and for tracking down the EC register that holds the radio switch state. Signed-off-by: Henrique de Moraes Holschuh Cc: Henning Schild Signed-off-by: Len Brown commit 9b010de59cb6dcab7e167dd2a0fa5d3b31447fea Author: Henrique de Moraes Holschuh Date: Wed Jul 18 23:45:30 2007 -0300 ACPI: thinkpad-acpi: export hotkey maximum masks The firmware knows how many hot keys it supports, so export this information in a sysfs attribute. And the driver knows which keys are always handled by the firmware in all known ThinkPad models too, so export this information as well in a sysfs attribute. Unless you know which events need to be handled in a passive way, do *not* enable hotkeys that are always handled by the firmware. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit ae92bd17ff703b3703562148c73b4d6833e6a326 Author: Henrique de Moraes Holschuh Date: Wed Jul 18 23:45:29 2007 -0300 ACPI: thinkpad-acpi: enable more hotkeys Revise ACPI HKEY functionality to better interface with the firmware, and enable up to 32 regular hotkeys, instead of just 16 of them. Ouch. This takes care of most keys one used to have to do CMOS NVRAM polling on, and should drop the need for tpb, thinkpad-keys, and other such 5Hz NVRAM polling power vampires on most modern ThinkPads ;-) And, just to add insult to injury, this was sort of working since forever through the procfs interface, but nobody noticed or tried an echo 0xffffffff > /proc/acpi/ibm/hotkey and told me it would generate weird events. ARGH! Thanks to Richard Hughes for kicking off the work that ended up with this discovery, and to Matthew Garret for calling my attention to the fact that newer ThinkPads were indeed generating ACPI GPEs when such hot keys were pressed. Signed-off-by: Henrique de Moraes Holschuh Cc: Richard Hughes Cc: Matthew Garrett Signed-off-by: Len Brown commit b8b26402cb711de5d3bbd4515b91b6d863fea259 Author: Henrique de Moraes Holschuh Date: Wed Jul 18 23:45:28 2007 -0300 ACPI: thinkpad-acpi: update information on T43 thermal sensor 0xc1 Update the documentation with some extra data on the T43 thermal sensor @0xc1, thanks to Alexey Fisher. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit 94954cc60194796fb257802f6f65d79553c9a8ca Author: Henrique de Moraes Holschuh Date: Wed Jul 18 23:45:27 2007 -0300 ACPI: thinkpad-acpi: remove all uneeded initializers Remove all initializers to NULL or zero. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit b964b437601a0e7d09896d5d9a85c83643e94f41 Author: Henrique de Moraes Holschuh Date: Wed Jul 18 23:45:26 2007 -0300 ACPI: thinkpad-acpi: add DMI-based modalias Add DMI-based aliases to allow module autoloading on select thinkpads. The aliases will do nothing unless the dmi-based-module-autoloading.patch patch from Lennart Poettering is applied. Lennart's patch has been accepted by greghk and will be merged eventually. Signed-off-by: Henrique de Moraes Holschuh Cc: Lennart Poettering Signed-off-by: Len Brown commit e51f802babc5e368c60fbfd08c6c11269c9253b0 Author: David Howells Date: Sat Jul 21 19:30:16 2007 -0700 [NET]: Add missing entries to family name tables Add missing entries to af_family_clock_key_strings[]. Signed-off-by: David Howells Signed-off-by: David S. Miller commit 3167d93fc0cb81541dea551dc14411ed211eb9e0 Author: Christoph Hellwig Date: Sat Jul 21 19:22:42 2007 -0700 [SPARC64]: ERROR: "sys_ioctl" [arch/sparc64/solaris/solaris.ko] undefined! From: Christoph Hellwig On Fri, Jul 20, 2007 at 09:24:42AM -0400, Horst H. von Brand wrote: > When building v2.6.22-3478-g275afca on sparc64 (.config attached) I get: > > MODPOST vmlinux > Building modules, stage 2. > MODPOST 463 modules > ERROR: "sys_ioctl" [arch/sparc64/solaris/solaris.ko] undefined! Sorry, my fault. It looked to me like sparc64 exports sys_ioctl on it's own, but it only exports compat_sys_ioctl on it's own. Signed-off-by: David S. Miller commit 378e515c867bc7b6cb33a5aa52776d3e897e7b81 Author: Al Viro Date: Sat Jul 21 19:20:34 2007 -0700 [SPARC32]: Make PAGE_SHARED a read-mostly variable. same scheme as for sparc64, same rationale Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 0f516813ce5aa78b30084cd0cc2e7e2ba1777168 Author: Al Viro Date: Sat Jul 21 19:19:38 2007 -0700 [SPARC32]: Take enable_irq/disable_irq out of line. Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 32231a66b4e1b649c346dc76b7d191f7e64a663a Author: Al Viro Date: Sat Jul 21 19:18:57 2007 -0700 [SPARC32]: clean include/asm-sparc/irq.h Move stuff used only by arch/sparc/kernel/* into arch/sparc/kernel/irq.h and into individual files in there (e.g. macros internal to sun4m_irq.c, etc.) Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 196bffa5dc3181897bd32e41415ec0db8dbab5e7 Author: Mark Fortescue Date: Sat Jul 21 19:17:41 2007 -0700 [SPARC32]: Fix rounding errors in ndelay/udelay implementation. __ndelay and __udelay have not been delayung >= specified time. The problem with __ndelay has been tacked down to the rounding of the multiplier constant. By changing this, delays > app 18us are correctly calculated. The problem with __udelay has also been tracked down to rounding issues. Changing the multiplier constant (to match that used in sparc64) corrects for large delays and adding in a rounding constant corrects for trunctaion errors in the claculations. Many short delays will return without looping. This is not an error as there is the fixed delay of doing all the maths to calculate the loop count. Signed-off-by: Mark Fortescue Signed-off-by: David S. Miller commit e0009820edfa50267eb7a3e3c43f5530325a987b Author: Jan Engelhardt Date: Sat Jul 21 19:11:35 2007 -0700 [NET]: Make NETDEVICES depend on NET. Enabling drivers from "Devices > Networking" (in menuconfig), for example SLIP and/or PLIP, throws link time errors when CONFIG_NET itself is =n. Have CONFIG_NETDEVICES depend on CONFIG_NET. Signed-off-by: Jan Engelhardt Signed-off-by: David S. Miller commit b77f2fa6299af4bbb7aa50c5064a0f087ea089d9 Author: Al Viro Date: Sat Jul 21 19:09:41 2007 -0700 [IPV6]: endianness bug in ip6_tunnel Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 43a415138d8133587c0901d29941b821b86e9e7d Author: Stephen Rothwell Date: Sat Jul 21 19:08:13 2007 -0700 [IrDA]: TOSHIBA_FIR depends on virt_to_bus Signed-off-by: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit e97e2ddf07d6b6c2d621ddaec277e19f86c0cdb1 Author: Samuel Ortiz Date: Sat Jul 21 19:07:33 2007 -0700 [IrDA]: EP7211 IR driver port to the latest SIR API The EP7211 SIR driver was the only one left without a new SIR API port. Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit 22e1fb25e78fd47b1ef3af3b48a2b07efdd3f95f Author: Samuel Ortiz Date: Sat Jul 21 19:06:53 2007 -0700 [IrDA] Typo fix in irnetlink.c copyright Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit 08f1c192c3c32797068bfe97738babb3295bbf42 Author: Muli Ben-Yehuda Date: Sun Jul 22 00:23:39 2007 +0300 x86-64: introduce struct pci_sysdata to facilitate sharing of ->sysdata This patch introduces struct pci_sysdata to x86 and x86-64, and converts the existing two users (NUMA, Calgary) to use it. This lays the groundwork for having other users of sysdata, such as the PCI domains work. The Calgary bits are tested, the NUMA bits just look ok. Signed-off-by: Jeff Garzik Signed-off-by: Muli Ben-Yehuda Signed-off-by: Linus Torvalds commit 7557244ba27f63404236cb27277b98c27d856692 Author: Joachim Deguara Date: Sat Jul 21 17:11:44 2007 +0200 x86_64: make k8topology multi-core aware This makes k8topology multicore aware instead of limited to signle- and dual-core CPUs. It uses the CPUID to be more future proof. Signed-off-by: Joachim Deguara Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 81e02d19b901da0900332654fa7846d119b53221 Author: Jan Beulich Date: Sat Jul 21 17:11:42 2007 +0200 x86_64: remove __smp_alt* sections Leftovers from the removal of the more general (but abandoned) SMP alternatives. Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 09fce8a195638ad038b8a58d9d8d3558c21a23ea Author: Robert P. J. Day Date: Sat Jul 21 17:11:41 2007 +0200 i386: Update alignment when 4K stacks are used. Signed-off-by: Robert P. J. Day Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit edc2cbf49682079d5344bf7f2545ed6b036fa355 Author: Stefan Richter Date: Sat Jul 21 17:11:40 2007 +0200 i386: remove old IRQ balancing debug cruft Dead or misnamed CONFIG_BALANCED_IRQ_DEBUG found by Robert P. J. Day. It's not a Kconfig variable. Since this debug code is ancient, I suggest to get rid of this misleading CONFIG_ macro by deleting all of this debug code. Signed-off-by: Stefan Richter Cc: Ingo Molnar Cc: "Robert P. J. Day" Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit a1dfd851b97bfefeb50e6ccf8cd2c52f9acd8fea Author: Aaron Durbin Date: Sat Jul 21 17:11:39 2007 +0200 i386: insert HPET firmware resource after PCI enumeration has completed Insert HPET resources after pci probing has been completed in order to avoid resource conflicts with PCI resource reservation. With this change the HPET firmware resources will be identified, but it should also not cause issues when the HPET address falls on a BAR in a PCI device, and the PCI enumeration cannot reserve the resources. Signed-off-by: Aaron Durbin Cc: john stultz Cc: Thomas Gleixner Cc: Len Brown Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit f62e518484e9b16a0eca013e8a6764bc4f56d5fe Author: Andres Salomon Date: Sat Jul 21 17:11:38 2007 +0200 i386: basic infrastructure support for AMD geode-class machines This builds upon the existing geode infrastructure, but adds southbridge support, some GPIO functions, and a header file (asm-i386/geode.h) with some useful GX/LX detection tests. The majority of this code was written by Jordan Crouse. Signed-off-by: Jordan Crouse Signed-off-by: Andres Salomon Cc: Alan Cox Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 5a3ece79b2aa9e71ed67689c97b3bda6135f7248 Author: Dan Aloni Date: Sat Jul 21 17:11:37 2007 +0200 x86_64: arch/x86_64/kernel/e820.c lower printk severity Signed-off-by: Dan Aloni Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 753811dc82a6a39554c34c13c996c3de9f4aa634 Author: Dan Aloni Date: Sat Jul 21 17:11:36 2007 +0200 x86_64: arch/x86_64/kernel/aperture.c lower printk severity Users that use kernel log filtering (e.g. via syslogd or a proprietry method) wouldn't like to see warning prints that are not really warnings. Signed-off-by: Dan Aloni Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 9585116ba09f1d8c52d0a1346e20bb9d443e9c02 Author: Jeremy Fitzhardinge Date: Sat Jul 21 17:11:35 2007 +0200 i386: fix iounmap's use of vm_struct's size field get_vm_area always returns an area with an adjacent guard page. That guard page is included in vm_struct.size. iounmap uses vm_struct.size to determine how much address space needs to have change_page_attr applied to it, which will BUG if applied to the guard page. This patch adds a helper function - get_vm_area_size() in linux/vmalloc.h - to return the actual size of a vm area, and uses it to make iounmap do the right thing. There are probably other places which should be using get_vm_area_size(). Thanks to Dave Young for debugging the problem. [ Andi, it wasn't clear to me whether x86_64 needs the same fix. ] Signed-off-by: Jeremy Fitzhardinge Cc: Dave Young Cc: Chuck Ebbert Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit a2900975ef3f1df33c83e750cc1e490de3374ca8 Author: Thomas Gleixner Date: Sat Jul 21 17:11:34 2007 +0200 i386: move PIT function declarations and constants to correct header file setup_pit_timer is declared in asm-i386/timer.h. Move it to the pit header file, so it can be used by x86_64 as well. Move also the PIT constants. Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 43d6ca01844789b4c695175f8c205861a06a84cb Author: Chris Wright Date: Sat Jul 21 17:11:33 2007 +0200 i386: hpet assumes boot cpu is 0 I fixed this in x86_64. Looks like the kind of thing that will break voyager on i386. Signed-off-by: Chris Wright Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit f5352fd0ce41b079a01e23c01ea3578c29f097e7 Author: Thomas Gleixner Date: Sat Jul 21 17:11:32 2007 +0200 i386: remove volatile in apic.c Remove the volatile in apic. We have a cpu_relax() in the wait loop. Fix a coding style issue while at it. Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit f2cf8e085c0d3fd5c755d7c0de7334a50ebb728e Author: Yinghai Lu Date: Sat Jul 21 17:11:31 2007 +0200 x86_64: move iommu declaration from proto to iommu.h [akpm@linux-foundation.org: build fix] Signed-off-by: Yinghai Lu Cc: Alan Cox Cc: "Eric W. Biederman" Cc: Muli Ben-Yehuda Cc: Vivek Goyal Cc: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 1c05f093c0721894bb60fd26d174815bb7ef2b7f Author: David Rientjes Date: Sat Jul 21 17:11:30 2007 +0200 x86_64: disable srat when numa emulation succeeds When NUMA emulation succeeds, acpi_numa needs to be set to -1 so that srat_disabled() will always return true. We won't be calling acpi_scan_nodes() or registering the true nodes we've found. [hugh@veritas.com: Fix x86_64 CONFIG_NUMA_EMU build: acpi_numa needs CONFIG_ACPI_NUMA] Signed-off-by: David Rientjes Cc: Len Brown Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit a7e96629efcab1ccea3a376f3f5683c8d9e882c1 Author: David Rientjes Date: Sat Jul 21 17:11:29 2007 +0200 x86_64: fix e820_hole_size based on address ranges e820_hole_size() now uses the newly extracted helper function, e820_find_active_region(), to determine the size of usable RAM in a range of PFN's. This was previously broken because of two reasons: - The start and end PFN's of each e820 entry were not properly rounded prior to excluding those entries in the range, and - Entries smaller than a page were not properly excluded from being accumulated. This resulted in emulated nodes being incorrectly mapped to ranges that were completely reserved and not candidates for being registered as active ranges. Signed-off-by: David Rientjes Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit bc2cea6a34fdb30f118ec75db39a46a191870607 Author: Yinghai Lu Date: Sat Jul 21 17:11:28 2007 +0200 x86_64: disable the GART in shutdown For K8 system: 4G RAM with memory hole remapping enabled, or more than 4G RAM installed. when using kexec to load second kernel. In the second kernel, when mem is allocated for GART, it will do the memset for clear, it will cause restart, because some device still used that for dma. solution will be: in second kernel: disable that at first before we try to allocate mem for it. or in the first kernel: do disable that before shutdown. Andi/Eric/Alan prefer to second one for clean shutdown in first kernel. Andi also point out need to consider to AGP enable but mem less 4G case too. Signed-off-by: Yinghai Lu Cc: Alan Cox Cc: "Eric W. Biederman" Cc: Muli Ben-Yehuda Cc: Vivek Goyal Cc: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 48dd9343d0bb54362a2ba65380fea7c8f07f9e74 Author: Robert P. J. Day Date: Sat Jul 21 17:11:26 2007 +0200 i386: replace hard-coded constant with appropriate macro from kernel.h Signed-off-by: Robert P. J. Day Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 267eb01a62b1190d0bf87b1ef3b0c9d21cdb2c57 Author: Andreas Mohr Date: Sat Jul 21 17:11:25 2007 +0200 i386: add cpu_relax() to cmos_lock() Add cpu_relax() to cmos_lock() inline function for faster operation on SMT CPUs and less power consumption on others in case of lock contention (which probably doesn't happen too often, so admittedly this patch is not too exciting). [akpm@linux-foundation.org: Include the header file for cpu_relax()] Signed-off-by: Andreas Mohr Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 8f03d6ce4ee20e7521b69188f6b5a9bb9ba7457f Author: Andrew Morton Date: Sat Jul 21 17:11:24 2007 +0200 x86_64: flush_tlb_kernel_range() warning fix mm/vmalloc.c: In function 'unmap_kernel_range': mm/vmalloc.c:75: warning: unused variable 'start' make it a C function so that the compiler thinks it used its arguments. Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 1048fa52810a5bad542cd4929a702af5e241fa81 Author: Yinghai Lu Date: Sat Jul 21 17:11:23 2007 +0200 x86_64: change _map_single to static in pci_gart.c etc This function is called via dma_ops->.., so change it to static Signed-off-by: Yinghai Lu Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e199ece4472cdcc73f329813d67dc4280424cd2d Author: Yinghai Lu Date: Sat Jul 21 17:11:22 2007 +0200 x86_64: Geode HW Random Number Generator depends on X86_32 Signed-off-by: Yinghai Lu Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit bdb345a4e3cf51dbe52955734c33003bbf0486e7 Author: Jiri Kosina Date: Sat Jul 21 17:11:21 2007 +0200 x86_64: fix wrong comment regarding set_fixmap() The function name is set_fixmap(), not fixmap_set() as stated in the comment. Also fix a typo, punctuation and lower/uppercase a bit. Signed-off-by: Jiri Kosina Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 2d4fa2f665e0585cae62c3a1ea85d82ee523c8ef Author: Dan Aloni Date: Sat Jul 21 17:11:20 2007 +0200 x86_64: lower printk severity Signed-off-by: Dan Aloni Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 7b0b8207e07f3f3ce01af37b78024c60e9f4b1f5 Author: Alessio Igor Bogani Date: Sat Jul 21 17:11:19 2007 +0200 x86_64: fix typo in acpi_pm.c Signed-off-by: Alessio Igor Bogani Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 28318daf791b692f2654cb9c89687388063bd42b Author: Thomas Gleixner Date: Sat Jul 21 17:11:18 2007 +0200 x86_64: use the global PIT lock Replace the pcspkr private PIT lock by the global PIT lock to serialize the PIT access all over the place. Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 021daae2c265a844fd27bb6cc49c2bd114571069 Author: Will Schmidt Date: Sat Jul 21 17:11:17 2007 +0200 x86_64: During VM oom condition, kill all threads in process group During a VM oom condition, kill all threads in the process group. We have had complaints where a threaded application is left in a bad state after one of it's threads is killed when we hit a VM: out_of_memory condition. Killing just one of the process threads can leave the application in a bad state, whereas killing the entire process group would allow for the application to restart, or otherwise handled, and makes it very obvious that something has gone wrong. This change allows the entire process group to be taken down, rather than just the one thread. Signed-off-by: Will Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 99253b8e734a7a773c0e4bedd7d8d1847c98c538 Author: Glauber de Oliveira Costa Date: Sat Jul 21 17:11:16 2007 +0200 x86_64: Move functions declarations to header file Some interrupt entry points are currently defined in i8259.c They probably belong in a header. Right now, their only user is init_IRQ, justifying their declaration in-file. But when virtualization comes in, we may be interested in using that functions in late initializations. Signed-off-by: Glauber de Oliveira Costa Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d24e399763f9e91cc03e4e351d75f6231d5ed4f2 Author: Andy Whitcroft Date: Sat Jul 21 17:11:15 2007 +0200 i386: move the kernel to 16MB for NUMA-Q We are seeing corruption of the decompressed kernel. It is suspected that this is platform specific as it has yet to be seen on any other x86. Move the kernel to the 16MB boundary. Signed-off-by: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 028a690a1ebc8b825b6f42214a99a5abcf9aa4c6 Author: Jesper Juhl Date: Sat Jul 21 17:11:14 2007 +0200 i386: Remove unneeded test of 'task' in dump_trace() Remove unneeded test of task != NULL from arch/i386/kernel/traps.c::dump_trace() At the start of the function we have this test: if (!task) task = current; so further down there's no need to test 'task'. Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit c673f1a9d994de501b674b2bb6a48bd5e912afe0 Author: William Lee Irwin III Date: Sat Jul 21 17:11:13 2007 +0200 i386: divorce CONFIG_X86_PAE from CONFIG_HIGHMEM64G PAE is useful for more than supporting more than 4GB RAM. It supports expanded swapspace and NX executable protections. Some users may want NX or expanded swapspace support without the overhead or instability of highmem. For these reasons, the following patch divorces CONFIG_X86_PAE from CONFIG_HIGHMEM64G. Cc: Mark Lord Signed-off-by: William Irwin Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 075bcd1f9726b8a1caff86eda06f29f71fb21235 Author: Thomas Gleixner Date: Sat Jul 21 17:11:12 2007 +0200 i386: HPET, check if the counter works Some systems have a HPET which is not incrementing, which leads to a complete hang. Detect it during HPET setup. Signed-off-by: Thomas Gleixner Cc: john stultz Cc: Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit df2edcf3b6ba54d9ffa620e322583cd994a6e54a Author: James Jarvis Date: Sat Jul 21 17:11:11 2007 +0200 i386: DMI_MATCH patch in reboot.c for SFF Dell OptiPlex 745 - fixes hang on reboot The following patch enables reboot through BIOS on the Dell Optiplex 745 Small Form Factor base, on which reboot hangs. The larger form factor does not require this, hence the match on DMI_BOARD_NAME. Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 1c10070a55a38ad8489df8afd52c9a3ffd46bbb5 Author: Rafael J. Wysocki Date: Sat Jul 21 17:11:09 2007 +0200 i386: do not restore reserved memory after hibernation On some systems the ACPI NVS area is located in the first 1 MB of RAM and it is overwritten by the i386 code during the restore after hibernation. This confuses the ACPI platform firmware that doesn't update the AC adapter status appropriately as a result (http://bugzilla.kernel.org/show_bug.cgi?id=7995). The solution is to register the reserved memory in the first 1 MB as 'nosave', so that swsusp doesn't touch it during the restore. Also, this has been done on x86_64 for a long time now, so this patch makes the i386 restore code behave like the x86_64 one. [akpm@linux-foundation.org: build fix] Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Cc: David Rientjes Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 114ab8e99c52828b37c994f580e39ce341c17d3b Author: Sam Ravnborg Date: Sat Jul 21 17:11:08 2007 +0200 i386: fix section mismatch warning in intel_cacheinfo Fix following warning: WARNING: arch/i386/kernel/built-in.o(.init.text+0x3818): Section mismatch: reference to .exit.text:cache_remove_dev (between 'cacheinfo_cpu_callback' and 'cache_sysfs_init') It points out that a function marked __cpuexit is calling a function marked __cpuinit => oops. The call happens only in an error-condition which may explain why we have not seen it before. The offending function was not used anywhere else - so marked it __cpuexit. Note: This warning triggers only with a local copy of modpost but that version will soon be pushed out. Signed-off-by: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 2378569dd18b3b99e3535ad06b47db7c11dde7d1 Author: Adrian Bunk Date: Sat Jul 21 17:11:07 2007 +0200 i386: pgd_{c,d}tor() static pgd_{c,d}tor() can now become static. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 3cc39bda26c90782f98305c34a7f769819784a61 Author: Muli Ben-Yehuda Date: Sat Jul 21 17:11:06 2007 +0200 x86_64: Calgary - fold in redundant functions After the bitmap changes we can get rid of the unlocked versions of calgary_unmap_sg and iommu_free. Fold __calgary_unmap_sg and __iommu_free into their calgary_unmap_sg and iommu_free, respectively. Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 0b11e1c6a604014283af70e27e0f32971407fd6d Author: Yinghai Lu Date: Sat Jul 21 17:11:05 2007 +0200 x86_64: Calgary - change _map_single, etc to static there function are called via dma_ops->.., so change them to static Signed-off-by: Yinghai Lu Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 820a149705c2c2a37989554a4f4a34e3d0b0df1f Author: Muli Ben-Yehuda Date: Sat Jul 21 17:11:04 2007 +0200 x86_64: Calgary - tighten up the bitmap locking Currently the IOMMU table's lock protects both the bitmap and access to the hardware's TCE table. Access to the TCE table is synchronized through the bitmap; therefore, only hold the lock while modifying the bitmap. This gives a yummy 10-15% reduction in CPU utilization for netperf on a large SMP machine. Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 7354b07595b2e43b75fe353fcf18e73eb0427c9b Author: Muli Ben-Yehuda Date: Sat Jul 21 17:11:03 2007 +0200 x86_64: Calgary - fix few style problems pointed out by checkpatch.pl No actual code was harmed in the production of this patch. Thanks to Andrew Morton for telling me about checkpatch.pl. Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 12de257b83e2fa9343eb7cee70a6edc85b51fbc5 Author: Muli Ben-Yehuda Date: Sat Jul 21 17:11:02 2007 +0200 x86_64: tidy up debug printks Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e8f204147149e48d72e9c1e321ee72452169e34a Author: Muli Ben-Yehuda Date: Sat Jul 21 17:11:01 2007 +0200 x86_64: only reserve the first 1MB of IO space for CalIOC2 Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 8bcf77055cc88228263f936b2ecf69c017906cb2 Author: Muli Ben-Yehuda Date: Sat Jul 21 17:11:00 2007 +0200 x86_64: tabify and trim trailing whitespace Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 05b48ea61c900115add991427f52ee5eacf361a8 Author: Guillaume Thouvenin Date: Sat Jul 21 17:10:59 2007 +0200 x86_64: cleanup of unneeded macros Cleanup unneeded macros used for register space address calculation. Now we are using the EBDA to find the space address. Signed-off-by: Guillaume Thouvenin Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 07877cf6fd559cbdced7ad4c15ab225a552ab692 Author: Muli Ben-Yehuda Date: Sat Jul 21 17:10:58 2007 +0200 x86_64: reserve TCEs with the same address as MEM regions This works around a bug where DMAs that have the same addresses as some MEM regions do not go through. Not clear yet if this is due to a mis-configuration or something deeper. [akpm@linux-foundation.org: coding style fixlet] Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit ddbd41b4e76f2b586366df0e85df80729ef90bc5 Author: Muli Ben-Yehuda Date: Sat Jul 21 17:10:57 2007 +0200 x86_64: grab PLSSR too when a DMA error occurs Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 8cb32dc748571fb474018172e6b59e5a06123192 Author: Muli Ben-Yehuda Date: Sat Jul 21 17:10:55 2007 +0200 x86_64: make dump_error_regs a chip op Provide seperate versions for Calgary and CalIOC2 Also print out the PCIe Root Complex Status on CalIOC2 errors Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 00be3fa42f164f7e2783a5acf9766fb07fb64e68 Author: Muli Ben-Yehuda Date: Sat Jul 21 17:10:54 2007 +0200 x86_64: implement CalIOC2 TCE cache flush sequence Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit c38601084b386991f1614f03e0323c51236e19e1 Author: Muli Ben-Yehuda Date: Sat Jul 21 17:10:53 2007 +0200 x86_64: add chip_ops and a quirk function for CalIOC2 [akpm@linux-foundation.org>: make calioc2_chip_ops static] Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 8a244590ca699ebbf8c5682d11c47732b7cc9db9 Author: Muli Ben-Yehuda Date: Sat Jul 21 17:10:52 2007 +0200 x86_64: introduce CalIOC2 support CalIOC2 is a PCI-e implementation of the Calgary logic. Most of the programming details are the same, but some differ, e.g., TCE cache flush. This patch introduces CalIOC2 support - detection and various support routines. It's not expected to work yet (but will with follow-on patches). Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 35b6dfa08736e8a362b9d41ff52ffa1eb36505a9 Author: Muli Ben-Yehuda Date: Sat Jul 21 17:10:51 2007 +0200 x86_64: abstract how we find the iommu_table for a device ... in preparation for doing it differently for CalIOC2. Signed-off-by: Muli Ben-Yehuda Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit ff297b8c081bdc60507eaeb1838996e0c67141c8 Author: Muli Ben-Yehuda Date: Sat Jul 21 17:10:50 2007 +0200 x86_64: introduce chipset specific ops Calgary and CalIOC2 share most of the same logic. Introduce struct cal_chipset_ops for quirks and tce flush logic which are [akpm@linux-foundation.org: make calgary_chip_ops static] Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit b8d2ea1b87b02fc94ffcab58b29c83fbbb6a1e4e Author: Muli Ben-Yehuda Date: Sat Jul 21 17:10:49 2007 +0200 x86_64: introduce handle_quirks() for various chipset quirks Move the aic94xx split completion timeout handling there. Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 9882234bf2e54ebf4866245d46e2c704a1214ad9 Author: Muli Ben-Yehuda Date: Sat Jul 21 17:10:48 2007 +0200 x86_64: update copyright notice Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit a2b663f6728ab71f0e45db41333fb0aaf5e59072 Author: Muli Ben-Yehuda Date: Sat Jul 21 17:10:47 2007 +0200 x86_64: generalize calgary_increase_split_completion_timeout ... will be used by CalIOC2 later Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 9596017e79cddb4f4fd4b896425a30f86946ce85 Author: Adrian Bunk Date: Sat Jul 21 17:10:46 2007 +0200 x86: remove support for the Rise CPU The Rise CPUs were only very short-lived, and there are no reports of anyone both owning one and running Linux on it. Googling for the printk string "CPU: Rise iDragon" didn't find any dmesg available online. If it turns out that against all expectations there are actually users reverting this patch would be easy. This patch will make the kernel images smaller by a few bytes for all i386 users. Signed-off-by: Adrian Bunk Acked-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit ef3e28c5b956cbb3b17531c85b698a27e83d5cf2 Author: Eric W. Biederman Date: Sat Jul 21 17:10:45 2007 +0200 x86_64: check remote IRR bit before migrating level triggered irq On x86_64 kernel, level triggered irq migration gets initiated in the context of that interrupt(after executing the irq handler) and following steps are followed to do the irq migration. 1. mask IOAPIC RTE entry; // write to IOAPIC RTE 2. EOI; // processor EOI write 3. reprogram IOAPIC RTE entry // write to IOAPIC RTE with new destination and // and interrupt vector due to per cpu vector // allocation. 4. unmask IOAPIC RTE entry; // write to IOAPIC RTE Because of the per cpu vector allocation in x86_64 kernels, when the irq migrates to a different cpu, new vector(corresponding to the new cpu) will get allocated. An EOI write to local APIC has a side effect of generating an EOI write for level trigger interrupts (normally this is a broadcast to all IOAPICs). The EOI broadcast generated as a side effect of EOI write to processor may be delayed while the other IOAPIC writes (step 3 and 4) can go through. Normally, the EOI generated by local APIC for level trigger interrupt contains vector number. The IOAPIC will take this vector number and search the IOAPIC RTE entries for an entry with matching vector number and clear the remote IRR bit (indicate EOI). However, if the vector number is changed (as in step 3) the IOAPIC will not find the RTE entry when the EOI is received later. This will cause the remote IRR to get stuck causing the interrupt hang (no more interrupt from this RTE). Current x86_64 kernel assumes that remote IRR bit is cleared by the time IOAPIC RTE is reprogrammed. Fix this assumption by checking for remote IRR bit and if it still set, delay the irq migration to the next interrupt arrival event(hopefully, next time remote IRR bit will get cleared before the IOAPIC RTE is reprogrammed). Initial analysis and patch from Nanhai. Clean up patch from Suresh. Rewritten to be less intrusive, and to contain a big fat comment by Eric. [akpm@linux-foundation.org: fix comments] Acked-by: Ingo Molnar Cc: Nanhai Zou Acked-by: Suresh Siddha Cc: Asit Mallick Cc: Keith Packard Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 22293e5806f58a9682267139678a5cc117fd3dcf Author: Venki Pallipadi Date: Sat Jul 21 17:10:44 2007 +0200 x86: round_jiffies() for i386 and x86-64 non-critical/corrected MCE polling This helps to reduce the frequency at which the CPU must be taken out of a lower-power state. Signed-off-by: Venkatesh Pallipadi Acked-by: Tim Hockin Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 459029541d857258dfa9ad29e443d287a74c36fe Author: Andrew Morton Date: Sat Jul 21 17:10:43 2007 +0200 i386: add reference to the arguments Prevent stuff like this: mm/vmalloc.c: In function 'unmap_kernel_range': mm/vmalloc.c:75: warning: unused variable 'start' Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit bb1995d52b05f7e671914454d0ae57bd4170ef47 Author: Alan Stern Date: Sat Jul 21 17:10:42 2007 +0200 x86: Make Alt-SysRq-p display the debug register contents This patch (as921) adds code to the show_regs() routine in i386 and x86_64 to print the contents of the debug registers along with all the others. Signed-off-by: Alan Stern Signed-off-by: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 44bf4cea43816d43deab73c1c16361e899996eaa Author: Nigel Cunningham Date: Sat Jul 21 17:10:41 2007 +0200 x86: PM_TRACE support Signed-off-by: Nigel Cunningham Cc: Randy Dunlap Cc: "Rafael J. Wysocki" Cc: Pavel Machek Acked-by: Linus Torvalds Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 9ef231a436fddb34d806f599c97b479691b3c38b Author: Sam Ravnborg Date: Sat Jul 21 17:10:39 2007 +0200 i386: fix section mismatch warnings in mtrr Following section mismatch warnings were reported by Andrey Borzenkov: WARNING: arch/i386/kernel/built-in.o - Section mismatch: reference to .init.text:amd_init_mtrr from .text between 'mtrr_bp_init' (at offset 0x967a) and 'mtrr_attrib_to_str' WARNING: arch/i386/kernel/built-in.o - Section mismatch: reference to .init.text:cyrix_init_mtrr from .text between 'mtrr_bp_init' (at offset 0x967f) and 'mtrr_attrib_to_str' WARNING: arch/i386/kernel/built-in.o - Section mismatch: reference to .init.text:centaur_init_mtrr from .text between 'mtrr_bp_init' (at offset 0x9684) and 'mtrr_attrib_to_str' WARNING: arch/i386/kernel/built-in.o - Section mismatch: reference to .init.text: from .text between 'get_mtrr_state' (at offset 0xa735) and 'generic_get_mtrr' WARNING: arch/i386/kernel/built-in.o - Section mismatch: reference to .init.text: from .text between 'get_mtrr_state' (at offset 0xa749) and 'generic_get_mtrr' WARNING: arch/i386/kernel/built-in.o - Section mismatch: reference to .init.text: from .text between 'get_mtrr_state' (at offset 0xa770) and 'generic_get_mtrr' It was tracked down to a few functions missing __init tag. Compile tested only. Signed-off-by: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 8b93789808756bcc1e5c90c99f1b1ef52f839a51 Author: Truxton Fulton Date: Sat Jul 21 17:10:38 2007 +0200 i386: fix machine rebooting Commit 59f4e7d572980a521b7bdba74ab71b21f5995538 fixed machine rebooting on Truxton's machine (when no keyboard was present). But it broke it on Lee's machine. The patch reinstates the old (pre-59f4e7d572980a521b7bdba74ab71b21f5995538) code and if that doesn't work out, try the new, post-59f4e7d572980a521b7bdba74ab71b21f5995538 code instead. Cc: Lee Garrett Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit bd78432c8f209a1028f4e5bada8b1da1d8e4da09 Author: Tim Hockin Date: Sat Jul 21 17:10:37 2007 +0200 x86_64: mcelog tolerant level cleanup Background: The MCE handler has several paths that it can take, depending on various conditions of the MCE status and the value of the 'tolerant' knob. The exact semantics are not well defined and the code is a bit twisty. Description: This patch makes the MCE handler's behavior more clear by documenting the behavior for various 'tolerant' levels. It also fixes or enhances several small things in the handler. Specifically: * If RIPV is set it is not safe to restart, so set the 'no way out' flag rather than the 'kill it' flag. * Don't panic() on correctable MCEs. * If the _OVER bit is set *and* the _UC bit is set (meaning possibly dropped uncorrected errors), set the 'no way out' flag. * Use EIPV for testing whether an app can be killed (SIGBUS) rather than RIPV. According to docs, EIPV indicates that the error is related to the IP, while RIPV simply means the IP is valid to restart from. * Don't clear the MCi_STATUS registers until after the panic() path. This leaves the status bits set after the panic() so clever BIOSes can find them (and dumb BIOSes can do nothing). This patch also calls nonseekable_open() in mce_open (as suggested by akpm). Result: Tolerant levels behave almost identically to how they always have, but not it's well defined. There's a slightly higher chance of panic()ing when multiple errors happen (a good thing, IMHO). If you take an MBE and panic(), the error status bits are not cleared. Alternatives: None. Testing: I used software to inject correctable and uncorrectable errors. With tolerant = 3, the system usually survives. With tolerant = 2, the system usually panic()s (PCC) but not always. With tolerant = 1, the system always panic()s. When the system panic()s, the BIOS is able to detect that the cause of death was an MC4. I was not able to reproduce the case of a non-PCC error in userspace, with EIPV, with (tolerant < 3). That will be rare at best. Signed-off-by: Tim Hockin Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e02e68d31e2d436197386997727b216fee9c4623 Author: Tim Hockin Date: Sat Jul 21 17:10:36 2007 +0200 x86_64: support poll() on /dev/mcelog Background: /dev/mcelog is typically polled manually. This is less than optimal for situations where accurate accounting of MCEs is important. Calling poll() on /dev/mcelog does not work. Description: This patch adds support for poll() to /dev/mcelog. This results in immediate wakeup of user apps whenever the poller finds MCEs. Because the exception handler can not take any locks, it can not call the wakeup itself. Instead, it uses a thread_info flag (TIF_MCE_NOTIFY) which is caught at the next return from interrupt or exit from idle, calling the mce_user_notify() routine. This patch also disables the "fake panic" path of the mce_panic(), because it results in printk()s in the exception handler and crashy systems. This patch also does some small cleanup for essentially unused variables, and moves the user notification into the body of the poller, so it is only called once per poll, rather than once per CPU. Result: Applications can now poll() on /dev/mcelog. When an error is logged (whether through the poller or through an exception) the applications are woken up promptly. This should not affect any previous behaviors. If no MCEs are being logged, there is no overhead. Alternatives: I considered simply supporting poll() through the poller and not using TIF_MCE_NOTIFY at all. However, the time between an uncorrectable error happening and the user application being notified is *the*most* critical window for us. Many uncorrectable errors can be logged to the network if given a chance. I also considered doing the MCE poll directly from the idle notifier, but decided that was overkill. Testing: I used an error-injecting DIMM to create lots of correctable DRAM errors and verified that my user app is woken up in sync with the polling interval. I also used the northbridge to inject uncorrectable ECC errors, and verified (printk() to the rescue) that the notify routine is called and the user app does wake up. I built with PREEMPT on and off, and verified that my machine survives MCEs. [wli@holomorphy.com: build fix] Signed-off-by: Tim Hockin Signed-off-by: William Irwin Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit f528e7ba28492e363a64c80c414ded4cadf48f89 Author: Tim Hockin Date: Sat Jul 21 17:10:35 2007 +0200 x86_64: O_EXCL on /dev/mcelog Background: /dev/mcelog is a clear-on-read interface. It is currently possible for multiple users to open and read() the device. Users are protected from each other during any one read, but not across reads. Description: This patch adds support for O_EXCL to /dev/mcelog. If a user opens the device with O_EXCL, no other user may open the device (EBUSY). Likewise, any user that tries to open the device with O_EXCL while another user has the device will fail (EBUSY). Result: Applications can get exclusive access to /dev/mcelog. Applications that do not care will be unchanged. Alternatives: A simpler choice would be to only allow one open() at all, regardless of O_EXCL. Testing: I wrote an application that opens /dev/mcelog with O_EXCL and observed that any other app that tried to open /dev/mcelog would fail until the exclusive app had closed the device. Caveats: None. Signed-off-by: Tim Hockin Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit a5ba7971045a90a36cef8f7d5a3075600b475b74 Author: Aaron Durbin Date: Sat Jul 21 17:10:34 2007 +0200 i386: insert unclaimed MMCONFIG resources Insert the unclaimed MMCONFIG resources into the resource tree without the IORESOURCE_BUSY flag during late initialization. This allows the MMCONFIG regions to be visible in the iomem resource tree without interfering with other system resources that were discovered during PCI initialization. [akpm@linux-foundation.org: nanofixes] Signed-off-by: Aaron Durbin Cc: David Rientjes Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 08705b89ecb0f4b0ba5735630ef988bd9fd9dd95 Author: David Rientjes Date: Sat Jul 21 17:10:33 2007 +0200 x86_64: fake apicid_to_node mapping for fake numa When we are in the emulated NUMA case, we need to make sure that all existing apicid_to_node mappings that point to real node ID's now point to the equivalent fake node ID's. If we simply iterate over all apicid_to_node[] members for each node, we risk remapping an entry if it shares a node ID with a real node. Since apicid's may not be consecutive, we're forced to create an automatic array of apicid_to_node mappings and then copy it over once we have finished remapping fake to real nodes. Signed-off-by: David Rientjes Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 3484d79813707bb6045773953a809abba443dc20 Author: David Rientjes Date: Sat Jul 21 17:10:32 2007 +0200 x86_64: fake pxm-to-node mapping for fake numa For NUMA emulation, our SLIT should represent the true NUMA topology of the system but our proximity domain to node ID mapping needs to reflect the emulated state. When NUMA emulation has successfully setup fake nodes on the system, a new function, acpi_fake_nodes() is called. This function determines the proximity domain (_PXM) for each true node found on the system. It then finds which emulated nodes have been allocated on this true node as determined by its starting address. The node ID to PXM mapping is changed so that each fake node ID points to the PXM of the true node that it is located on. If the machine failed to register a SLIT, then we assume there is no special requirement for emulated node affinity so we use the default LOCAL_DISTANCE, which is newly exported to this code, as our measurement if the emulated nodes appear in the same PXM. Otherwise, we use REMOTE_DISTANCE. PXM_INVAL and NID_INVAL are also exported to the ACPI header file so that we can compare node_to_pxm() results in generic code (in this case, the SRAT code). Cc: Len Brown Signed-off-by: David Rientjes Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 3af044e0f832cfa3fcdce14dc30678b79dd36995 Author: David Rientjes Date: Sat Jul 21 17:10:31 2007 +0200 x86_64: extract helper function from e820_register_active_regions The logic in e820_find_active_regions() for determining the true active regions for an e820 entry given a range of PFN's is needed for e820_hole_size() as well. e820_hole_size() is called from the NUMA emulation code to determine the reserved area within an address range on a per-node basis. Its logic should duplicate that of finding active regions in an e820 entry because these are the only true ranges we may register anyway. [akpm@linux-foundation.org: cleanup] Cc: Mel Gorman Signed-off-by: David Rientjes Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 34feb2c83beb3bdf13535a36770f7e50b47ef299 Author: Christoph Lameter Date: Sat Jul 21 17:10:30 2007 +0200 x86_64: Quicklist support for x86_64 This adds caching of pgds and puds, pmds, pte. That way we can avoid costly zeroing and initialization of special mappings in the pgd. A second quicklist is useful to separate out PGD handling. We can carry the initialized pgds over to the next process needing them. Also clean up the pgd_list handling to use regular list macros. There is no need anymore to avoid the lru field. Move the add/removal of the pgds to the pgdlist into the constructor / destructor. That way the implementation is congruent with i386. Signed-off-by: Christoph Lameter Cc: "David S. Miller" Cc: "Luck, Tony" Acked-by: William Lee Irwin III Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit f0a7a5c93dfd1c0348dbbdb6f22cb82d99079c93 Author: Adrian Bunk Date: Sat Jul 21 17:10:29 2007 +0200 i386: timer_irq_works() static again timer_irq_works() needlessly became global. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 3f9c8d19d26e016de31d1e59a573913edc64ce5c Author: Adrian Bunk Date: Sat Jul 21 17:10:28 2007 +0200 i386: arch/i386/kernel/i8253.c should #include Every file should include the headers containing the prototypes for its global functions. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 10079ae35fc91a0d5afa50eb4ccc82fb8f7124e9 Author: Adrian Bunk Date: Sat Jul 21 17:10:27 2007 +0200 i386: remapped_pgdat_init() static Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d5321abe6abd16e1749ccd89636415d39611e138 Author: Jan Beulich Date: Sat Jul 21 17:10:26 2007 +0200 i386: minor nx handling adjustment Constrain __supported_pte_mask and NX handling to just the PAE kernel. Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 09488165d5cc795a90b789c5657b1cbd279beb16 Author: Jan Beulich Date: Sat Jul 21 17:10:25 2007 +0200 i386: smp-alt-once option is only useful with HOTPLUG_CPU Hence remove its handling in the opposite case. Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d567b6a955c2c1a6b0e8fc13ecddc7d4ac4900a2 Author: Jan Beulich Date: Sat Jul 21 17:10:23 2007 +0200 x86_64: remove unused variable maxcpus .. and adjust documentation to properly reflect options that are x86-64 specific. Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 74a1ddc597d83d5ca6541b15a15f80a3722e3a1e Author: Jan Beulich Date: Sat Jul 21 17:10:22 2007 +0200 x86_64: minor exception trace variables cleanup Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 2f30c00702aca3229e1157718675f0ee56d2a931 Author: Jan Beulich Date: Sat Jul 21 17:10:21 2007 +0200 i386: allow debuggers to access the vsyscall page with compat vDSO Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit cdc1793ef7f5ccc47696e3d00b827e832e4c5bdb Author: Jan Beulich Date: Sat Jul 21 17:10:20 2007 +0200 x86_64: ia32entry adjustments Consolidate the three 32-bit system call entry points so that they all treat registers in similar ways. Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit c3508f8f341f19f6b1c3f854f144540427668151 Author: Ravikiran G Thirumalai Date: Sat Jul 21 17:10:19 2007 +0200 x86_64: Avoid too many remote cpu references due to /proc/stat Too many remote cpu references due to /proc/stat. On x86_64, with newer kernel versions, kstat_irqs is a bit of a problem. On every call to kstat_irqs, the process brings in per-cpu data from all online cpus. Doing this for NR_IRQS, which is now 256 + 32 * NR_CPUS results in (256+32*63) * 63 remote cpu references on a 64 cpu config. /proc/stat is parsed by common commands like top, who etc, causing lots of cacheline transfers This statistic seems useless. Other 'big iron' arches disable this. AK: changed to remove for all SMP setups AK: add comment Signed-off-by: Ravikiran Thirumalai Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 2618f86e0010fc6703e77af3613bac7ade46efc6 Author: Thomas Gleixner Date: Sat Jul 21 17:10:18 2007 +0200 x86_64: time.c white space wreckage cleanup Signed-off-by: Thomas Gleixner Signed-off-by: Chris Wright Signed-off-by: Ingo Molnar Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 6935d1f922e5f676ebe98fac700da9c5bf6acfca Author: Thomas Gleixner Date: Sat Jul 21 17:10:17 2007 +0200 x86_64: apic.c coding style janitor work Fix coding style, white space wreckage and remove unused code. Signed-off-by: Thomas Gleixner Signed-off-by: Chris Wright Signed-off-by: Ingo Molnar Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 0655d7c32bd21685a58fc4636f378d086396eb68 Author: Thomas Gleixner Date: Sat Jul 21 17:10:16 2007 +0200 x86: share hpet.h with i386 hpet.h in asm-i386 and asm-x86_64 contain tons of duplicated stuff. Consolidate into one shared header file. AK: Fix i386 compilation with !X86_IO_APIC Signed-off-by: Thomas Gleixner Signed-off-by: Chris Wright Signed-off-by: Ingo Molnar Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit aec8148fda5686b671fbbd9ffd6f432a1f80ee3c Author: Thomas Gleixner Date: Sat Jul 21 17:10:15 2007 +0200 x86_64: fiuxp pt_reqs leftovers The hpet_rtc_interrupt handler still uses pt_regs. Fix it. Signed-off-by: Thomas Gleixner Signed-off-by: Chris Wright Signed-off-by: Ingo Molnar Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit f40f31bfe104d50d4fceb760ec48d2effd0610aa Author: Thomas Gleixner Date: Sat Jul 21 17:10:14 2007 +0200 x86_64: Fix APIC typo Signed-off-by: Thomas Gleixner Signed-off-by: Chris Wright Signed-off-by: Ingo Molnar Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 7ff984785cf08e96bd46f7d9c7bf4d73f871599b Author: Thomas Gleixner Date: Sat Jul 21 17:10:13 2007 +0200 x86_64: Remove dead code and other janitor work in tsc.c Remove unused code and variables and do some codingstyle / whitespace cleanups while at it. Cc: john stultz Signed-off-by: Thomas Gleixner Signed-off-by: Chris Wright Signed-off-by: Ingo Molnar Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit ef81ab2c72e6979367612502fefbb18669e37879 Author: Thomas Gleixner Date: Sat Jul 21 17:10:12 2007 +0200 x86_64: Use generic xtime init xtime can be initialized including the cmos update from the generic timekeeping code. Remove the arch specific implementation. Signed-off-by: Thomas Gleixner Signed-off-by: Chris Wright Signed-off-by: Ingo Molnar Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit af74522ab782c718783b9d85d6d53b8cbf0c7b17 Author: Thomas Gleixner Date: Sat Jul 21 17:10:11 2007 +0200 x86_64: use generic cmos update Use the generic cmos update function in kernel/time/ntp.c Cc: john stultz Signed-off-by: Thomas Gleixner Signed-off-by: Chris Wright Signed-off-by: Ingo Molnar Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 55f93afd89fe6b9b9e12cfb2d3eb1a68e21f529e Author: Chris Wright Date: Sat Jul 21 17:10:09 2007 +0200 x86_64: Untangle asm/hpet.h from asm/timex.h When making changes to x86_64 timers, I noticed that touching hpet.h triggered an unreasonably large rebuild. Untangling it from timex.h quiets the extra rebuild quite a bit. Cc: john stultz Signed-off-by: Chris Wright Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit bef9f9de32ec201ea5372caf2c76e7c71f80ee35 Author: Chris Wright Date: Sat Jul 21 17:10:08 2007 +0200 i386: remove pit_interrupt_hook Remove pit_interrupt_hook as it adds just an extra layer. Signed-off-by: Chris Wright Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 8180a550284bf2c8e13414082fc20b8983c2c401 Author: Thomas Gleixner Date: Sat Jul 21 17:10:07 2007 +0200 x86_64: hpet tsc calibration fix broken smi detection logic The current SMI detection logic in read_hpet_tsc() makes sure, that when a SMI happens between the read of the HPET counter and the read of the TSC, this wrong value is used for TSC calibration. This is not the intention of the function. The comparison must ensure, that we do _NOT_ use such a value. Fix the check to use calibration values where delta of the two TSC reads is smaller than a reasonable threshold. Signed-off-by: Thomas Gleixner Signed-off-by: Chris Wright Signed-off-by: Ingo Molnar Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e82f64e5bb0648a13630d752c35be1e7bd8bab96 Author: Björn Steinbrink Date: Sat Jul 21 17:10:06 2007 +0200 i386: Reserve the right performance counter for the Intel PerfMon NMI watchdog The Intel PerfMon NMI watchdog reserves the first performance counter, but uses the second one. Make it correctly reserve the second one. Signed-off-by: Björn Steinbrink Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d9c6d69145ec696128961204f755a3b01edc2ff6 Author: Andi Kleen Date: Sat Jul 21 17:10:05 2007 +0200 x86_64: Don't use softirq safe locks in smp_call_function It is not fully softirq safe anyways. Can't do a WARN_ON unfortunately because it could trigger in the panic case. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit af3e9a2e33952204e070bf5dfeebe293e90444b8 Author: Yinghai Lu Date: Sat Jul 21 17:10:04 2007 +0200 x86_64: remove extra extern declaring about dmi_ioremap Signed-off-by: Yinghai Lu Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 67cddd947992b02f01ad093ec814738c5827d17c Author: Andi Kleen Date: Sat Jul 21 17:10:03 2007 +0200 i386: Add L3 cache support to AMD CPUID4 emulation With that an L3 cache is correctly reported in the cache information in /sys With fixes from Andreas Herrmann and Dean Gaudet and Joachim Deguara Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 2aae950b21e4bc789d1fc6668faf67e8748300b7 Author: Andi Kleen Date: Sat Jul 21 17:10:01 2007 +0200 x86_64: Add vDSO for x86-64 with gettimeofday/clock_gettime/getcpu This implements new vDSO for x86-64. The concept is similar to the existing vDSOs on i386 and PPC. x86-64 has had static vsyscalls before, but these are not flexible enough anymore. A vDSO is a ELF shared library supplied by the kernel that is mapped into user address space. The vDSO mapping is randomized for each process for security reasons. Doing this was needed for clock_gettime, because clock_gettime always needs a syscall fallback and having one at a fixed address would have made buffer overflow exploits too easy to write. The vdso can be disabled with vdso=0 It currently includes a new gettimeofday implemention and optimized clock_gettime(). The gettimeofday implementation is slightly faster than the one in the old vsyscall. clock_gettime is significantly faster than the syscall for CLOCK_MONOTONIC and CLOCK_REALTIME. The new calls are generally faster than the old vsyscall. Advantages over the old x86-64 vsyscalls: - Extensible - Randomized - Cleaner - Easier to virtualize (the old static address range previously causes overhead e.g. for Xen because it has to create special page tables for it) Weak points: - glibc support still to be written The VM interface is partly based on Ingo Molnar's i386 version. Includes compile fix from Joachim Deguara Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit a586df067afe0580bb02b7a6312ca2afe49bba03 Author: Andi Kleen Date: Sat Jul 21 17:10:00 2007 +0200 x86: Support __attribute__((__cold__)) in gcc 4.3 gcc 4.3 supports a new __attribute__((__cold__)) to mark functions cold. Any path directly leading to a call of this function will be unlikely. And gcc will try to generate smaller code for the function itself. Please use with care. The code generation advantage isn't large and in most cases it is not worth uglifying code with this. This patch marks some common error functions like panic(), printk() as cold. This will longer term make many unlikely()s unnecessary, although we can keep them for now for older compilers. BUG is not marked cold because there is currently no way to tell gcc to mark a inline function told. Also all __init and __exit functions are marked cold. With a non -Os build this will tell the compiler to generate slightly smaller code for them. I think it currently only uses less alignments for labels, but that might change in the future. One disadvantage over *likely() is that they cannot be easily instrumented to verify them. Another drawback is that only the latest gcc 4.3 snapshots support this. Unfortunately we cannot detect this using the preprocessor. This means older snapshots will fail now. I don't think that's a problem because they are unreleased compilers that nobody should be using. gcc also has a __hot__ attribute, but I don't see any sense in using this in the kernel right now. But someday I hope gcc will be able to use more aggressive optimizing for hot functions even in -Os, if that happens it should be added. Includes compile fix from Thomas Gleixner. Cc: Jan Hubicka Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit b520b85a963bf7b14b9614579aff14558d7ee264 Author: Andi Kleen Date: Sat Jul 21 17:09:59 2007 +0200 i386: Move all simple string operations out of line The compiler generally generates reasonable inline code for the simple cases and for the rest it's better for code size for them to be out of line. Also there they can be potentially optimized more in the future. In fact they probably should be in a .S file because they're all pure assembly, but that's for another day. Also some code style cleanup on them while I was on it (this seems to be the last untouched really early Linux code) This saves ~12k text for a defconfig kernel with gcc 4.1. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit aac57f81eb16d56afb5bd5a31ff325b5d1615580 Author: Andi Kleen Date: Sat Jul 21 17:09:58 2007 +0200 x86_64: Always use builtin memcpy on gcc 4.3 Jan asked to always use the builtin memcpy on gcc 4.3 mainline because it should generate better code than the old macro. Let's try it. Cc: Jan Hubicka Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 5b74e3abb3e9bd8a2f52a7b653941e3686c5df1a Author: Andi Kleen Date: Sat Jul 21 17:09:57 2007 +0200 x86_64: Use string instruction memcpy/memset on AMD Fam10 Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit ae2c6dcf90c5a9ff9bd9a176cafd43a255fcc64b Author: David Rientjes Date: Sat Jul 21 17:09:56 2007 +0200 x86_64: various cleanups in NUMA scan node In acpi_scan_nodes(), we immediately return -1 if acpi_numa <= 0, meaning we haven't detected any underlying ACPI topology or we have explicitly disabled its use from the command-line with numa=noacpi. acpi_table_print_srat_entry() and acpi_table_parse_srat() are only referenced within drivers/acpi/numa.c, so we can mark them as static and remove their prototypes from the header file. Likewise, pxm_to_node_map[] and node_to_pxm_map[] are only used within drivers/acpi/numa.c, so we mark them as static and remove their externs from the header file. The automatic 'result' variable is unused in acpi_numa_init(), so it's removed. Signed-off-by: David Rientjes Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit a2e212dae57071d4a4a6cbbc12d70c628fd47ad2 Author: David Rientjes Date: Sat Jul 21 17:09:55 2007 +0200 x86_64: Use LOCAL_DISTANCE and REMOTE_DISTANCE in x86_64 ACPI code Use LOCAL_DISTANCE and REMOTE_DISTANCE in x86_64 ACPI code Signed-off-by: David Rientjes Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 42ee2b74140b69fa24da1c671b03c9f8019e6f62 Author: Andi Kleen Date: Sat Jul 21 17:09:54 2007 +0200 x86_64: Report the pending irq if available in smp_affinity Otherwise smp_affinity would only update after the next interrupt on x86 systems. Cc: Thomas Gleixner Cc: Ingo Molnar Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 78b599aed61a1098444558e74c93745f22eda6cb Author: Andi Kleen Date: Sat Jul 21 17:09:53 2007 +0200 x86_64: Don't rely on a unique IO-APIC ID Linux 64bit only uses the IO-APIC ID as an internal cookie. In the future there could be some cases where the IO-APIC IDs are not unique because they share an 8 bit space with CPUs and if there are enough CPUs it is difficult to get them that. But Linux needs the io apic ID internally for its data structures. Assign unique IO APIC ids on table parsing. TBD do for 32bit too Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 9d531cc1193693f2d2e5ef2532a877481b118be6 Author: Jean Delvare Date: Sat Jul 21 17:09:52 2007 +0200 x86_64: asm/ptrace.h needs linux/compiler.h On x86_64, uses __user but doesn't include . This could lead to build failures. Signed-off-by: Jean Delvare Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 65d2f0bc65b0249a22a6c1f49ec29ee5e2980c7b Author: Andi Kleen Date: Sat Jul 21 17:09:51 2007 +0200 x86: Always flush pages in change_page_attr Fix a bug introduced with the CLFLUSH changes: we must always flush pages changed in cpa(), not just when they are reverted. Reenable CLFLUSH usage with that now (it was temporarily disabled for .22) Add some BUG_ONs Contains fixes from Mathieu Desnoyers Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit ad386589676403eca4e8f52c944995db56e445c3 Author: Andi Kleen Date: Sat Jul 21 17:09:50 2007 +0200 i386: Update defconfig Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 56525597619ab93abc60a22a4ee53e51a0853749 Author: Andi Kleen Date: Sat Jul 21 17:09:49 2007 +0200 x86_64: Update defconfig Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 4440e0e11d2e9eb13e6edf44f89019e4f8a4dd58 Author: Haavard Skinnemoen Date: Sat Jul 21 04:38:02 2007 -0700 atmel_lcdfb: use spare bits in 32bpp mode as alpha channel Set var->transp.offset and var->transp.length in 32bpp mode to indicate that the 8 otherwise unused bits can be used for transparency. Signed-off-by: Haavard Skinnemoen Signed-off-by: Nicolas Ferre Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7cc90249ff0e21c526532ce5b5ba35c07c8b8389 Author: Adrian Bunk Date: Sat Jul 21 04:38:01 2007 -0700 rivafb_setup() must be __devinit WARNING: drivers/built-in.o(.text+0x57106): Section mismatch: reference to .init.text:rivafb_setup (between 'rivafb_init' and 'nv3Busy') Signed-off-by: Adrian Bunk Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 250a269da4e2afe815aeef97c3b115fbda4440ac Author: Nicolas Ferre Date: Sat Jul 21 04:37:59 2007 -0700 atmel_lcdfb: Fix STN LCD support Fixes STN LCD support for the atmel_lcdfb framebuffer driver. This patch is the result of a work from Jan Altenberg and has been tested on a Hitachi SP06Q002 on at91sam9261ek. It adds a Kconfig switch that enables the proper LCD in the board configuration file (STN or TFT). The switch is used in arch/arm/mach-at91/at91sam9261_devices.c & board-sam9261ek.c as an example. This patch includes the "Fix wrong line_length calculation" little one from Jan and Haavard (submitted earlier). AT91 platform informations are directly submitted trough the at91 maintainer, here : http://article.gmane.org/gmane.linux.kernel/543158 Signed-off-by: Nicolas Ferre Cc: "Antonino A. Daplas" Cc: Jan Altenberg Cc: Patrice Vilchez Cc: Andrew Victor Cc: Haavard Skinnemoen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 029641151bfede0930a79ecabb2572dc27a3c86f Author: Thomas Hommel Date: Sat Jul 21 04:37:58 2007 -0700 rtc: add support for STK17TA8 chip This patch adds support for the Simtek STK17TA8 timekeeping chip. The STK17TA8 is quite similar to the DS1553, but differs in register layout and in various control bits in the registers. I chose to make this a new driver to avoid confusion in the code and to not get lost in #ifdefs. Signed-off-by: Thomas Hommel Cc: Alessandro Zummo Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8a2601f6aa837903bfb385b138b50b1e305f3e04 Author: Dale Farnsworth Date: Sat Jul 21 04:37:57 2007 -0700 rtc: update and use the MAX6900 century byte We now read and write the century byte in the max6900 chip. We probably don't need to do so on Linux-only system, but it's necessary when the chip is shared by another OS that uses the century byte. Signed-off-by: Dale Farnsworth Cc: Alessandro Zummo Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55ff1aba940ff46d4f6d4fd790ea3e1a47aaa84f Author: David Brownell Date: Sat Jul 21 04:37:56 2007 -0700 rtc kconfig: point out need for static linkage Various people have expressed surprise that their modular RTC drivers don't seem to work for initializing the system time at boot. To help avoid such unpleasantness, make the Kconfig text point out that the driver probably needs to be statically linked. Signed-off-by: David Brownell Acked-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ef154ec69c45aa052b1fa71ee5eeaca7e7f920a3 Author: Atsushi Nemoto Date: Sat Jul 21 04:37:55 2007 -0700 rtc: do not return void value This patch fixes these sparse warnings: drivers/rtc/rtc-ds1742.c:265:2: warning: returning void-valued expression drivers/rtc/rtc-ds1553.c:409:2: warning: returning void-valued expression Signed-off-by: Atsushi Nemoto Cc: David Brownell Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8214b0832cb3c0b74198e5b22c0e070aeaa3dd20 Author: Jan Engelhardt Date: Sat Jul 21 04:37:54 2007 -0700 Use menuconfig objects: ISDN/Gigaset Change Kconfig objects from "menu, config" into "menuconfig" so that the user can disable the whole feature without having to enter the menu first. Signed-off-by: Jan Engelhardt Cc: Tilman Schmidt Acked-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 857038d93adce6c1dfdb12c242d7fbee1ded370d Author: Jan Engelhardt Date: Sat Jul 21 04:37:54 2007 -0700 Use menuconfig objects: ISDN Unclutter the ISDN menu a tiny bit by moving ISDN4Linux and the CAPI2.0 layers into their own menu. Signed-off-by: Jan Engelhardt Cc: Tilman Schmidt Acked-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5f67c5cc855d5a189fc542da3921868ca87fc274 Author: Tilman Schmidt Date: Sat Jul 21 04:37:53 2007 -0700 Use menuconfig objects - CONFIG_ISDN_I4L Remove a menu statement and several dependencies from the Kconfig files in the drivers/isdn tree as they have become unnecessary by the transformation of CONFIG_ISDN from "menu, config" into "menuconfig". (Modified version of a patch originally proposed by Jan Engelhardt.) Signed-off-by: Tilman Schmidt Cc: Jan Engelhardt Acked-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 149a6501f90df457d75a1954dd5a29434a182e6a Author: Adrian Bunk Date: Sat Jul 21 04:37:52 2007 -0700 spi.c:scan_boardinfo() mustn't be __init_or_module WARNING: drivers/built-in.o(.text+0x889735): Section mismatch: reference to .init.text:scan_boardinfo (between 'spi_register_master' and '__unregister') Signed-off-by: Adrian Bunk Acked-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b6f50ef1d5cc86b278eb42bc91630fad455fb10 Author: Jeremy Kerr Date: Sat Jul 21 04:37:51 2007 -0700 spufs: make signal-notification files readonly for NOSCHED contexts Reading from the signal{1,2} files requires a spu_acquire_saved, so make these files write-only for contexts created with SPU_CREATE_NOSCHED. Signed-off-by: Jeremy Kerr Acked-by: Arnd Bergmann Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cfd13af6270c25e8089e9c5b59ffb55d39ae74a0 Author: Geert Uytterhoeven Date: Sat Jul 21 04:37:51 2007 -0700 ps3fb: Set FBINFO_READS_FAST to speed up text console scrolling ps3fb: Set FBINFO_READS_FAST to speed up text console scrolling (on average 50%, according to my tests) Signed-off-by: Geert Uytterhoeven Cc: Geoff Levand Cc: Paul Mackerras Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 50b2529e38eb1f954bbadec93961aabe8c801904 Author: Geert Uytterhoeven Date: Sat Jul 21 04:37:50 2007 -0700 ps3fb: Shrink default virtual frame buffer size from 18 to 9 MiB ps3fb: Shrink the default virtual frame buffer size from 18 to 9 MiB, as nobody really uses the double buffering feature and Linux can use an additional 9 MiB. It can still be overridden on the kernel command line using `ps3fb=18M'. Signed-off-by: Geert Uytterhoeven Cc: Geoff Levand Cc: Paul Mackerras Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 23e9c94caf134cb36a22b91043796057111f6ef3 Author: Geert Uytterhoeven Date: Sat Jul 21 04:37:49 2007 -0700 ps3fb: Enable VT_HW_CONSOLE_BINDING for proper kexec ps3fb: VT_HW_CONSOLE_BINDING must be enabled to make console unbinding work, which is needed to give up all hypervisor resources before reboot or kexec. Signed-off-by: Geert Uytterhoeven Cc: Geoff Levand Cc: Paul Mackerras Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 24ed8559c7e8205eb94088532b9dbdf2e290dfa2 Author: Geoff Levand Date: Sat Jul 21 04:37:49 2007 -0700 PS3: Fix build with 32-bit toolchains The PS3 bootwrapper files use instructions only available on 64-bit CPUs. Add the code generation directive '.machine "ppc64"' for toolchains configured for 32-bit CPUs. Signed-off-by: Geoff Levand Acked-by: Grant Likely Cc: Geert Uytterhoeven Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f96526354bb0824f3ce550a028606d2f94435b92 Author: Geert Uytterhoeven Date: Sat Jul 21 04:37:48 2007 -0700 ps3: FLASH ROM Storage Driver Add a FLASH ROM Storage Driver for the PS3: - Implemented as a misc character device driver - Uses a fixed 256 KiB buffer allocated from boot memory as the hypervisor requires the writing of aligned 256 KiB blocks Cc: Geoff Levand Signed-off-by: Geert Uytterhoeven Cc: Jens Axboe Cc: James Bottomley Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9aea8cbf2866c5680e30ff473341b7c5e93f7442 Author: Geert Uytterhoeven Date: Sat Jul 21 04:37:47 2007 -0700 ps3: BD/DVD/CD-ROM Storage Driver Add a BD/DVD/CD-ROM Storage Driver for the PS3: - Implemented as a SCSI device driver - Uses software scatter-gather with a 64 KiB bounce buffer as the hypervisor doesn't support scatter-gather Cc: Geoff Levand Signed-off-by: Geert Uytterhoeven Cc: Jens Axboe Cc: James Bottomley Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c6131fa528c4fc57605c474bf8c83821aff164c0 Author: Geert Uytterhoeven Date: Sat Jul 21 04:37:45 2007 -0700 ps3: Disk Storage Driver Add a Disk Storage Driver for the PS3: - Implemented as a block device driver with a dynamic major - Disk names (and partitions) are of the format ps3d%c(%u) - Uses software scatter-gather with a 64 KiB bounce buffer as the hypervisor doesn't support scatter-gather Cc: Geoff Levand Signed-off-by: Geert Uytterhoeven Acked-by: Jens Axboe Cc: James Bottomley Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 97d22d26b4a5aefc5a18ac81ef4e7b46da451426 Author: Mariusz Kozlowski Date: Sat Jul 21 04:37:44 2007 -0700 powerpc: tlb_32.c build fix allnoconfig results in this: CC arch/powerpc/mm/tlb_32.o In file included from include/asm/tlb.h:60, from arch/powerpc/mm/tlb_32.c:30: include/asm-generic/tlb.h: In function 'tlb_flush_mmu': include/asm-generic/tlb.h:76: error: implicit declaration of function 'release_pages' include/asm-generic/tlb.h: In function 'tlb_remove_page': include/asm-generic/tlb.h:105: error: implicit declaration of function 'page_cache_release' Signed-off-by: Mariusz Kozlowski Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fccdb5ae7e453eb7de5592bc4ed17d10d4d90125 Author: Oliver Neukum Date: Sat Jul 21 04:37:43 2007 -0700 Documentation:reference notifiers.txt in freezing-of-tasks.txt freezing-of-tasks.txt mentions firmware issues without mentioning the use of the new notifier API to overcome them. Here's an update. Signed-off-by: Oliver Neukum Acked-by: Rafael J. Wysocki Acked-by: Nigel Cunningham Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6269543ef24aa012aa228c27af3adb074f7b36b Author: Matt Mackall Date: Sat Jul 21 04:37:40 2007 -0700 slob: reduce list scanning The version of SLOB in -mm always scans its free list from the beginning, which results in small allocations and free segments clustering at the beginning of the list over time. This causes the average search to scan over a large stretch at the beginning on each allocation. By starting each page search where the last one left off, we evenly distribute the allocations and greatly shorten the average search. Without this patch, kernel compiles on a 1.5G machine take a large amount of system time for list scanning. With this patch, compiles are within a few seconds of performance of a SLAB kernel with no notable change in system time. Signed-off-by: Matt Mackall Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 41f9dc5c871600f53c8912b2975971d2a11c1c25 Author: Christoph Hellwig Date: Sat Jul 21 04:37:40 2007 -0700 remove handle_mm_fault export Now that arch/powerpc/platforms/cell/spufs/fault.c is always built in the kernel there is no need to export handle_mm_fault anymore. Signed-off-by: Christoph Hellwig Cc: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 61d488da9bad8d1511d18291006bd2dd728f173d Author: Adrian Bunk Date: Sat Jul 21 04:37:39 2007 -0700 i386: intel_cacheinfo.c:find_num_cache_leaves() should be __cpuinit WARNING: arch/i386/kernel/built-in.o(.text+0xb6a7): Section mismatch: reference to .init.text:find_num_cache_leaves (between 'init_intel_cacheinfo' and 'cache_shared_cpu_map_setup') It could be __init_refok, but gcc >= 4.0 anyway inlines it into the __cpuinit init_intel_cacheinfo(), and IMHO it's too small for "noinline __init". Signed-off-by: Adrian Bunk Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7671988b9cd31daf53fd38f8e75c8b881324842b Author: Thomas Gleixner Date: Sat Jul 21 04:37:38 2007 -0700 i386: PIT stop only, when in periodic or oneshot mode The patch is necessary on one of my boxen, where programming the stop sequence twice leads to PIT malfunction. Sigh ! Signed-off-by: Thomas Gleixner Cc: Andi Kleen Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 82644459c592a28a3eab682f9b88d81019ddfe8b Author: Thomas Gleixner Date: Sat Jul 21 04:37:37 2007 -0700 NTP: move the cmos update code into ntp.c i386 and sparc64 have the identical code to update the cmos clock. Move it into kernel/time/ntp.c as there are other architectures coming along with the same requirements. [akpm@linux-foundation.org: build fixes] Signed-off-by: Thomas Gleixner Cc: Chris Wright Cc: Ingo Molnar Cc: john stultz Cc: David Miller Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 99bc2fcb283852931fb6bbef40f3df8316b59000 Author: Ingo Molnar Date: Sat Jul 21 04:37:36 2007 -0700 hrtimer: speedup hrtimer_enqueue Speedup hrtimer_enqueue by evaluating the rbtree insertion result. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 820de5c39ef7f6866d2c9e6c7d208bcd2a6e1942 Author: Ingo Molnar Date: Sat Jul 21 04:37:36 2007 -0700 highres: improve debug output Add some more debug information to the hrtimer and clock events code. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3704540b48295253bd9c87a5e7ff545f9d47a3b8 Author: john stultz Date: Sat Jul 21 04:37:35 2007 -0700 tick management: spread timer interrupt After discussing w/ Thomas over IRC, it seems the issue is the sched tick fires on every cpu at the same time, causing extra lock contention. This smaller change, adds an extra offset per cpu so the ticks don't line up. This patch also drops the idle latency from 40us down to under 20us. Signed-off-by: john stultz Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5590a536c0bc403fc73908c66c1c88cbed735ecb Author: Thomas Gleixner Date: Sat Jul 21 04:37:35 2007 -0700 clockevents: fix device replacement When a device is replaced by a better rated device, then the broadcast mode needs to be evaluated again. When the new device has no requirement for broadcasting, then the broadcast bits for the CPU must be cleared. Signed-off-by: Thomas Gleixner Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 18de5bc4c1f1f1fa5e14f354a7603bd6e9d4e3b6 Author: Thomas Gleixner Date: Sat Jul 21 04:37:34 2007 -0700 clockevents: fix resume logic We need to make sure, that the clockevent devices are resumed, before the tick is resumed. The current resume logic does not guarantee this. Add CLOCK_EVT_MODE_RESUME and call the set mode functions of the clock event devices before resuming the tick / oneshot functionality. Fixup the existing users. Thanks to Nigel Cunningham for tracking down a long standing thinko, which affected the jinxed VAIO. [akpm@linux-foundation.org: xen build fix] Signed-off-by: Thomas Gleixner Cc: john stultz Cc: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 93da56efcf8c6a111f0349f6b7651172d4745ca0 Author: Thomas Gleixner Date: Sat Jul 21 04:37:33 2007 -0700 clockevents: remove prototypes of removed functions Signed-off-by: Thomas Gleixner Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d4e3cc387ea1b74c3ad2ef2f6f5c05fd6fc314b8 Author: Andrew Morton Date: Sat Jul 21 04:37:32 2007 -0700 revert "PIE randomization" There are reports of this causing userspace failures (http://lkml.org/lkml/2007/7/20/421). Revert. Cc: Jan Kratochvil Cc: Jiri Kosina Cc: Ingo Molnar Cc: Roland McGrath Cc: Jakub Jelinek Cc: Ulrich Kunitz Cc: "H. Peter Anvin" Cc: "Bret Towe" Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 80e27982a66ea8306a704ba8bdf634ed480d4b46 Author: Sam Ravnborg Date: Sat Jul 21 04:37:31 2007 -0700 console: fix section mismatch warning in vgacon.c Fix following section mismatch warning: WARNING: vmlinux.o(.text+0x121e62): Section mismatch: reference to .init.text:__alloc_bootmem (between 'vgacon_startup' and 'vgacon_scrolldelta') Browsing the code it seems that vgacon_scrollback_startup() is only called during the init phase so the reference to the .init.text section is OK. Teach modpost not to warn using ___init_refok. Signed-off-by: Sam Ravnborg Acked-by: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e63516c826454c964eefdd24d33e188064c6679 Author: J. Bruce Fields Date: Sat Jul 21 04:37:30 2007 -0700 knfsd: fix typo in export display, print uid and gid as unsigned For display purposes, treat uid's and gid's as unsigned ints for now. Also fix a typo. Signed-off-by: "J. Bruce Fields" Cc: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 601e625587bf92c9f370d74a15c4e43bc6468f9f Author: Konrad Rzeszutek Date: Sat Jul 21 04:37:29 2007 -0700 i386: touch_nmi_watchdog() in print_trace_address() Prevent NMI watchdog triggering during long sysrq-T outputs. Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 80b16c192e469541263d6bfd9177662ceb632ecc Author: Milan Broz Date: Sat Jul 21 04:37:27 2007 -0700 dm io: fix panic on large request Flush workqueue before releasing bioset and mopools in dm-crypt. There can be finished but not yet released request. Call chain causing oops: run workqueue dec_pending bio_endio(...); mempool_free(io, cc->io_pool); This usually happens when cryptsetup create temporary luks mapping in the beggining of crypt device activation. When dm-core calls destructor crypt_dtr, no new request are possible. Signed-off-by: Milan Broz Cc: Chuck Ebbert Cc: Patrick McHardy Acked-by: Alasdair G Kergon Cc: Christophe Saout Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d3fec424b23c47686efcf3f2004c3f1c1cee4d9c Author: Jan Harkes Date: Sat Jul 21 04:37:26 2007 -0700 coda: remove CODA_STORE/CODA_RELEASE upcalls This is an variation on the patch sent by Christoph Hellwig which kills file_count abuse by the Coda kernel module by moving the coda_flush functionality into coda_release. However part of reason we were using the coda_flush callback was to allow Coda to pass errors that occur during writeback from the userspace cache manager back to close(). As Al Viro explained on linux-fsdevel, it is impossible to guarantee that such errors can in fact be returned back to the caller. There are many cases where the last reference to a file is not released by the close system call and it is also impossible to pick some close as a 'last-close' and delay it until all other references have been destroyed. The CODA_STORE/CODA_RELEASE upcall combination is clearly a broken design, and it is better to remove it completely. Signed-off-by: Jan Harkes Cc: Christoph Hellwig Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b50731732f926d6c49fd0724616a7344c31cd5cf Author: Paul Mundt Date: Sat Jul 21 04:37:25 2007 -0700 nommu: vmalloc_32_user()/vm_insert_page() and symbol exports. Trying to survive an allmodconfig on a nommu platform results in many screen lengths of module unhappiness. Many of the mmap related things that binfmt_flat hooks in to are never exported despite being global, and there are also missing definitions for vmalloc_32_user() and vm_insert_page(). I've implemented vmalloc_32_user() trying to stick as close to the mm/vmalloc.c implementation as possible, though we don't have any need for VM_USERMAP, so groveling for the VMA can be skipped. vm_insert_page() has been stubbed for now in order to keep the build happy. Signed-off-by: Paul Mundt Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit df336d1c7b6fd510fa6d3a028f999e7586c7026e Author: Keir Fraser Date: Sat Jul 21 04:37:24 2007 -0700 Fix swiotlb_sync_single_range() If the swiotlb maps a multi-slab region, swiotlb_sync_single_range() can be invoked to sync a sub-region which does not include the first slab. Unfortunately io_tlb_orig_addr[] is only initialised for the first slab, and hence the call to sync_single() will read a garbage orig_addr in this case. This patch fixes the issue by initialising all mapped slabs in io_tlb_orig_addr[]. It also correctly adjusts the buffer pointer in sync_single() to handle the case that the given dma_addr is not aligned on a slab boundary. Signed-off-by: Keir Fraser Cc: "Luck, Tony" Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 28de7948a896763bc97ccd416bba5b9422158350 Author: Cyrill Gorcunov Date: Sat Jul 21 04:37:18 2007 -0700 UDF: coding style conversion - lindent fixups This patch fixes up sources after conversion by Lindent. Signed-off-by: Cyrill Gorcunov Cc: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 71133027febfabd501fde7583b30008224f4d799 Author: Nick Piggin Date: Sat Jul 21 04:37:17 2007 -0700 x86_64: wbinvd macro fix Too many semicolons in this macro. Signed-off-by: Nick Piggin Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit df468820b6881fc14e50f6b2fcffd3e945417d68 Author: FUJITA Tomonori Date: Sat Jul 21 13:23:25 2007 +0900 [SCSI] bsg: fix bsg_unregister_queue scsi_sysfs_add_sdev ignores the bsg_register_queue failure, so bsg_unregister_queue must check whether the queue has a bsg device. Signed-off-by: FUJITA Tomonori Signed-off-by: James Bottomley commit 39dca558a5b52b63e49bc234a7e887be092aa690 Author: James Bottomley Date: Fri Jul 20 18:22:17 2007 -0500 [SCSI] bsg: make class backlinks Currently, bsg doesn't make class backlinks (a process whereby you'd get a link to bsg in the device directory in the same way you get one for sg). This is because the bsg device is uninitialised, so the class device has nothing it can attach to. The fix is to make the bsg device point to the cdevice of the entity creating the bsg, necessitating changing the bsg_register_queue() prototype into a form that takes the generic device. Acked-by: FUJITA Tomonori Signed-off-by: James Bottomley commit 0e78d158b67fba3977f577f293c323359d80dd0e Author: adam radford Date: Fri Jul 20 15:28:28 2007 -0700 [SCSI] 3w-9xxx: add support for 9690SA The attached patch updates the 3ware 9000 driver: - Fix dma mask setting to fallback to 32-bit if 64-bit fails. - Add support for 9690SA controllers. Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit 6826ee4fdbe24c7aab56ce833ef94be81d190587 Author: James Bottomley Date: Fri Jul 20 16:50:10 2007 -0500 [SCSI] bsg: fix bsg_register_queue error path unfortunately, if IS_ERR(class_dev) is true, that means class_dev isn't null and the check in the error leg is pointless ... it's also asking for trouble to request unregistration of a device we haven't actually created (although it works currently). Fix by using explicit gotos and unregisters. Acked-by: FUJITA Tomonori Signed-off-by: James Bottomley commit c4d198d5183ec7bbf8b53216cfc5ded7ebb0ec0c Author: Avi Kivity Date: Sat Jul 21 09:06:46 2007 +0300 KVM: MMU: Fix cleaning up the shadow page allocation cache __free_page() wants a struct page, not a virtual address. Signed-off-by: Avi Kivity Signed-off-by: Linus Torvalds commit e2f81daf23efde23d8cac1fc253d41838f0347cf Author: Stefan Roscher Date: Fri Jul 20 16:04:17 2007 +0200 IB/ehca: Support small QP queues eHCA2 supports QP queues that can be as small as 512 bytes. This greatly reduces memory overhead for consumers that use lots of QPs with small queues (e.g. RDMA-only QPs). Apart from dealing with firmware, this code needs to manage bite-sized chunks of kernel pages, making sure that no kernel page is shared between different protection domains. Signed-off-by: Hoang-Nam Nguyen commit 0c10f7b79b5bb07a37aa5927072abdc3f45ac8d3 Author: Joachim Fenkes Date: Thu Jul 19 21:40:00 2007 +0200 IB/ehca: Make internal_create/destroy_qp() static They're only used in ehca_qp.c, so make them static to that file. Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit 51d2bfbddb33dc59786a3a41f7eeb59e30fa561c Author: Hoang-Nam Nguyen Date: Fri Jul 20 16:02:46 2007 +0200 IB/ehca: Move ehca2ib_return_code() out of line ehca2ib_return_code() is not used in any fast path, and making it non-inline saves ~1.5K of code. Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit 633a5aedaee1c96347b8a6c2ae7dceb47d0c910f Author: Hoang-Nam Nguyen Date: Fri Jul 20 16:02:18 2007 +0200 IB/ehca: Generate async event when SRQ limit reached Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit 5bb7d9290cd23a55906e4fe7a7fedecf29468c81 Author: Hoang-Nam Nguyen Date: Fri Jul 20 16:01:51 2007 +0200 IB/ehca: Support large page MRs Add support for MR pages larger than 4K on eHCA2. This reduces firmware memory consumption. If enabled via the mr_largepage module parameter, the MR page size will be determined based on the MR length and the hardware capabilities -- if the MR is >= 16M, 16M pages are used, for example. Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit 23f1b38481596ad77e5f51562977b12c8418eee3 Author: Roland Dreier Date: Fri Jul 20 21:19:43 2007 -0700 IB/mlx4: Fix error path in create_qp_common() The error handling code at err_wrid in create_qp_common() does not handle a userspace QP attached to an SRQ correctly, since it ends up in the else clause of the if statement. This means it tries to kfree() the uninitialized qp->sq.wrid and qp->rq.wrid pointers. Fix this so we only free the wrid arrays for kernel QPs. Pointed out by Michael S. Tsirkin . Signed-off-by: Roland Dreier commit 0981582dbfae86ba0306406f1af329bb702752d2 Author: Roland Dreier Date: Fri Jul 20 21:19:43 2007 -0700 mlx4_core: Change command token on timeout The FW command token is currently only updated on a command completion event. This means that on command timeout, the same token will be reused for new command, which results in a mess if the timed out command *does* eventually complete. This is the same change as the patch for mthca from Michael S. Tsirkin that was just merged. It seems sensible to avoid gratuitous differences in FW command processing between mthca and mlx4. Signed-off-by: Roland Dreier commit c1f74958dbd19f6a837d887ed416688c063af529 Author: Michael S. Tsirkin Date: Thu Jul 19 14:28:49 2007 +0300 IB/mthca: Change command token on timeout The FW command token is currently only updated on a command completion event. This means that on command timeout, the same token will be reused for new command, which results in a mess if the timed out command *does* eventually complete. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit bd631048116df40837667a72c578b170c906dd30 Author: Arthur Jones Date: Thu Jul 19 11:32:49 2007 -0700 IB/ipath: Remove ipath_layer dead code The ipath_layer.[ch] code was an attempt to provide a single interface for the ipath verbs and ipath_ether code to use. As verbs functionality increased, the layer's functionality became insufficient and the verbs code broke away to interface directly to the driver. The failed attempt to get ipath_ether upstream was the final nail in the coffin and now it sits quietly in a dark kernel.org corner waiting for someone to notice the smell and send it along to it's final resting place. Roland Dreier was that someone -- this patch expands on his work... Signed-off-by: Arthur Jones Signed-off-by: Roland Dreier commit f5b404317b79823ec643dfbb71d62f65a48cc178 Author: Florin Malita Date: Thu Jul 19 15:58:09 2007 -0400 IB/mlx4: Fix leaks in __mlx4_ib_modify_qp Temporarily allocated struct mlx4_qp_context *context is leaked by several error paths. The patch takes advantage of the return value 'err' being preinitialized to -EINVAL. Spotted by Coverity (CID 1768). Signed-off-by: Florin Malita Signed-off-by: Roland Dreier commit 31ce72a6b1c7635259cf522459539c0611f2c50c Author: Patrick McHardy Date: Fri Jul 20 19:45:45 2007 -0700 [NET]: Fix loopback crashes when multiqueue is enabled. From: Patrick McHardy Signed-off-by: David S. Miller commit fc7b93800b48324667e218a4b6b784b853cf4dd7 Author: Patrick McHardy Date: Fri Jul 20 19:39:17 2007 -0700 [IPV4]: Fix inetpeer gcc-4.2 warnings CC net/ipv4/inetpeer.o net/ipv4/inetpeer.c: In function 'unlink_from_pool': net/ipv4/inetpeer.c:297: warning: the address of 'stack' will always evaluate as 'true' net/ipv4/inetpeer.c:297: warning: the address of 'stack' will always evaluate as 'true' net/ipv4/inetpeer.c: In function 'inet_getpeer': net/ipv4/inetpeer.c:409: warning: the address of 'stack' will always evaluate as 'true' net/ipv4/inetpeer.c:409: warning: the address of 'stack' will always evaluate as 'true' "Fix" by checking for != NULL. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit d73f5222a618a91452d41c29f5996ce3d9c63673 Author: David Miller Date: Fri Jul 20 17:32:45 2007 -0700 [SCSI] ESP: Increase ESP_BUS_TIMEOUT to 275. This matches the original driver's value and seems to be necessary for some disks on sun4c systems. Reported by Mark Fortescue Signed-off-by: David S. Miller Signed-off-by: James Bottomley commit 1256efd5519a8eca2dfa6039ce5cf58f44d1626d Author: Sam Ravnborg Date: Fri Jul 20 17:20:56 2007 -0700 [SPARC64]: fix section mismatch warning in mdesc.c Fix following warning: WARNING: vmlinux.o(.text+0x35264): Section mismatch: reference to .init.text:__alloc_bootmem (between 'mdesc_bootmem_alloc' and 'mdesc_bootmem_free') Rename mdesc_mem_ops to *_ops so modpost ignores __init references and declare mdesc_bootmem_alloc __init since it is only used during __init context. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit f0429bf7a099c28b4806b68812b821ef6d1ddbcb Author: Sam Ravnborg Date: Fri Jul 20 17:19:56 2007 -0700 [SPARC64]: fix section mismatch warning in pci_sunv4 Fix following warning: WARNING: vmlinux.o(.text+0x3cf50): Section mismatch: reference to .init.text:page_in_phys_avail (between 'pci_sun4v_pbm_init' and 'sun4v_pci_init') pci_sun4v_pbm_init and sun4v_pci_init was only used under __init context so declare them _init. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit cdee99d7461d928815db6219fb14d37f99241d44 Author: David S. Miller Date: Thu Jul 19 13:59:58 2007 -0700 [SPARC64]: Stop using drivers/char/rtc.c The existing sparc64 mini_rtc driver can handle CMOS based rtcs trivially with just a few lines of code and the simplifies things tremendously. Tested on SB1500. Signed-off-by: David S. Miller commit 0fe85d504b47267bcdb25a563c535aa2ae075ff4 Author: David S. Miller Date: Wed Jul 18 23:15:04 2007 -0700 [SPARC64]: Convert parport to of_platform_driver. Signed-off-by: David S. Miller commit 3adf55ad5c0fcabf1c53bb274f39953cb1d6698f Author: David S. Miller Date: Wed Jul 18 22:03:58 2007 -0700 [SPARC]: Implement fb_is_primary_device(). Signed-off-by: David S. Miller commit 93b3238ef8b04f1383b2aa7704487fb3c0e44193 Author: David S. Miller Date: Fri Jul 20 02:58:28 2007 -0700 [SPARC64]: Fix virq decomposition. The dev_handle and dev_ino fields don't match up exactly to the traditional IMAP_IGN and IMAP_INO masks. So store them away in a table and look them up directly. Signed-off-by: David S. Miller commit e83fb17f9ba6ea0c64d084cca0c557d7e7dc9693 Author: David S. Miller Date: Fri Jul 20 02:39:04 2007 -0700 [SPARC64]: Use KERN_ERR in IRQ manipulation error printks. Signed-off-by: David S. Miller commit afd69ed142a3aa8df81ea54e5e78d77dbcf08467 Author: David S. Miller Date: Fri Jul 20 02:34:41 2007 -0700 [SPARC64]: Do not flood log with failed DS messages. When booting up a control node it's quite common to not be able to register several service types. And likewise on guests at least one or two are going to not be there. Signed-off-by: David S. Miller commit 028ebff26915df18ab0cda664e2f0582650af155 Author: David S. Miller Date: Fri Jul 20 02:30:25 2007 -0700 [SPARC64]: Add proper multicast support to VNET driver. Signed-off-by: David S. Miller commit 5fc986100cb253897b4e16992e805343d30a819e Author: David S. Miller Date: Thu Jul 19 23:25:35 2007 -0700 [SPARC64]: Handle multiple domain-services-port nodes properly. Signed-off-by: David S. Miller commit 58fb666643acee28d347de0b59bb938844c22f83 Author: David S. Miller Date: Thu Jul 19 22:51:07 2007 -0700 [SPARC64]: Improve VIO device naming further. The best scheme to get uniqueness seems to be: FOO -- If node lacks "id" property FOO-$(ID) -- If node has "id" but parent lacks "cfg-handle" FOO-$(ID)-$(CFG_HANDLE) -- If node has both Signed-off-by: David S. Miller commit 3d6e470236bc759f43c9f2377899b526a50e2e63 Author: David S. Miller Date: Wed Jul 18 22:03:25 2007 -0700 [SPARC]: Make sure dev_archdata is filled in for all devices. Signed-off-by: David S. Miller commit e865f3e6f4ef2d2617f5003c7c819ed15b5a511b Author: David S. Miller Date: Wed Jul 18 20:59:54 2007 -0700 [SPARC]: Define minimal struct dev_archdata, similarly to sparc64. Signed-off-by: David S. Miller commit c73fcc846c91f53fd2c67fd9c6c04888a9e5892e Author: David S. Miller Date: Fri Jul 20 16:59:26 2007 -0700 [SPARC]: Fix serial console device detection. The current scheme works on static interpretation of text names, which is wrong. The output-device setting, for example, must be resolved via an alias or similar to a full path name to the console device. Paths also contain an optional set of 'options', which starts with a colon at the end of the path. The option area is used to specify which of two serial ports ('a' or 'b') the path refers to when a device node drives multiple ports. 'a' is assumed if the option specification is missing. This was caught by the UltraSPARC-T1 simulator. The 'output-device' property was set to 'ttya' and we didn't pick upon the fact that this is an OBP alias set to '/virtual-devices/console'. Instead we saw it as the first serial console device, instead of the hypervisor console. The infrastructure is now there to take advantage of this to resolve the console correctly even in multi-head situations in fbcon too. Thanks to Greg Onufer for the bug report. Signed-off-by: David S. Miller commit eaf729c8a8bfc9c7a5ff5659e3b2584bf2ef22e1 Author: Linus Torvalds Date: Fri Jul 20 14:53:52 2007 -0700 Un-ignore "vmlinux.lds.S" in .gitignore We ignore all the generated files called "vmlinux*" from the top-level gitignore, but that also ends up catching a few files that we track, and that people do edit. Notably the "vmlinux.lds.S" file, that each architecture has. You can always use "git add -f" to override the ignore file, but we might as well just make it explicit for this file. Bitten-by-and-tested-by: Ingo Molnar Signed-off-by: Linus Torvalds commit 110dd8f19df534b5e464bd1d8f491195a7e62a26 Author: James Bottomley Date: Fri Jul 20 13:11:44 2007 -0500 [SCSI] libsas: fix scr_read/write users and update the libata documentation This fixes up the usage in libsas (which are easy to miss, since they're only in the scsi-misc tree) ... and also corrects the documentation on the point of what these two function pointers actually return. Signed-off-by: James Bottomley commit 11179d8ca28d669e3d4cc7573a5f5fdda3e6f02d Author: Catalin Marinas Date: Fri Jul 20 11:42:24 2007 +0100 [ARM] 4497/1: Only allow safe cache configurations on ARMv6 and later Currently, Linux doesn't generate correct page tables for ARMv6 and later cores if the cache policy is different from the default one (it may lead to strongly ordered or shared device mappings). This patch disallows cache policies other than writeback and the CPU_[ID]CACHE_DISABLE options only affect the CP15 system control register rather than the page tables. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 2eb8c82bc492d5f185150e63eba5eac4dff24178 Author: Catalin Marinas Date: Fri Jul 20 11:43:02 2007 +0100 [ARM] 4503/1: nommu: Add noMMU support for ARMv7 This patch adds the necessary ifdef's to the proc-v7.S code and defines the v7wbi_tlb_fns macro in pgtable-nommu.h Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 7092fc38ee770251aed361572bf6bed05fcf3ee2 Author: Catalin Marinas Date: Fri Jul 20 11:42:29 2007 +0100 [ARM] 4498/1: ARMv7: Remove the L2 cache configuration via the aux ctrl register The auxiliary control and the L2 auxiliary control registers are Cortex-A8 specific. They need to be removed from the generic ARMv7 support code. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 1b2232ab879993fcf5b9391c3febf6ab5d78201e Author: Hans Verkuil Date: Fri Jul 20 06:25:22 2007 -0300 V4L/DVB (5880): wm8775/wm8739: Fix memory leak when unloading module State struct was never freed. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 2fc9e2f78acd06d0a76a05abb2802cc4616453e3 Author: Trent Piepho Date: Fri Jul 20 04:11:36 2007 -0300 V4L/DVB (5877): radio-gemtek-pci: remove unused structure member The drivers reads the PCI subsystem ID into its state structure, but it's never used anywhere. Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit 32b78de7fee70a0bdb2081b23fc2b676ec566814 Author: Cyrill Gorcunov Date: Thu Jul 19 11:44:11 2007 -0300 V4L/DVB (5871): Conexant 2388x: check for kthread_run The patch adds checking of kthread_run return code and issues a message if it fails. Signed-off-by: Cyrill Gorcunov Signed-off-by: Mauro Carvalho Chehab commit a46c5fbc6912c4e34cb7ded314249b639dc244a6 Author: Hans Verkuil Date: Thu Jul 19 04:53:36 2007 -0300 V4L/DVB (5869): Add check for valid control ID to v4l2_ctrl_next. If v4l2_ctrl_next is called without the V4L2_CTRL_FLAG_NEXT_CTRL then it should check whether the passed control ID is valid and return 0 if it isn't. Otherwise a for-loop over the control IDs will never end. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 3d58ffe2aa107df6db57f875dba5368960b17cde Author: Hans Verkuil Date: Wed Jul 18 18:41:08 2007 -0300 V4L/DVB (5867): videodev2.h: add missing for userspace When videodev2.h is included by an application, it needs to include for the timeval struct. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit dd1e729d63f74a0b6290ca417bafd3fd8665db50 Author: Hans Verkuil Date: Wed Jul 18 13:22:06 2007 -0300 V4L/DVB (5866): ivtv: fix DMA timeout when capturing VBI + another stream The VBI DMA is handled in a special way and is marked with a bit. However, that bit was set at the wrong time and could be cleared by mistake if a PCM (or other) DMA request would arrive before the VBI DMA was completed. So on completion of the VBI DMA the driver no longer knew that that DMA transfer was for VBI data. And this in turn caused havoc with the card's DMA engine. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 201700d3544c653d453716a60976efe1987110af Author: Mauro Carvalho Chehab Date: Thu Jul 19 11:21:04 2007 -0300 V4L/DVB (5865): Remove usage of HZ on ivtv driver, replacing by msecs_to_jiffies Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit fe06fe0a4d0f781f8ae0570e4d7e517a81878c1d Author: Mauro Carvalho Chehab Date: Tue Jul 17 16:36:20 2007 -0300 V4L/DVB (5861): Use msecs_to_jiffies instead of HZ on bttv, cx88 and saa7134 Signed-off-by: Mauro Carvalho Chehab commit 818ca4711eb8ec064c1cd5d7657f95ed6bc2bbed Author: Mauro Carvalho Chehab Date: Tue Jul 17 16:29:07 2007 -0300 V4L/DVB (5860): Use msecs_to_jiffies instead of HZ on some webcam drivers Signed-off-by: Mauro Carvalho Chehab commit f7518bd2d9ecad8c404c300e7872f7c2ab4961ad Author: Mauro Carvalho Chehab Date: Tue Jul 17 16:27:30 2007 -0300 V4L/DVB (5859): use msecs_to_jiffies on InfraRed RC5 timeout Signed-off-by: Mauro Carvalho Chehab commit 09df5cbe46511611410274f09571ada229231ddb Author: Mauro Carvalho Chehab Date: Tue Jul 17 16:25:38 2007 -0300 V4L/DVB (5858): Use msecs_to_jiffies instead of HZ on media/video I2C drivers Signed-off-by: Mauro Carvalho Chehab commit a2d66a37c743ba201e85c93c4ec29d58ca94b728 Author: Mauro Carvalho Chehab Date: Tue Jul 17 16:15:58 2007 -0300 V4L/DVB (5857): Use msecs_to_jiffies instead of HZ on radio drivers Signed-off-by: Mauro Carvalho Chehab commit 7809b4cba2bc0165c804ab4eaf10308aad14fc8e Author: Hans Verkuil Date: Tue Jul 17 13:50:46 2007 -0300 V4L/DVB (5855): ivtv: fix Kconfig typo and refer to the driver homepage. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit ae38d93bd710d8014925f1cb9b689dc89c13d778 Author: Hans Verkuil Date: Tue Jul 17 13:42:43 2007 -0300 V4L/DVB (5854): ivtv: cleanup of driver messages Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 11d28766deedc8bcadc87db8a65775a41c15789a Author: Hans Verkuil Date: Tue Jul 17 12:47:38 2007 -0300 V4L/DVB (5853): ivtv: add support to suppress high volume i2c debug messages. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 4b9bc014bf4c65e1da86fbc9721f04e2763feca9 Author: Alexey Dobriyan Date: Tue Jul 17 09:03:14 2007 -0300 V4L/DVB (5852): ivtv: don't recompile needlessly Driver prints banner including kernel version. Was a leftover from when the driver was standalone. Signed-off-by: Alexey Dobriyan Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit c9b9a5817afc8f969b1ae834f88af6929f70de41 Author: Hans Verkuil Date: Tue Jul 17 06:45:42 2007 -0300 V4L/DVB (5851): ivtv: fix missing I2C_ALGOBIT config option I2C_ALGOBIT must also be selected when ivtv is selected. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 67632e17da1e90a0c43283823f94080c0ee07088 Author: Hans Verkuil Date: Tue Jul 17 06:38:43 2007 -0300 V4L/DVB (5850): ivtv: improve API command debugging Turn off debugging of API commands that occur during encoding or decoding, unless they are explicitly requested. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 8f40a9f5325cdceddb1610cb3dfd8cb532f5a618 Author: Yoann Padioleau Date: Mon Jul 16 16:54:49 2007 -0300 V4L/DVB (5848): Av7110: fix typo Parse error in ifdef or bad use of macro. Signed-off-by: Yoann Padioleau Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 69ebb22277a53f612ccd632ceb73ed87c9093412 Author: Kristoffer Ericson Date: Fri Jul 20 18:22:57 2007 +0100 [ARM] 4506/1: HP Jornada 7XX: Addition of SSP Platform Driver These patches add full SSP/MCU support for the HP Jornada 720 machine. Its needed to handle keyboard, touchscreen, battery and backlight/lcd. The main driver exports functions and the header file exports the command values. When talking to the MCU the general procedure is to start MCU, send command (using ssp_inout(command)), the proper reply is always TXDUMMY. After receiving TXDUMMY you can send the value you wish pushed (for example brightness level). End with ssp_end() so the spinlock gets unlocked. Drivers using this havent been implemented yet, but will shortly. Signed-off-by: Kristoffer Ericson Signed-off-by: Russell King commit 2008220879af095d00ca27eb168a55c8595fbc0b Author: Linus Torvalds Date: Fri Jul 20 13:28:54 2007 -0700 Revert "sys_time() speedup" This basically reverts commit 4e44f3497d41db4c3b9051c61410dee8ae4fb49c, while waiting for it to be re-done more completely. There are cases of people mixing "time()" with higher-resolution time sources, and we need to take the nanosecond offsets into account. Ingo has a patch that does that, but it's still under some discussion. In the meantime, just revert back to the old simple situation of just doing the whole exact timesource calculations. But rather than using do_gettimeofday(), use the internal nanosecond resolution getnstimeofday(), which at least avoids one unnecessary conversion (since we really don't care about whether the fractional seconds are nanoseconds or microseconds - we'll just throw them away). Signed-off-by: Linus Torvalds commit 7b4c965a0b74748269d05185a394c9dc121dd558 Author: Catalin Marinas Date: Fri Jul 20 11:42:57 2007 +0100 [ARM] 4504/1: nommu: Fix the ARMv6 support for MMU-less platforms With this patch, Kconfig only selects CPU_HAS_ASID for the MMU case. It also corrects the typo in the v6wbi_tlb_fns definition in pgtable-nommu.h. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 2a0cc6885f34a8f1de195f718b9f51ece6923b80 Author: Catalin Marinas Date: Fri Jul 20 11:42:46 2007 +0100 [ARM] 4502/1: nommu: Do not export the copy/clear user page functions The __cpu_{clear|copy}_user_page functions are not defined for the MMU-less case and therefore should not be exported. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 367afaf83b0a8886ea566638a865701c54710af9 Author: Catalin Marinas Date: Fri Jul 20 11:42:51 2007 +0100 [ARM] 4501/1: nommu: Select TLS register emulation if ARMv6 and not v6K If not MMU and not v6K, access to the TLS register has to be emulated. MMU-less systems do not provide a high page for kuser helpers. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 0762097625711e829a008b64f42dc0ec74abb284 Author: Catalin Marinas Date: Fri Jul 20 11:42:40 2007 +0100 [ARM] 4500/1: Add locking around the background L2x0 cache operations The background operations of the L2x0 cache controllers are aborted if another operation is issued on the same or different core. This patch protects the maintenance operation issuing/polling with a spinlock. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 13a63ab289627e977a045864b36792cf0b61364a Author: Russell King Date: Fri Jul 20 10:44:02 2007 +0100 [ARM] rpc: convert an outb() to writeb() Signed-off-by: Russell King commit 8b801ead3d7ab3cce991ea3a2d00c7336215fc7d Author: Russell King Date: Fri Jul 20 10:38:54 2007 +0100 [ARM] rpc: update Acorn SCSI drivers to modern ecard interfaces Signed-off-by: Russell King commit 13d5fadf45d12786b90916e95e97f593e91aaf0a Author: Russell King Date: Fri Jul 20 10:36:05 2007 +0100 [ARM] Make 'i' and 'zi' targets work The 'i' and 'zi' targets short-circuit the dependencies for 'install' and 'zinstall' targets; these are useful for installing the kernel on platforms which have make but no compiler installed. Signed-off-by: Russell King commit cdcb81f7d99f3d525003068b84445dd4acc63266 Author: Russell King Date: Fri Jul 20 10:32:46 2007 +0100 [ARM] Allow neponset to build again Signed-off-by: Russell King commit f393e99d9e9540d9c5b3ebc42dfb0ff9a77827fe Author: Dan Williams Date: Fri Jul 20 02:07:36 2007 +0100 [ARM] 4496/1: elf_hwcap: fix up #include misplacement While bisecting an iop13xx compile failure I noticed that include/asm-arm/hwcap.h should be included from include/asm-arm/elf.h outside #ifndef __ASSEMBLY__ since hwcap.h has its own __ASSEMBLY__ protections. Cc: Catalin Marinas Signed-off-by: Dan Williams Signed-off-by: Russell King commit 48da78bc93b087eadd8fa840ba661b9442846dee Author: Catalin Marinas Date: Wed Jul 11 11:29:28 2007 +0100 [ARM] 4471/1: Compile the uncompressing code with -fno-builtin This is to avoid a compiler warning for overriding the built-in "putc" function. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit fbc9a5727401442f6972bbddaeb0650f2bf2ebe2 Author: Gwendal Grignou Date: Fri Jul 20 12:38:36 2007 -0700 [SCSI] mpt fusion: update Kconfig help Update help in Kconfig for mptfc driver to indicate the driver supports Brocade FC 4G HBA. signed-off-by: Gwendal Grignou Acked-by: Eric Moore Signed-off-by: James Bottomley commit 486acd4850dde6d2f8c7f431432f3914c4bfb5f5 Author: Christoph Hellwig Date: Fri Jul 20 21:39:54 2007 +0200 [CELL] spufs: rework list management and associated locking This sorts out the various lists and related locks in the spu code. In detail: - the per-node free_spus and active_list are gone. Instead struct spu gained an alloc_state member telling whether the spu is free or not - the per-node spus array is now locked by a per-node mutex, which takes over from the global spu_lock and the per-node active_mutex - the spu_alloc* and spu_free function are gone as the state change is now done inline in the spufs code. This allows some more sharing of code for the affinity vs normal case and more efficient locking - some little refactoring in the affinity code for this locking scheme Signed-off-by: Christoph Hellwig Signed-off-by: Arnd Bergmann commit 1474855d0878cced6f39f51f3c2bd7428b44cb1e Author: Bob Nelson Date: Fri Jul 20 21:39:53 2007 +0200 [CELL] oprofile: add support to OProfile for profiling CELL BE SPUs From: Maynard Johnson This patch updates the existing arch/powerpc/oprofile/op_model_cell.c to add in the SPU profiling capabilities. In addition, a 'cell' subdirectory was added to arch/powerpc/oprofile to hold Cell-specific SPU profiling code. Exports spu_set_profile_private_kref and spu_get_profile_private_kref which are used by OProfile to store private profile information in spufs data structures. Also incorporated several fixes from other patches (rrn). Check pointer returned from kzalloc. Eliminated unnecessary cast. Better error handling and cleanup in the related area. 64-bit unsigned long parameter was being demoted to 32-bit unsigned int and eventually promoted back to unsigned long. Signed-off-by: Carl Love Signed-off-by: Maynard Johnson Signed-off-by: Bob Nelson Signed-off-by: Arnd Bergmann Acked-by: Paul Mackerras commit 36aaccc1e96481e8310b1d13600096da0f24ff43 Author: Bob Nelson Date: Fri Jul 20 21:39:52 2007 +0200 [CELL] oprofile: enable SPU switch notification to detect currently active SPU tasks From: Maynard Johnson This patch adds to the capability of spu_switch_event_register so that the caller is also notified of currently active SPU tasks. Exports spu_switch_event_register and spu_switch_event_unregister so that OProfile can get access to the notifications provided. Signed-off-by: Maynard Johnson Signed-off-by: Carl Love Signed-off-by: Bob Nelson Signed-off-by: Arnd Bergmann Acked-by: Paul Mackerras commit 2414059420311e5384de646eebfd529c184afd3c Author: Christoph Hellwig Date: Fri Jul 20 21:39:51 2007 +0200 [CELL] spu_base: locking cleanup Sort out the locking mess in spu_base and document the current rules. As an added benefit spu_alloc* and spu_free don't block anymore. Signed-off-by: Christoph Hellwig Signed-off-by: Arnd Bergmann commit 9e7cbcbb6ede4299d52c839e352aae527c06124a Author: Arnd Bergmann Date: Fri Jul 20 21:39:50 2007 +0200 [CELL] cell: indexing of SPUs based on firmware vicinity properties This patch links spus according to their physical position using information provided by the firmware through a special vicinity device-tree property. This property is present in current version of Malta firmware. Example of vicinity properties for a node in Malta: Node: Vicinity property contains phandles of: spe@0 [ spe@100000 , mic-tm@50a000 ] spe@100000 [ spe@0 , spe@200000 ] spe@200000 [ spe@100000 , spe@300000 ] spe@300000 [ spe@200000 , bif0@512000 ] spe@80000 [ spe@180000 , mic-tm@50a000 ] spe@180000 [ spe@80000 , spe@280000 ] spe@280000 [ spe@180000 , spe@380000 ] spe@380000 [ spe@280000 , bif0@512000 ] Only spe@* have a vicinity property (e.g., bif0@512000 and mic-tm@50a000 do not have it). Signed-off-by: Andre Detsch Signed-off-by: Arnd Bergmann commit cbc23d3e7cb3c9fd3c9fce0bc3f44f687a9517c0 Author: Arnd Bergmann Date: Fri Jul 20 21:39:49 2007 +0200 [CELL] spufs: integration of SPE affinity with the scheduller This patch makes the scheduller honor affinity information for each context being scheduled. If the context has no affinity information, behaviour is unchanged. If there are affinity information, context is schedulled to be run on the exact spu recommended by the affinity placement algorithm. Signed-off-by: Andre Detsch Signed-off-by: Arnd Bergmann commit c5fc8d2a92461fcabd00dfd678204cba36b93119 Author: Arnd Bergmann Date: Fri Jul 20 21:39:48 2007 +0200 [CELL] cell: add placement computation for scheduling of affinity contexts This patch provides the spu affinity placement logic for the spufs scheduler. Each time a gang is going to be scheduled, the placement of a reference context is defined. The placement of all other contexts with affinity from the gang is defined based on this reference context location and on a precomputed displacement offset. Signed-off-by: Andre Detsch Signed-off-by: Arnd Bergmann commit 8e68e2f248332a9c3fd4f08258f488c209bd3e0c Author: Arnd Bergmann Date: Fri Jul 20 21:39:47 2007 +0200 [CELL] spufs: extension of spu_create to support affinity definition This patch adds support for additional flags at spu_create, which relate to the establishment of affinity between contexts and contexts to memory. A fourth, optional, parameter is supported. This parameter represent a affinity neighbor of the context being created, and is used when defining SPU-SPU affinity. Affinity is represented as a doubly linked list of spu_contexts. Signed-off-by: Andre Detsch Signed-off-by: Arnd Bergmann commit 3ad216cae837d90415c605e1149e6fd88f51c973 Author: Arnd Bergmann Date: Fri Jul 20 21:39:46 2007 +0200 [CELL] cell: add hardcoded spu vicinity information for QS20 This patch allows the use of spu affinity on QS20, whose original FW does not provide affinity information. This is done through two hardcoded arrays, and by reading the reg property from each spu. Signed-off-by: Andre Detsch Signed-off-by: Arnd Bergmann commit 9d92af621f193c1c889ac8b6fd8c987ccd8aae1f Author: Arnd Bergmann Date: Fri Jul 20 21:39:45 2007 +0200 [CELL] cell: add vicinity information on spus This patch adds affinity data to each spu instance. A doubly linked list is created, meant to connect the spus in the physical order they are placed in the BE. SPUs near to memory should be marked as having memory affinity. Adjustments of the fields acording to FW properties is done in separate patches, one for CPBW, one for Malta (patch for Malta under testing). Signed-off-by: Andre Detsch Signed-off-by: Arnd Bergmann commit aa6d5b20254a21b69092dd839b70ee148303ef25 Author: Arnd Bergmann Date: Fri Jul 20 21:39:44 2007 +0200 [CELL] cell: add per BE structure with info about its SPUs Addition of a spufs-global "cbe_info" array. Each entry contains information about one Cell/B.E. node, namelly: * list of spus (both free and busy spus are in this list); * list of free spus (replacing the static spu_list from spu_base.c) * number of spus; * number of reserved (non scheduleable) spus. SPE affinity implementation actually requires only access to one spu per BE node (since it implements its own pointer to walk through the other spus of the ring) and the number of scheduleable spus (n_spus - non_sched_spus) However having this more general structure can be useful for other functionalities, concentrating per-cbe statistics / data. Signed-off-by: Andre Detsch Signed-off-by: Arnd Bergmann commit 7e90b74967ea54dbd6eb539e1cb151ec37f63d7f Author: Masato Noguchi Date: Fri Jul 20 21:39:43 2007 +0200 [CELL] spufs: use find_first_bit() instead of sched_find_first_bit() spu_sched->bitmap has MAX_PRIO(=140) width in bits.However, since ff80a77f20f811c0cc5b251d0f657cbc6f788385, sched_find_first_bit() only supports 100-bit bitmaps. Thus, spu_sched->bitmap should be treated by generic find_first_bit(). Signed-off-by: Masato Noguchi Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann commit 50af32a94beef566664022254d677504e51b6139 Author: Jeremy Kerr Date: Fri Jul 20 21:39:42 2007 +0200 [CELL] spufs: remove unused file argument from spufs_run_spu() From: Sebastian Siewior The 'file' argument is unused in spufs_run_spu(). This change removes it. Signed-off-by: Sebastian Siewior Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann commit ca53da3abb1d49748931ff2acb66d5a6eeeba2a1 Author: Masato Noguchi Date: Fri Jul 20 21:39:41 2007 +0200 [CELL] spufs: change decrementer restore timing The SPU decrementer should be restored after the LSCSA DMA has completed. Signed-off-by: Masato Noguchi Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann commit cf17df223c8cd56a92f34162f2a362eec9f4b157 Author: Masato Noguchi Date: Fri Jul 20 21:39:40 2007 +0200 [CELL] spufs: dont halt decrementer at restore step 47 No need to halt the SPE decrementer at context restore step 47, it will be done in step 7. Signed-off-by: Masato Noguchi Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann commit a103f347a5ae2735b9bf0a725a36c34be3f24c88 Author: Masato Noguchi Date: Fri Jul 20 21:39:39 2007 +0200 [CELL] spufs: limit saving MFC_CNTL bits At save step 8, the mfc control register in the CSA should be written _only_ with Sc and Sm bits (at least MFC_CNTL[Dh] should be set to 0) Signed-off-by: Masato Noguchi Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann commit d40a01d4f4f205d0645beb371edc153d9ec8fb9f Author: Masato Noguchi Date: Fri Jul 20 21:39:38 2007 +0200 [CELL] spufs: fix read and write for decr_status file The decr_status in the LSCSA is valid only in the sequence of context restore. Thus, it's nonsense to read and/or write it through spufs. This patch changes decr_status node to access MFC_CNTL[Ds] in the CSA. Signed-off-by: Masato Noguchi Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann commit 1cfc0f86eb0348dd04ace8c2171642ebe9cd87bb Author: Masato Noguchi Date: Fri Jul 20 21:39:37 2007 +0200 [CELL] spufs: fix decr_status meanings The decr_status in the LSCSA is confusedly used as two meanings: * SPU decrementer was running * SPU decrementer was wrapped as a result of adjust and the code to set decr_status is missing. This patch fixes these problems by using the decr_status argument as a set of flags. This requires a rebuild of the shipped spu_restore code. Signed-off-by: Masato Noguchi Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann commit cfd529b25d9b1d48423b85d76066348e2459e646 Author: Masato Noguchi Date: Fri Jul 20 21:39:36 2007 +0200 [CELL] spufs: remove needless context save/restore code The following steps are not needed in the SPE context save/restore paths: Save Step 12: save_mfc_decr() save suspend_time to CSA (It will be done by step 14) save ch 7 (decrementer value will be saved in LSCSA by spe-side step 10) Restore Step 59: restore_ch_part1() restore ch 1 (it will be done by spe-side step 15) This change removes the unnecessary steps. Signed-off-by: Masato Noguchi Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann commit daced0f718b92b0bcdb9790622c255d4660f51ce Author: Jeremy Kerr Date: Fri Jul 20 21:39:35 2007 +0200 [CELL] spufs: fix array size of channel index Based on a fix from Masato Noguchi . Remove the (incorrect) array size declarations in the spufs channel arrays, and use ARRAY_SIZE rather than hardcoded values. Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann commit 27b1ea091f0c088ecad0d492f37fbe7b8d54d7dc Author: Christoph Hellwig Date: Fri Jul 20 21:39:34 2007 +0200 [CELL] spufs: make sure context are scheduled again after spu_acquire_saved Currently a process is removed from the physical spu when spu_acquire_saved is saved but never put back. This patch adds a new spu_release_saved that is to be paired with spu_acquire_saved and put the process back if it has been in RUNNABLE state before. Niether Jeremy not be are entirely happy about this exact patch because it adds another spu_activate call outside of the owner thread, but I feel this is the best short-term fix we can come up with. Signed-off-by: Christoph Hellwig Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann commit 27ec41d3a1d4df2b7cd190e93aad22ab86a72aa1 Author: Andre Detsch Date: Fri Jul 20 21:39:33 2007 +0200 [CELL] spufs: add spu stats in sysfs and ctx stat file in spufs This patch exports per-context statistics in spufs as long as spu statistics in sysfs. It was formed by merging: "spufs: add spu stats in sysfs" From: Christoph Hellwig "spufs: add stat file to spufs" From: Christoph Hellwig "spufs: fix libassist accounting" From: Jeremy Kerr "spusched: fix spu utilization statistics" From: Luke Browning And some adjustments by myself, after suggestions on cbe-oss-dev. Having separate patches was making the review process harder than it should, as we end up integrating spus and ctx statistics accounting much more than it was on the first implementation. Signed-off-by: Andre Detsch Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann commit e840cfe6814d6f13ecb86cff7097ad7259df502e Author: Jeremy Kerr Date: Fri Jul 20 21:39:32 2007 +0200 [CELL] spufs: Remove spurious WARN_ON for spu_deactivate for NOSCHED contexts In 6cbf93960e64f313f6e247cbca7afaa50e3ee2c we added a WARN_ON for calling spu_deactivate on contexts created with the SPU_CREATE_NOSCHED flag. However, all NOSCHED contexts will need to be deactivated when the context is destroyed, so this gives a spurious warning when any NOSCHED context is closed. This change removes the WARN_ON. Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann commit d054b36ffd302ec65aabec16a0c60ddd9e6b5a62 Author: Jeremy Kerr Date: Fri Jul 20 21:39:31 2007 +0200 [CELL] spufs: Make signal-notification files readonly for NOSCHED contexts Reading from the signal{1,2} files requires a spu_acquire_saved, so make these files write-only for contexts created with SPU_CREATE_NOSCHED. Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann commit 49776d30aea903fb2f9966c8e9b6f23ae5f7c937 Author: Kazunori Asayama Date: Fri Jul 20 21:39:30 2007 +0200 [CELL] spufs: Avoid unexpectedly restaring MFC during context save The current SPU context saving procedure in SPUFS unexpectedly restarts MFC when halting decrementer, because MFC_CNTL[Dh] is set without MFC_CNTL[Sm]. This bug causes, for example, saving broken DMA queues. Here is a patch to fix the problem. Signed-off-by: Kazunori Asayama Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann commit d1450317554d52e0e4a454806c4d05bb2a834f00 Author: Sebastian Siewior Date: Fri Jul 20 21:39:29 2007 +0200 [CELL] spufs: remove section mismatch warning WARNING: arch/powerpc/platforms/cell/spufs/spufs.o(.init.text+0x158): Section mismatch: reference to .exit.text:.spu_sched_exit (between '.init_module' and '.spu_sched_init') was introduced by c99c1994a2bb9493b4ac372b2b6ee2606d291171 This patch removes the warning. Cc: Christoph Hellwig Signed-off-by: Sebastian Siewior Signed-off-by: Arnd Bergmann commit ce21b3c9648ae55181787bf25ee00cf91dfd5c91 Author: Michael Ellerman Date: Fri Jul 20 21:39:28 2007 +0200 [CELL] add support for MSI on Axon-based Cell systems This patch adds support for the setup and decoding of MSIs on Axon-based Cell systems, using the MSIC mechanism. This involves setting up an area of BE memory which the Axon then uses as a FIFO for MSI messages. When one or more MSIs are decoded by the MSIC we receive an interrupt on the MPIC, and the MSI messages are written into the FIFO. At the moment we use a 64KB FIFO, one per MSIC/BE. Signed-off-by: Michael Ellerman Signed-off-by: Arnd Bergmann commit 8d2655e621bfc3c3f925016f881a36739d479f69 Author: Andre Detsch Date: Fri Jul 20 21:39:27 2007 +0200 [CELL] saving spus information for kexec crash This patch adds support for investigating spus information after a kernel crash event, through kdump vmcore file. Implementation is based on xmon code, but the new functionality was kept independent from xmon. Signed-off-by: Lucio Jose Herculano Correia Signed-off-by: Andre Detsch Signed-off-by: Arnd Bergmann commit dbdf04c40161f81d74e27f04e201acb3a5dfad69 Author: Maxim Shchetynin Date: Fri Jul 20 21:39:26 2007 +0200 [CELL] driver for DDR2 memory on AXON The Axon bridge chip used on new Cell/B.E. based blade servers comes with a DDR2 memory controller that can be used to attach cheap memory modules, as opposed to the high-speed XDR memory that is used by the CPU itself. Since the memory controller does not participate in the cache coherency protocol, we can not use the memory direcly for Linux applications, but by providing a block device it can be used for swap space, temporary file storage and through the use of the direct_access block device operation for mapping into user addresses, when it is mounted with an appropriate file system. Signed-off-by: Maxim Shchetynin Signed-off-by: Arnd Bergmann commit b86ce01c7700cfc74665799355a46dcadf920ebd Author: Jean-Christophe DUBOIS Date: Fri Jul 20 21:39:25 2007 +0200 [CELL] allow linux to map Cell regs on legacy SLOF tree. The platforms missing the "cpus" property in the "be" node are mono-Cell platforms such as CAB or Getaway. Therefore it is possible to assume that if there is no "cpus" properties under the "be" node then we can safely return the "device node" without more checking. This is a bit hacky but ... it allows it to work on these platforms. Signed-off-by: Jean-Christophe DUBOIS Acked-by: Christian Krafft Signed-off-by: Arnd Bergmann commit 827e3648dc2c31e01db7cd2e4498061cf78a97a9 Author: Jean-Christophe DUBOIS Date: Fri Jul 20 21:39:24 2007 +0200 [CELL] fix cbe_thermal for legacy SLOF tree. Previous patch changed based on Christian Krafft's comment. On some legacy SLOF tree the generic code is unable to ioremap some Cell BE registers. Therefore the "generic" functions are returning a NULL pointer, triggering a crash on such platforms. Let's handle this more gracefully. Signed-off-by: Jean-Christophe DUBOIS Acked-by: Christian Kraff Signed-off-by: Arnd Bergmann commit 64bafa9db7e92d5a46402613188b71800924ca1f Author: Jean-Christophe DUBOIS Date: Fri Jul 20 21:39:23 2007 +0200 [CELL] fix cbe_cpufreq for legacy SLOF tree. Previous patch changed based on Christian Krafft's comment. On some legacy SLOF tree the generic code is unable to ioremap some Cell BE registers. Therefore the "generic" functions are returning a NULL pointer, triggering a crash on such platforms. Let's handle this more gracefully. Signed-off-by: Jean-Christophe DUBOIS Acked-by: Christian Kraff Signed-off-by: Arnd Bergmann commit 74889e41d9a1f80928130a02af9b010673bc5ba7 Author: Christian Krafft Date: Fri Jul 20 21:39:22 2007 +0200 [CELL] cbe_cpufreq: reorganize code This patch reorganizes the code of the driver into three files. Two cbe_cpufreq_pmi.c and cbe_cpufreq_pervasive.c care about hardware. cbe_cpufreq.c contains the logic. There is no changed behaviour, except that the PMI related function is now located in a seperate module cbe_cpufreq_pmi. This module will be required by cbe_cpufreq, if CONFIG_CBE_CPUFREQ_PMI has been set. Signed-off-by: Christian Krafft Signed-off-by: Arnd Bergmann commit 1e21fd5af3797a2c322e1723c69732e77aa74f48 Author: Christian Krafft Date: Fri Jul 20 21:39:21 2007 +0200 [CELL] cbe_cpufreq: fix minor issues Minor issues have been fixed: * added a missing call to of_node_put() * signedness of a function parameter * added some line breaks * changed global pmi_frequency_limit to a per node pmi_slow_mode_limit array Signed-off-by: Christian Krafft Signed-off-by: Arnd Bergmann commit e5ecc8719212e2566440818491ec5741689f3743 Author: Christian Krafft Date: Fri Jul 20 21:39:20 2007 +0200 [CELL] cbe_cpufreq: fix initialization This patch fixes the initialization of the cbe_cpufreq driver. The code that initializes the PMI related functions was called per cpu: * registering cpufreq notifier block * registering a pmi handler This ends in a bug that the notifier block gets called in an endless loop. The initialization code is being put to the module init code path by this patch. This way it only gets called once. Signed-off-by: Christian Krafft Signed-off-by: Arnd Bergmann commit a964b9be3e475f30aee334654b4ff200bcdc0092 Author: Christian Krafft Date: Fri Jul 20 21:39:19 2007 +0200 [CELL] cbe_cpufreq: fix latency measurement This patch fixes the debug code that calculates the transition time when changing the slow modes on a Cell BE cpu. Signed-off-by: Christian Krafft Signed-off-by: Arnd Bergmann commit 813f90728e7d74e9b753e6ef6c6915cd2a047adb Author: Christian Krafft Date: Fri Jul 20 21:39:18 2007 +0200 [CELL] pmi: remove support for mutiple devices. The pmi driver got simplified by removing support for multiple devices. As there is no more than one pmi device per maschine, there is no need to specify the device for listening and sending messages. This way the caller (cbe_cpufreq) doesn't need to scan the device tree. When registering the handler on a board without a pmi interface, pmi.c will just return -ENODEV. The patch that fixed the breakage of cell_defconfig has been broken out of the earlier version of this patch. So this is the version that applies cleanly on top of it. Signed-off-by: Christian Krafft Signed-off-by: Arnd Bergmann commit 1d4ec7b1d6f130818f9b62dea3411d9ee2ff6ff6 Author: Roland Dreier Date: Fri Jul 20 12:13:20 2007 -0700 Fix ZERO_OR_NULL_PTR(ZERO_SIZE_PTR) The comparison with ZERO_SIZE_PTR in ZERO_OR_NULL_PTR() needs to be <= (not just <) so that ZERO_OR_NULL_PTR(ZERO_SIZE_PTR) is 1. Signed-off-by: Roland Dreier [ Duh! - Linus ] Signed-off-by: Linus Torvalds commit 0b1937ac0ef1541c0ea44e6f81c33d2f59803957 Author: David Howells Date: Fri Jul 20 17:02:04 2007 +0100 FRV: Fix linkage problems Make it possible to use __start_notes and __stop_notes without getting a GPREL overflow error from the FRV linker. Small variables that would otherwise be in .data or .bss may, depending on the arch, be placed in special sections (.sdata or .sbss) that permit single instruction references on fixed instruction width machines. __start_notes and __stop_notes aren't really char variables, and certainly don't refer to data in .data or .bss. Making them type "void" fools the compiler into not assuming anything about them. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 03ce11048b3832f5f0c471ccdb3363a870a14ac1 Author: Reiner Sailer Date: Fri Jul 20 10:03:02 2007 -0400 Fix memory leak in tpm_binary_bios_measurements_open() The same problem that was fixed for tpm_ascii_bios_measurements_open() in commit 178554ae75739e91dc4d7c3e42a3db95448cc5bf also occurs in tpm_binary_bios measurements(). Thanks for noticing this Satyam! I tested the attached patch to fix tpm_binary_bios_measurments as well. Signed-off-by: Reiner Sailer Signed-off-by: Linus Torvalds commit bd807f9c5b90c236c3d173a5815d620bc1b1316d Author: Robert P. J. Day Date: Wed Jul 18 07:33:08 2007 -0400 [IA64] Prevent people from directly including . Signed-off-by: Robert P. J. Day Signed-off-by: Tony Luck commit 1f564ad6d4182859612cbae452122e5eb2d62a76 Author: Bob Picco Date: Wed Jul 18 15:51:28 2007 -0700 [IA64] remove time interpolator Remove time_interpolator code (This is generic code, but only user was ia64. It has been superseded by the CONFIG_GENERIC_TIME code). Signed-off-by: Bob Picco Signed-off-by: John Stultz Signed-off-by: Peter Keilty Signed-off-by: Tony Luck commit 0aa366f351d044703e25c8425e508170e80d83b1 Author: Tony Luck Date: Fri Jul 20 11:22:30 2007 -0700 [IA64] Convert to generic timekeeping/clocksource This is a merge of Peter Keilty's initial patch (which was revived by Bob Picco) for this with Hidetoshi Seto's fixes and scaling improvements. Acked-by: Bob Picco Signed-off-by: Tony Luck commit 941091024ef0f2f7e09eb81201d293ac18833cc8 Author: Franck Bui-Huu Date: Thu Jul 19 14:04:21 2007 +0200 [MIPS] User stack pointer randomisation Signed-off-by: Franck Bui-Huu Signed-off-by: Ralf Baechle commit c55757b261038d17c729068fcdaef646a665385f Author: Yoichi Yuasa Date: Tue Jul 17 23:07:44 2007 +0900 [MIPS] Remove unused include/asm-mips/gfx.h Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit ca002ba8be889f882d5e31cb5f2a9a0bf2b2d7b1 Author: Yoichi Yuasa Date: Tue Jul 17 23:06:24 2007 +0900 [MIPS] Remove unused include/asm-mips/ds1216.h Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 5a81299928f3d9abfaced60bedd85214cf9921a4 Author: Ralf Baechle Date: Tue Jul 17 18:49:48 2007 +0100 [MIPS] Workaround for RM7000 WAIT instruction aka erratum 38 Signed-off-by: Ralf Baechle commit 17099b1142f6c0359fca60a3464dea8fb30badea Author: Ralf Baechle Date: Sat Jul 14 13:24:05 2007 +0100 [MIPS] Make support for weakly ordered LL/SC a config option. None of weakly ordered processor supported in tree need this but it seems like this could change ... Signed-off-by: Ralf Baechle commit ed203dadcd1373e80e95b04075e1eefc554a914b Author: Ralf Baechle Date: Fri Jul 13 18:58:25 2007 +0100 [MIPS] Disable UserLocal runtime detection on platforms which never have it. Signed-off-by: Ralf Baechle commit 798d9023e440085f00b352f1c1af8894959ff63e Author: Ralf Baechle Date: Fri Jul 13 18:54:10 2007 +0100 [MIPS] Disable MT runtime detection on platforms which never support MT. Signed-off-by: Ralf Baechle commit b6aff66953a29e40e0683be9b39c369ade143a5b Author: James Bottomley Date: Fri Jul 20 11:10:05 2007 -0500 [SCSI] scsi_transport_sas: add destructor for bsg There's currently no destructor for the bsg components. If you insert and remove the module, you see the bsg devices building up and up. This patch adds the destructor in the correct place in the transport class so that the bsg and request queue are removed just before the device destruction. Acked-by: FUJITA Tomonori Signed-off-by: James Bottomley commit c1158e63dfeb3928e94c768f0a403b3e0e799f70 Author: Avi Kivity Date: Fri Jul 20 08:18:27 2007 +0300 KVM: MMU: Fix oopses with SLUB The kvm mmu uses page->private on shadow page tables; so does slub, and an oops result. Fix by allocating regular pages for shadows instead of using slub. Tested-by: S.Çağlar Onur Signed-off-by: Avi Kivity commit 35f3f28613bc7263949db23a4c7078e425810c8c Author: Avi Kivity Date: Tue Jul 17 14:20:30 2007 +0300 KVM: x86 emulator: implement rdmsr and wrmsr Allow real-mode emulation of rdmsr and wrmsr. This allows smp Windows to boot, presumably for its sipi trampoline. Signed-off-by: Avi Kivity commit 90cb0529dd230548a7f0d6b315997be854caea1b Author: Avi Kivity Date: Tue Jul 17 13:04:56 2007 +0300 KVM: Fix memory slot management functions for guest smp The memory slot management functions were oriented against vcpu 0, where they should be kvm-wide. This causes hangs starting X on guest smp. Fix by making the functions (and resultant tail in the mmu) non-vcpu-specific. Unfortunately this reduces the efficiency of the mmu object cache a bit. We may have to revisit this later. Signed-off-by: Avi Kivity commit d55e2cb20123cdb5020ec4a2b2f1eace5038c292 Author: Avi Kivity Date: Tue Jul 10 17:50:55 2007 +0300 KVM: MMU: Store nx bit for large page shadows We need to distinguish between large page shadows which have the nx bit set and those which don't. The problem shows up when booting a newer smp Linux kernel, where the trampoline page (which is in real mode, which uses the same shadow pages as large pages) is using the same mapping as a kernel data page, which is mapped using nx, causing kvm to spin on that page. Signed-off-by: Avi Kivity commit 964f9ce2ff42dc47cf40fbd2f5c81cd60689e384 Author: Pierre Ossman Date: Fri Jul 20 18:20:36 2007 +0200 sdhci: make sure to clear the error interrupt The controller has a bit indicating that one of the higher bits (the error bits) are set. A previous bug caused this bit to be masked, but since that bug has been fixed we have to clear it explicictly. Signed-off-by: Pierre Ossman commit 63b66438860f246f25f5563cde4978cf255cb810 Author: Marc Pignat Date: Mon Jul 16 11:07:02 2007 +0200 mmc: at91_mci: wakeup on card insertion (or removal) This piece of code enable the system to be wake-up by a card insertion or removal. Signed-off-by: Marc Pignat Signed-off-by: Nicolas Ferre Signed-off-by: Pierre Ossman commit 81764fa9a472dd72b93385f30f718ed4f98ec129 Author: Pierre Ossman Date: Sun Jul 15 18:47:38 2007 +0200 mmc: add maintainer for at91 Nicolas Ferre has taken it upon himself to look after the AT91 MMC host driver. Signed-off-by: Pierre Ossman commit 3d50527bbf1b68e5206263ade414f0d966b00f74 Author: Mike Rapoport Date: Wed Jul 18 11:31:46 2007 +0100 [ARM] 4475/2: EM-x270 board support Signed-off-by: Mike Rapoport Signed-off-by: Russell King commit fe885fa2372b1d255974e71d5b7c51b1e9673835 Author: Arnaud Patard Date: Wed Jul 18 21:04:00 2007 +0100 [ARM] 4491/1: em7210 rtc clock The commit d815461c7a73903d0a926b3cace6f69e144c54a3 in linus tree converts the rtc-rs5c372 driver to a "new style" i2c driver. Like commit c00593f6f816e5cfa6d193a2561ca77541f71424, this patch register the rtc i2c device for the em7210 board. Signed-off-by: Arnaud Patard Signed-off-by: Russell King commit b750a09385d7c464113ae8915e63541a163fbac8 Author: Eric Miao Date: Wed Jul 18 11:40:13 2007 +0100 [ARM] 4489/1: pxa: split pxa_cpu_suspend to processor specific ones 1. split pxa_cpu_suspend to pxa25x_cpu_suspend and pxa27x_cpu_suspend and make pxa25x_cpu_pm_enter() and pxa27x_cpu_pm_enter() to invoke the corresponding _suspend functions, thus remove all those ugly #ifdef .. #endif out of sleep.S 2. move the declarations of those suspend functions to pm.h note: this is not a clean enough solution until all the pxa25x and pxa27x specific part is further removed out of sleep.S, sleep.S is supposed to contain generic code only Signed-off-by: eric miao Signed-off-by: Russell King commit 711be5ccfe9a02ba560aa918a008c31ea4760163 Author: Eric Miao Date: Wed Jul 18 11:38:45 2007 +0100 [ARM] 4488/1: pxa: move pxa25x/pxa27x specific code out of pm.c 1. introduce a structure pxa_cpu_pm_fns for pxa25x/pxa27x specific operations as follows: struct pxa_cpu_pm_fns { int save_size; void (*save)(unsigned long *); void (*restore)(unsigned long *); int (*valid)(suspend_state_t state); void (*enter)(suspend_state_t state); } 2. processor specific registers saving and restoring are performed by calling the corresponding (*save) and (*restore) 3. pxa_cpu_pm_fns->save_size should be initialized to the required size for processor specific registers saving, the allocated memory address will be passed to (*save) and (*restore) memory allocation happens early in pxa_pm_init(), and save_size should be assigned prior to this (which is usually true, since pxa_pm_init() happens in device_initcall() 4. there're some redundancies for those SLEEP_SAVE_XXX and related macros, will be fixed later, one way possible is for the system devices to handle the specific registers saving and restoring Signed-off-by: eric miao Signed-off-by: Russell King commit 8c6b065b792061c2e471d530127f2348fd9d243d Author: Alan Cox Date: Fri Jul 20 15:36:31 2007 +0100 pata_cs5520: Fix probe bug regression introduced in 2.6.22 Signed-off-by: Alan Cox Signed-off-by: Linux Torvalds commit 6a860c979b35469e4d77da781a96bdb2ca05ae64 Author: Jens Axboe Date: Fri Jul 20 15:18:12 2007 +0200 splice: fix bad unlock_page() in error case If add_to_page_cache_lru() fails, the page will not be locked. But splice jumps to an error path that does a page release and unlock, causing a BUG() in unlock_page(). Fix this by adding one more label that just releases the page. This bug was actually triggered on EL5 by gurudas pai using fio. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 9d1ca6f13cfedfd127f3be7e447bd6d922806a65 Author: Rusty Russell Date: Fri Jul 20 22:15:01 2007 +1000 lguest: override sched_clock Guests currently use the default scheduler clock: this means they always use jiffies even if TSC is actually available. It doesn't make any noticeable difference here, but it's a better thing to do. Also remove commented-out asm/sched-clock.h from -mm tree. Signed-off-by: Rusty Russell Signed-off-by: Linus Torvalds commit 876be9d89e9c8a007577e6372e331042edf4020b Author: Rusty Russell Date: Fri Jul 20 22:12:56 2007 +1000 lguest: trivial: We now have asm/processor-flags.h, so use it. Signed-off-by: Rusty Russell Signed-off-by: Linus Torvalds commit e5faff45b381e053c31214713ed783d97f49177b Author: Rusty Russell Date: Fri Jul 20 22:11:13 2007 +1000 lguest: fix sense if IF flag on interrupt injection The sense of the IF bit is backwards in the host interrupt handling. This means we always save "IF=1" on the stack when injecting an interrupt. It turns out this is almost always correct (unless the guest is taking a page fault in an interrupt due to an unpopulated vmalloc mapping), so went unnoticed. Signed-off-by: Rusty Russell Signed-off-by: Linus Torvalds commit e7cbff13ec1f236a3f8341c503a2e1bd0cf692e5 Author: Al Viro Date: Fri Jul 20 16:03:40 2007 +0100 [SCSI] iscsi_tcp: buggered kmalloc() Signed-off-by: Al Viro Cc: Mike Christie Signed-off-by: James Bottomley commit bd6dc742a4b1945861795a66dc27c65365c5f28e Author: David Howells Date: Fri Jul 20 10:59:41 2007 +0100 AFS: Use patched rxrpc_kernel_send_data() correctly Fix afs_send_simple_reply() to accept a greater-than-zero return value from rxrpc_kernel_send_data() as being a successful return rather than thinking it an error and aborting the call. rxrpc_kernel_send_data() previously returned zero incorrectly when it worked successfully, but has been patched to return the number of bytes it transmitted. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 5c72fc5cad68f5e1bfe0910cca9f63723e4a5c4a Author: Nick Piggin Date: Fri Jul 20 09:21:06 2007 +0200 arm: fix up handle_mm_fault changes Update arm to use bitwise types for its VM_FAULT_ constants. Signed-off-by: Nick Piggin Cc: Russell King Signed-off-by: Linus Torvalds commit e609ccc3161ead8a685b15533d9b6958ed368358 Author: Matthew Wilcox Date: Fri Jul 20 09:29:50 2007 -0600 Fix Lindent to not indent preprocessor comments so far I recently ran Lindent over the AdvanSys driver and it moved the comments on #else and #endif lines way over to the right: #else /* ADVANSYS_DEBUG */ This doesn't match what I expect from kernel style, but it is documented. We just need another flag to indent to make this look like: #else /* ADVANSYS_DEBUG */ Signed-off-by: Matthew Wilcox Signed-off-by: Linus Torvalds commit 178554ae75739e91dc4d7c3e42a3db95448cc5bf Author: Jesper Juhl Date: Fri Jul 20 00:31:48 2007 -0700 Memory leak in tpm_ascii_bios_measurements_open() Coverity found a memory leak in tpm_ascii_bios_measurements_open(). If "read_log(log)" fails, then we may leak 'log' and 'log->bios_event_log'. Signed-off-by: Jesper Juhl Cc: Seiji Munetoh Cc: Stefan Berger Cc: Reiner Sailer Cc: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22982a5687d8abf7bafe6d307585464f47089f18 Author: Greg Ungerer Date: Fri Jul 20 00:31:47 2007 -0700 m68knommu: reformat show_cpuinfo() Reformat show_cpuinfo() to be consistent with normal coding style (and rest of this file). Signed-off-by: Greg Ungerer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e3bbb3f05339de438faf54124f25c92e6fe4ac2e Author: Jesper Juhl Date: Fri Jul 20 00:31:47 2007 -0700 cr_backlight_probe() allocates too little storage for struct cr_panel The Coverity checker noticed that we allocate too little storage for "struct cr_panel *crp" in cr_backlight_probe(). Signed-off-by: Jesper Juhl Cc: Thomas Hellstrom Cc: Alan Hourihane Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eb0645a8b1f14da300f40bb9f424640cd1181fbf Author: Dan Williams Date: Fri Jul 20 00:31:46 2007 -0700 async_tx: fix kmap_atomic usage in async_memcpy Andrew Morton: [async_memcpy] is very wrong if both ASYNC_TX_KMAP_DST and ASYNC_TX_KMAP_SRC can ever be set. We'll end up using the same kmap slot for both src add dest and we get either corrupted data or a BUG. Evgeniy Polyakov: Btw, shouldn't it always be kmap_atomic() even if flag is not set. That pages are usual one returned by alloc_page(). So fix the usage of kmap_atomic and kill the ASYNC_TX_KMAP_DST and ASYNC_TX_KMAP_SRC flags. Cc: Andrew Morton Cc: Evgeniy Polyakov Signed-off-by: Dan Williams Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7c6129c68fe90a61166800b40217a850b8faee98 Author: Stephen Rothwell Date: Fri Jul 20 00:31:45 2007 -0700 dpt_i2o depends on virt_to_bus Signed-off-by: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1833633803c7ef4d8f09877d3f1549cbd252f477 Author: Nick Piggin Date: Fri Jul 20 00:31:45 2007 -0700 fix some conversion overflows Fix page index to offset conversion overflows in buffer layer, ecryptfs, and ocfs2. It would be nice to convert the whole tree to page_offset, but for now just fix the bugs. Signed-off-by: Nick Piggin Cc: Michael Halcrow Cc: Mark Fasheh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e228929bc257b963523ed75aa60d2ad77ece2189 Author: Paul Mundt Date: Fri Jul 20 00:31:44 2007 -0700 mm: fix memory hotplug oops from ZONE_MOVABLE changes. zone_movable_pfn is presently marked as __initdata and referenced from adjust_zone_range_for_zone_movable(), which in turn is referenced by zone_spanned_pages_in_node(). Both of these are __meminit annotated. When memory hotplug is enabled, this will oops on a hot-add, due to zone_movable_pfn having been freed. __meminitdata annotation gives the desired behaviour. This will only impact platforms that enable both memory hotplug and ARCH_POPULATES_NODE_MAP. Signed-off-by: Paul Mundt Acked-by: Mel Gorman Acked-by: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d1b87530e7df5c9541a69910ef7f786f034eca0 Author: Adrian Bunk Date: Fri Jul 20 00:31:44 2007 -0700 arch/i386/xen/events.c should #include Every file should include the headers containing the prototypes for its global functions. Signed-off-by: Adrian Bunk Acked-by: Jeremy Fitzhardinge Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d2eea68e7db759ce67807b42b7407236cccfde71 Author: Roland McGrath Date: Fri Jul 20 00:31:43 2007 -0700 xen: disable vdso "nosegneg" on native boot One of the nice ideas behind paravirt is that CONFIG_XEN=y can be included in a standard configuration and be no worse for native booting than as a Xen guest. The glibc feature that supports the vDSO "nosegneg" note is designed specifically to make this easy. You just have to flip one bit at boot time. This patch makes Xen flip the bit, so a CONFIG_XEN=y kernel on bare hardware does not make glibc use the less-optimized library builds. Signed-off-by: Roland McGrath Acked-by: Jeremy Fitzhardinge Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d046943cbaf332f75284ad99f4b3e60bae7ffff2 Author: Al Viro Date: Fri Jul 20 16:18:06 2007 +0100 fix gfp_t annotations for slub Since we have use like ~SLUB_DMA, we ought to have the type set right in both cases. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 8d4bc5b6b0ce030f51a2db836caeaf687b986791 Author: Al Viro Date: Fri Jul 20 16:15:28 2007 +0100 ANSIfy a couple of functions in netfilter It's C, not C++... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 6d14bfe77b8246a45670b7158d3a49bfe55662c7 Author: Al Viro Date: Fri Jul 20 16:10:24 2007 +0100 Fix lguest misannotation It's void __user *, not void * __user... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 25cccecce8e29f92eb5a0445bc97ee01ef2da379 Author: Al Viro Date: Fri Jul 20 16:07:33 2007 +0100 Fix up sky2 breakage Doing |= 1 << 19 to 16bit unsigned is not particulary useful; that register is 32bit, unlike the ones dealt with in the rest of function, so we need u32 variable here. Signed-off-by: Al Viro Acked-by: Stephen Hemminger Signed-off-by: Linus Torvalds commit a9204879b4242c2bed3a172399906acd371a8081 Author: Al Viro Date: Fri Jul 20 16:03:40 2007 +0100 Fix buggered kmalloc() call argument order Wrong order of arguments Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit dfedfaf55a452637d72bfc482c80f902a470ebb7 Author: Al Viro Date: Fri Jul 20 04:33:58 2007 +0100 m68k: exclude more unbuildable drivers anything that wants working dma-mapping won't work parport_pc won't work on m68k unless we have ISA Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 446df4c1e5f56cb68ec0cd9c29bbb2c7b04a513e Author: Al Viro Date: Fri Jul 20 04:33:48 2007 +0100 mac89x0: missing __init Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit f6ea2090e08abf3b95e1b692f1eec596bce69e9c Author: Al Viro Date: Fri Jul 20 04:33:38 2007 +0100 m68k: remove empty ->setup is several consoles Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 66a3f820cb6a88ef0481e042d4b48b2299deab7e Author: Al Viro Date: Fri Jul 20 04:33:28 2007 +0100 m68k: missing __init Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 88f8bb780e13fd31f207e1752ee8624dc786381f Author: Al Viro Date: Fri Jul 20 04:33:18 2007 +0100 m68k: missing exports Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 7e5de05169b766b86b4bc7c196f53d57e1952bff Author: Al Viro Date: Fri Jul 20 04:33:08 2007 +0100 m68k: use .text.head i.e. tell modpost that entry point code (that has to be outside of .init.text for external reasons) is OK to refer to .init.* Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit f9569e1d1540791f664aeb935b1ec11b6e56507c Author: Al Viro Date: Fri Jul 20 04:32:58 2007 +0100 m68k iomem (based on Geert's tree + memcpy_... stuff) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 3a5df1d451cfe3a3d6d63f144554cac286eecba1 Author: Al Viro Date: Fri Jul 20 04:32:48 2007 +0100 m68k: teach modpost about .m68_fixup Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 8a0236743ecd591f16a749f5c06670c6ae9661be Author: Al Viro Date: Fri Jul 20 00:24:22 2007 +0100 more isa/eisa/pci-only drivers marked as such Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 6585c1b3e2e6fe78701980686139f9599be07d66 Author: Andrew Vasquez Date: Thu Jul 19 15:06:04 2007 -0700 [SCSI] qla2xxx: Update version number to 8.02.00-k2. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit c3a2f0dfe1cecac76950f340f540c1a887dd2500 Author: Andrew Vasquez Date: Thu Jul 19 20:37:34 2007 -0700 [SCSI] qla2xxx: Add ISP25XX support. Large code-reuse from ISP24xx, consolidate RISC memory extraction routines during firmware-dump. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit af6177d88d76834b4d05499482d471d64559a6af Author: Andrew Vasquez Date: Thu Jul 19 15:06:02 2007 -0700 [SCSI] qla2xxx: Use pci_try_set_mwi(). As the "must-check" return-value of pci_set_msi() is never really checked. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit f85ec187dcd65c76dcb29f70ff3b5c7f2ae37cc8 Author: Andrew Vasquez Date: Thu Jul 19 15:06:01 2007 -0700 [SCSI] qla2xxx: Use PCI-X/PCI-Express read control interfaces. Original from Peter Oruba . Additional cleanups included. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit fd34f55694a784052981977cb84c50ea369ffc68 Author: Andrew Vasquez Date: Thu Jul 19 15:06:00 2007 -0700 [SCSI] qla2xxx: Re-factor isp_operations to static structures. In preparation for new ISP types. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 8084fe168a5252548cdddf2ed181c337fecd0523 Author: Shyam Sundar Date: Thu Jul 19 15:05:59 2007 -0700 [SCSI] qla2xxx: Validate mid-layer 'underflow' during check-condition handling. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 5881569bb33cdb0d4cdcd44d9ca2551ab04fb811 Author: Andrew Vasquez Date: Thu Jul 19 15:05:58 2007 -0700 [SCSI] qla2xxx: Correct setting of 'current' and 'supported' speeds during FDMI registration. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit c76f2c013f7fce83d54acd9d414af7e989e0a1dd Author: Andrew Vasquez Date: Thu Jul 19 15:05:57 2007 -0700 [SCSI] qla2xxx: Generalize iIDMA support. In preparation for new ISP types. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit e428924ccdf4644c58e23c2314ab970ff3afc607 Author: Andrew Vasquez Date: Thu Jul 19 15:05:56 2007 -0700 [SCSI] qla2xxx: Generalize FW-Interface-2 support. In preparation for new ISP types. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 5ddf24c5ea9d715dc4f5d5d5dd1c9337d90466dc Author: Tejun Heo Date: Mon Jul 16 14:29:41 2007 +0900 libata: implement EH fast drain In most cases, when EH is scheduled, all in-flight commands are aborted causing EH to kick in immediately. However, in some cases (especially with PMP), it's unclear which commands are affected by the error condition and although aborting all in-flight commands work, it isn't optimal and may cause unnecessary disruption. On the other hand, waiting for in-flight commands to drain themselves can take up to 30seconds. This patch implements EH fast drain to handle such situations. It gives in-flight commands some time to finish up but doesn't wait for too long. After EH is scheduled, fast drain timer is started and if no other completion occurs in ATA_EH_FASTDRAIN_INTERVAL all in-flight commands are aborted. If any completion occurred in the interval, the port is given another interval to finish up itself. Currently ATA_EH_FASTDRAIN_INTERVAL is 3 secs which should be enough for finishing up most commands. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 4e57c517b3cbaceb7438eeec879ca129fc17442c Author: Tejun Heo Date: Mon Jul 16 14:29:41 2007 +0900 libata: schedule probing after SError access failure during autopsy If SError isn't accessible, EH can't tell whether hotplug has happened or not. Report SError read failure with AC_ERR_OTHER and schedule probing with hardreset. This will be mainly useful for PMPs. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit fccb6ea5c240b9f29baa55448488fd6aee49f5a5 Author: Tejun Heo Date: Mon Jul 16 14:29:41 2007 +0900 libata: clear HOTPLUG flag after a reset ATA_EHI_HOTPLUGGED is a hint for reset functions indicating the the port might have gone through hotplug/unplug just before entering EH. Reset functions modify their behaviors a bit to handle the situation better - e.g. using longer debouncing delay. Currently, once HOTPLUG is set, it isn't cleared till the end of EH. This is unnecessary and makes EH take longer. Clear the HOTPLUGGED flag after a reset try (successful or not). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit f8f1e1cc0cd4d75c73e9a55a0ede8958e4fa14f1 Author: Tejun Heo Date: Mon Jul 16 14:29:40 2007 +0900 libata: reorganize ata_ehi_hotplugged() __ata_ehi_hotplugged() now has no users. Regorganize ata_ehi_hotplugged() such that a new function ata_ehi_schedule_probe() deals with scheduling probing. ata_ehi_hotplugged() calls it and additionally marks hotplug specific flags. ata_ehi_schedule_probe() will be used laster. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 1ae463171cc1b1ea6dad7bcb298e96c073e7373e Author: Tejun Heo Date: Mon Jul 16 14:29:40 2007 +0900 libata: improve SCSI scan failure handling SCSI scan may fail due to memory allocation failure even if EH is not in progress. Due to use of GFP_ATOMIC in SCSI scan path, allocation failure isn't too rare especially while probing multiple devices at once which is the case when a bunch of devices are connected to PMP. This patch moves SCSI scan failure detetion logic from ata_scsi_hotplug() to ata_scsi_scan_host() and implement synchronous scan behavior. The synchronous path sleeps briefly and repeats SCSI scan if some devices aren't attached properly. It contains robust retry loop to minimize the chance of device misdetection during boot and falls back to async retry if everything fails. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit f1545154a5c96590b1992aac8ee1e2c445e301ed Author: Tejun Heo Date: Mon Jul 16 14:29:40 2007 +0900 libata: quickly trigger SATA SPD down after debouncing failed Debouncing failure is a good indicator of basic link problem. Use -EPIPE to indicate debouncing failure and make ata_eh_reset() invoke sata_down_spd_limit() if the error occurs during reset. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 008a78961ec72990d09d7625ef9499d7317d040d Author: Tejun Heo Date: Mon Jul 16 14:29:40 2007 +0900 libata: improve SATA PHY speed down logic sata_down_spd_limit() first reads the current SPD from SStatus and limit the speed to the lower one of one below the current limit or one below the current SPD in SStatus. SPD may not be accessible or valid when SPD down is requested making sata_down_spd_limit() fail when it's most needed. This patch makes the current SPD cached after each successful reset and forces GEN I speed (1.5Gbps) if neither of SStatus or the cached value is valid, so sata_down_spd_limit() is now guaranteed to lower the speed limit if lower speed is available. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit badc2341579511a247f5993865aa68379e283c5c Author: su henry Date: Fri Jul 20 08:07:46 2007 -0400 The SATA controller device ID is different according to the onchip SATA type set in the system BIOS: Device Device ID SATA in IDE mode 0x4390 SATA in AHCI mode 0x4391 SATA in non-raid5 driver 0x4392 SATA in raid5 driver 0x4393 Although the device ID is different, they use the same AHCI driver .The attached file is the patch for adding these device IDs for ATI SB700. Signed-off-by: henry.su.ati@gmail.com Signed-off-by: Jeff Garzik commit 203ef6c456ad70e660cca67921d3d872b13aa516 Author: Tejun Heo Date: Mon Jul 16 14:29:40 2007 +0900 ahci: implement SCR_NOTIFICATION r/w Make ahci_scr_read/write() handle SCR_NOTIFICATION if the controller supports it. Also, print "sntf" in the cap line if supported. While at it, convert eight space into a tab in ahci_print_info(). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 274c1fde5c775a53331427d454745b9ecc5c783b Author: Tejun Heo Date: Mon Jul 16 14:29:40 2007 +0900 ahci: make NO_NCQ handling more consistent ahci_save_initial_config() is responsible for reading, screening the host CAP register and storing the modified result into hpriv->cap for the rest of the driver. Move ATA_FLAG_NO_NCQ handling into ahci_save_initial_config(). It's more consistent this way and the rest of the driver can always refer to hpriv->cap to determine configured capability. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit da3dbb17a0e9a9ec7f5aed95f1fddadb790edc9d Author: Tejun Heo Date: Mon Jul 16 14:29:40 2007 +0900 libata: make ->scr_read/write callbacks return error code Convert ->scr_read/write callbacks to return error code to better indicate failure. This will help handling of SCR_NOTIFICATION. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 5335b729064e03319cd2d5219770451dbb1d7f67 Author: Tejun Heo Date: Mon Jul 16 14:29:40 2007 +0900 libata: implement AC_ERR_NCQ When an NCQ command fails, all commands in flight are aborted and the offending one is reported using log page 10h. Depending on controller characteristics and LLD implementation, all commands may appear as having a device error due to shared TF status making it hard to determine what's actually going on. This patch adds AC_ERR_NCQ, marks the command reported by log page 10h with it and print extra "" after the error report for the command to help distinguishing the offending command. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit b64bbc39f2122a2276578e40144af69ef01decd4 Author: Tejun Heo Date: Mon Jul 16 14:29:39 2007 +0900 libata: improve EH report formatting Requiring LLDs to format multiple error description messages properly doesn't work too well. Help LLDs a bit by making ata_ehi_push_desc() insert ", " on each invocation. __ata_ehi_push_desc() is the raw version without the automatic separator. While at it, make ehi_desc interface proper functions instead of macros. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 975530e8a33fdeb1ad80d82fde11d56bf9ed2760 Author: Tejun Heo Date: Mon Jul 16 14:29:39 2007 +0900 sata_sil24: separate out sil24_do_softreset() Separate out sil24_do_softreset() which takes @pmp as its last argument. This will be used to implement sil24_pmp_softreset(). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 37b99cba8c2a3fd05a3a9f652cc2b3e48d1b9197 Author: Tejun Heo Date: Mon Jul 16 14:29:39 2007 +0900 sata_sil24: separate out sil24_exec_polled_cmd() Separate out sil24_exec_polled_cmd() from sil24_softreset(). This will be used to implement sil24_pmp_read/write(). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit e59f0dad33176a13803ff8a41cc639a06c43d381 Author: Tejun Heo Date: Mon Jul 16 14:29:39 2007 +0900 sata_sil24: replace sil24_update_tf() with sil24_read_tf() Replace sil24_update_tf() to sil24_read_tf() which reads TF into passed int result TF argument and can read TFs of PMP links. This will be used by PMP support. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit a9cf5e858100b2f82ad61028c26a1a3de11c4839 Author: Tejun Heo Date: Mon Jul 16 14:29:39 2007 +0900 ahci: separate out ahci_do_softreset() Separate out ahci_do_softreset() which takes @pmp as its last argument. This will be used to implement ahci_pmp_softreset(). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 91c4a2e09267b0ddc8e59d121e3748cd18675739 Author: Tejun Heo Date: Mon Jul 16 14:29:39 2007 +0900 ahci: separate out ahci_exec_polled_cmd() Separate out ahci_exec_polled_cmd() from ahci_softreset(). This will be used to implement ahci_pmp_read/write(). ahci_exec_polled_cmd() performs reset_engine before returning if the command fails (times out). This is to improve robustness. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit d2e75dfffbe9e86e1d646264792ac9bcd2cc4267 Author: Tejun Heo Date: Mon Jul 16 14:29:39 2007 +0900 ahci: separate out ahci_kick_engine() Separate out stop_engine - CLO - start_engine sequence from ahci_softreset() and ahci_clo() into ahci_reset_engine() and use it in ahci_softreset() and ahci_post_internal_cmd(). The function will also be used to prepare for and clean up after PMP register access commands. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 2cbb79ebbd4be07041368da5379a64f89f8ad518 Author: Tejun Heo Date: Mon Jul 16 14:29:38 2007 +0900 ahci: use deadline instead of fixed timeout for 1st FIS for SRST Use deadline instead of fixed timeout for 1st FIS for SRST to improve robustness of SRST. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 9977126c4b65c1396b665f7a0eeb8c7dede336f9 Author: Tejun Heo Date: Mon Jul 16 14:29:38 2007 +0900 libata: add @is_cmd to ata_tf_to_fis() Add @is_cmd to ata_tf_to_fis(). This controls bit 7 of the second byte which tells the device whether this H2D FIS is for a command or not. This cleans up ahci a bit and will be used by PMP. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit fe36cb53cfd82f3c0796a0826e1c9caf198c8f97 Author: Petr Vandrovec Date: Fri Jul 20 07:44:44 2007 -0400 [libata] Fix reported task file values in sense data ata_tf_read was setting HOB bit when lba48 command was submitted, but was not clearing it before reading "normal" data. As it is only place which sets HOB bit in control register, and register reads should not be affected by other bits, let's just clear it when we are done with reading upper bytes so non-48bit commands do not have to touch ctl at all. pata_scc suffered from same problem... Signed-off-by: Petr Vandrovec Signed-off-by: Jeff Garzik commit f3a03b0934fb83a030ccd3e6f1fbe845a9c44d49 Author: Dave Jones Date: Mon Jul 16 11:23:03 2007 -0400 Correct comment in libata-sff.c The filename in the file header is incorrect. Signed-off-by: Dave Jones Signed-off-by: Jeff Garzik commit dcd0344775c1c0bf8ff3b9541863beea5088a7c9 Author: Akira Iguchi Date: Tue Jul 17 12:10:17 2007 +0900 pata_scc.c: small fixes (Workaround for errata A308) This patch fixes some issues of the previous patch: - Use mode_filter() hook to limit ATAPI UDMA mode - "data loss" warning message - handling of udma_mask Signed-off-by: Kou Ishizaki Signed-off-by: Akira Iguchi Signed-off-by: Jeff Garzik commit 028a2596336b19a7e3713cfa9fe04d0d32e95876 Author: Alexey Dobriyan Date: Tue Jul 17 23:48:48 2007 +0400 ahci.c: fix CONFIG_PM=n compilation Commit df69c9c5438b4e396a64d42608b2a6c48a3e7475 moved only prototype of out of CONFIG_PM. Move function out as well. Box seems to boot fine. Signed-off-by: Alexey Dobriyan Signed-off-by: Jeff Garzik commit 3fb6589ceaf06d9c65bdf2382249d818771e913b Author: Tejun Heo Date: Fri Jul 20 12:49:38 2007 +0900 libata: add ST9160821AS 3.CLF to NONCQ blacklist Yay, the first one from Seagate. 3.ALC firmware is okay. This was reported by Sam Freed on bugzilla bug 8759. Signed-off-by: Tejun Heo Signed-off-by: Sam Freed Signed-off-by: Jeff Garzik commit 83b6839ec33becca78ebf6035489733a62e750bb Author: Magnus Damm Date: Fri Jul 20 12:50:58 2007 +0900 pata_platform: Fix NULL pointer dereference pata_platform: Fix NULL pointer dereference pata_platform currently dereferences a NULL pointer in pata_platform_probe() if pdev->dev.platform_data is set to NULL. This breakage was most likely introduced by commit 5f45bc50976ee1f408f7171af155aec646655a37. Signed-off-by: Magnus Damm Signed-off-by: Jeff Garzik commit 0ea9e179f436f153fc19fdaef7abbc1e0da20762 Author: Jeff Garzik Date: Fri Jul 13 17:06:45 2007 -0400 [libata] sata_mv: minor cleanups * trim trailing whitespace * document some flags, registers, and register bits * fix locking around EDMA on/off and configuration * continue replacing "constant OP var" with "var OP constant" * use new pci_try_set_mwi() Signed-off-by: Jeff Garzik commit 6c1153e00af8de755ec278d873a97c9ce2a72d10 Author: Jeff Garzik Date: Fri Jul 13 15:20:15 2007 -0400 [libata] sata_mv: Micro-optimization and cleanups * Micro-optimization in the EDMA interrupt handling code * s/EDMA_ERR_CRBQ_PAR/EDMA_ERR_CRQB_PAR/ * Document EDMA Error Interrupt Cause register bits Signed-off-by: Jeff Garzik commit 56386f6424f242cff46e2cfd7be44624cd37dce1 Author: Magnus Damm Date: Fri Jul 20 18:44:49 2007 +0900 sh: intc - add support for SH7750 and its variants This patch converts the cpu specific 7750 setup code to use the new intc controller. Many new vectors are added and multiple processor variants including 7091, 7750, 7750s, 7750r, 7751 and 7751r should all have the correct vectors hooked up. IRLM interrupts can be enabled using ipr_irq_enable_irlm() which now is marked as __init. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 53555eb758388fff3982875129ca96080caed147 Author: Jaroslav Kysela Date: Fri Jul 20 11:13:35 2007 +0200 [ALSA] version 1.0.14 Signed-off-by: Jaroslav Kysela commit 1f6268e982c7d35adee34d8f92a17644c7b3f78a Author: Jaroslav Kysela perex@suse.cz Date: Fri Jul 20 10:42:56 2007 +0200 [ALSA] remove duplicate Logitech Quickcam USB ID in usbquirks.h Signed-off-by: Jaroslav Kysela commit aafc03398baefaac380b34a1ee6356e7eed8e663 Author: Takashi Iwai Date: Tue May 29 18:01:06 2007 +0200 [ALSA] hda-codec - Fix input with STAC92xx The recent fix for STAC92xx surround outputs broke the input pin setting for shared line-in and mic jacks. This patch fixes the breakage. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit c54728d8aa59283ece86cb745e5085ece8b4eedb Author: Nicola Fagnani Date: Thu Jul 19 23:28:52 2007 +0200 [ALSA] hda-intel: support for iMac 24'' released on 09/2006 Basic audio support for the iMac 24'' model released on 09/2006, including headphone jack detection with automatic speaker muting. This iMac uses the Realtek ALC885 codec, not a Sigmatel one as in other models. Functionality has been tested for internal speakers, headphone and microphone. Signed-off-by: Nicola Fagnani Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit c5d9f1cdbf067b5500886c5171159e99657341ce Author: Claudio Matsuoka Date: Thu Jul 19 23:18:32 2007 +0200 [ALSA] hda-codec - Add quirk for Asus P5LD2 Without the proper model setting, the Asus P5LD2 rear outputs remain completely silent unlike other systems where the front speakers usually work. This patch adds the P5LD2 to the quirk table. Signed-off-by: Claudio Matsuoka Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 8632649b1c991aab883a8538e493c33e362d077a Author: James Courtier-Dutton Date: Fri May 18 20:35:50 2007 +0100 [ALSA] snd-ca0106: Add support for X-Fi Extreme Audio. This card is just a normal SB Live 24bit, but under a different marketing name. Signed-off-by: James Courtier-Dutton Signed-off-by: Jaroslav Kysela commit d9e8a552d486eff3281e58754d126500782dcd74 Author: James Courtier-Dutton Date: Sat Jul 14 10:24:49 2007 +0100 [ALSA] snd-emu10k1:Enable E-Mu 1616m notebook firmware loading. Signed-off-by: James Courtier-Dutton Signed-off-by: Jaroslav Kysela commit 3663d845e557989d09e856c1e9e708e80a976dd4 Author: James Courtier-Dutton Date: Sat Jul 14 02:18:26 2007 +0100 [ALSA] snd-emu10k1: Initial support for E-Mu 1616 and 1616m. Signed-off-by: James Courtier-Dutton Signed-off-by: Jaroslav Kysela commit 89f157d9e6bf08b65f93dcb1dca1de037079885f Author: Takashi Iwai Date: Thu Jul 19 11:23:21 2007 +0200 [ALSA] cs46xx - Fix PM resume Fixed PM resume of cs46xx devices. It now restores properly the DSP image and kick-off the DSP. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 87d483630a4bd5af2beb2155c7ae8c408729a1a6 Author: Matthew Ranostay Date: Tue Jul 17 11:52:24 2007 +0200 [ALSA] hda: Enable SPDIF in/out on some stac9205 boards Added support for some boards with SPDIF in/out, and cleaned up the GPIO enable function. Signed-off-by: Matthew Ranostay Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 7c64ec343a7d7b2d73b19e6bb8d9fd15f0462890 Author: Clemens Ladisch Date: Mon Jul 16 11:01:30 2007 +0200 [ALSA] timer: check for incorrect device state in non-debug compiles, too Convert the snd_assert()s to simple if()s to prevent crashes when one of the timer instance ioctls is called before the file is bound to a timer device. Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela commit c28054d4b31d78272f65c0d11db0796f50fb9569 Author: Yoann Padioleau Date: Sat Jul 14 00:33:15 2007 +0200 [ALSA] snd-aoa-codec-onyx: fix typo Parse error in ifdef or bad use of macro. Signed-off-by: Yoann Padioleau Signed-off-by: Andrew Morton Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit ef64adbbba1b215e8b523b50ef9d568b4bf2e1e3 Author: Claudio Matsuoka Date: Sat Jul 14 00:26:16 2007 +0200 [ALSA] hda-codec - Add quirks for HP dx2200/dx2250 HP dx2200 and dx2250 use Micro-Star International (MSI) motherboards (models MS-7254 and MS-7297 respectively) with an ALC862 codec in threestack configuration. Adding this quirk allows correct 5.1 sound output in these systems. Signed-off-by: Claudio Matsuoka Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 4723c022e1960abb5608b37ef61443da7d6296bb Author: Claudio Matsuoka Date: Fri Jul 13 14:36:19 2007 +0200 [ALSA] hda-codec - Rename HP model-specific quirks Rename ALC888_HP_NETTLE and ALC888_HP_LUCKNOW models to the more generic names ALC888_6ST_HP and ALC888_3ST_HP since HP seems to be consistent in the wiring of their 3stack and 6stack ALC888-based systems. Signed-off-by: Claudio Matsuoka Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit e87f97a3e842a816f30f087d5bfac68ef2afaef2 Author: Claudio Matsuoka Date: Fri Jul 13 11:51:32 2007 +0200 [ALSA] hda-codec - Add quirk for HP Samba This patch fixes 5.1 surround output for the HP Samba using the same quirk as the HP Lucknow. If HP machines are uniform in their wiring, we should rename ALC888_HP_NETTLE to ALC888_6ST_HP and ALC888_HP_LUCKNOW to ALC888_3ST_HP for generic HP 6stack and 3stack configurations. Signed-off-by: Claudio Matsuoka Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit e4f41da9e5f03e67ebe6067aad40c6a79443c3ae Author: Claudio Matsuoka Date: Fri Jul 13 11:51:06 2007 +0200 [ALSA] hda-codec - Add LG LW20 line-in capture source Add line-in to the list of LG LW20 capture sources. Also fix the LG LW pin assignment list comment. Signed-off-by: Claudio Matsuoka Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit cac19c3ba123369b7c1199e20bb01fb265004ff5 Author: Thibault Le Meur Date: Fri Jul 13 11:50:23 2007 +0200 [ALSA] usb-audio - Fix AC3 with M-Audio Audiophile USB Fixed AC3 interface in device_setup=0x00 mode thanks to Hakan Lennestal and updated documentation Signed-off-by: Thibault Le Meur Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 1b290a510c12be91b6a2f7d6a07ef61b8ee9f06a Author: Matthew Ranostay Date: Thu Jul 12 15:17:34 2007 +0200 [ALSA] hda: stac9202 mixer fix Added support for line out controls for STAC9202 cards, and fixed issue where master mixer control was being created twice for headphone and speaker outs. Signed-off-by: Matthew Ranostay Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 82fb159aa3d187aac0fce076739d7d8884e7a0af Author: Matt Reimer Date: Thu Jul 12 12:27:24 2007 +0200 [ALSA] Make s3c24xx_i2s_set_clkdiv() change the correct bits Make s3c24xx_i2s_set_clkdiv() change the correct bits. Signed-off-by: Matt Reimer Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit ef2ec0dd65bc542f9ab45ea2fac6920cb1afa13b Author: Claudio Matsuoka Date: Thu Jul 12 11:27:37 2007 +0200 [ALSA] hda-codec - Add LG LW20 si3054 modem id Signed-off-by: Claudio Matsuoka Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit f8c78b82b9e47d933629e7060e4a83a277b15ffe Author: Thibault Le Meur Date: Thu Jul 12 11:26:35 2007 +0200 [ALSA] usb-audio - Fix audiophile-USB quirk for little-endian Audiophile-usb fix (corrects little-endianness in 16bit modes, resets interfaces at device initialization, and updates the documentation). Signed-off-by: Thibault Le Meur Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit be38114a49853e441e694d690e631937de5fc524 Author: Claudio Matsuoka Date: Wed Jul 11 10:31:08 2007 +0200 [ALSA] hda-codec - Add VIA HDA to si3054 Add VIA HDA identification to use the HDA-based Motorola modem of the Clevo m540 laptop. Signed-off-by: Claudio Matsuoka Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 2dcd522f89d17936d08665c22ab0ee415b8c5d56 Author: Tobin Davis Date: Tue Jul 10 17:04:57 2007 +0200 [ALSA] HDA-Intel - Add support for MSI K9AGM2-FIH motherboard This patch adds support for the MSI K9AGM2-FIH on-board audio. Signed-off-by: Tobin Davis Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit cfc24ec89b488eeb5dfe4189761205fca38eb58e Author: Ritesh Raj Sarraf Date: Tue Jul 10 13:03:57 2007 +0200 [ALSA] USB ID for intergrated quickcam on dell xps m1210 This patch adds Logitech QuickCam USB ID for Dell's XPS M1210 notebooks. Signed-off-by: Ritesh Raj Sarraf Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 706568967c7d99a5975b2a21aacd791dc838ea8c Author: Adrian Bunk Date: Tue Jul 10 11:34:32 2007 +0200 [ALSA] fix SND_CS5530=y, ISA=n compilation This patch fixes the following compile error with CONFIG_SND_CS5530=y, CONFIG_ISA=n: <-- snip --> ... LD .tmp_vmlinux1 sound/built-in.o: In function 'snd_sb16_capture_trigger': sb16_main.c:(.text+0x212ad): undefined reference to 'snd_sbdsp_command' sb16_main.c:(.text+0x212cc): undefined reference to 'snd_sbdsp_command' sb16_main.c:(.text+0x212f7): undefined reference to 'snd_sbdsp_command' sound/built-in.o: In function 'snd_sb16_playback_trigger': sb16_main.c:(.text+0x2136d): undefined reference to 'snd_sbdsp_command' sb16_main.c:(.text+0x2138c): undefined reference to 'snd_sbdsp_command' ... <-- snip --> Signed-off-by: Adrian Bunk Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit f95474ec05106a2af46220fbf8624adc17fcb3e7 Author: Takashi Iwai Date: Tue Jul 10 00:47:43 2007 +0200 [ALSA] hda-codec - Fix default pin config of Abit AW9D-MAX Fix the default pin configuration of Abit AW9D-MAX. The board has a broken BIOS that doesn't set the correct pin default configs, which screws up the auto-configuration of snd-hda-intel driver. The patch enables the override of default pin config values. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 341d4eb0cffdcd5fbdbd696dc26671f91e7c418c Author: Takashi Iwai Date: Mon Jul 9 17:53:18 2007 +0200 [ALSA] hda-codec - Fix Toshiba A100 with ALC861 One of the newly added model entries causes a regression on Toshiba A100. It works fine with model=auto. So, let's deselect the entry again. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit c34532da91c208bd5567419984ea6a4bf60dad60 Author: George Shapovalov Date: Mon Jul 9 10:42:35 2007 +0200 [ALSA] usb-audio: another Logitech camera/microphone ID match From: George Shapovalov Another case of ALSA ticket #3040: we need an explicit USB ID match for another Logitech camera/microphone device. Signed-off-by: Daniel Drake Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit f167684a6454183d41588982ed26e4c6ee6feb48 Author: Takashi Iwai Date: Mon Jul 9 10:39:44 2007 +0200 [ALSA] usbaudio - Add quirk for Roland EXR series Added a quirk for Roland EXR series. Reported by Andre Coetzee. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit d20b9b20e5f3bb82a6f38583154cb2f163d465d7 Author: Takashi Iwai Date: Mon Jul 9 10:36:22 2007 +0200 [ALSA] aica - fix behaviour in poor resource conditions Fix behaviour in poor resource conditions. With this new patch, tidied with indent and with SNDRV_PCM_TRIGGER_STOP being used. Signed-off by: Adrian McMenamin Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 43bbb6ccc67775b432c31d5fd2e1050329ffdcbf Author: Takashi Iwai Date: Fri Jul 6 20:22:05 2007 +0200 [ALSA] hda-intel - Show the last command in warning messages Show the last issued command in warning messages when any communication error with CORB/RIRB occurs. Also, a bit code clean-up for composing the command value in *_send_cmd(). Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit a4eed138add1018846d17e813560b0c7c0ae8e01 Author: Takashi Iwai Date: Fri Jul 6 18:17:04 2007 +0200 [ALSA] hda-codec - Fix number of pin widgets with STAC codecs Use ARRAY_SIZE() to calculate the number of pin widgets for each codec chip. This also fixes a typo in STAC9205 code that gives a wrong number (14 instead of 12), which resulted in fatal communication errors. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 47a2327eac01fa944ab935fc5bb03c3032b2ec37 Author: Robert P. J. Day Date: Fri Jul 6 13:27:16 2007 +0200 [ALSA] Remove unreferenced header file include/sound/wavefront_fx.h Signed-off-by: Robert P. J. Day Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 1a7fa543cb5d8185d293a03842b33136d8dcc04c Author: Takashi Iwai Date: Fri Jul 6 12:27:25 2007 +0200 [ALSA] Fix substream to check in PCM drain The check of a substream in snd_pcm_drain() might not be always correct since runtime can point a different substream (although the PCM state of each linked substream should be same, in theory). This patch fixes it. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 940d244851f8a204b5aedae678d9ab96c20b2fec Author: Takashi Iwai Date: Fri Jul 6 12:24:55 2007 +0200 [ALSA] Add missing model entries for HD-audio codecs Added missing model entries for HD-audio codecs in the module option list. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 0f40502e0b5300a37c4cfc7bf93f84c2702dbbe9 Author: Takashi Iwai Date: Fri Jul 6 12:24:11 2007 +0200 [ALSA] hda-codec - Add missing model parameter strings for ALC262 Added the missing model option values for ALC262. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit cdb0e9a7af3ad34f3f879fda9251039c4cad3403 Author: Claudio Matsuoka Date: Fri Jul 6 12:11:22 2007 +0200 [ALSA] Update Claudio's CREDITS information Signed-off-by: Claudio Matsuoka Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 8341de60c76c400eaa453c91810ba6995d2fdb57 Author: Claudio Matsuoka Date: Fri Jul 6 12:10:45 2007 +0200 [ALSA] hda-codec - Add HP Lucknow 5.1 support Added HP Lucknow (ALC888) 5.1 surround support based on ALC883 6-channel threestack with changes in channel routing. Signed-off-by: Claudio Matsuoka Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit cd1e3b40429c172b29c04a9c777be2ca1ac012e0 Author: Claudio Matsuoka Date: Fri Jul 6 12:10:01 2007 +0200 [ALSA] hda-codec - Fix HP Nettle 5.1 output Fixed HP Nettle 6ch/8ch channel routing based on ALC883 sixstack and swapping rear and center/LFE in verbs and mixer settings. Signed-off-by: Claudio Matsuoka Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 1624cb9a35d4276c8ea0d939d580a6945ac72ac1 Author: Takashi Iwai Date: Thu Jul 5 13:10:51 2007 +0200 [ALSA] hda-codec - Fix the recording selection on VAIO laptop Fix the mismatch of init verb and capture mux with VAIO STAC9872. Also, changed the item names to be more intuitive. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 067b5a844c7b9703b0bdcd8cf003a621734c3bae Author: Kailang Yang Date: Thu Jul 5 12:35:15 2007 +0200 [ALSA] hda-codec - Fix ALC662 auto mode Fixed ALC662 auto mode, wrong NIDs were chosen. Signed-off-by: Kailang Yang Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 83c34218a867085f7108438408c8323b46dbfc4a Author: Kailang Yang Date: Thu Jul 5 11:43:05 2007 +0200 [ALSA] hda-codec - Some fixes for Realtek codec supports - Added BenQ T31-16 AMD Turion64x2 (ALC262) support - Added models for ASUS machines with ALC861 Signed-off-by: Kailang Yang Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 0a8c5da3c066a1e92a66a493e6fe04d5ce7a206d Author: Claudio Matsuoka Date: Wed Jul 4 15:17:38 2007 +0200 [ALSA] hda-codec - Fix 5.1 output in LG LW20 Implemented LG LW20 5.1 support based on ALC880 threestack modes. It was previously set to use one DAC and 2 jack modes, giving 2-channel output only. Analog CD playing support is still missing. Signed-off-by: Claudio Matsuoka Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 4210861964145617cf27b2b9c45860bff3e8290c Author: Paul Vojta Date: Wed Jul 4 10:35:29 2007 +0200 [ALSA] nm256 - Add mention of opl3sa2 to a diagnostic message Adds mention of opl3sa2 driver to a diagnostic message for NeoMagic nm256 driver. Signed-off-by: Paul Vojta Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 4700418cfc045296ee453342dc2fb142dc752aed Author: Paul Vojta Date: Wed Jul 4 10:34:22 2007 +0200 [ALSA] opl3sa2 - Add Neomagic MagicWave 3D ISA PnP ID Add Neomagic MagicWave 3D to list of supported devices for opl3sa2 driver. Signed-off-by: Paul Vojta Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 8f41b56645f03e6f50407211d6f0f0627ae95e4e Author: Claudio Matsuoka Date: Tue Jul 3 20:02:49 2007 +0200 [ALSA] hda-codec - Add support for HP Nettle Added the model for HP Nettle mobo with ALC883. From: Claudio Matsuoka Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 8481da5a8d009d9bbac3d1483b579940e6dd9d59 Author: Claudio Matsuoka Date: Tue Jul 3 20:05:19 2007 +0200 [ALSA] hda-codec - Add support for HP Spartan Added the model for HP Spartan with Conexant codec chip. From: Claudio Matsuoka Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 95093a23b9090025f8a6be0ac93859210fbba678 Author: Claudio Matsuoka Date: Tue Jul 3 20:07:39 2007 +0200 [ALSA] usb-audio - Add quirk for Roland Juno-G Added a quirk for Roland Juno-G. It's simply a copy of Fantom-X with the IDs changed. From: Claudio Matsuoka Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit c454fd4e888dc2b1423b6a65106a619e99a2deb4 Author: Masakazu Mokuno Date: Tue Jul 3 12:54:49 2007 +0200 [ALSA] Add PS3 sound driver The patch adds the support for the sound feature of PS3 - the digital output of HDMI and SPDIF optical, and the analog output of AV multi. Signed-off-by: Masakazu Mokuno Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 87823090a8bd373f34bdb6f1d5cdc5f2f4da4905 Author: Carlo Beccaria Date: Tue Jul 3 08:04:25 2007 +0200 [ALSA] usb-audio: add Roland SH-201 support Add quirks to detect the Roland SH-201. Signed-off-by: Carlo Beccaria Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela commit df802952b723cdb08f2f8a3cba396c357290850b Author: Takashi Iwai Date: Mon Jul 2 19:18:00 2007 +0200 [ALSA] hda-codec - Fix the error in DAC assignment of STAC codec The STAC codec support code has the automatic recognition of additional side-output pins, and this may result in an error when the assigned pin has no corresponding DAC connection. The patch fixes the problem -- it corrects the line_outs again without such additional pins. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit d10ad1a26da03fe089c02846a95fa5938c3ca3ce Author: Adrian Bunk Date: Mon Jul 2 16:03:12 2007 +0200 [ALSA] sound/pci/hda/patch_realtek.c: remove dead code This patch removes some dead code spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 3c2b576d58b4542b1adc56cbfb92dbfa5eef89ee Author: Randy Dunlap Date: Wed Jun 27 11:52:39 2007 +0200 [ALSA] portman2x4 section mismatch FIx section mismatch when CONFIG_HOTPLUG=n: WARNING: sound/built-in.o(.exit.text+0x271): Section mismatch: reference to .init.text:snd_p ortman_unregister_all (between 'snd_portman_module_exit' and 'alsa_mpu401_uart_exit') Signed-off-by: Randy Dunlap Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 076c0e4fd80a43f64710fe9aabdc4c463b7f8621 Author: Randy Dunlap Date: Tue Jun 26 11:43:52 2007 +0200 [ALSA] fix ensoniq section mismatch Fix ensoniq driver sections when HOTPLUG=n, but code is used during resume, so it cannot be discarded: WARNING: sound/pci/snd-ens1371.o(.text+0x5c0): Section mismatch: reference to .init.text: (between 'snd_ensoniq_chip_init' and 'snd_ensoniq_free') Signed-off-by: Randy Dunlap Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit f8f794ab27dd3c6d9965ec5434775ead23d3d7a2 Author: Tobin Davis Date: Mon Jun 25 12:14:25 2007 +0200 [ALSA] HDA - Change default configuration for Fujitsu Si3515 This patch changes the default configuration for the Fujitsu Siemens Si3515 Laptop to the correct model=laptop. Signed-off-by: Tobin Davis Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 6963f84c428ecd31780c97224004c2462b0664f7 Author: Mike Crash Date: Mon Jun 25 12:12:51 2007 +0200 [ALSA] hda: support for S/PDIF out on ASUS M2V Added support for S/PDIF digital output on ASUS M2V motheboard - added new model '3stack-660-digout' and ALC660VD_3ST_DIG Signed-off-by: Mike Crash Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit e65365de5ba280e058bd6b8b80c8790253268887 Author: Takashi Iwai Date: Mon Jun 25 12:09:32 2007 +0200 [ALSA] Fix invalid schedule_timeout_interruptible() Fixed the invalid use of schedule_timeout_interruptible() without checking pending signals. Simply replaced with schedule_timeout(). Suggestions thanks to Jeff Garzik. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit c12aad6efbee1d937438f1deabbef695add0628b Author: Randy Dunlap Date: Mon Jun 25 12:08:01 2007 +0200 [ALSA] more section mismatches Something about __init_or_module isn't working as expected (?). CONFIG_HOTPLUG=y CONFIG_MODULES=n Fix shared init/exit code helper: WARNING: sound/built-in.o(.exit.text+0x243): Section mismatch: reference to .init.text: (between 'alsa_card_mpu401_exit' and 'ac97_bus_exit') WARNING: sound/built-in.o(.exit.text+0x21b): Section mismatch: reference to .init.text: (between 'alsa_card_dummy_exit' and 'alsa_card_serial_exit') Signed-off-by: Randy Dunlap Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit bdec0c728256e1a3739820e244a5138bcfae5a91 Author: Randy Dunlap Date: Mon Jun 25 12:07:38 2007 +0200 [ALSA] fix section mismatch Fix shared init/exit function attributes: WARNING: sound/built-in.o(.exit.text+0x4a1): Section mismatch: reference to .init.text: (between 'alsa_card_virmidi_exit' and 'alsa_card_serial_exit') WARNING: sound/built-in.o(.exit.text+0x4c1): Section mismatch: reference to .init.text: (between 'alsa_card_serial_exit' and 'ac97_bus_exit') Signed-off-by: Randy Dunlap Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 0ac8551ea08e655fc6f35874803f091a17dacf90 Author: Takashi Iwai Date: Wed Jun 20 15:46:13 2007 +0200 [ALSA] hda-codec - Add AD1882 codec support Added AD1882 codec support. It has currently two models, 3stack and 6stack. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit e25c05f1d5cf4e332db88b15e9daa1cabd6e17e0 Author: Jonathan Phenix Date: Tue Jun 19 18:31:28 2007 +0200 [ALSA] hda-codec - Output MFG information for HDA devices This patch output information about the MFG (Modem Function Group) to the /proc/asound/card?/codec#? file. This information is important to identify if a HDA device has a modem or not. Signed-off-by: Jonathan Phenix Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 92a22beb756c53985e8ba98d39f2c8fc834557a4 Author: Matthew Ranostay Date: Tue Jun 19 16:48:28 2007 +0200 [ALSA] hda: add eapd support to additional idt codecs Added support for EAPD on the 927x, and 9227-8 IDT HDA codecs. Enabling EAPD powers the internal speaker amp otherwise there is no sound on systems with an internal amp. Signed-off-by: Matthew Ranostay Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 76c08828709129bdce6c6a325e0342ba73f2618f Author: Takashi Iwai Date: Tue Jun 19 12:17:42 2007 +0200 [ALSA] hda-codec - Add model dell for Dell XPS M1210 Added a new model 'dell' for Dell XPS M1210 with STAC922x codec chip. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit b69f3748400517d1023337b97456a0a1cdc74a79 Author: Tobin Davis Date: Tue Jun 19 12:13:32 2007 +0200 [ALSA] hda-codec - Add Fujitsu Siemens v3515 support to patch_conexant This patch adds support for the Fujitsu Seimens Amilo Pro v3515 notebook. Signed-off-by: Tobin Davis Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 2723f2a46823465f24b91cca0ace1e1389fe3507 Author: Graeme Gregory Date: Tue Jun 19 12:12:33 2007 +0200 [ALSA] ASoC S3C24xx machine drivers - lm4857-h missing patch Somewhere when dealing with the s3c24xx patches and requested changes I managed to miss this file on re-submission. Its a header file required for compilation of neo1973-wm8573.c and should be a no brainer. Signed-off-by: Graeme Gregory Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 8c87286fdcb67f796cc9477a9bc1a2f1e173d99f Author: Takashi Iwai Date: Tue Jun 19 12:11:16 2007 +0200 [ALSA] hda-codec - Fix ALC662 auto-configuration code The auto-configuration code didn't initialize the verbs correctly. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit a18519e1e4783628182743e6cca5f9dfa6a9e3bd Author: Takashi Iwai Date: Thu Jun 14 12:58:23 2007 +0200 [ALSA] hda-codec - Add model for Toshiba A135 Added model=lenovo for Toshiba A135 with ALC861VD codec. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit febe3375ea690a6cf544c33fa0fea1a06ff451ee Author: Tobin Davis Date: Tue Jun 12 11:27:46 2007 +0200 [ALSA] hda-codec - Add HP Pavillion quirk to Realtek code This patch adds the HP Pavillion a1589L desktop system to the ALC883 configuration table. Signed-off-by: Tobin Davis Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 1c3973240b94a48766b7bfe743a4fcaad4eab3eb Author: Andrew Morton Date: Mon Jun 11 12:23:31 2007 +0200 [ALSA] ali5451 warning fix sound/pci/ali5451/ali5451.c: In function 'snd_ali_prepare': sound/pci/ali5451/ali5451.c:716: warning: 'R2' may be used uninitialized in this function Signed-off-by: Andrew Morton Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 13d457094bc364e942884266036fd1b2ab74308b Author: Pavel Hofman Date: Mon Jun 11 12:21:20 2007 +0200 [ALSA] emu10k1 - EMU 1212 with 16 capture channels * adding 8 more 32-bit capture channels (total of 16) for emu1010 cards * adding some code comments and card details description Signed-off-by: Pavel Hofman Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 15cc4458c5c93bd5a616410815d5d165f0fe0900 Author: Peer Chen Date: Fri Jun 8 13:55:10 2007 +0200 [ALSA] Add the MCP73/77 support to hda_intel driver Add the MCP73/MCP77 support to hda driver. The patch base on kernel 2.6.22-rc4 Signed-off-by: Peer Chen Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit b959d1f83fc9cb707aef86ccb3f65e20f9572428 Author: Takashi Iwai Date: Fri Jun 8 12:25:25 2007 +0200 [ALSA] hda-codec - Fix Thinkpad X61/T61 outputs Enable EAPD bit on Thinkpad X61/T61. The recent model requires it explicitly to make any sounds. In future, it should be toggled automatically on demand. Also, added a beep volume/switch. Some people like it although I don't understand why :) Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit bc55197d5a19a58c63f826dbd326da70e97b88f8 Author: Manuel Lauss Date: Fri Jun 8 11:41:34 2007 +0200 [ALSA] soc/sh: let SND_SOC_PCM_SH7760 depend on SH_DMABRG Let SND_SOC_PCM_SH7760 depend on SH_DMABRG rather than select'ing it. Gets rid of the Kbuild warning about SH_DMABRG being undefined on non-sh builds. Signed-off-by: Manuel Lauss Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 6f3bf657edf9c592cf9d92e07ab385bb0ede48c5 Author: Daniel T Chen Date: Fri Jun 8 11:39:35 2007 +0200 [ALSA] hda-codec - Add quirk for another MSI laptop to alc883_cfg_tbl[] This hg commit adds the SSID of another MSI laptop to the alc883_cfg_tbl[] quirk list. Verified in #alsa/Freenode on Thu, Jun 7, 2007. Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 35739bb179386cf52c13d0779a42ecfe18dedf7e Author: Dave Jones Date: Wed Jun 6 14:48:52 2007 +0200 [ALSA] Yet another Uniwill laptop with ALC861 codec From: Dave Jones Rediffed version of the patch from .. http://bugzilla.kernel.org/show_bug.cgi?id=8016 that seems to be lingering for some time. Original patch by: Andy Shevchenko Signed-off-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit a361d84bfcd938208dea6c84aa19994b3d69e15d Author: Kailang Yang Date: Tue Jun 5 12:30:55 2007 +0200 [ALSA] hda-codec - Add support of ALC268 codec Added the support of new ALC268 codec chip. Signed-off-by: Kailang Yang Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 7d87de2db2213e6e9413532445b14c92dae42c85 Author: Kailang Yang Date: Tue Jun 5 12:17:21 2007 +0200 [ALSA] hda-codec - Add proper model for HP xw series Set the proper model for HP xw4550, xw4600, xw6600 and xw8600. Signed-off-by: Kailang Yang Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 538c49c41bf5a0a739ad2a5417ec25e060ee9d9e Author: Takashi Iwai Date: Tue Jun 5 12:13:34 2007 +0200 [ALSA] hda-codec - Fix AD1984 basic model Fix the amp direction of digital mic capture volume mixer, which resulted in -EINVAL. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 1919de0a9e939ef4f9453ef1630ca1345991e144 Author: Alan Horstmann Date: Mon Jun 4 23:11:23 2007 +0200 [ALSA] More description on duplex streams with OSS emulation Add paragraph to the OSS document to clarify correct use of duplex streams. Signed-off-by: Alan Horstmann Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 3b194401a31b8df9a07a1850e3fe44fc7ba832a4 Author: Takashi Iwai Date: Mon Jun 4 18:32:23 2007 +0200 [ALSA] hda-codec - Fix Oops with AD1984 thinkpad model Fixed Oops with AD1984 thinkpad model. Also fixed the wrong init verbs for NID 0x03 and 0x04, which have apparently no mute bit. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 304e3bb7a15d839cef64b24a1bcc1230b2ae6fa6 Author: Takashi Iwai Date: Wed May 30 12:46:21 2007 +0200 [ALSA] rme9652 - Fix the hw_pointer check The negative check in hw_pointer callback doesn't work because the value is unsigned. Cast to int in the comparison to fix this. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit ba8c3c37db0d6bf5e6de25016975ebfb558d2aba Author: Takashi Iwai Date: Wed May 30 12:42:31 2007 +0200 [ALSA] ali5451 - Fix invalid type of codec->irq field The irq field of struct snd_ali shouldn't be unsigned since it's uninitialized value is -1. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 807a463603a2e014f36e88317aa5e07c15887fcd Author: Takashi Iwai Date: Tue May 29 19:01:37 2007 +0200 [ALSA] hda-codec - Fix STAC922x capture boost level STAC922x provides the capture boost level up to 4, but actually it works only up to 2. Since the range of the mixer is automatically defined from amp-capability bits, we need to override the value beforehand. snd_hda_override_amp_caps() is introduced for this purpose. The function patch_stac922x() calls this for NID 0x12 (Mux Capture Volume). This should fix another recording problem on Intel Macs. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 5d5d3bc3eddf2ad97b2cb090b92580e7fed6cee1 Author: Ivan N. Zlatev Date: Tue May 29 16:03:00 2007 +0200 [ALSA] hda-codec - Fix pin configs for Intel Macs * adds the pinconfigs for all 5 Apple boards and 14 Subsystem IDs (support for possibly all iMac, Mac, MacMini etc etc) * adds 'intel-mac-v1' to v5 models which replace the current * reflects changes in Alsa-Configuration.txt Signed-off-by: Ivan N. Zlatev Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 65ff2357a7e40bf4b42858516861c3d0e19f512b Author: Ash Willis Date: Tue May 29 14:34:17 2007 +0200 [ALSA] Disable debugging output for the ALS300 driver Disables debugging output in the ALS300 driver. Also contains a whitespace cleanup and a fix for a potential bug. Signed-off-by: Ash Willis Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit dda369cf2022fb767b158c4ba2fe2f1ca1fba29c Author: Takashi Iwai Date: Fri May 25 11:50:33 2007 +0200 [ALSA] Fix SB-module dependency with PCI drivers A few PCI drivers like ALS4000 and CS5530 require the SB16-codes. This patch fixes / improves the dependency between SB modules and PCI drivers. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 621887aee9c7b4b613c12b82b83df7e56877f303 Author: Takashi Iwai Date: Thu May 24 18:46:54 2007 +0200 [ALSA] Add support for Cyrix/NatSemi Geode CS5530 (VSA1) Add support for Cyrix/NatSemi Geode SC5530 (VSA1). The driver is snd-cs5530. Signed-off-by Ash Willis Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 0ba7962b9f06c02dd1af93002e8d757805d16758 Author: Takashi Iwai Date: Wed May 23 16:27:32 2007 +0200 [ALSA] hda-codec - Fix wrong mixer controls for AD1984 thinkpad model Fixed the wrong mixer controls for AD1984 thinkpad model. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 0dae0f83cd9956d0959f6d6de9f5391da6483274 Author: Takashi Iwai Date: Mon May 21 12:41:29 2007 +0200 [ALSA] hda-codec - Add support of newer version of Intel iMac Added the pin configs for newer version of Intel iMac. The information provided by Ivan N. Zlatev . Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit ea7cfcdfe6439cd98816da9d339a6bc9032d2084 Author: Pavel Hofman Date: Sat May 19 17:21:04 2007 +0200 [ALSA] ice1724 - Add PCM Playback Switch to Revo 7.1 This patch adds the support of mute for front channels of M-Audio Revolution 7.1 (the DAC AK4381 features a mute bit). Signed-off-by: Pavel Hofman Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 959047431a9e65f6ae25705e77a8e460a1aa04c0 Author: Takashi Iwai Date: Sat May 19 17:06:42 2007 +0200 [ALSA] Add description about probe_mask option for snd-hda-intel Added a brief description about probe_mask option for snd-hda-intel. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 2bac647c45ed9b397ace9109e6935c1364690f8a Author: Takashi Iwai Date: Fri May 18 18:21:41 2007 +0200 [ALSA] hda-codec - Add AD1884 / AD1984 codec support Added the support of AD1884 and AD1984 codec chips. Also experimental quirks for Thinkpad T61/X61 laptops with AD1984. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 198de43d758ca2700e2b52b49c0b189b4931466c Author: Adrian McMenamin Date: Fri May 18 14:26:59 2007 +0200 [ALSA] Add ALSA support for the SEGA Dreamcast PCM device ALSA support for the SEGA Dreamcast Yamaha AICA sound device (pcm) This patch adds ALSA sound support for pcm playback on two channels on the SEGA Dreamcast built-in sound device (the Yamaha AICA) Add driver for the AICA sound device built into the SEGA Dreamcast Hook it all up with the build system. Signed-off-by: Adrian McMenamin Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit aef3b06ac69783d6a6d1e4357c62bab46dd16141 Author: Manuel Lauss Date: Mon May 14 18:40:07 2007 +0200 [ALSA] SH7760 ASoC support ALSA ASoC support for SH7760 This patch adds ALSA ASoC drivers for the Audio interfaces of the SH7760 SoC: Add driver for the SH7760 DMA engine (dmabrg) Add AC97 driver for HAC unit(s) found on SH7760/SH7780 Add I2S driver for SSI unit(s) found on SH7760/SH7780 Add a generic SH7760-AC97 machine driver. Hook it all up with the build system. Signed-off-by: Manuel Lauss Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 80ab1c0e9ea90467e34dd3187b1d8162e8be314b Author: Graeme Gregory Date: Mon May 14 11:06:11 2007 +0200 [ALSA] ASoC S3C24xx machine drivers - Kconfig This patch adds Kconfig and build support for the Neo1973, SMDK2443 and S3C2443 AC97 ALSA audio drivers. Signed-off-by: Graeme Gregory Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 7a05f067c0da139613cbe74583bb7d208a5f87b9 Author: Liam Girdwood Date: Mon May 14 11:05:09 2007 +0200 [ALSA] ASoC S3C24xx machine drivers - I2C ID for LM4857 This patch adds I2C ID for the LM4857 audio amp and corrects the spacing of the WM8731, WM8750 and WM8753 ID's. Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 438b76ad816ef7d8e523d7b10d113eeb0b9932b2 Author: Graeme Gregory Date: Mon May 14 11:04:34 2007 +0200 [ALSA] ASoC S3C24xx machine drivers - SMDK 2443 This patch adds ALSA support for the SMDK2443 reference board. Signed-off-by: Graeme Gregory Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 74930bb6db56bcc9899723c6c79fe681524e5b62 Author: Graeme Gregory Date: Mon May 14 11:03:52 2007 +0200 [ALSA] ASoC S3C24xx machine drivers - Openmoko Neo1973 This patch adds ALSA support for the Openmoko Neo1973 phone. Features:- * HiFi Playback and capture. * Phone calls supported. * Support for BT PCM in WM8753 voice interface. * Support for LM4857 audio amp. Signed-off-by: Graeme Gregory Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 050f05eaec1c7c5434c78d010ada3cfeb7d0b3b3 Author: Graeme Gregory Date: Mon May 14 11:02:51 2007 +0200 [ALSA] ASoC S3C24xx machine drivers - s3c2443-AC97 This patch adds AC97 support to the Samsung S3C2443 CPU. Signed-off-by: Graeme Gregory Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit c111b8de975a357ff58e73047e9af48afacf2347 Author: Richard Knutsson Date: Mon May 14 10:38:57 2007 +0200 [ALSA] usbusx2yaudio: kfree(NULL) is valid if (!x) kfree(x); is not needed since kfree(NULL) is valid. Signed-off-by: Richard Knutsson Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 500bec3d2ba4787e6ab110d159b2926093c27304 Author: Daniel Drake Date: Thu May 10 08:52:19 2007 +0200 [ALSA] usb-audio: another Logitech QuickCam ID This patch adds the ID for another quickcam microphone, reported by freqmod on ALSA ticket #0003040 I'm going to submit a USB patch separately to provide a macro to simplify these entries, as suggested by Alan Stern. We could switch to using that in future. Signed-off-by: Daniel Drake Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela commit 101f6f4ba7109aafd7b3f2eafd7124f854dda451 Author: Takashi Iwai Date: Wed Jun 20 12:03:09 2007 +0200 [ALSA] Fix unfreed pnp driver in opti9xx ISA driver - Added the missing pnp_unregister_card_driver() in the case ISA PnP isn't found, which caused an error at kobject_add with -EEXIST Jun 11 09:07:31 rain kernel: kobject_add failed for opti9xx with -EEXIST, don't try to register things with the same name in the same directory. Jun 11 09:07:31 rain kernel: [] kobject_shadow_add+0x12a/0x1c0 Jun 11 09:07:31 rain kernel: [] kobject_register+0x21/0x50 Jun 11 09:07:31 rain kernel: [] bus_add_driver+0x72/0x1b0 Jun 11 09:07:31 rain kernel: [] pnp_register_card_driver+0x4f/0xc0 Jun 11 09:07:31 rain kernel: [] alsa_card_opti9xx_init+0xa/0x25 [snd_opti92x_ad1848] Jun 11 09:07:31 rain kernel: [] sys_init_module+0x157/0x1610 Jun 11 09:07:31 rain kernel: [] syscall_call+0x7/0xb - Fixed the probe behavior when no PnP is set up. Now it behaves like the former version. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 26c671c6b7c02bc9f9c42331e6ecbeccdf67164c Author: Uwe Kleine-König Date: Thu Jul 19 22:13:05 2007 +0100 [ARM] 4493/1: ns9xxx: disable a non-reloading timer before ack'ing its irq The HRM states that is must be done this way ... Signed-off-by: Uwe Kleine-König Signed-off-by: Russell King commit 3945a567d0c1d6721994a88f58f028c27d8249d2 Author: Uwe Kleine-König Date: Tue Jul 17 22:36:09 2007 +0100 [ARM] 4487/1: ns9xxx: complete definition of GPIO related registers I changed the naming to be more obvious---unfortunately the HRM doesn't specify these. Moreover the numbering is changed to be zero indexed as this is more natural. Adjust all callers. Signed-off-by: Uwe Kleine-König Signed-off-by: Russell King commit f4ae6413f4d4889c8bf3fb90939d967ced65ece7 Author: Uwe Kleine-König Date: Tue Jul 17 22:35:52 2007 +0100 [ARM] 4486/1: ns9xxx: fix a typo in the register definitions. Fixed all users. Signed-off-by: Uwe Kleine-König Signed-off-by: Russell King commit cebfaf5f1c4dcf9456463c8411ae869f3c03619f Author: Uwe Kleine-König Date: Tue Jul 17 22:35:34 2007 +0100 [ARM] 4485/1: ns9xxx: pass the correct irq number to the interrupt handlers Signed-off-by: Uwe Kleine-König Signed-off-by: Russell King commit 70ca7d55e1e10a5b654295b04dc8854e245a352f Author: Uwe Kleine-König Date: Tue Jul 17 22:35:14 2007 +0100 [ARM] 4484/1: ns9xxx: fix definition of SYS_TCx_TEN_DIS Signed-off-by: Uwe Kleine-König Signed-off-by: Russell King commit aa4db079f7c4cf389fc25f78b943589b4a6401de Author: Uwe Kleine-König Date: Tue Jul 17 22:34:28 2007 +0100 [ARM] 4483/1: ns9xxx: fix three sparse warnings: symbol 'xyz' was not declared. make ns9xxx_ack_irq_functions static and add one include to get declarations for ns9xxx_map_io and ns9xxx_init_machine. Signed-off-by: Uwe Kleine-König Signed-off-by: Russell King commit 3f20246bb67594acae5a82a8b859f21579b0ff07 Author: Uwe Kleine-König Date: Tue Jul 17 22:33:18 2007 +0100 [ARM] 4482/1: ns9xxx: fix compilation for mach-type CC9P9360JS I must have written the patch introducing support for this machine deep in the night... Signed-off-by: Uwe Kleine-König Signed-off-by: Russell King commit e09d02e123fb6944af23a0697369ebcfc15acf73 Author: Eric Miao Date: Tue Jul 17 10:45:58 2007 +0100 [ARM] 4480/1: pxa: change the pxa device naming scheme 1. for common devices across all the pxa variants, the names are changed to be: "pxa_device_xxx" 2. for pxa25x or pxa27x specific devices, the names are changed to be: "pxa25x_device_xxx", or "pxa27x_device_xxx" Signed-off-by: eric miao Signed-off-by: Russell King commit 4b300c362d690c8e0788f69ed91c22a0a76f7ce2 Author: Sascha Hauer Date: Tue Jul 17 13:35:46 2007 +0100 [ARM] 4481/1: Fix a bug when i.MX is compiled as a module Fix the unregistration order in the i.MX serial driver Signed-off-by: Sreekrishnan Venkateswaran Acked-by: Sascha Hauer Signed-off-by: Russell King commit 5c9b9123b35e28dd7cb3012f3f8d4ea13a30631c Author: Tim Harvey Date: Sat Jul 14 11:15:05 2007 +0200 [ARM] ixp4xx: fix IRQ GPIO direction configuration for GPIOs >= 8 I believe that the following patch is necessary to properly configure GPIO line configuration for IRQ's which are mapped to a GPIO line >= 8 (without this patch the wrong GPIO is configured as an input.) Signed-off-by: Tim Harvey Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 3be20cad15107adc423ac812ac7b3330ca195c74 Author: Russell King Date: Sun Jul 15 12:21:37 2007 +0100 [ARM] ks8695: no need to include linux/ptrace.h arch/arm/mach-ks8695/irq.c doesn't need to include linux/ptrace.h so remove it. Signed-off-by: Russell King commit fad9e7d95769ff6c0918b79d58a7ba03615c3ff9 Author: Paul Mundt Date: Fri Jul 20 17:46:42 2007 +0900 sh64: Flag sh64_get_page() as __init_refok. sh64_get_page() wraps in to regular allocators as well as the bootmem allocator for fetching pages, it carefully checks to see which one it can use depending on the system state, so the access is safe. Signed-off-by: Paul Mundt commit 56982002a359533d471834f4398e3002aeb6fbbc Author: Paul Mundt Date: Fri Jul 20 17:45:05 2007 +0900 sh64: Move entry point code to .text.head. Follow the sh and m68k changes to silence the modpost warnings. Signed-off-by: Paul Mundt commit ed54fcfd785e8fecfbd8b129466235fc4ab0a402 Author: Andrew Victor Date: Mon Jul 16 11:55:42 2007 +0100 [ARM] 4479/1: AT91: Define new MMC register bits Add definitions for RDPROOF, WRPROOF and PDCFBYTE bits of the Mode Register in the updated MMC controller found on the AT91SAM9260 and AT91SAM9263 processors. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit c06911c00b2af93e498ba45200ad903929e71529 Author: Andrew Victor Date: Mon Jul 16 11:35:40 2007 +0100 [ARM] 4478/1: AT91: Convert AT91RM9200 to use atmel_spi driver Convert the AT91RM9200 platform-setup code to use the new atmel_spi driver (and manually-driven chip-selects), instead of the legacy AT91-only SPI stack. The AT91SAM9 processors are already using the atmel_spi driver. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 339547bf5de1212c9c7b89b0e0d69620709729d2 Author: Paul Mundt Date: Fri Jul 20 17:40:03 2007 +0900 sh: Move entry point code to .text.head. Follow Al Viro's m68k change from l-k: i.e. tell modpost that entry point code (that has to be outside of .init.text for external reasons) is OK to refer to .init.* Shuts up some section mismatch warnings from modpost. Signed-off-by: Paul Mundt commit 6a4d0287c7418b24dd776d8977edff2bfa706539 Author: Kristoffer Ericson Date: Sat Jul 7 17:45:10 2007 +0100 [ARM] 4459/1: Changing email in MAINTAINERS file Updating email adress in MAINTAINER file. Signed-off-by: Kristoffer Ericson Signed-off-by: Russell King commit 228adef16d6e7b7725ef6b9ba760810d5966afa5 Author: Russell King Date: Wed Jul 18 09:37:10 2007 +0100 [ARM] vfp: make fpexc bit names less verbose Use the fpexc abbreviated names instead of long verbose names for fpexc bits. Signed-off-by: Russell King commit 21d1ca04532005c50ed57c2b2948e465b2e90720 Author: Russell King Date: Sun Jul 15 14:52:16 2007 +0100 [ARM] avoid floppy warnings by using fd_dma_setup() Avoid the virt_to_bus()/bus_to_virt() warnings in floppy.c caused by the (useless) double conversion to/from bus addresses. Signed-off-by: Russell King commit 1ad2cdbd0eaf0ddb3f634d10d01a2710b00b2051 Author: Russell King Date: Sun Jul 15 13:01:59 2007 +0100 [ARM] remove asm/ptrace.h from asm/thread_info.h asm/thread_info.h doesn't need asm/ptrace.h, remove it. Signed-off-by: Russell King commit 07ed31319422e82d50dfae7aebf88514d258b8f3 Author: Russell King Date: Sun Jul 15 12:51:41 2007 +0100 [ARM] rpc: silence two section mismatch warnings WARNING: drivers/built-in.o(.text+0x3fd54): Section mismatch: reference to .init.data: (between 'ether3_probe' and 'ether1_setmulticastlist') WARNING: drivers/built-in.o(.text+0x40380): Section mismatch: reference to .init.data: (between 'ether1_probe' and 'ether1_interrupt') Signed-off-by: Russell King commit 40c3a578a76ce0b20d1716e03b5a4b407ca9ca51 Author: Russell King Date: Sun Jul 15 12:48:57 2007 +0100 [ARM] shut up "warning: "__IGNORE_sync_file_range" redefined" Signed-off-by: Russell King commit 6accc0575c6b2105bf9b00bfc8cfee2cead3df6d Author: Russell King Date: Sun Jul 15 12:33:16 2007 +0100 [ARM] rpc: remove linux/ptrace.h from ARM ether?.c drivers Signed-off-by: Russell King commit 70c14ff0e9f5e1f5456587b827620e636ba70a09 Author: Dan Williams Date: Fri Jul 20 02:07:26 2007 +0100 [ARM] 4495/1: iop: combined watchdog timer driver for iop3xx and iop13xx In order for this driver to be shared across the iop architectures the iop3xx and iop13xx header files are modified to present a common interface for the iop_wdt driver. Details: * iop13xx supports disabling the timer while iop3xx does not. This requires a few 'compatibility' definitions in include/asm-arm/hardware/iop3xx.h to preclude adding #ifdef CONFIG_ARCH_IOP13XX blocks to the driver code. * The heartbeat interval is derived from the internal bus clock rate, so this this patch also exports the tick rate to the iop_wdt driver. Cc: Curt Bruns Cc: Peter Milne Signed-off-by: Dan Williams Acked-by: Wim Van Sebroeck Signed-off-by: Russell King commit bf73af2314702fcf44fb2a098244e3927f459531 Author: Paul Mundt Date: Fri Jul 20 17:35:42 2007 +0900 sh: heartbeat: Shut up resource size warning. Signed-off-by: Paul Mundt commit 7dea1b20066cd30fb54da7e686b16b5e38b46b2d Author: Dan Williams Date: Fri Jul 20 02:07:31 2007 +0100 [ARM] 4494/1: iop13xx: fix up elf_hwcap compile breakage arch/arm/boot/compressed/misc.o: In function `valid_user_regs': misc.c:(.text+0x74): undefined reference to `elf_hwcap' This triggers after the various elf_hwcap cleanups in: f884b1cf578e079f01682514ae1ae64c74586602 d1cbbd6b413510c6512f4f80ffd48db1a8dd554a include/asm-arm/arch-iop13xx/uncompress.h calls cpu_relax while spinning on a register value. cpu_relax requires processor.h->ptrace.h->hwcap.h 'elf_hwcap' is defined as an extern, but since the uncompressor does not link against arch/arm/kernel/setup.c 'elf_hwcap' remains undefined. Fix is to open code the cpu_relax() call as barrier(). Cc: Lennert Buytenhek Cc: Catalin Marinas Signed-off-by: Dan Williams Signed-off-by: Russell King commit a8135fcfd0431eda3653c7069e7aefc8674fdfbe Author: Arnaud Patard Date: Sun Jul 15 20:12:23 2007 +0100 [ARM] 4476/1: EM7210/SS4000E support This patch adds the basic support for the em7210 board. It is similar to the iq31244 board and can be found on Intel "Baxter Creek" ss4000e nas. Signed-off-by: Arnaud Patard Signed-off-by: Russell King commit ee54505199ad0d5819c613a68746d425a08fdc8f Author: Magnus Damm Date: Fri Jul 20 17:25:48 2007 +0900 sh: update r2d defconfig and fix SH7751R pci compliation This patch updates the r2d board support in a few ways: - CPU_SUBTYPE_SH7751R is selected in the defconfig to play well with the r2d board Kconfig entry. Without this the defconfig results in no board enabled. - Enable EARLY_PRINTK. - Enable SH_STANDARD_BIOS - this works well for early printk on the r2d board. - Add "earlyprink=bios" to the cmdline for early serial port output by default. - CONFIG_SUBTYPE_SH7751R support is added to the sh-specific pci makefile. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 8350163a90f6003c9e60e8ebc0e00f654657645f Author: Alexey Dobriyan Date: Fri Jul 20 10:07:50 2007 +0200 cfq: Write-only stuff in CFQ data structures There are some leftover bits from the task cooperator patch, that was yanked out again. While it will get reintroduced, no point in having this write-only stuff in the tree. So yank it. Signed-off-by: Jens Axboe commit c2dea2d1fdbce86942dba0a968c523d8b7858bb5 Author: Vasily Tarasov Date: Fri Jul 20 10:06:38 2007 +0200 cfq: async queue allocation per priority If we have two processes with different ioprio_class, but the same ioprio_data, their async requests will fall into the same queue. I guess such behavior is not expected, because it's not right to put real-time requests and best-effort requests in the same queue. The attached patch fixes the problem by introducing additional *cfqq fields on cfqd, pointing to per-(class,priority) async queues. Signed-off-by: Jens Axboe commit 98d877c487a75af78f74780703aa6b174780788d Author: Paul Mundt Date: Fri Jul 20 16:59:49 2007 +0900 sh: Many symbol exports for nommu allmodconfig. allmodconfig generates a lot of interesting code, a lot of the generated symbols we've never exported before, so this fixes those up. Verified with both GCC3 and GCC4 toolchains. Signed-off-by: Paul Mundt commit 3a353824df7595165a162aee3b53e4d96e7dfa95 Author: Magnus Damm Date: Fri Jul 20 16:34:22 2007 +0900 sh: zero terminate 8250 platform data for r2d board struct plat_serial8250_port should contain a terminating zero entry Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 6894e0a94350e8ba5c5c8342e916fde14df5fb43 Author: Paul Mundt Date: Fri Jul 20 16:03:02 2007 +0900 sh: cpufreq: Fix up the build for SH-2. Signed-off-by: Paul Mundt commit fc10020292c7a21d1c85a215fa266d4c7cf0f4eb Author: Paul Mundt Date: Fri Jul 20 14:24:57 2007 +0900 sh: Make on-chip DMA channel selection explicit. Currently this has a prompt to allow users to change it. There's no reason to do this, and it has caused breakage and confusion in the past, so remove it entirely. We'll get rid of this when the whole driver is tidied for the driver model. Signed-off-by: Paul Mundt commit 3e7678333a2b3bd89e3669535faa18d53a8fa054 Author: Paul Mundt Date: Fri Jul 20 14:23:04 2007 +0900 sh: Fix up CPU dependencies for on-chip DMAC. We only handle SH-3 and SH-4 at present, don't expose it to the other CPUs. Signed-off-by: Paul Mundt commit 78d00125398f18f7354e759ba7cd544a6b07f504 Author: David S. Miller Date: Thu Jul 19 21:50:09 2007 -0700 [SPARC64]: Fix two year old bug in early bootup asm. We try to fetch the CIF entry pointer from %o4, but that can get clobbered by the early OBP calls. It is saved in %l7 already, so actually this "mov %o4, %l7" can just be completely removed with no other changes. Signed-off-by: David S. Miller commit cb5ec75b8b0410bba4ae612d13a2f26e938bc49c Author: Paul Mundt Date: Fri Jul 20 13:38:19 2007 +0900 sh: cpufreq: clock framework support. This gets the SH cpufreq working again. We follow the changes in the AVR32 implementation for wrapping in to the clock framework. CPUs that wish to use this are required to define rate rounding primitives in order to satisfy clk_round_rate(). This works well enough for the common case, though we should look at unifying this driver across all of the platforms that implement clock framework support in one capacity or another. Signed-off-by: Paul Mundt commit cbc5a069373264dec320e887835390132c69b951 Author: David S. Miller Date: Thu Jul 19 21:30:56 2007 -0700 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller commit fe04d7798f611bca333df27d44484bdd62eef53f Author: Paul Mundt Date: Fri Jul 20 13:30:07 2007 +0900 sh: Support rate rounding for SH7722 FRQCR clocks. Now that the round_rate() op is supported, hook it up on SH7722 for the FRQCR (CPU, PCLK, etc.) clocks. Signed-off-by: Paul Mundt commit 5a6eb676d3bc4d7a6feab200a92437b62ad298da Author: Soeren Sonnenburg Date: Fri Jul 20 00:29:32 2007 -0400 Input: appletouch - improve powersaving for Geyser3 devices The appletouch geyser3 devices found in the Intel Macs (and possibly some later PPC ones?) send a constant stream of packets after the first touch. This results in the kernel waking up around once every couple of milliseconds to process them, making it almost impossible to spend any significant amount of time in C3 state on a dynamic HZ kernel. Sending the mode initialization code makes the device shut up until it's touched again. This patch does so after receiving 10 packets with no interesting content. Signed-off-by: Soeren Sonnenburg Signed-off-by: Matthew Garrett Signed-off-by: Dmitry Torokhov commit e6b20d8d62d87451f41365945b27202d7dadaee6 Author: Dmitry Torokhov Date: Fri Jul 20 00:29:14 2007 -0400 Input: lifebook - fix an oops on Panasonic CF-18 Signed-off-by: Dmitry Torokhov commit f6991b0456416186b578d38717efcda2b012b79c Author: Paul Mundt Date: Fri Jul 20 13:29:09 2007 +0900 sh: Implement clk_round_rate() in the clock framework. This is an optional component of the clock framework. However, as we're going to be using this in the cpufreq drivers, add support for it to the framework. Signed-off-by: Paul Mundt commit 74121b699c7142cbf11b01212512a1824fbd5f19 Author: Fabio Massimo Di Nitto Date: Thu Jul 19 14:00:55 2007 -0700 [SPARC64]: Fix log message type in vio_create_one(). Signed-off-by: David S. Miller commit 5f7426c0e16dba118aa1b18f3c97c3d7adfb7540 Author: David S. Miller Date: Wed Jul 18 23:16:51 2007 -0700 [SPARC64]: Tweak assertions in sun4v_build_virq(). They are too strict. Signed-off-by: David S. Miller commit 2a26302164e0d26df94810ffa2eabcad0fc55c95 Author: David S. Miller Date: Wed Jul 18 21:18:50 2007 -0700 [SPARC64]: Tweak kernel log messages in power_probe(). Use KERN_INFO, add missing newline, etc. Signed-off-by: David S. Miller commit 91ba3c2128e9ee490a9f04bcd5b54749b18e4410 Author: David S. Miller Date: Wed Jul 18 15:15:45 2007 -0700 [SPARC64]: Fix handling of multiple vdc-port nodes. The "id" property in vdc-port nodes are not unique, they are all zero. Therefore assign ID's using the parent's "cfg-handle" property which will be unique. Signed-off-by: David S. Miller commit 48db7b7c50cdb06c85f0ff01b5c19ac34903048b Author: Fabio Massimo Di Nitto Date: Wed Jul 18 14:37:26 2007 -0700 [SPARC64]: Fix device type matching in VIO's devspec_show(). with the recent renames, we forgot to update the matches for devspec. This is required to keep udev working and autoload modules. Signed-off-by: David S. Miller commit da68e0814a83649f7063c33562f535b60396b566 Author: Fabio Massimo Di Nitto Date: Wed Jul 18 14:35:23 2007 -0700 [SPARC64]: Fix MODULE_DEVICE_TABLE() specification in VDC and VNET. Signed-off-by: David S. Miller commit bc5a2e64a185c4759a540becac34651443b2d2ab Author: David S. Miller Date: Wed Jul 18 14:28:59 2007 -0700 [SPARC]: Add sys_fallocate() entries. Signed-off-by: David S. Miller commit a376178011c9db0b704bb1f9b4719d873847362e Author: David S. Miller Date: Wed Jul 18 13:12:45 2007 -0700 [SPARC64]: Use orderly_poweroff(). Signed-off-by: David S. Miller commit 3f23de10f283819bcdc0d2282e8b5b14c2e96d3b Author: Stephen Rothwell Date: Thu May 3 02:38:57 2007 +1000 Create drivers/of/platform.c and populate it with the common parts from PowerPC and Sparc[64]. Signed-off-by: Stephen Rothwell Acked-by: Paul Mackerras Acked-by: David S. Miller commit b41912ca345e6de8ec8469d57cd585881271e2b9 Author: Stephen Rothwell Date: Tue May 1 16:12:57 2007 +1000 Create linux/of_platorm.h Move common stuff from asm-powerpc/of_platform.h to here and move the common bits from asm-sparc*/of_device.h here as well. Create asm-sparc*/of_platform.h and move appropriate parts of of_device.h to them. Signed-off-by: Stephen Rothwell Acked-by: Paul Mackerras Acked-by: David S. Miller commit 37b7754aab9a6ad7ecbba45c87f8d8a1f81b3bcc Author: Stephen Rothwell Date: Mon Apr 30 17:43:56 2007 +1000 [SPARC/64] Rename some functions like PowerPC This is to make the of merge easier. Also rename of_bus_type. Signed-off-by: Stephen Rothwell Acked-by: David S. Miller commit bd5f0d1c256fdf286fab358a04e87476e3535075 Author: Paul Mundt Date: Fri Jul 20 13:22:47 2007 +0900 sh: Fix up PCI section mismatch warnings. Flag pcibios_setup() and pcibios_fixup_bus() as __devinit. Follows the sh64 change. Signed-off-by: Paul Mundt commit beeea6d6a1f9c39fbda3abdd2c528ba90422e4bf Author: Paul Mundt Date: Fri Jul 20 13:14:07 2007 +0900 sh64: Fix up PCI section mismatch warnings. pcibios_fixup_bus() and pcibios_setup() should be __devinit. Signed-off-by: Paul Mundt commit f898f8dbcec4848cddb8c5be2d0affd75779ebe2 Author: Stephen Rothwell Date: Tue May 1 16:49:51 2007 +1000 Begin consolidation of of_device.h This just moves the common stuff from the arch of_device.h files to linux/of_device.h. Signed-off-by: Stephen Rothwell Acked-by: Paul Mackerras Acked-by: David S. Miller commit f85ff3056cefdf4635ebf98b30e9a7d86521567f Author: Stephen Rothwell Date: Tue May 1 16:40:36 2007 +1000 Begin to consolidate of_device.c This moves all the common parts for the Sparc, Sparc64 and PowerPC of_device.c files into drivers/of/device.c. Apart from the simple move, Sparc gains of_match_node() and a call to of_node_put in of_release_dev(). PowerPC gains better recovery if device_create_file() fails in of_device_register(). Signed-off-by: Stephen Rothwell Acked-by: Paul Mackerras Acked-by: David S. Miller commit 207a130540b045d2dc7ce7becaa7a687b81548b9 Author: Paul Mundt Date: Fri Jul 20 12:39:54 2007 +0900 sh64: Update cayman defconfig. Signed-off-by: Paul Mundt commit 1ef4d4242d9c494c49ae1ae66dc938fce0272816 Author: Stephen Rothwell Date: Tue Apr 24 17:57:33 2007 +1000 Consolidate of_find_node_by routines This consolidates the routines of_find_node_by_path, of_find_node_by_name, of_find_node_by_type and of_find_compatible_device. Again, the comparison of strings are done differently by Sparc and PowerPC and also these add read_locks around the iterations. Signed-off-by: Stephen Rothwell Acked-by: Paul Mackerras Acked-by: David S. Miller commit a13c16e847ee50d77546cffa596d3c573b3270b7 Author: Paul Mundt Date: Fri Jul 20 12:37:51 2007 +0900 sh64: Wire up fallocate() syscall. Signed-off-by: Paul Mundt commit d1cd355a5e44dfe993efc0c0458ca9f99a28a9a3 Author: Stephen Rothwell Date: Tue Apr 24 17:21:29 2007 +1000 Consolidate of_get_next_child This adds a read_lock around the child/next accesses on Sparc. Signed-off-by: Stephen Rothwell Acked-by: Paul Mackerras Acked-by: David S. Miller commit e679c5f445fe142940e0962de9c5c82f10d9357c Author: Stephen Rothwell Date: Tue Apr 24 17:16:16 2007 +1000 Consolidate of_get_parent This requires creating dummy of_node_{get,put} routines for sparc and sparc64. It also adds a read_lock around the parent accesses. Signed-off-by: Stephen Rothwell Acked-by: Paul Mackerras Acked-by: David S. Miller commit 581b605a83ec241a2aff8ef780e08b9414c8dfd8 Author: Stephen Rothwell Date: Tue Apr 24 16:46:53 2007 +1000 Consolidate of_find_property The only change here is that a readlock is taken while the property list is being traversed on Sparc where it was not taken previously. Also, Sparc uses strcasecmp to compare property names while PowerPC uses strcmp. Signed-off-by: Stephen Rothwell Acked-by: Paul Mackerras Acked-by: David S. Miller commit 0081cbc3731de8ad4744ba433af51f17bf27eb9c Author: Stephen Rothwell Date: Tue May 1 16:29:19 2007 +1000 Consolidate of_device_is_compatible The only difference here is that Sparc uses strncmp to match compatibility names while PowerPC uses strncasecmp. Signed-off-by: Stephen Rothwell Acked-by: Paul Mackerras Acked-by: David S. Miller commit 97e873e5c8ad8711ce4cca080cff4eb5d21b3aeb Author: Stephen Rothwell Date: Tue May 1 16:26:07 2007 +1000 Start split out of common open firmware code This creates drivers/of/base.c (depending on CONFIG_OF) and puts the first trivially common bits from the prom.c files into it. Signed-off-by: Stephen Rothwell Acked-by: Paul Mackerras Acked-by: David S. Miller commit 0c99adb0a6dfe292842a8142b48e494d7731f5fe Author: Paul Mundt Date: Fri Jul 20 12:27:09 2007 +0900 sh: Wire up fallocate() syscall. Signed-off-by: Paul Mundt commit 39c7aa9ea9b6175f4313f69ef9f8e0a3a9bba5bb Author: Magnus Damm Date: Fri Jul 20 12:10:29 2007 +0900 sh: intc - add support for 7780 This patch converts the cpu specific 7780 setup code to use the new intc controller. Many new vectors are added and also support for external interrupt sense configuration. So with this patch it is now possible to configure external interrupt pins as edge or level triggered using set_irq_type(). No external interrupts are registered by default. Use plat_irq_setup_pins() to select between IRQ or IRL mode. This patch also fixes the Alarm IRQ for the RTC. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 680c45981ae2b4029878806d76aa17bb62d3c674 Author: Magnus Damm Date: Fri Jul 20 12:09:29 2007 +0900 sh: intc - improve group support This patch improves intc group support, ie it makes it possible to group interrupts together and mask / unmask the entire group. This also works with priorities, so setting a priority for an entire group is also possible. This patch is needed to properly support certain processors such as the 7780. Fixes for NULL pointers in DECLARE_INTC_DESC() are also included. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit d0afa579698f33a65bc5c21d3d667dbb46f9e440 Author: Paul Mundt Date: Wed Jul 18 18:55:25 2007 +0900 sh: Fix up SH-3 and SH-4 driver dependencies. Both shwdt and rtc-sh are only supported on SH-3 and SH-4 at the moment, don't allow them to break the SH-2 and SH-5 (sh64) builds. Signed-off-by: Paul Mundt commit e5e3dfc80a7380abe101d5b5d5266bed2691de1d Author: Paul Mundt Date: Wed Jul 18 18:54:09 2007 +0900 sh: push-switch: Correct license string. This was accidentally set as "GPLv2", whereas the kernel expects v2 to be written "GPL v2", this caused complaints regarding the use of the platform device APIs when built as a module. Signed-off-by: Paul Mundt commit 792e947a29da618d0945048bd257f354f8a1dc89 Author: Paul Mundt Date: Wed Jul 18 18:53:09 2007 +0900 sh: cpufreq: Fix driver dependencies and flag as broken. This is only supported on SH-4, so don't expose it for the other CPUs. Additionally, it's suffered some bitrot, so add a BROKEN dependency as well until we fix it up. Signed-off-by: Paul Mundt commit 90015c89386ffb8967422fbe9f5e7babf1dc2c5e Author: Magnus Damm Date: Wed Jul 18 17:57:34 2007 +0900 sh: IPR/INTC2 IRQ setup consolidation. This patch unifies the cpu specific interrupt setup functions for interrupt controller blocks such as ipr, intc2 and intc. There is no point in having separate functions for each interrupt controller, so let's clean this up. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 493a358e0a8992ec13098dd084223b55b05a7f03 Author: Magnus Damm Date: Wed Jul 18 17:54:10 2007 +0900 sh: clean up interrupt code for solution engine 7722 board This patch cleans up solution engine 7722 specific interrupt code. The main purpose is to replace the mux function with use of set_irq_chained_handler() and replace hard coded register poking code with set_irq_type(). The board specific interrupts are also moved to start from SE7722_FPGA_IRQ_BASE. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 1b06428ee56fadedd004bfc5e3fbb39fb8c99010 Author: Magnus Damm Date: Wed Jul 18 17:51:24 2007 +0900 sh: intc - add support for 7722 processor This patch converts the cpu specific 7722 setup code to use the new intc controller. Many new vectors are added and also support for external interrupt sense configuration. So with this patch it is now possible to configure external interrupt pins as edge or level triggered using set_irq_type(). Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 02ab3f70791f7d5c9098acaa31a72dd7d0961cb0 Author: Magnus Damm Date: Wed Jul 18 17:25:09 2007 +0900 sh: intc - shared IPR and INTC2 controller This is the second version of the shared interrupt controller patch for the sh architecture, fixing up handling of intc_reg_fns[]. The three main advantages with this controller over the existing ones are: - Both priority (ipr) and bitmap (intc2) registers are supported - External pin sense configuration is supported, ie edge vs level triggered - CPU/Board specific code maps 1:1 with datasheet for easy verification This controller can easily coexist with the current IPR and INTC2 controllers, but the idea is that CPUs/Boards should be moved over to this controller over time so we have a single code base to maintain. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 53aba19f82045c1df838570b8484043e93c4442a Author: Magnus Damm Date: Tue Jul 17 18:10:11 2007 +0900 sh: Fix irq assignment for uarts on sh7722 This patch contains two serial port related fixes for sh7722: - Make sure the irqs for the first serial port is correct - Add the second and third serial port to the platform data Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 4aafae27d0ce73f8507b8983b36006b734aa343a Author: Kristoffer Ericson Date: Tue Jul 17 13:52:38 2007 +0900 sh: hd64461 tidying. Kill off the hd64461 io.c, as all of the hd64461 users are now using the generic I/O routines. [ hd64461/ moved to hd64461.c by Paul ] Signed-off-by: Kristoffer Ericson Signed-off-by: Paul Mundt commit e6c972f21828f16d12704e5cf67d6f79c26cb53b Author: Yoshihiro Shimoda Date: Tue Jul 17 13:38:54 2007 +0900 sh: r7780rp: Add R8A66597 and M66592 support. This wires up the platform devices for the USB expansion boards for the Highlander boards. Signed-off-by: Yoshihiro Shimoda Signed-off-by: Paul Mundt commit 76c1ce7870fd9b05431da1bbd47fdafcc029a25b Author: Stephen Rothwell Date: Tue May 1 16:19:07 2007 +1000 Split out common parts of prom.h This creates linux/of.h and includes asm/prom.h from it. We also include linux/of.h from asm/prom.h while we transition. Signed-off-by: Stephen Rothwell Acked-by: Paul Mackerras Acked-by: David S. Miller commit 75473c1d3930896bbabcc99bb58fafd53ef42473 Author: Al Viro Date: Fri Jul 20 02:01:16 2007 +0100 fallout from kbuild changes Change in 'kbuild: do section mismatch check on full vmlinux' should've been replicated in arch/um/Makefile. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 20c2df83d25c6a95affe6157a4c9cac4cf5ffaac Author: Paul Mundt Date: Fri Jul 20 10:11:58 2007 +0900 mm: Remove slab destructors from kmem_cache_create(). Slab destructors were no longer supported after Christoph's c59def9f222d44bb7e2f0a559f2906191a0862d7 change. They've been BUGs for both slab and slub, and slob never supported them either. This rips out support for the dtor pointer from kmem_cache_create() completely and fixes up every single callsite in the kernel (there were about 224, not including the slab allocator definitions themselves, or the documentation references). Signed-off-by: Paul Mundt commit d20da3c39b9d5b04f0258ba74643533268f56e30 Author: S.Caglar Onur Date: Mon Jul 16 13:41:45 2007 +0300 USB: drivers/usb/storage/dpcm.c whitespace cleanup Following trivial patch converts smarttabs/whitespaces into real tabs. Signed-off-by: S.Caglar Onur Signed-off-by: Greg Kroah-Hartman commit e294531dc9f2c1f5291373dcdd5013c0cdcbdee2 Author: Yoshihiro Shimoda Date: Wed Jul 18 23:10:34 2007 +0900 USB: r8a66597-hcd: fixes some problem This patch incorporates some updates. Updates include: - Fix the problem that control transfer might fail - Change from GFP_KERNEL to GFP_ATOMIC - Clean up some coding style issue Signed-off-by: Yoshihiro Shimoda Signed-off-by: Greg Kroah-Hartman commit 809a58b896ba07e771adc76a47c83e4ca1969da8 Author: Alan Stern Date: Wed Jul 18 12:14:24 2007 -0400 USB: change name of spinlock in hcd.c This patch (as940 renames hcd_data_lock in hcd.c to hcd_urb_list_lock, which is more descriptive of the lock's job. It also introduces a convenient inline routine for testing whether a particular USB device is a root hub. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 32aca5600526189dd876e6c92b64fd88cf052c8d Author: Alan Stern Date: Wed Jul 18 12:08:02 2007 -0400 USB: move routines in hcd.c This patch (as939) moves a couple of routine in hcd.c around. The purpose is to put all the general URB- and endpoint-related routines (submit, unlink, giveback, and disable) together in one spot. There are no functional changes. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 82210d377468f59745303b96473e30e60b33434d Author: Greg Kroah-Hartman Date: Wed Jul 18 10:58:02 2007 -0700 USB: misc: uss720: clean up urb->status usage This done in anticipation of removal of urb->status, which will make that patch easier to review and apply in the future. Signed-off-by: Greg Kroah-Hartman commit 59d99785a9f8294f9e38ac677df8526e44462f66 Author: Greg Kroah-Hartman Date: Wed Jul 18 10:58:02 2007 -0700 USB: misc: usbtest: clean up urb->status usage This done in anticipation of removal of urb->status, which will make that patch easier to review and apply in the future. Signed-off-by: Greg Kroah-Hartman commit 0723af13bf5c6710af99531fc4862622f3c2d637 Author: Greg Kroah-Hartman Date: Wed Jul 18 10:58:02 2007 -0700 USB: misc: usblcd: clean up urb->status usage This done in anticipation of removal of urb->status, which will make that patch easier to review and apply in the future. Signed-off-by: Greg Kroah-Hartman commit a95a03811beb4ac4b9ac4a39486b912d07d64d64 Author: Greg Kroah-Hartman Date: Wed Jul 18 10:58:02 2007 -0700 USB: misc: phidgetmotorcontrol: clean up urb->status usage This done in anticipation of removal of urb->status, which will make that patch easier to review and apply in the future. Signed-off-by: Greg Kroah-Hartman commit 2fe8c3f1538e8db2b853f10480584679b0c336f1 Author: Greg Kroah-Hartman Date: Wed Jul 18 10:58:02 2007 -0700 USB: misc: phidgetkit: clean up urb->status usage This done in anticipation of removal of urb->status, which will make that patch easier to review and apply in the future. Signed-off-by: Greg Kroah-Hartman commit 64771a0f19320f73ab4be69db591ba51a17d7748 Author: Greg Kroah-Hartman Date: Wed Jul 18 10:58:02 2007 -0700 USB: misc: legousbtower: clean up urb->status usage This done in anticipation of removal of urb->status, which will make that patch easier to review and apply in the future. Signed-off-by: Greg Kroah-Hartman commit 491c021e0beafe4146f6a1c9a1c58bd0fb2a42d0 Author: Greg Kroah-Hartman Date: Wed Jul 18 10:58:02 2007 -0700 USB: misc: ldusb: clean up urb->status usage This done in anticipation of removal of urb->status, which will make that patch easier to review and apply in the future. Signed-off-by: Greg Kroah-Hartman commit fb3abee69de583180348b9029378e31574c31cfd Author: Greg Kroah-Hartman Date: Wed Jul 18 10:58:02 2007 -0700 USB: misc: iowarrior: clean up urb->status usage This done in anticipation of removal of urb->status, which will make that patch easier to review and apply in the future. Signed-off-by: Greg Kroah-Hartman commit 84346269f9a05e66ff2973916776a080d566f9ab Author: Greg Kroah-Hartman Date: Wed Jul 18 10:58:02 2007 -0700 USB: misc: ftdi-elan: clean up urb->status usage This done in anticipation of removal of urb->status, which will make that patch easier to review and apply in the future. Signed-off-by: Greg Kroah-Hartman commit 22bea334c941bcece2ddcc79201de4437803e3a5 Author: Greg Kroah-Hartman Date: Wed Jul 18 10:58:02 2007 -0700 USB: misc: auerswald: clean up urb->status usage This done in anticipation of removal of urb->status, which will make that patch easier to review and apply in the future. Signed-off-by: Greg Kroah-Hartman commit 13f9782d8e2e6a20e5fc44dd758d5747fdfd76ab Author: Greg Kroah-Hartman Date: Wed Jul 18 10:58:02 2007 -0700 USB: misc: appledisplay: clean up urb->status usage This done in anticipation of removal of urb->status, which will make that patch easier to review and apply in the future. Signed-off-by: Greg Kroah-Hartman commit 24497a00114ef42a752d614635168db9e2192f5e Author: Greg Kroah-Hartman Date: Wed Jul 18 10:58:02 2007 -0700 USB: misc: adtux: clean up urb->status usage This done in anticipation of removal of urb->status, which will make that patch easier to review and apply in the future. Signed-off-by: Greg Kroah-Hartman commit 3fc3e8269fa5c1f35b518dbe18dc48acef3c7684 Author: Greg Kroah-Hartman Date: Wed Jul 18 10:58:02 2007 -0700 USB: core: message: clean up urb->status usage This done in anticipation of removal of urb->status, which will make that patch easier to review and apply in the future. Signed-off-by: Greg Kroah-Hartman commit b44cd112a0400d5eb381f3c1a1e7a6925911c835 Author: Greg Kroah-Hartman Date: Wed Jul 18 10:58:02 2007 -0700 USB: image: microtek: clean up urb->status usage This done in anticipation of removal of urb->status, which will make that patch easier to review and apply in the future. Signed-off-by: Greg Kroah-Hartman commit dd6fa4d755fb1e2822406ab8ce3d28db217acc01 Author: Greg Kroah-Hartman Date: Wed Jul 18 10:58:02 2007 -0700 USB: image: mdc800: clean up urb->status usage This done in anticipation of removal of urb->status, which will make that patch easier to review and apply in the future. Signed-off-by: Greg Kroah-Hartman commit 62e5a330dc1354d98f73a82f3d13517805f061f6 Author: Greg Kroah-Hartman Date: Wed Jul 18 10:58:02 2007 -0700 USB: storage: onetouch: clean up urb->status usage This done in anticipation of removal of urb->status, which will make that patch easier to review and apply in the future. Signed-off-by: Greg Kroah-Hartman commit 18ac3016055b58d676f6148a77dcf539d05ce215 Author: Greg Kroah-Hartman Date: Wed Jul 18 10:58:02 2007 -0700 USB: class: usblp: clean up urb->status usage This done in anticipation of removal of urb->status, which will make that patch easier to review and apply in the future. Signed-off-by: Greg Kroah-Hartman commit 185d40587d22fe604962fb53c0c9a9f1670feb66 Author: Greg Kroah-Hartman Date: Wed Jul 18 10:58:02 2007 -0700 USB: class: cdc-acm: clean up urb->status usage This done in anticipation of removal of urb->status, which will make that patch easier to review and apply in the future. Signed-off-by: Greg Kroah-Hartman commit 33fea2b2f523251d29619641451bfebdc35f4950 Author: Greg Kroah-Hartman Date: Wed Jul 18 10:58:02 2007 -0700 USB: atm: usbatm: clean up urb->status usage This done in anticipation of removal of urb->status, which will make that patch easier to review and apply in the future. Signed-off-by: Greg Kroah-Hartman commit 508330ebdacb3df07ee2a75aee8caf2c205befc8 Author: Greg Kroah-Hartman Date: Wed Jul 18 10:58:02 2007 -0700 USB: atm: ueagle-atm: clean up urb->status usage This done in anticipation of removal of urb->status, which will make that patch easier to review and apply in the future. Signed-off-by: Greg Kroah-Hartman commit 9a5a3e95b49c93813476974abaa038c9d36bdd14 Author: Greg Kroah-Hartman Date: Wed Jul 18 10:58:02 2007 -0700 USB: atm: speedtch: clean up urb->status usage This done in anticipation of removal of urb->status, which will make that patch easier to review and apply in the future. Signed-off-by: Greg Kroah-Hartman commit c35f68a05d0916e89ae2aab1a456f96fea9190cd Author: Greg Kroah-Hartman Date: Wed Jul 18 10:58:02 2007 -0700 USB: atm: cxacru: clean up urb->status usage This done in anticipation of removal of urb->status, which will make that patch easier to review and apply in the future. Signed-off-by: Greg Kroah-Hartman commit 598f22e11bef8171f2244128bf0341da38fe8a23 Author: Yoshihiro Shimoda Date: Tue Jul 17 21:01:17 2007 +0900 USB: m66592-udc: fixes some problems This patch incorporates some updates from the review of the Renesas m66592-udc driver. Updates include: - Fix some locking bugs; and add a few sparse annotations - Don't #define __iomem ! - Lots of whitespace fixes (most of the patch by volume) - Some #include file trimmage - Other checkpatch.pl and sparse updates - Alphabetized and slightly-more-informative Kconfig - Don't use the ID which was assigned to the amd5536udc driver. - Remove pointless suspend/resume methods updating obsolete field. - Some section fixups - Fix some leak bugs - Fix byteswapping Signed-off-by: David Brownell Signed-off-by: Yoshihiro Shimoda Signed-off-by: Greg Kroah-Hartman commit d8fbba2f59c0c131a1babf5a66f003faee02e01a Author: Alan Stern Date: Mon Jul 16 15:30:20 2007 -0400 USB: usb-storage: unusual_devs entry for Nikon D100 This patch (as938) adds an unusual_devs entry for the Nikon DSC D100. Signed-off-by: Alan Stern Cc: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman commit 0d46c0079a8eeed25105fa374f79862842ee80c1 Author: Jesper Juhl Date: Mon Jul 16 22:17:25 2007 +0200 USB: Remove pointless conditional in drivers/usb/serial/io_ti.c::edge_shutdown() Coverity scan found (CID: 1708) this in drivers/usb/serial/io_ti.c::edge_shutdown() : ... 2797 for (i=0; i < serial->num_ports; ++i) { 2798 edge_port = usb_get_serial_port_data(serial->port[i]); 2799 edge_remove_sysfs_attrs(edge_port->port); 2800 if (edge_port) { 2801 edge_buf_free(edge_port->ep_out_buf); 2802 kfree(edge_port); 2803 } 2804 usb_set_serial_port_data(serial->port[i], NULL); 2805 } ... It's complaining that we dereference 'edge_port' in line 2799 which makes the test of that pointer against NULL in 2800 pointless, since if edge_port was actually NULL we'd have crashed already before reaching line 2800. Reading the edge_open() function it seems to me that the pointer returned by usb_get_serial_port_data(serial->port[i]) and stored in 'edge_port' can never actually be NULL here, so the test is entirely superfluous (even if it could be NULL it would be pointless here, ignoring the then possible crash in that case, since both edge_buf_free() and kfree() can handle being passed NULL pointers. This patch removes the pointless conditional (and also makes a few tiny style corrections now that I was in the area anyway). Signed-off-by: Jesper Juhl Signed-off-by: Greg Kroah-Hartman commit 167a675a8caa249f8bc9053c02d711545d1f7662 Author: Thomas Dahlmann Date: Thu Jul 12 09:30:39 2007 -0700 USB: MAINTAINERS entry for amd5536udc MAINTAINERS entry for amd5536udc driver. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 55d402d854ade6b63b26e958f201ee2ef00b7b15 Author: Thomas Dahlmann Date: Mon Jul 16 21:40:54 2007 -0700 USB: amd5536 UDC driver (in GEODE southbridge) Driver for the AMD5536 UDC, as found in the AMD Geode CS5536 (southbridge). This is a high speed DMA-capable controller, which can also be used in OTG configurations (which are not supported by this patch). Acked-by: Jordan Crouse Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit beafef072af10bc8497c9ee51ce2804aa7da26be Author: Alan Stern Date: Fri Jul 13 15:47:16 2007 -0400 USB: documentation update for usb_unlink_urb This patch (as936) updates the kerneldoc for usb_unlink_urb. The explanation of how endpoint queues are meant to work is now clearer and in better agreement with reality. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit e7e7c360fb07020b24652843aec442325baad0ce Author: Alan Stern Date: Fri Jul 13 15:46:29 2007 -0400 UHCI: short control URBs get a status stage It has recently been pointed out that short control transfers should have a status stage, even if they generate an error because URB_SHORT_NOT_OK was set. This patch (as935) changes uhci-hcd to enable the status stage when this happens. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit e94fa28f137813c2f6e05470b41bd8f3c5422a04 Author: Florin Malita Date: Mon Jul 16 11:50:53 2007 -0400 USB: mos7720, mos7840: remove redundant urb check Coverity (1709, 1710, 1711, 1712, 1713) actually flagged these as REVERSE_INULLs (NULL check performed after dereference). But looking at the other drivers I can't see any similar tests and the USB core already makes sure urb is non-null - so might as well get rid of the checks. Signed-off-by: Florin Malita Signed-off-by: Greg Kroah-Hartman commit 195af2cce5ff81c4609c7ba585b6698a7771cbfc Author: Alan Stern Date: Mon Jul 16 15:28:19 2007 -0400 USB: fix warning caused by autosuspend counter going negative This patch (as937) fixes a minor bug in the autosuspend usage-counting code. Each hub's usage counter keeps track of the number of unsuspended children. However the current driver increments the counter after registering a new child, by which time the child may already have been suspended and caused the counter to go negative. The obvious solution is to increment the counter before registering the child. Signed-off-by: Alan Stern Cc: stable Signed-off-by: Greg Kroah-Hartman commit 69d42a78f935d19384d1f6e4f94b65bb162b36df Author: Alan Stern Date: Thu Jul 12 17:06:23 2007 -0400 USB: add "descriptors" binary sysfs attribute This patch (as934) adds a new readonly binary sysfs attribute file called "descriptors" for each USB device. The attribute contains the device descriptor followed by the raw descriptor entry (config plug subsidiary descriptors) for the current configuration. Having this information available in fixed-format binary makes life a lot easier for user programs by avoiding the need to open, read, and parse multiple sysfs text files. The information in this attribute file is much like that in usbfs's device file, but there are some significant differences: The 2-byte fields in the device descriptor are left in little-endian byte order, as they appear on the bus and in the kernel. Only one raw descriptor set is presented, that of the current configuration. Opening this file will not cause a suspended device to be autoresumed. The last item in particular should be a big selling point for libusb, which currently forces all USB devices to be resumed as it scans the device tree. Signed-off-by: Alan Stern Cc: Dave Mielke Signed-off-by: Greg Kroah-Hartman commit 1b4cd43bd3f9aa7a794e29b80b0d984a8e144df4 Author: Alan Stern Date: Thu Jul 12 17:03:01 2007 -0400 isp116x-hcd: prepare for urb->status This patch (as931b), adapted from a patch by Olav Kongas, makes a small set of conservative changes to the isp116x-hcd driver in preparation for the removal of urb->status. finish_request() is moved up in the source and is called as soon as the URB is known to have completed, rather than after all the active endpoints have been scanned. The status of a completed URB is kept in a local variable and copied to urb->status only when the URB is about to be given back. -EREMOTEIO error status for control transfers is set after the status stage rather than when the short packet arrives. Some unnecessary uses of urb->lock are removed. Signed-off-by: Alan Stern Cc: Olav Kongas Signed-off-by: Greg Kroah-Hartman commit 10e485221edd2799dc495e4cde98fe74aeb292b1 Author: Pete Zaitcev Date: Tue Jul 10 20:09:58 2007 -0700 USB: usblp: "Big cleanup" breaks O_NONBLOCK I found the first regresson in the rewritten ("all dynamic" and "no races") driver. If application uses O_NONBLOCK, I return -EAGAIN despite the URB being submitted successfuly. This causes the application to resubmit the same data erroneously. The fix is to pretend that the transfer has succeeded even if URB was merely queued. It is the same behaviour as with the old version. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 9454c46a89c13fe82a28c91706b86f612fd19462 Author: Kevin Lloyd Date: Mon Jul 16 13:49:29 2007 -0700 USB: sierra: Add new devices This patch adds new devices to the Sierra Wireless driver. This is being resubmitted because the dependent patch (patch 01/02) needed to be resubmitted. Signed-off-by: Kevin Lloyd Signed-off-by: Greg Kroah-Hartman commit 112225b13cedd53dfd6455038b8843cf004ddec9 Author: Kevin Lloyd Date: Mon Jul 16 13:49:27 2007 -0700 USB: sierra: Add TRU-Install (c) Support This patch adds compatibility with Sierra Wireless' new TRU-Install feature. Future devices that use this feature will not work unless this patch has been applied. Signed-off-by: Kevin Lloyd Signed-off-by: Greg Kroah-Hartman commit eb33caec1ed29fa2b04a2c5f02e3fed2add91db4 Author: Matthias Kaehlcke Date: Fri Jul 13 21:29:46 2007 +0200 USB: use mutex instead of semaphore in the FTDI ELAN driver The FTDI ELAN driver uses a semaphore as mutex. Use the mutex API instead of the (binary) semaphore. Signed-off-by: Matthias Kaehlcke Signed-off-by: Greg Kroah-Hartman commit 8293c568b25611cdc4ac54ded438d8d7938c593c Author: Matthias Kaehlcke Date: Fri Jul 13 21:28:31 2007 +0200 USB: use mutex instead of semaphore in the Adutux driver The Adutux driver uses a semaphore as mutex. Use the mutex API instead of the (binary) semaphore. Signed-off-by: Matthias Kaehlcke Signed-off-by: Greg Kroah-Hartman commit d2066eb659e6ee915383510c136da38eff86ef15 Author: Matthias Kaehlcke Date: Fri Jul 13 21:26:59 2007 +0200 USB: use mutex instead of semaphore in the ELAN U132 adapter driver The ELAN U132 adapter driver uses the semaphore u132_module_lock as mutex. Use the mutex API instead of the (binary) semaphore. Signed-off-by: Matthias Kaehlcke Signed-off-by: Greg Kroah-Hartman commit 831c70fc13ca8c6074ab0c9d1121a93fd6c5a34a Author: Matthias Kaehlcke Date: Fri Jul 13 21:25:25 2007 +0200 USB: use mutex instead of semaphore in the USB gadget serial driver The USB gadget serial driver uses a semaphore as mutex. Use the mutex API instead of the (binary) semaphore. Signed-off-by: Matthias Kaehlcke Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit ffc720409ae8d1cb16ae4b9c39e9e744e4c59898 Author: Tony Luck Date: Thu Jul 19 14:00:34 2007 -0700 [IA64] refresh some config files for 64K pagesize Update arch/ia64/defconfig: select 64K pagesize Same for arch/ia64/configs/tiger_defconfig + CONFIG_COMPAT=n Signed-off-by: Tony Luck commit 5f47c7eac65a45e33d7fe390effe75ec5c74f8bf Author: Al Viro Date: Fri Jul 20 00:23:31 2007 +0100 coda breakage a) switch by loff_t == __cmpdi2 use. Replaced with a couple of obvious ifs; update of ->f_pos in the first one makes sure that we do the right thing in all cases. b) block_signals() and unblock_signals() are globals on UML. Renamed coda ones; in principle UML probably ought to do rename as well, but that's another story. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit c65c5131b349b08f3292b1cd10239cf376bfcb15 Author: Al Viro Date: Fri Jul 20 00:17:45 2007 +0100 missed cong_avoid() instance Removal of rtt argument in ->cong_avoid() had missed tcp_htcp.c instance. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 89636af25d75d8672aea05d258be357d0dc4bd70 Author: Bartlomiej Zolnierkiewicz Date: Fri Jul 20 01:11:59 2007 +0200 ide: add support for SCSI ioctls to ide-floppy Now that ide-floppy supports SG_IO we can add support for SCSI ioctls (except deprecated SCSI_IOCTL_SEND_COMMAND and legacy CDROM_SEND_PACKET ones - we can add them later iff really needed). While at it remove handling of CDROMEJECT and CDROMCLOSETRAY ioctls from generic_ide_ioctl(): - This prevents ide-{disk,tape,scsi} device drivers from obtaining REQ_TYPE_BLOCK_PC type requests which are currently unsupported by these drivers and which are potentially harmful (as reported by Andrew). - There is no functionality loss since aforementioned ioctls will now be handled by idefloppy_ioctl()->scsi_cmd_ioctl() (for devices using ide-floppy driver) and by idecd_ioctl->cdrom_ioctl()->scsi_cmd_ioctl() (for devices using ide-cd driver). Cc: Jens Axboe Cc: FUJITA Tomonori Cc: James Bottomley Cc: Jeff Garzik Cc: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit 4bf9fdf7f21f118e2c5052ec8e46faf00eb5a4ea Author: Bartlomiej Zolnierkiewicz Date: Fri Jul 20 01:11:59 2007 +0200 ide: remove stale changelog from setup-pci.c Signed-off-by: Bartlomiej Zolnierkiewicz commit 74565073cbf6b3c1746ee623e97b2ba0fcd3fbb6 Author: Bartlomiej Zolnierkiewicz Date: Fri Jul 20 01:11:59 2007 +0200 ide: remove stale changelog/comments/TODO from ide.c Signed-off-by: Bartlomiej Zolnierkiewicz commit d281e9ad87f79fd01ce1fc2d2f258e2ee765bc5a Author: Bartlomiej Zolnierkiewicz Date: Fri Jul 20 01:11:59 2007 +0200 ide-cris: handle PIO auto-tuning in tune_cris_ide() Signed-off-by: Bartlomiej Zolnierkiewicz commit 4099d14322149c7a467e4997b87be4ba8eb78697 Author: Bartlomiej Zolnierkiewicz Date: Fri Jul 20 01:11:59 2007 +0200 ide: add PIO masks * Add ATA_PIO[0-6] defines to . * Add ->pio_mask field to ide_pci_device_t and ide_hwif_t. * Add PIO masks to host drivers. change ACK-ed by Jeff Garzik . Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 6a824c92db4d606c324272c4eed366fb71672440 Author: Bartlomiej Zolnierkiewicz Date: Fri Jul 20 01:11:58 2007 +0200 ide: remove ide_find_best_pio_mode() * Add ->host_flags to ide_hwif_t to store ide_pci_device_t.host_flags, assign it in setup-pci.c:ide_pci_setup_ports(). * Add IDE_HFLAG_PIO_NO_{BLACKLIST,DOWNGRADE} to ide_pci_device_t.host_flags and teach ide_get_best_pio_mode() about them. Also remove needless !drive->id check while at it (drive->id is always present). * Convert amd74xx, via82cxxx and ide-timing.h to use ide_get_best_pio_mode() and then remove no longer needed ide_find_best_pio_mode(). There should be no functionality changes caused by this patch. Acked-by: Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 2134758d2a5429325cee4d4ce8959af5314eeba1 Author: Bartlomiej Zolnierkiewicz Date: Fri Jul 20 01:11:58 2007 +0200 ide: drop "PIO data" argument from ide_get_best_pio_mode() * Drop no longer needed "PIO data" argument from ide_get_best_pio_mode() and convert all users accordingly. * Remove no longer needed ide_pio_data_t. Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit e5fa4b2968ff0f32b5ecfa082fd6db50b731055e Author: Bartlomiej Zolnierkiewicz Date: Fri Jul 20 01:11:57 2007 +0200 ide: ide_find_best_pio_mode() fixes (take 2) * Check IORDY bit for PIO modes > 2. * Some devices claim maximum PIO mode > 2 in id->tPIO, they were punished too severly for this by being limited to PIO_SLOW. Limit them to PIO2 instead. v2: * Fix PIO number being returned incorrectly instead of PIO mode (Noticed by Sergei). Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 7dd00083b1160b560fa2a0a486799b57baa5d035 Author: Bartlomiej Zolnierkiewicz Date: Fri Jul 20 01:11:56 2007 +0200 ide: add ide_pio_cycle_time() helper (take 2) * Add ide_pio_cycle_time() helper. * Use it in ali14xx/ht6560b/qd65xx/cmd64{0,x}/sl82c105 and pmac host drivers (previously cycle time given by the device was only used for "pio" == 255). * Remove no longer needed ide_pio_data_t.cycle_time field. v2: * Fix "ata_" prefix (Noticed by Jeff). Acked-by: Sergei Shtylyov Cc: Jeff Garzik Signed-off-by: Bartlomiej Zolnierkiewicz commit 31c4df441cce6b9ec541e7f722f50bfbc617dd76 Author: Bartlomiej Zolnierkiewicz Date: Fri Jul 20 01:11:56 2007 +0200 sc1200: remove stale Power Management code * Nowadays core IDE code handles restoring of PIO and DMA modes (ide-io.c:ide_start_power_step() etc) so remove open-coded version from sc1200_resume(). There should be no change in behavior because settings done by sc1200_resume() were always overridden by generic_ide_resume() and ide_{start,stop}_power_step(). * Bump driver version. Cc: Mark Lord Signed-off-by: Bartlomiej Zolnierkiewicz commit 8987d21ba6a426b0685257866ce366055930b57f Author: Bartlomiej Zolnierkiewicz Date: Fri Jul 20 01:11:56 2007 +0200 ide: ide_start_power_step() fix WRT disabling DMA * Do the same thing as probe_hwif() and always disable DMA so chipset DMA enabled bit gets cleared (if the drive doesn't support DMA ide_set_dma() won't try to tune it anyway). * Add TODO comment about respecting ->using_dma setting. Signed-off-by: Bartlomiej Zolnierkiewicz commit 1c164acf50146d8a82caed642951390e073620f1 Author: Bartlomiej Zolnierkiewicz Date: Fri Jul 20 01:11:56 2007 +0200 serverworks: fix DMA The driver used to depend on BIOS settings for deciding whether it is OK to use DMA. However it seems that BIOS doesn't always handle all cases correctly so just let IDE core to decide about this. It should be a safe thing to do now, after the driver went through heavy bugfixing. Thanks for bugreport and testing the patch goes out to Sven Niedner. Signed-off-by: Bartlomiej Zolnierkiewicz commit 1880a8d7f2d0587e657e3292166003636067b7ea Author: Bartlomiej Zolnierkiewicz Date: Fri Jul 20 01:11:56 2007 +0200 serverworks: always tune PIO * Always set ->autotune so PIO gets correctly auto-tuned (previously ->autotune was only set when ->dma_base wasn't available, however ->ide_dma_check()/->speedproc() was always trying to tune PIO when tuning DMA). * Move code responsible for programming chipset for PIO mode from svwks_tune_chipset() to svwks_tune_pio(). Don't tune PIO when tuning DMA (this is no longer needed since ->autotune is always set now). * Handle PIO modes early in svwks_tune_chipset() so DMA configuration registers don't get cleared when programming PIO mode. * Bump driver version. Signed-off-by: Bartlomiej Zolnierkiewicz commit a5d8c5c834d3cabf4b7b477c3f6ee923c25026fc Author: Bartlomiej Zolnierkiewicz Date: Fri Jul 20 01:11:55 2007 +0200 ide: add ide_pci_device_t.host_flags (take 2) * Rename ide_pci_device_t.flags to ide_pci_device_t.host_flags and IDEPCI_FLAG_ISA_PORTS flag to IDE_HFLAG_ISA_PORTS. * Add IDE_HFLAG_SINGLE flag for single channel devices. * Convert core code and all IDE PCI drivers to use IDE_HFLAG_SINGLE and remove no longer needed ide_pci_device_t.channels field. v2: * Fix issues noticed by Sergei: - correct code alignment in scc_pata.c - s/IDE_HFLAG_SINGLE/~IDE_HFLAG_SINGLE/ in serverworks.c Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 2229833c1365346b64357a9263fa724f74f5e376 Author: Bartlomiej Zolnierkiewicz Date: Fri Jul 20 01:11:55 2007 +0200 ide: add ide_dev_has_iordy() helper (take 4) * Add ide_dev_has_iordy() helper and use it sl82c105 host driver. * Remove no longer needed ide_pio_data_t.use_iordy field. v2/v3: * Fix issues noticed by Sergei: - correct patch description - fix comment in ide_get_best_pio_mode() v4: * Fix "ata_" prefix (Noticed by Jeff). Acked-by: Sergei Shtylyov Cc: Jeff Garzik Signed-off-by: Bartlomiej Zolnierkiewicz commit 342cdb6d4739cee430efc3eafcacd1605db66036 Author: Bartlomiej Zolnierkiewicz Date: Fri Jul 20 01:11:55 2007 +0200 ide: make ide_get_best_pio_mode() print info if overriding PIO mode * Print info about overriding PIO mode in ide_get_best_pio_mode(). * Remove info about overriding PIO mode from cmd64{0,x} host drivers. * Remove no longer needed ide_pio_data_t.overridden field. Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 328dcbb63657ebbb2dd26982fa9e1fa9e04b6fa2 Author: Bartlomiej Zolnierkiewicz Date: Fri Jul 20 01:11:54 2007 +0200 siimage: PIO mode setup fixes (take 2) * Add sil_tuneproc() wrapper for siimage_tuneproc() which also sets PIO mode on the device. * Add missing ide_get_best_pio_mode() call to sil_tuneproc() so "pio" == 255 (autotune) is handled correctly (previously PIO0 was used) and "pio" values > 4 && < 255 are filtered to PIO4 (instead of PIO0). * Add code limiting maximum PIO mode according to the pair device capabilities to sil_tuneproc(). * Convert users of config_siimage_chipset_for_pio() to use sil_tune_pio() and sil_tuneproc(). This fixes PIO fallback in siimage_config_drive_for_dma() to use max PIO mode available instead of PIO4 (config_siimage_chipset_for_pio() used wrong arguments for ide_get_best_pio_mode() and as a results always tried to set PIO4). * Remove no longer needed siimage_taskfile_timing() and config_siimage_chipset_for_pio(). * Enable ->autotune unconditionally and remove PIO tuning for UDMA/MDMA modes from siimage_speedproc() * Bump driver version. v2: * Fix issues noticed by Sergei: - correct pair device check - trim only taskfile PIO to the slowest of the master/slave - enable ->autotune unconditionally and remove PIO tuning for UDMA/MDMA modes from siimage_speedproc() - add TODO item for IORDY bugs - minor cleanups Reviewed-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 485efc6cf507eae2b8e83b56e179c8fa3980641a Author: Bartlomiej Zolnierkiewicz Date: Fri Jul 20 01:11:54 2007 +0200 atiixp: PIO mode setup fixes * Split off exisiting atiixp_tuneproc() into atiixp_tune_pio() and then add setting device PIO mode to atiixp_tuneproc(). * Add missing ide_get_best_pio_mode() call to atiixp_tuneproc() so "pio" == 255 (autotune) is handled correctly and "pio" values > 4 && < 255 are filtered to PIO4 (previously "pio" == 5 could result in wrong timings being used and "pio" values > 4 && < 255 in an OOPS). * Handle PIO modes early in atiixp_speedproc() so save_mdma_mode[] doesn't get cleared. * In atiixp_dma_check(): - fix max_mode argument for ide_get_best_pio_mode() - don't call atiixp_dma_2_pio() so PIO1 doesn't get remapped to PIO0 - use atiixp_tuneproc() instead of atiixp_speedproc() * Bump driver version. Signed-off-by: Bartlomiej Zolnierkiewicz commit 9702b5d5c26be12d376e1baf2a8e5b82e6c06b66 Author: Alan Cox Date: Fri Jul 20 01:11:54 2007 +0200 ide: Stop mapping ROMs Various old IDE drivers go mapping ROM devices for no apparent reason and without using the ROM mapping API we now have. They don't actually use the ROM they map and the new libata drivers are happy without it being mapped so rather than port them lets just junk it for the next -rc1. Signed-off-by: Alan Cox Acked-by: Sergei Shtylyov Cc: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit c82d72f5c521434c36b9550b3ac6601eb8167687 Author: Robert P. J. Day Date: Fri Jul 20 01:11:54 2007 +0200 IDE: Remove references to dead ETRAX-related variables. The two CONFIG variables CONFIG_ETRAX_IDE_CSE1_16_RESET CONFIG_ETRAX_IDE_CSP0_8_RESET appear to have been dead since way back in 2.5.xx days: http://www.linuxhq.com/kernel/v2.5/75/arch/cris/drivers/Kconfig Signed-off-by: Robert P. J. Day Cc: Michael Starvik Signed-off-by: Bartlomiej Zolnierkiewicz commit 363f7e428dcf9f90d726481029f7b4a0ed6d55ce Author: Marcin Juszkiewicz Date: Fri Jul 20 01:11:53 2007 +0200 PCMCIA: Add another MemoryCard to ide-cs/pata_pcmcia One card submitted by user. Signed-off-by: Marcin Juszkiewicz Cc: Jeff Garzik Signed-off-by: Bartlomiej Zolnierkiewicz commit 4ae41ff887224b39c3c3c673a918193e90be558f Author: Kou Ishizaki Date: Fri Jul 20 01:11:53 2007 +0200 scc_pata.c: Workaround for errata A308 (take 2) Workaround for errata A308: turn down the UDMA mode and retry the DMA command when the data lost condition is detected. take2: udma_filter() hook is used to limit ATAPI UDMA mode. Signed-off-by: Kou Ishizaki Signed-off-by: Akira Iguchi Cc: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit f644d47af3834b603d909c212287d0c21ec3ebbb Author: Kumar Gala Date: Fri Jul 20 01:11:53 2007 +0200 scc_pata: Use inline function for eieio Move to using inline function variant of eieio instead of inline assmebly. Signed-off-by: Kumar Gala Cc: kou.ishizaki@toshiba.co.jp Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 2d9ce177e68645945e3366cfe2d66ee3c28cd4f2 Author: Avi Kivity Date: Thu Jul 19 14:30:14 2007 +0300 i386: Allow KVM on i386 nonpae Currently, CONFIG_X86_CMPXCHG64 both enables boot-time checking of the cmpxchg64b feature and enables compilation of the set_64bit() family. Since the option is dependent on PAE, and since KVM depends on set_64bit(), this effectively disables KVM on i386 nopae. Simplify by removing the config option altogether: the boot check is made dependent on CONFIG_X86_PAE directly, and the set_64bit() family is exposed without constraints. It is up to users to check for the feature flag (KVM does not as virtualiation extensions imply its existence). Signed-off-by: Avi Kivity Signed-off-by: Linus Torvalds commit 12795067cfa595434be0236b102a8eb20d578741 Author: Matthew Wilcox Date: Thu Jul 19 13:09:10 2007 -0600 Update .gitignore for arch/i386/boot With the new setup code, we generate a couple more files Signed-off-by: Matthew Wilcox [ .. and do the same for x86-64 - Alexey ] Acked-by: Alexey Dobriyan Acked-by: H. Peter Anvin Signed-off-by: Linus Torvalds commit 80422977478775fe03f25e57b67efe9f0a67e50c Author: Christoph Hellwig Date: Thu Jul 19 12:05:58 2007 -0700 fix spufs build after ->fault changes 83c54070ee1a2d05c89793884bea1a03f2851ed4 broke spufs by incorrectly updating the code, this patch gets it to compile again. It's probably still broken due to the scheduler changes, but this at least makes sure cell kernels can still be built. Signed-off-by: Christoph Hellwig Cc: Arnd Bergmann Acked-by: Geoff Levand Cc: Paul Mackerras Cc: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a021e9ffd56c22700133ebc37d607f95be8f7bd Author: Matt Mackall Date: Thu Jul 19 11:30:14 2007 -0700 random: fix bound check ordering (CVE-2007-3105) If root raised the default wakeup threshold over the size of the output pool, the pool transfer function could overflow the stack with RNG bytes, causing a DoS or potential privilege escalation. (Bug reported by the PaX Team ) Cc: Theodore Tso Cc: Willy Tarreau Signed-off-by: Matt Mackall Signed-off-by: Chris Wright Signed-off-by: Linus Torvalds commit 626ac545c12e5f9bffe93086d1d03d26c99987ea Author: Serge E. Hallyn Date: Tue Jul 17 15:28:17 2007 -0400 user namespace: fix copy_user_ns return value When a CONFIG_USER_NS=n and a user tries to unshare some namespace other than the user namespace, the dummy copy_user_ns returns NULL rather than the old_ns. This value then gets assigned to task->nsproxy->user_ns, so that a subsequent setuid, which uses task->nsproxy->user_ns, causes a NULL pointer deref. Fix this by returning old_ns. Signed-off-by: Serge E. Hallyn Signed-off-by: Linus Torvalds commit bf903d0a4503db8ac166ca6135a59bc5f9b91a45 Author: Yasuaki Ishimatsu Date: Wed Jul 18 15:47:34 2007 +0900 [IA64] Delete iosapic_free_rte() > arch/ia64/kernel/iosapic.c:597: warning: 'iosapic_free_rte' defined but not used > > This isn't spurious, the only call to iosapic_free_rte() has been removed, but there > is still a call to iosapic_alloc_rte() ... which means we must have a memory leak. I did it on purpose (and gave the warning a miss...) and I consider iosapic_free_rte() is no longer needed. I decided to remain iosapic_rte_info to keep gsi-to-irq binding after device disable. Indeed it needs some extra memory, but it is only "sizeof(iosapic_rte_info) * " bytes and has no memory leak becasue re-enabled devices use the iosapic_rte_info which they used before disabling. Signed-off-by: Yasuaki Ishimatsu Signed-off-by: Tony Luck commit 3d7559e677deafefe134f36c1e75f9119b956672 Author: David Chinner Date: Mon Jul 16 15:33:40 2007 +1000 [IA64] fallocate system call sys_fallocate for ia64. This uses an empty slot #1303 erroneously marked as reserved for move_pages (which had already been allocated as syscall #1276) Signed-Off-By: Dave Chinner Signed-off-by: Tony Luck commit 9550b105b8646f916862aee3ab7b25020ca14159 Author: Linus Torvalds Date: Thu Jul 19 13:21:34 2007 -0700 slub: fix ksize() for zero-sized pointers The slab and slob allocators already did this right, but slub would call "get_object_page()" on the magic ZERO_SIZE_PTR, with all kinds of nasty end results. Noted by Ingo Molnar. Cc: Ingo Molnar Cc: Christoph Lameter Cc: Andrew Morton Signed-off-by: Linus Torvalds commit a5c96d8a1c67f31ef48935a78da2d2076513842b Author: Linus Torvalds Date: Thu Jul 19 13:17:15 2007 -0700 Fix up non-NUMA SLAB configuration for zero-sized allocations I suspect Christoph tested his code only in the NUMA configuration, for the combination of SLAB+non-NUMA the zero-sized kmalloc's would not work. Of course, this would only trigger in configurations where those zero- sized allocations happen (not very common), so that may explain why it wasn't more widely noticed. Seen by by Andi Kleen under qemu, and there seems to be a report by Michael Tsirkin on it too. Cc: Andi Kleen Cc: Roland Dreier Cc: Michael S. Tsirkin Cc: Pekka Enberg Cc: Christoph Lameter Cc: Andrew Morton Signed-off-by: Linus Torvalds commit e436d80085133858bf2613a630365e8a0459fd58 Author: Ingo Molnar Date: Thu Jul 19 21:28:35 2007 +0200 [PATCH] sched: implement cpu_clock(cpu) high-speed time source Implement the cpu_clock(cpu) interface for kernel-internal use: high-speed (but slightly incorrect) per-cpu clock constructed from sched_clock(). This API, unused at the moment, will be used in the future by blktrace, by the softlockup-watchdog, by printk and by lockstat. Signed-off-by: Ingo Molnar commit 969bb4e4032dac67287951d8f6642a3b5119694e Author: Suresh Siddha Date: Thu Jul 19 21:28:35 2007 +0200 [PATCH] sched: fix the all pinned logic in load_balance_newidle() nr_moved is not the correct check for triggering all pinned logic. Fix the all pinned logic in the case of load_balance_newidle(). Signed-off-by: Suresh Siddha Signed-off-by: Ingo Molnar commit 9439aab8dbc33c2c03c3a19dba267360383ba38c Author: Suresh Siddha Date: Thu Jul 19 21:28:35 2007 +0200 [PATCH] sched: fix newly idle load balance in case of SMT In the presence of SMT, newly idle balance was never happening for multi-core and SMP domains (even when both the logical siblings are idle). If thread 0 is already idle and when thread 1 is about to go to idle, newly idle load balance always think that one of the threads is not idle and skips doing the newly idle load balance for multi-core and SMP domains. This is because of the idle_cpu() macro, which checks if the current process on a cpu is an idle process. But this is not the case for the thread doing the load_balance_newidle(). Fix this by using runqueue's nr_running field instead of idle_cpu(). And also skip the logic of 'only one idle cpu in the group will be doing load balancing' during newly idle case. Signed-off-by: Suresh Siddha Signed-off-by: Ingo Molnar commit c41917df8a1adde34864116ce2231a7fe308d2ff Author: Ralf Baechle Date: Thu Jul 19 21:28:35 2007 +0200 [PATCH] sched: sched_cacheflush is now unused Since Ingo's recent scheduler rewrite which was merged as commit 0437e109e1841607f2988891eaa36c531c6aa6ac sched_cacheflush is unused. Signed-off-by: Ralf Baechle Signed-off-by: Ingo Molnar commit 0a87cf128f3d3bc6aa7b1040e73109c974ed875a Author: Jeff Layton Date: Wed Jul 18 11:28:43 2007 -0400 NFSv4: handle lack of clientaddr in option string If a NFSv4 mount is attempted with string based options, and the option string doesn't contain a clientaddr= option, the kernel will currently oops. Check for this situation and return a proper error. Signed-off-by: Jeff Layton Signed-off-by: Trond Myklebust commit f9d888fcd9665b863fa042212a3ee7b4c51399f6 Author: Benny Halevy Date: Sun Jul 15 20:14:32 2007 +0300 NFSv4: debug print ntohl(status) in nfs client callback xdr code status in nfs client callback xdr code is passed in network order. print it in host order for better readability. Signed-off-by: Benny Halevy Signed-off-by: Trond Myklebust commit e4eff1a622edd6ab7b73acd5d8763aa2fa3fee49 Author: Trond Myklebust Date: Sat Jul 14 15:39:58 2007 -0400 SUNRPC: Clean up the sillyrename code Fix a couple of bugs: - Don't rely on the parent dentry still being valid when the call completes. Fixes a race with shrink_dcache_for_umount_subtree() - Don't remove the file if the filehandle has been labelled as stale. Fix a couple of inefficiencies - Remove the global list of sillyrenamed files. Instead we can cache the sillyrename information in the dentry->d_fsdata - Move common code from unlink_setup/unlink_done into fs/nfs/unlink.c Signed-off-by: Trond Myklebust commit 4fdc17b2a7f4d9db5b08e0f963d0027f714e4104 Author: Trond Myklebust Date: Sat Jul 14 15:39:57 2007 -0400 NFS: Introduce struct nfs_removeargs+nfs_removeres We need a common structure for setting up an unlink() rpc call in order to fix the asynchronous unlink code. Signed-off-by: Trond Myklebust commit 3062c532ad410fe0e8320566fe2879a396be6701 Author: Trond Myklebust Date: Sat Jul 14 17:36:45 2007 -0400 NFS: Use dentry->d_time to store the parent directory verifier. This will free up the d_fsdata field for other use. Signed-off-by: Trond Myklebust commit be879c4e249a8875d7129f3b0c1bb62584dafbd8 Author: J. Bruce Fields Date: Wed Jul 11 18:39:02 2007 -0400 SUNRPC: move bkl locking and xdr proc invocation into a common helper Since every invocation of xdr encode or decode functions takes the BKL now, there's a lot of redundant lock_kernel/unlock_kernel pairs that we can pull out into a common function. Signed-off-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit e3a535e1739a9da3cc316ccdfe5cd4bf84d745ac Author: Trond Myklebust Date: Thu Jul 19 10:03:38 2007 -0400 NFSv4: Fix the nfsv4 readlink reply buffer alignment Signed-off-by: Trond Myklebust commit d6ac02dfaa6c423874839fe289c7320624aa9288 Author: Trond Myklebust Date: Thu Jul 19 10:03:37 2007 -0400 NFSv4: Fix the readdir reply buffer alignment Signed-off-by: Trond Myklebust commit 9104a55dc382c4aae42dff3f54351085cbcb7317 Author: Trond Myklebust Date: Tue Jul 17 21:52:42 2007 -0400 NFSv4: More NFSv4 xdr cleanups Signed-off-by: Trond Myklebust commit 9936781d0147e13cbc6df02f5265e0b9999ce3cf Author: Trond Myklebust Date: Tue Jul 17 21:52:41 2007 -0400 NFSv4: Try to recover from getfh failures in nfs4_xdr_dec_open Try harder to recover the open state if the server failed to return a filehandle. Signed-off-by: Trond Myklebust commit 56659e9926ef5996398924c799ecac39ca8b6223 Author: Trond Myklebust Date: Tue Jul 17 21:52:39 2007 -0400 NFSv4: 'constify' lookup arguments. Signed-off-by: Trond Myklebust commit 365c8f589afbc27d8cf42d396475017bc1c462fd Author: Trond Myklebust Date: Tue Jul 17 21:52:37 2007 -0400 NFSv4: Don't fail nfs4_xdr_dec_open if decode_restorefh() failed We can already easily recover from that inside _nfs4_proc_open(). Signed-off-by: Trond Myklebust commit 6f220ed5a84d87645a84ae22105dc565f3f248b5 Author: Trond Myklebust Date: Tue Jul 17 21:50:45 2007 -0400 NFSv4: Fix open state recovery Ensure that opendata->state is always initialised when we do state recovery. Ensure that we set the filehandle in the case where we're doing an "OPEN_CLAIM_PREVIOUS" call due to a server reboot. Signed-off-by: Trond Myklebust commit 8cd69e1bc7970bfb032b425043cc0d4e4345c74c Author: Trond Myklebust Date: Thu Jul 19 10:03:34 2007 -0400 NFSD/SUNRPC: Fix the automatic selection of RPCSEC_GSS Bruce's patch broke the ability to compile RPCSEC_GSS as a module. Signed-off-by: Trond Myklebust commit e24b8cb4fa2bb779bdf48656152366b6f52f748f Author: Jean Delvare Date: Sun Jul 8 14:26:37 2007 +0200 i2c: Delete the i2c-isa pseudo bus driver There are no users of i2c-isa left, so we can finally get rid of it. Signed-off-by: Jean Delvare commit c182f5bbfb399b1fa2ad65107b3caf9c1c69435e Author: Hans de Goede Date: Tue Jul 10 17:09:57 2007 +0200 hwmon: refuse to load abituguru driver on non-Abit boards With this patch the abituguru refuses to load on non Abit motherboards, as discussed in lkml CONFIG_BREAK_MY_MACHINE thread. Signed-off-by: Hans de Goede Acked-by: Jean Delvare Signed-off-by: Mark M. Hoffman commit 9c2e14afb98f761ec80ea809adbc87b15b060e7b Author: Hans de Goede Date: Mon Jul 2 23:08:26 2007 +0200 hwmon: fix Abit Uguru3 driver detection on some motherboards This patch changes the driver to also detect uguru3's which hold 0x08 at DATA initially, as has been reported here: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=220160 Also when an uguru3's holds 0x0014 in the ID register it will now report "Abit AB9 Pro" as motherboard identification. Signed-off-by: Hans de Goede Signed-off-by: Mark M. Hoffman commit 9f66036b4f95f5e830d68a3ce90aeece0e0c4bf3 Author: Jean Delvare Date: Sun Jun 24 11:23:41 2007 +0200 hwmon/w83627ehf: Be quiet when no chip is found This fixes bug #8593: http://bugzilla.kernel.org/show_bug.cgi?id=8593 Signed-off-by: Jean Delvare Signed-off-by: Mark M. Hoffman commit 7cb7273f8ce9c5790a7b64208172b4203977e0a3 Author: Jean Delvare Date: Sun Jun 24 11:21:43 2007 +0200 hwmon/w83627ehf: No need to initialize fan_min We don't need to initialize fan_min in this driver, as the fan_div attributes are read-only. Signed-off-by: Jean Delvare Signed-off-by: Mark M. Hoffman commit da667365befb2846485b82c4e6c57729dd513fd2 Author: Jean Delvare Date: Sun Jun 24 11:21:02 2007 +0200 hwmon/w83627ehf: Export the thermal sensor types Add support for the w83627ehf thermal sensor types. I made them read-only, as the BIOS is supposed to set them up properly. This information makes it easier to find out which temperature channel corresponds to the CPU. Signed-off-by: Jean Delvare Signed-off-by: Mark M. Hoffman commit d3130f0e30745b406af233897a27834eb5285f45 Author: Jean Delvare Date: Sun Jun 24 11:20:13 2007 +0200 hwmon/w83627ehf: Enable VBAT monitoring If VBAT monitoring is disabled, enable it. Original patch from an anonymous contributor on the lm-sensors trac system: http://lm-sensors.org/ticket/2218 Signed-off-by: Jean Delvare Signed-off-by: Mark M. Hoffman commit fc18d6c0479d5b6da281590a8caf166d60cc748b Author: Jean Delvare Date: Sun Jun 24 11:19:42 2007 +0200 hwmon/w83627ehf: Add support for the VID inputs The W83627EHF and similar chips have 6 VID input pins, add support for them. The driver changes the input voltage level automatically if the current setting is not correct for the detected CPU model. Signed-off-by: Jean Delvare Signed-off-by: Mark M. Hoffman commit 6b3e46458049fe556c2346a347c4540e532db288 Author: Jean Delvare Date: Sun Jun 24 11:19:01 2007 +0200 hwmon/w83627ehf: Fix timing issues * I have experimental evidence that the W83627EHG needs more than 1 second to refresh all the measured values. Increase the caching time to 1.5 second. * When changing a fan clock divider, the corresponding fan speed measurement register is no longer valid, until the next time the chip will refresh it. One way to fix this is to pretend that the cache is still valid for one more period (1.5 second.) Signed-off-by: Jean Delvare Signed-off-by: Mark M. Hoffman commit 475ef85512900dcb87435e13656c1f5e724de379 Author: David Hubbard Date: Sun Jun 24 11:17:09 2007 +0200 hwmon/w83627ehf: Add error messages for two error cases If the Super-I/O device is disabled, it is likely the BIOS has a good reason for leaving it disabled, so give a warning when enabling it -- it's not likely to be wired correctly or be able to give good data. Also, if the Super-I/O device is configured with an address of 0, the driver refuses to initialize it. Signed-off-by: David Hubbard Signed-off-by: Jean Delvare Signed-off-by: Mark M. Hoffman commit 1ea6dd3840e5a22924d78299fee018c82e425d80 Author: David Hubbard Date: Sun Jun 24 11:16:15 2007 +0200 hwmon/w83627ehf: Convert to a platform driver Remove i2c-isa from the w83627ehf driver, and use a platform driver instead. Signed-off-by: David Hubbard Signed-off-by: Jean Delvare Signed-off-by: Mark M. Hoffman commit 658291fc38715c8723372a869c22b700ec41c972 Author: David Hubbard Date: Sun Jun 24 11:15:03 2007 +0200 hwmon/w83627ehf: Update the Kconfig entry Add description for the W83627DHG chip to Kconfig. Signed-off-by: David Hubbard Signed-off-by: Jean Delvare Signed-off-by: Mark M. Hoffman commit d2bc7b135a948f788646e3a7aff9ac5597f42f4f Author: Adrian Bunk Date: Fri Jul 6 01:23:06 2007 +0200 make coretemp_device_remove() static coretemp_device_remove() can become static. Signed-off-by: Adrian Bunk Acked-by: Jean Delvare Signed-off-by: Mark M. Hoffman commit e46957edfb85e3054ed49350777833e18564c9ff Author: Hans-Jürgen Koch Date: Thu Jul 5 17:58:29 2007 +0200 hwmon: Add LM93 support This patch adds support for the LM93 hardware monitoring chip. Signed-off-by: Hans J. Koch Signed-off-by: Mark M. Hoffman commit 875f25d5f553f7cf3e6a59c50b32e5fc06442945 Author: Jean Delvare Date: Wed Jun 27 21:26:08 2007 +0200 hwmon: Improve the pwmN_enable documentation The documentation of the pwmN_enable interface file is not very clear, and has been confusing several driver authors already. Make it clearer. Signed-off-by: Jean Delvare Signed-off-by: Mark M. Hoffman commit 90205c6cbb8fd9880bf798903a99f5b8903455e2 Author: Jean Delvare Date: Sat Jun 23 14:58:22 2007 +0200 hwmon/smsc47b397: Don't report missing fans as spinning at 82 RPM Also protects ourselves against a possible division by zero. Signed-off-by: Jean Delvare Signed-off-by: Mark M. Hoffman commit 3faa1ffb4f4be7d10715f4b003ff7b27d14eae26 Author: Hans de Goede Date: Sun Jun 17 00:28:45 2007 +0200 hwmon: Add support for newer uGuru's This patch adds a new driver for the hardware monitoring features of the third revision of the Abit uGuru chip, found on recent Abit motherboards. This is an entirely different beast then the first and second revision (its again a winbond microcontroller, but the "protocol" to talk to it and the bank addresses are very different. Signed-off-by: Hans de Goede Signed-off-by: Mark M. Hoffman commit aba5073d3f4c928c89c483d85f8cff7cc9aa3312 Author: Phil Endecott Date: Fri Jun 29 09:19:14 2007 +0200 hwmon/f71805f: Add temperature-tracking fan control mode Add support for the "temperature mode" fan speed control. In this mode, the user can define 3 temperature/speed trip points, and the chip will set the speed automatically according to the temperature changes. Signed-off-by: Phil Endecott Signed-off-by: Jean Delvare Signed-off-by: Mark M. Hoffman commit 158ce07564b68d4215b9560213a089d6f7c5a4ea Author: Jean Delvare Date: Sun Jun 17 16:09:12 2007 +0200 hwmon/w83627ehf: Preserve speed reading when changing fan min The w83627ehf driver changes the fan clock divider automatically when a new min fan speed is set. It is supposed to preserve the fan speed reading while doing so, bug doesn't really. Fix it. Signed-off-by: Jean Delvare Signed-off-by: Mark M. Hoffman commit e432dc811bfb6b3d3ad618d99bd8d58132fec316 Author: Hans de Goede Date: Mon Jun 18 22:59:34 2007 +0200 hwmon: fix detection of abituguru volt inputs This patch fixes the detection of volt inputs with a reading of more then 240 units. Signed-off-by: Hans de Goede Signed-off-by: Mark M. Hoffman commit 2dbbdb35746fdc1a3c3bc5b07f197a90e53b059e Author: Juerg Haefliger Date: Wed Jun 20 15:41:33 2007 -0700 hwmon: add SCH5317 to smsc47b397 driver This patch adds the SMSC SCH5317 chip (device ID 0x85) as a supported device to the smsc47b397 driver. Signed-off-by: Juerg Haefliger Signed-off-by: Mark M. Hoffman commit b74f3fdd98c7186930b8ee841dc542dfdba95473 Author: corentin.labbe Date: Wed Jun 13 20:27:36 2007 +0200 hwmon: convert it87 to platform driver This is the patch for converting it87 to a platform driver (and remove i2c-isa). Signed-off-by: Corentin LABBE Acked-by: Jean Delvare Signed-off-by: Mark M. Hoffman commit 04a6217df28e3004ba4e76eb0a356a30f72c564f Author: Jean Delvare Date: Tue Jun 12 13:57:19 2007 +0200 hwmon: Fix a potential race condition on unload Fix a potential race condition when some hardware monitoring platform drivers are being unloaded. I believe that the driver data pointer shouldn't be cleared before all the sysfs files are removed, otherwise a sysfs callback might attempt to dereference a NULL pointer. I'm not sure exactly what the driver core protects drivers against, so let's play it safe. While we're here, clear the driver data pointer when probe fails, so as to not leave an invalid pointer behind us. Signed-off-by: Jean Delvare Signed-off-by: Mark M. Hoffman commit ec5e1a4b8faa6a3522171a185a5c6ac9609e14b4 Author: Roger Lucas Date: Tue Jun 12 21:04:08 2007 +0200 hwmon: Convert vt8231 to a platform driver Convert the vt8231 driver from the nonsensical i2c-isa hack to a regular platform driver. Signed-off-by: Roger Lucas Signed-off-by: Jean Delvare Signed-off-by: Mark M. Hoffman commit 2f6ae157905c393f7372607bc2954f7689838199 Author: Jean Delvare Date: Sat Jun 9 10:11:17 2007 -0400 hwmon/sis5595: Use PCI_REVISION_ID Use PCI_REVISION_ID instead of our own define. Signed-off-by: Jean Delvare commit 1f5f48dde709ae6951a2f1e044c21f5641684b0a Author: Jean Delvare Date: Sat Jun 9 10:11:16 2007 -0400 hwmon/sis5595: Use dynamic sysfs callbacks This lets us get rid of macro-generated functions and shrinks the driver size by about 7%. Signed-off-by: Jean Delvare commit 17e7dc4373dfcf2a3058d307665263df29dd5fe7 Author: Jean Delvare Date: Sat Jun 9 10:11:16 2007 -0400 hwmon/sis5595: Convert to a platform driver Convert the sis5595 driver from the nonsensical i2c-isa hack to a regular platform driver. Signed-off-by: Jean Delvare commit 1e71a5a2ce40425e3bf1bbce021a443ec8a24043 Author: Jean Delvare Date: Sat Jun 9 10:11:16 2007 -0400 hwmon/via686a: Use dynamic sysfs callbacks This lets us get rid of macro-generated functions and shrinks the driver size by about 9%. Signed-off-by: Jean Delvare commit 2ec342e68453d9f3a1ac28ab80ffa8faacf58710 Author: Jean Delvare Date: Sat Jun 9 10:11:16 2007 -0400 hwmon/via686a: Convert to a platform driver Convert the via686a driver from the nonsensical i2c-isa hack to a regular platform driver. Signed-off-by: Jean Delvare commit 58fe0809cc02d51b7aca05ee858c8bbb0af9e0b6 Author: Jean Delvare Date: Sat Jun 9 10:11:16 2007 -0400 hwmon/via686a: Temperature interrupt configuration fix Fix the writing of the temperature interrupt configuration. The old code was working only by accident. Signed-off-by: Jean Delvare commit 1550cb6d7e78c7cfdd7b48bee6809795d43d6a33 Author: Carlos Olalla Martinez Date: Sat Jun 9 10:11:16 2007 -0400 hwmon/w83627hf: Add PWM frequency selection support Signed-off-by: Carlos Olalla Signed-off-by: Jean Delvare commit 08a8f6e9e63a4317f716749ba9f828351bd4af35 Author: Rudolf Marek Date: Sat Jun 9 10:11:16 2007 -0400 hwmon/it87: Add IT8726F support Add support for IT8726F chip driver, which is just same as IT8716F with additional glue logic for AMD power sequencing. Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare commit 7817a39e65f04abe136d94a65fa26b7fe3334a1f Author: Jean Delvare Date: Sat Jun 9 10:11:16 2007 -0400 hwmon: Fault files naming convention We have the following naming convention documented in Documentation/hwmon/sysfs-interface for fault files: in[0-*]_input_fault fan[1-*]_input_fault temp[1-*]_input_fault Some drivers follow this convention (lm63, lm83, lm90, smsc47m192). However some drivers omit the "input" part and create files named fan1_fault (pc87427) or temp1_fault (dme1737). And the new "generic" libsensors follows this second (non-standard) convention, so it fails to report fault conditions for drivers which follow the standard. We want a single naming scheme, and everyone seems to prefer the shorter variant, so let's go for it. Signed-off-by: Jean Delvare commit 32c82a934759b2c9939c9e25865c2d7d1204b9e8 Author: Rainer Birkenmaier Date: Sat Jun 9 10:11:16 2007 -0400 hwmon/lm90: Add support for the Maxim MAX6680/MAX6681 Signed-off-by: Rainer Birkenmaier Signed-off-by: Jean Delvare commit 2df6d811574f46bea0d38bf91aa54df4c05488cd Author: Jean Delvare Date: Sat Jun 9 10:11:16 2007 -0400 hwmon: Use platform_device_add_data() Use platform_device_add_data() in hardware monitoring drivers. This makes the code nicer and smaller too. Reported by David Hubbard. Signed-off-by: Jean Delvare Cc: David Hubbard commit f641b588fdfd25e73c73f6e4977cd2daf8a5e363 Author: Jean Delvare Date: Sat Jun 9 10:11:16 2007 -0400 hwmon/pc87360: Convert to a platform driver Convert the pc87360 driver from the nonsensical i2c-isa hack to a regular platform driver. This is a direct conversion, other cleanups could happen on top of that. Signed-off-by: Jean Delvare Acked-by: Jim Cromie commit b825037d185549825d4f35504f2085ec86037110 Author: Juerg Haefliger Date: Sat Jun 9 10:11:16 2007 -0400 hwmon/dme1737: Add documentation Add documentation for the new SMSC DME1737 driver. Signed-off-by: Juerg Haefliger Signed-off-by: Jean Delvare commit 9431996f55f8a3c04cdcb63895cf7661e135fadb Author: Juerg Haefliger Date: Sat Jun 9 10:11:16 2007 -0400 hwmon: New SMSC DME1737 driver Add support for the hardware monitoring and fan control capabilities of the SMSC DME1737 and Asus A8000 Super-I/O chips. The hardware monitoring logic of this chip is similar to the LM85 but has some additional features that this driver supports. Even though it's a Super-I/O chip, the hardware monitoring logic can only be accessed via SMBus. Signed-off-by: Juerg Haefliger Signed-off-by: Jean Delvare commit 87f0f31baf9ea2cb273d7fb56b3ebf9df5096884 Author: Jean Delvare Date: Sat Jun 9 10:11:15 2007 -0400 hwmon/ds1621: Create individual alarm files Future versions of libsensors will need this. Signed-off-by: Jean Delvare Cc: Aurelien Jarno commit 46a2e71ced949ecf238f796c178f85f03501ce88 Author: Jean Delvare Date: Sat Jun 9 10:11:15 2007 -0400 hwmon/ds1621: Use dynamic sysfs callbacks This lets us get rid of macro-generated functions and shrinks the driver size by about 8%. Signed-off-by: Jean Delvare Cc: Aurelien Jarno commit 75819f01af77d6d70abc7777e450a0848a9b898b Author: Jean Delvare Date: Sat Jun 9 10:11:15 2007 -0400 hwmon/ds1621: Minor cleanups * Discard comments which do not apply or are redundant. * Remove a few useless instructions. * Rename new_client to just client. Signed-off-by: Jean Delvare Cc: Aurelien Jarno commit e4a7167f82130fa95005097797bb1ec9c76201fd Author: Jean Delvare Date: Sat Jun 9 10:11:15 2007 -0400 hwmon/smsc47m192: Semaphore to mutex conversion Signed-off-by: Jean Delvare commit 0966415d7267c860b88fe96f7e83cfd687efe0bd Author: Jean Delvare Date: Sat Jun 9 10:11:15 2007 -0400 hwmon/lm90: Spelling fix: explicitly Signed-off-by: Jean Delvare commit 6ea884dbc6eedd28af0fdb4577cdcb033d459543 Author: Mark M. Hoffman Date: Sat Jun 9 10:11:15 2007 -0400 hwmon: New maintainer Mark M. Hoffman is taking over for Jean Delvare as maintainer of the hwmon subsystem. He is also the author/maintainer for several existing drivers. Signed-off-by: Jean Delvare Signed-off-by: Mark M. Hoffman commit 80ed71ce1a3369521c693ebf30abb9cfe1dc7e66 Author: James Bottomley Date: Thu Jul 19 10:15:10 2007 -0500 [SCSI] bsg: separate bsg and SCSI (so SCSI can be modular) This patch moves the bsg registration into SCSI so that bsg no longer has a dependency on the scsi_interface_register API. This can be viewed as a temporary expedient until we can get universal bsg binding sorted out properly. Also use the sdev bus_id as the generic bsg name (to avoid clashes with the queue name). Acked-by: FUJITA Tomonori Acked-by: Jens Axboe Signed-off-by: James Bottomley commit 41e9d344bf52c57ec16648d08618b61d3f1d4bdc Author: Jens Axboe Date: Thu Jul 19 08:13:01 2007 +0200 IDE: fix termination of non-fs requests ide-disk calls ide_end_request(drive, 0, 0); to finish an unknown request, but this doesn't work so well for non-fs requests, since ide_end_request() internally looks at ->hard_cur_sectors to see how much data to end. Only file system requests store a transfer value in there, pc requests fill out ->data_len as a byte based transfer value instead. Since we ask to end 0 bytes of that request, it will never be terminated and ide-disk gets stuck in a loop "handling" that same request over and over. Switch __ide_end_request() to take a byte based transfer count, and adjust ide_end_request() to look at the right field to determine how much IO to end when it's being passed in 0. Acked-by: Bartlomiej Zolnierkiewicz Tested-By: Giacomo Catenazzi Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit b02b6bc46571b21a545c9e697df1e226ff22bc81 Author: Kristian Høgsberg Date: Wed May 9 19:23:12 2007 -0400 [SCSI] Make scsi_host_template::proc_name const char * instead of char *. Signed-off-by: Kristian Høgsberg collapsed with fw-sbp2 patch "Drop cast to non-const char * in host template initialization." from Kristian Høgsberg Signed-off-by: Stefan Richter Signed-off-by: James Bottomley commit 275afcac9953ece0828972edeab9684cfe1a5ef3 Author: Andrew Morton Date: Thu Jul 19 01:50:35 2007 -0700 afs build fix Bruce and David's patches clashed. fs/afs/flock.c: In function 'afs_do_getlk': fs/afs/flock.c:459: error: void value not ignored as it ought to be Cc: "J. Bruce Fields" Acked-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ed2c12f323e8fafbc94f9bcfb924f9df36e64dc7 Author: Andrew Morton Date: Thu Jul 19 01:50:35 2007 -0700 kernel/sysctl.c: finish off the warning comments I've been chasing these comments around this file all week. Hopefully we're straight now. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 87f24c3ac399e82c578e71311251f00618fc5203 Author: Doug Thompson Date: Thu Jul 19 01:50:34 2007 -0700 drivers/edac: add to edac docs Updated the EDAC kernel documentation Signed-off-by: Doug Thompson Cc: Greg KH Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b2a4ac0c2860b27670bce99e8c9c281bf431c272 Author: Doug Thompson Date: Thu Jul 19 01:50:33 2007 -0700 drivers/edac: fix edac_device sysfs corner case bug Some simple fixes to properly reference counter values from the block attribute level of edac_device objects. Properly sequencing the array pointer was added, resulting in correct identification of block level attributes from their base class functions. Added more verbose debug statement for event tracking. Also during some corner testing, found a bug in the store/show sequence of operations for the block attribute/controls management. An old intermediate structure for 'blocks' was still in the processing pipeline. This patch removes that old structure and correctly utilizes the new struct edac_dev_sysfs_block_attribute for passing control from the sysfs to the low level store/show function of the edac driver. Now the proper kobj pointer to passed downward to the store/show functions. Signed-off-by: Doug Thompson Cc: Greg KH Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba9a5918c86762fa7fae353c635bb6ed5221dfb8 Author: Douglas Thompson Date: Thu Jul 19 01:50:32 2007 -0700 drivers/edac: add to maintainers new info Update maintainer information on edac components Signed-off-by: Doug Thompson Cc: Greg KH Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 420390f06a5afd3e130b960ef99bc4bd4286e535 Author: Ranganathan Desikan Date: Thu Jul 19 01:50:31 2007 -0700 drivers/edac: new i82975x driver New EDAC driver for the i82975x memory controller chipset Used on ASUS motherboards [akpm@linux-foundation.org: fix multiple coding-style bloopers] Signed-off-by: Signed-off-by: Ranganathan Desikan Signed-off-by: Doug Thompson Cc: Greg KH Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bf52fa4a26567bfbf5b1d30f84cf0226e61d26cd Author: Doug Thompson Date: Thu Jul 19 01:50:30 2007 -0700 drivers/edac: fix workq reset deadlock Fix mutex locking deadlock on the device controller linked list. Was calling a lock then a function that could call the same lock. Moved the cancel workq function to outside the lock Added some short circuit logic in the workq code Added comments of description Code tidying Signed-off-by: Doug Thompson Cc: Greg KH Cc: Alan Cox Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fb3fb2068775a1363265edc00870aa5e2f0e3631 Author: Doug Thompson Date: Thu Jul 19 01:50:30 2007 -0700 drivers/edac: code tidying on export-gpl Change EXPORT_SYMBOLs to EXPORT_SYMBOLS_GPL Tidy changes: blank lines, inline removal, add comment Signed-off-by: Doug Thompson Cc: Greg KH Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1c3631ff1f805cb72644fcde02b7c58950f21cd5 Author: Douglas Thompson Date: Thu Jul 19 01:50:29 2007 -0700 drivers/edac: fix edac_device sysfs completion code With feedback, this patch corrects operation of the kobject release operation on kobjects, attributes and controls for the edac_device. Cc: Alan Cox alan@lxorguk.ukuu.org.uk Signed-off-by: Doug Thompson Acked-by: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8096cfafbb7ad3cb1a286ae7e8086167f4ebb4b6 Author: Doug Thompson Date: Thu Jul 19 01:50:27 2007 -0700 drivers/edac: fix edac_mc sysfs completion code This patch refactors the 'releasing' of kobjects for the edac_mc type of device. The correct pattern of kobject release is followed. As internal kobjs are allocated they bump a ref count on the top level kobj. It in turn has a module ref count on the edac_core module. When internal kobjects are released, they dec the ref count on the top level kobj. When the top level kobj reaches zero, it decrements the ref count on the edac_core object, allow it to be unloaded, as all resources have all now been released. Cc: Alan Cox alan@lxorguk.ukuu.org.uk Signed-off-by: Doug Thompson Acked-by: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d45e7823baf655ced91c7987fb4ba9aae990ad6d Author: Doug Thompson Date: Thu Jul 19 01:50:27 2007 -0700 drivers/edac: fix edac_device init apis Refactoring of sysfs code necessitated the refactoring of the edac_device_alloc() and edac_device_add_device() apis, of moving the index value to the alloc() function. This patch alters the in tree drivers to utilize this new api signature. Having the index value performed later created a chicken-and-the-egg issue. Moving it to the alloc() function allows for creating the necessary sysfs entries with the proper index number Cc: Alan Cox alan@lxorguk.ukuu.org.uk Signed-off-by: Doug Thompson Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b8f6f9755248026f21282e25cac49a1af698056c Author: Doug Thompson Date: Thu Jul 19 01:50:26 2007 -0700 drivers/edac: fix edac_mc init apis Refactoring of sysfs code necessitated the refactoring of the edac_mc_alloc() and edac_mc_add_mc() apis, of moving the index value to the alloc() function. This patch alters the in tree drivers to utilize this new api signature. Having the index value performed later created a chicken-and-the-egg issue. Moving it to the alloc() function allows for creating the necessary sysfs entries with the proper index number Cc: Alan Cox alan@lxorguk.ukuu.org.uk Signed-off-by: Doug Thompson Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fd309a9d8e63e9176759d00630b65d772ae06e0c Author: Douglas Thompson Date: Thu Jul 19 01:50:25 2007 -0700 drivers/edac: fix leaf sysfs attribute This patch fixes and enhances the driver level set of sysfs attributes that can be added to the 'block' level of an edac_device type of driver. There is a controller information structure, which contains one or more instances of device. Each instance will have one or more blocks of device specific counters. This patch fixes the ability to have more detailed attributes/controls for each of the 'blocks', providing for the addition of controls/attributes from the low level driver to user space via sysfs. Cc: Alan Cox alan@lxorguk.ukuu.org.uk Signed-off-by: Douglas Thompson Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7d8536fb484360f35c0a9e3631641948bf168e2b Author: Egor Martovetsky Date: Thu Jul 19 01:50:24 2007 -0700 drivers/edac: new pasemi driver NEW EDAC driver for the memory controllers on PA Semi PA6T-1682M. Changes since last submission: * Rebased on top of 2.6.22-rc4-mm2 with the EDAC changes merged there. * Minor checkpatch.pl cleanups * Renamed ctl_name * Added dev_name * edac_mc.h -> edac_core.h [akpm@linux-foundation.org: make printk more informative] Cc: Alan Cox alan@lxorguk.ukuu.org.uk Signed-off-by: Egor Martovetsky Signed-off-by: Olof Johansson Signed-off-by: Doug Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7297c2617f6465d7862e156d4db5d812744280f1 Author: Mark Grondona Date: Thu Jul 19 01:50:23 2007 -0700 drivers/edac: fix e752x reversed csrows Found a 'reversal' decoding bug in the driver. This patch fixes that mapping to correctly display the CSROW entries in their proper order. Users will be enable to correctly identifiy the failing DIMM with this fix. [akpm@linux-foundation.org: unneeded (and undesirable) cast of void*] Cc: Alan Cox alan@lxorguk.ukuu.org.uk Signed-off-by: Mark Grondona Signed-off-by: Doug Thompson Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0ca84761faeb9d49301d45b39859411c7a124690 Author: Doug Thompson Date: Thu Jul 19 01:50:22 2007 -0700 drivers/edac: fix edac_device semaphore to mutex A previous patch changed the edac_mc src file from semaphore usage to mutex This patch changes the edac_device src file as well, from semaphore use to mutex operation. Use a mutex primitive for mutex operations, as it does not require a semaphore Cc: Alan Cox alan@lxorguk.ukuu.org.uk Signed-off-by: Doug Thompson Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f065e723b02afb0d36a2aae8e6d206ba2667fc6 Author: Douglas Thompson Date: Thu Jul 19 01:50:22 2007 -0700 drivers/edac: remove file edac_mc.h Removed the no-longer-needed file edac_mc.h Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 494d0d55bcc7ef94c744a59779327e45a27f7801 Author: Douglas Thompson Date: Thu Jul 19 01:50:21 2007 -0700 drivers/edac: mod edac_opt_state_to_string function Refactored the function edac_op_state_toString() to be edac_op_state_to_string() for consistent style, and its callers Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7391c6dcab3094610cb99bbd559beaa282582eac Author: Douglas Thompson Date: Thu Jul 19 01:50:21 2007 -0700 drivers/edac: mod edac_align_ptr function Refactor the edac_align_ptr() function to reduce the noise of casting the aligned pointer to the various types of data objects and modified its callers to its new signature Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52490c8d07680a7ecc3c1a70a16841455d37e96a Author: Douglas Thompson Date: Thu Jul 19 01:50:20 2007 -0700 drivers/edac: edac_device code tidying For the file edac_device.c perform some coding style enhancements Add some function header comments Made for better readability commands Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b2ccaecad2b00bf7bc72d5b864425daf43a4080d Author: Douglas Thompson Date: Thu Jul 19 01:50:19 2007 -0700 drivers/edac: i5000 code tidying Various code style conformance patches on the i5000 driver Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f044091ca4c0b05be8f83748d76d4fbba4fc74cf Author: Douglas Thompson Date: Thu Jul 19 01:50:19 2007 -0700 drivers/edac: remove null from statics Patches to conform to coding style, namely static don't need to be initialized to NULL nor '0', as that is the default Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 977c76bd687585f4528c6c9c6966842955771f52 Author: Marisuz Kozlowski Date: Thu Jul 19 01:50:18 2007 -0700 drivers/edac: i5000 define typo Found a typo in one of the #defines in the driver MTR_DIM_RANKS --> MTR_DIMM_RANK Signed-off-by: Marisuz Kozlowski Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53078ca84b1c01f36c306d1f52e2f88c7bb2f9e4 Author: Douglas Thompson Date: Thu Jul 19 01:50:17 2007 -0700 include/linux/pci_id.h: add amd northbridge defines pci_ids.h needs two of the AMD NB device-ids namely, Addressmap and the Memory Controller devices This patch adds those to the pci_id.h include file Signed-off-by: Douglas Thompson Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1c52152b3008b7bdcc3b94d0be4d0b814dce1530 Author: Douglas Thompson Date: Thu Jul 19 01:50:17 2007 -0700 drivers/edac: fix ignored return i82875p Compiling this module gave a warning that the return value of 'pci_bus_add_device()' was not checked. This patch adds that check and an output message Signed-off-by: Douglas Thompson Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 654ede200fe028373852bbca387ab4834ddb7228 Author: Jason Uhlenkott Date: Thu Jul 19 01:50:16 2007 -0700 drivers/edac: mod race fix i82875p If ERRSTS indicates that there's no error then we don't need to bother reading the other registers. In addition to making the common case faster, this actually fixes a small race where we don't see an error but we clear the error bits anyway, potentially wiping away info on an error that happened in the interim (or where a CE arrives between the first and second read of ERRSTS, causing us to falsely claim "UE overwrote CE"). Signed-off-by: Jason Uhlenkott Signed-off-by: Douglas Thompson Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b113a3f7e85d7f97c8383a88a5bc7c2ea8daeb2f Author: Douglas Thompson Date: Thu Jul 19 01:50:15 2007 -0700 drivers/edac: add mips and ppc visibility 1) Remove an old CVS ID string 2) change EDAC from a tristate option to a simple bool option 3) In addition to the X86 arch, PPC and MIPS also have drivers in the submission queue. This patch turns on the EDAC flag for those archs. Each driver will have its respective 'depends on ARCH' set. Signed-off-by: Douglas Thompson Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 052dfb45ccb5ea354a426b52556bcfee75b9d2f5 Author: Douglas Thompson Date: Thu Jul 19 01:50:13 2007 -0700 drivers/edac: cleanup spaces-gotos after Lindent messup This patch fixes some remnant spaces inserted by the use of Lindent. Seems Lindent adds some spaces when it shoulded. These have been fixed. In addition, goto targets have issues, these have been fixed in this patch. Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6bc7840411b8c7fe11e1879d882c88119d1c033e Author: Douglas Thompson Date: Thu Jul 19 01:50:12 2007 -0700 drivers/edac: update MAINTAINERS files for EDAC Added new maintainers for the new EDAC drivers. Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8cb2a39831b25f2289a2a6571666a135e475035c Author: Douglas Thompson Date: Thu Jul 19 01:50:12 2007 -0700 drivers/edac: add info kconfig Kconfig - modified the help of EDAC Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d391a7b8147d12b0e5141fb65829856fb0c289dc Author: Douglas Thompson Date: Thu Jul 19 01:50:11 2007 -0700 drivers/edac: device output clenaup The error handling output strings needed to be refactored for better displaying of the error informaton. Also needed to added offset_value for output as well Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42a8e397a80c277afb2aeb22232bc70114035bb1 Author: Douglas Thompson Date: Thu Jul 19 01:50:10 2007 -0700 drivers/edac: add device sysfs attributes Added new controls for the edac_device and edac_mc sysfs folder. These can be initialized by the low level driver to provide misc controls into the low level driver for its use Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 456a2f9552e7849475f4aea1a9aa4c0e54b3ddda Author: Dave Jiang Date: Thu Jul 19 01:50:10 2007 -0700 drivers/edac: drivers to use new PCI operation Move x86 drivers to new pci controller setup Signed-off-by: Dave Jiang Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cddbfcacf02dc2d5b074fc2717358a7529a190db Author: Douglas Thompson Date: Thu Jul 19 01:50:08 2007 -0700 drivers/edac: Lindent r82600 Run r82600_edac.c file through Lindent for cleanup Signed-off-by: Douglas Thompson Signed-off-by: Dave Jiang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 11116601092c42364892d3f59c8f4a8a30916867 Author: Douglas Thompson Date: Thu Jul 19 01:50:07 2007 -0700 drivers/edac: Lindent i82443bxgx Run i82443bxgx.c file through Lindent for cleanup Signed-off-by: Douglas Thompson Signed-off-by: Dave Jiang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 203333cbbaae3941504c2b6e92850783bf361b6f Author: Dave Jiang Date: Thu Jul 19 01:50:06 2007 -0700 drivers/edac: Lindent e752x Run e752x_edac.c file through Lindent for cleanup Signed-off-by: Dave Jiang Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 466b71d58413a515a8029b4eccf98c08b8bb5aca Author: Dave Jiang Date: Thu Jul 19 01:50:05 2007 -0700 drivers/edac: Lindent i82875p Lindent cleanup of i82875p_edac driver Signed-off-by: Dave Jiang Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b4e8b37201d647e4b4abb89d57ebdb8c739d5405 Author: Dave Jiang Date: Thu Jul 19 01:50:04 2007 -0700 drivers/edac: Lindent i82860 Lindent cleanup of i82860 edac driver Signed-off-by: Dave Jiang Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 36b8289e249f800a57a4c908a9a7e91345f516ef Author: Dave Jiang Date: Thu Jul 19 01:50:04 2007 -0700 drivers/edac: Lindent i3000 Lindent cleanup of i3000_edac driver Signed-off-by: Dave Jiang Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 849a4c375a8e06cd000399dceb25888d356d021f Author: Dave Jiang Date: Thu Jul 19 01:50:03 2007 -0700 drivers/edac: Lindent e7xxx Lindent cleanup of e7xxx_edac driver Signed-off-by: Dave Jiang Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f4aff426533f62c46d4e4d104572d838d35034eb Author: Douglas Thompson Date: Thu Jul 19 01:50:03 2007 -0700 drivers/edac: Lindent i5000 Ran e752x_edac.c file through Lindent for cleanup Signed-off-by: Douglas Thompson Signed-off-by: Dave Jiang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 67cb2b61225601ef1ead842c7a012bb6da19f847 Author: Douglas Thompson Date: Thu Jul 19 01:50:02 2007 -0700 drivers/edac: Lindent amd76x Ran this driver through Lindent for cleanup Signed-off-by: Dave Jiang Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86aa8cb7bc47fe786df073246055d69d98e6330a Author: Douglas Thompson Date: Thu Jul 19 01:50:01 2007 -0700 drivers/edac: cleanup workq ifdefs The origin of this code comes from patches at sourceforge, that allow EDAC to be updated to various kernels. With kernel version 2.6.20 a new workq system was installed, thus the patches needed to be modified based on the kernel version. For submitting to the latest kernel.org those #ifdefs are removed Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 542b25881a6ae1bf0804d4d39bf8b4d2cfc25e42 Author: Douglas Thompson Date: Thu Jul 19 01:50:01 2007 -0700 drivers/edac: edac_device sysfs cleanup Removal of some old dead and disabled code from the edac_device sysfs code Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 079708b9173595bf74b31b14c36e946359ae6c7e Author: Douglas Thompson Date: Thu Jul 19 01:49:58 2007 -0700 drivers/edac: core Lindent cleanup Run the EDAC CORE files through Lindent for cleanup Signed-off-by: Douglas Thompson Signed-off-by: Dave Jiang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4de78c6877ec21142582ac19453c2d453d1ea298 Author: Dave Jiang Date: Thu Jul 19 01:49:54 2007 -0700 drivers/edac: mod PCI poll names Fixup poll values for MC and PCI. Also make mc function names unique to mc. Signed-off-by: Dave Jiang Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66ee2f940ac8ab25f0c43a1e717d25dc46bfe74d Author: Dave Jiang Date: Thu Jul 19 01:49:54 2007 -0700 drivers/edac: mod assert_error check Change error check and clear variable from an atomic to an int Signed-off-by: Dave Jiang Signed-off-by: Douglas Thompson Signed-off-by: Linus Torvalds commit 91b99041c1d577ded1da599ddc28cec2e07253cf Author: Dave Jiang Date: Thu Jul 19 01:49:52 2007 -0700 drivers/edac: updated PCI monitoring Moving PCI to a per-instance device model This should include the correct sysfs setup as well. Please review. Signed-off-by: Dave Jiang Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 81d87cb13e367bb804bf44889ae0de7369705d6c Author: Dave Jiang Date: Thu Jul 19 01:49:52 2007 -0700 drivers/edac: mod MC to use workq instead of kthread Move the memory controller object to work queue based implementation from the kernel thread based. Signed-off-by: Dave Jiang Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 535c6a53035d8911f6b90455550c5fde0da7b866 Author: Jason Uhlenkott Date: Thu Jul 19 01:49:48 2007 -0700 drivers/edac: new inte 30x0 MC driver Here's a driver for the Intel 3000 and 3010 memory controllers, relative to today's Sourceforge code drop. This has only had light testing (I've yet to actually see it handle a memory error) but it detects my hardware correctly. Signed-off-by: Jason Uhlenkott Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c4192705fec85219086231a1c0fa61e8776e2c3b Author: Dave Jiang Date: Thu Jul 19 01:49:47 2007 -0700 drivers/edac: add dev_name getter function Move dev_name() macro to a more generic interface since it's not possible to determine whether a device is pci, platform, or of_device easily. Now each low level driver sets the name into the control structure, and the EDAC core references the control structure for the information. Better abstraction. Signed-off-by: Dave Jiang Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 20bcb7a81dee21bfa3408f03f46b2891c9b5c84b Author: Douglas Thompson Date: Thu Jul 19 01:49:47 2007 -0700 drivers/edac: mod use edac_core.h In the refactoring of edac_mc.c into several subsystem files, the header file edac_mc.h became meaningless. A new header file edac_core.h was created. All the files that previously included "edac_mc.h" are changed to include "edac_core.h". Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c0d121720220584bba2876b032e58a076b843fa1 Author: Dave Jiang Date: Thu Jul 19 01:49:46 2007 -0700 drivers/edac: add new nmi rescan Provides a way for NMI reported errors on x86 to notify the EDAC subsystem pending ECC errors by writing to a software state variable. Here's the reworked patch. I added an EDAC stub to the kernel so we can have variables that are in the kernel even if EDAC is a module. I also implemented the idea of using the chip driver to select error detection mode via module parameter and eliminate the kernel compile option. Please review/test. Thx! Also, I only made changes to some of the chipset drivers since I am unfamiliar with the other ones. We can add similar changes as we go. Signed-off-by: Dave Jiang Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 28f96eeafc89643d411d54c258788a8573576127 Author: Andrew Morton Date: Thu Jul 19 01:49:45 2007 -0700 drivers/edac-new-i82443bxgz-mc-driver: mark as broken It will claim the PCI devices from under intel_agp.ko's feet. Greg is brewing some fix for that. Cc: Douglas Thompson Cc: Tim Small Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a2c675c891960f86c025d4ab3d3904364bf4f96 Author: Tim Small Date: Thu Jul 19 01:49:42 2007 -0700 drivers/edac: new i82443bxgz MC driver This is a NEW EDAC Memory Controller driver for the 440BX chipset (I82443BXGX) created and submitted by Timm Small Signed-off-by: Tim Small Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 522a94bd1e18a2acf9428f48db585a2fc816559e Author: Douglas Thompson Date: Thu Jul 19 01:49:41 2007 -0700 drivers/edac: core.h fix scrubdefs Patch to fix some scrubbing #defines in the edac_core.h file Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eb60705ac5a9869b2d078f0b472ea64b9b52b684 Author: Eric Wollesen Date: Thu Jul 19 01:49:39 2007 -0700 drivers/edac: new intel 5000 MC driver Eric Wollesen ported the Bluesmoke Memory Controller driver (written by Doug Thompson) for the Intel 5000X/V/P (Blackford/Greencreek) chipset to the in kernel EDAC model. This patch incorporates the module for the 5000X/V/P chipset family [m.kozlowski@tuxland.pl: edac i5000 parenthesis balance fix] Signed-off-by: Eric Wollesen Signed-off-by: Doug Thompson Signed-off-by: Mariusz Kozlowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 63b7df9101895d1f0a259c567b3bab949a23075f Author: Matthias Kaehlcke Date: Thu Jul 19 01:49:38 2007 -0700 drivers/edac: change from semaphore to mutex operation The EDAC core code uses a semaphore as mutex. use the mutex API instead of the (binary) semaphore. Matthaias wrote this, but since I had some patches ahead of it, I need to modify it to follow my patches. Signed-off-by: Matthias Kaehlcke Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a9b85e6b36cdd046b0a354c38af20a7155272b8 Author: Dave Jiang Date: Thu Jul 19 01:49:38 2007 -0700 drivers/edac: mc sysfs add missing mem types Adding missing mem types for use in the sysfs presentation file for Memory Controller device objects. Signed-off-by: Dave Jiang Signed-off-by: Doug Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e27e3dac651771fe3250f6305dee277bce29fc5d Author: Douglas Thompson Date: Thu Jul 19 01:49:36 2007 -0700 drivers/edac: add edac_device class This patch adds the new 'class' of object to be managed, named: 'edac_device'. As a peer of the 'edac_mc' class of object, it provides a non-memory centric view of an ERROR DETECTING device in hardware. It provides a sysfs interface and an abstraction for varioius EDAC type devices. Multiple 'instances' within the class are possible, with each 'instance' able to have multiple 'blocks', and each 'block' having 'attributes'. At the 'block' level there are the 'ce_count' and 'ue_count' fields which the device driver can update and/or call edac_device_handle_XX() functions. At each higher level are additional 'total' count fields, which are a summation of counts below that level. This 'edac_device' has been used to capture and present ECC errors which are found in a a L1 and L2 system on a per CORE/CPU basis. Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7c9281d76c1c0b130f79d5fc021084e9749959d4 Author: Douglas Thompson Date: Thu Jul 19 01:49:33 2007 -0700 drivers/edac: split out functions to unique files This is a large patch to refactor the original EDAC module in the kernel and to break it up into better file granularity, such that each source file contains a given subsystem of the EDAC CORE. Originally, the EDAC 'core' was contained in one source file: edac_mc.c with it corresponding edac_mc.h file. Now, there are the following files: edac_module.c The main module init/exit function and other overhead edac_mc.c Code handling the edac_mc class of object edac_mc_sysfs.c Code handling for sysfs presentation edac_pci_sysfs.c Code handling for PCI sysfs presentation edac_core.h CORE .h include file for 'edac_mc' and 'edac_device' drivers edac_module.h Internal CORE .h include file This forms a foundation upon which a later patch can create the 'edac_device' class of object code in a new file 'edac_device.c'. Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d56933e018b14fc7cad322f413eecc6cb6edf12e Author: Douglas Thompson Date: Thu Jul 19 01:49:32 2007 -0700 drivers/edac: add RDDR2 memory types Add Registered RDDR2 memory types for displaying DDR2 memories Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2da1c119fd999cb834b4fe0c1a5a8c36195df1cb Author: Adrian Bunk Date: Thu Jul 19 01:49:32 2007 -0700 drivers/edac: core: make functions static This patch makes needlessly global code static, in the edac core Signed-off-by: Adrian Bunk Cc: Doug Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5da0831c598f94582bce6bb0a55b8de2f9897cb1 Author: Douglas Thompson Date: Thu Jul 19 01:49:31 2007 -0700 drivers/edac: add edac_mc_find API This simple patch adds an important CORE API for EDAC that EDAC drivers can use to find their edac_mc control structure by passing a mem_ctl_info 'instance' value Needed for subsequent patches Signed-off-by: Douglas Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8ca47e00690914a9e5e6c734baa37c829a2f2fa1 Author: Rusty Russell Date: Thu Jul 19 01:49:29 2007 -0700 lguest: the documentation, example launcher A brief document describing how to use lguest. Because lguest doesn't have an ABI we also include an example launcher in the Documentation directory. [jmorris@namei.org: Fix up nat example in documentation] Signed-off-by: Rusty Russell Cc: Andi Kleen Signed-off-by: James Morris Cc: Matias Zabaljauregui Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b754416bfe9adac6468e45fba244d77f52048aeb Author: Rusty Russell Date: Thu Jul 19 01:49:29 2007 -0700 lguest: the block driver Lguest block driver A simple block driver for lguest. Signed-off-by: Rusty Russell Cc: Andi Kleen Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d503e2fa5aecef99675c5a81b61321a5407bf61f Author: Rusty Russell Date: Thu Jul 19 01:49:28 2007 -0700 lguest: the net driver Lguest net driver A simple net driver for lguest. [akpm@linux-foundation.org: include fix] Signed-off-by: Rusty Russell Cc: Andi Kleen Cc: Jeff Garzik Acked-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3f8c4d3f82c564e5e27c6375fe17544f694359dc Author: Rusty Russell Date: Thu Jul 19 01:49:27 2007 -0700 lguest: the console driver A simple console driver for lguest. Signed-off-by: Rusty Russell Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 709e89266b60eff444fc512400321eb02d2474eb Author: Rusty Russell Date: Thu Jul 19 01:49:27 2007 -0700 lguest: the Makefile and Kconfig This is the Kconfig and Makefile to allow lguest to actually be compiled. Signed-off-by: Rusty Russell Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6db7016d17b235a24e0c1544c202defa47ae7247 Author: Rusty Russell Date: Thu Jul 19 01:49:26 2007 -0700 lguest: the asm offsets This is the structure offsets required by lg.ko's switcher.S. Unfortunately we don't have infrastructure for private asm-offsets creation. Signed-off-by: Rusty Russell Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d7e28ffe6c74416b54345d6004fd0964c115b12c Author: Rusty Russell Date: Thu Jul 19 01:49:23 2007 -0700 lguest: the host code This is the code for the "lg.ko" module, which allows lguest guests to be launched. [akpm@linux-foundation.org: update for futex-new-private-futexes] [akpm@linux-foundation.org: build fix] [jmorris@namei.org: lguest: use hrtimers] [akpm@linux-foundation.org: x86_64 build fix] Signed-off-by: Rusty Russell Cc: Andi Kleen Cc: Eric Dumazet Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 07ad157f6e5d228be78acd5cea0291e5d0360398 Author: Rusty Russell Date: Thu Jul 19 01:49:22 2007 -0700 lguest: the guest code lguest is a simple hypervisor for Linux on Linux. Unlike kvm it doesn't need VT/SVM hardware. Unlike Xen it's simply "modprobe and go". Unlike both, it's 5000 lines and self-contained. Performance is ok, but not great (-30% on kernel compile). But given its hackability, I expect this to improve, along with the paravirt_ops code which it supplies a complete example for. There's also a 64-bit version being worked on and other craziness. But most of all, lguest is awesome fun! Too much of the kernel is a big ball of hair. lguest is simple enough to dive into and hack, plus has some warts which scream "fork me!". This patch: This is the code and headers required to make an i386 kernel an lguest guest. Signed-off-by: Rusty Russell Cc: Andi Kleen Cc: Jeremy Fitzhardinge Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5992b6dac0d23a2b51a1ccbaf8f1a2e62097b12b Author: Rusty Russell Date: Thu Jul 19 01:49:21 2007 -0700 lguest: export symbols for lguest as a module lguest does some fairly lowlevel things to support a host, which normal modules don't need: math_state_restore: When the guest triggers a Device Not Available fault, we need to be able to restore the FPU __put_task_struct: We need to hold a reference to another task for inter-guest I/O, and put_task_struct() is an inline function which calls __put_task_struct. access_process_vm: We need to access another task for inter-guest I/O. map_vm_area & __get_vm_area: We need to map the switcher shim (ie. monitor) at 0xFFC01000. Signed-off-by: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 57deb52622f3700d154e32662f36cd5f4053f6ed Author: Alessandro Zummo Date: Thu Jul 19 01:49:21 2007 -0700 RTC: add periodic irq support to rtc-cmos Adds support for periodic irq enabling in rtc-cmos. This could be used by the ALSA driver and is already being tested with the zaptel ztdummy module. Signed-off-by: Alessandro Zummo Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c7d51402d2a64c5b96531f9900bb368020ebbbbb Author: J. Bruce Fields Date: Thu Jul 19 01:49:20 2007 -0700 knfsd: clean up EX_RDONLY Share a little common code, reverse the arguments for consistency, drop the unnecessary "inline", and lowercase the name. Signed-off-by: "J. Bruce Fields" Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e22841c637dc8b308b40f59d64a5b6683d458ab7 Author: J. Bruce Fields Date: Thu Jul 19 01:49:20 2007 -0700 knfsd: move EX_RDONLY out of header EX_RDONLY is only called in one place; just put it there. Signed-off-by: "J. Bruce Fields" Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d3dbbeaf56d0365ac6b5c0a0da0bd31cc4781e1 Author: J. Bruce Fields Date: Thu Jul 19 01:49:19 2007 -0700 nfsd: remove unnecessary NULL checks from nfsd_cross_mnt We can now assume that rqst_exp_get_by_name() does not return NULL; so clean up some unnecessary checks. Signed-off-by: "J. Bruce Fields" Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a25b96c1f6e1a3c85c9524f3046c7c75d8fecc7 Author: J. Bruce Fields Date: Thu Jul 19 01:49:18 2007 -0700 nfsd: return errors, not NULL, from export functions I converted the various export-returning functions to return -ENOENT instead of NULL, but missed a few cases. This particular case could cause actual bugs in the case of a krb5 client that doesn't match any ip-based client and that is trying to access a filesystem not exported to krb5 clients. Signed-off-by: "J. Bruce Fields" Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a280df32db291f41b3922ac218674be526af5b9b Author: J. Bruce Fields Date: Thu Jul 19 01:49:18 2007 -0700 nfsd: fix possible read-ahead cache and export table corruption The value of nperbucket calculated here is too small--we should be rounding up instead of down--with the result that the index j in the following loop can overflow the raparm_hash array. At least in my case, the next thing in memory turns out to be export_table, so the symptoms I see are crashes caused by the appearance of four zeroed-out export entries in the first bucket of the hash table of exports (which were actually entries in the readahead cache, a pointer to which had been written to the export table in this initialization code). It looks like the bug was probably introduced with commit fce1456a19f5c08b688c29f00ef90fdfa074c79b ("knfsd: make the readahead params cache SMP-friendly"). Cc: Cc: Greg Banks Signed-off-by: "J. Bruce Fields" Acked-by: NeilBrown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d688abf50bd5a30d2c44dea2a72dd59052cd3cce Author: Andrew Morton Date: Thu Jul 19 01:49:17 2007 -0700 move page writeback acounting out of macros page-writeback accounting is presently performed in the page-flags macros. This is inconsistent and a bit ugly and makes it awkward to implement per-backing_dev under-writeback page accounting. So move this accounting down to the callsite(s). Acked-by: Peter Zijlstra Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6819457d2cb7fe4fdb0fc3655b6b6dc71a86bee9 Author: Thomas Gleixner Date: Thu Jul 19 01:49:16 2007 -0700 timer.c: cleanup recently introduced whitespace damage Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 71120f183bff04ba4f7ba3cc554202061912d548 Author: Thomas Gleixner Date: Thu Jul 19 01:49:16 2007 -0700 timekeeping: fixup shadow variable argument clocksource_adjust() has a clock argument, which shadows the file global clock variable. Fix this up. Signed-off-by: Thomas Gleixner Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 10146801e8b960d7473e350b60458d9d5a2be1cf Author: Greg Ungerer Date: Thu Jul 19 01:49:15 2007 -0700 m68knommu: remove is_in_rom() function Remove is_in_rom() function. It doesn't actually serve the purpose it was intended to. If you look at the use of it _access_ok() (which is the only use of it) then it is obvious that most of memory is marked as access_ok. No point having is_in_rom() then, so remove it. Signed-off-by: Greg Ungerer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a4c8b9159000018b0c641b844795a4de4e954582 Author: Greg Ungerer Date: Thu Jul 19 01:49:14 2007 -0700 m68knommu: start dump from exception stack In die_if_kernel() start the stack dump at the exception-time SP, not at the SP with all the saved registers; the stack below exception-time sp contains only exception-saved values and is already printed in details just before. Signed-off-by: Philippe De Muyter Signed-off-by: Greg Ungerer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2502b667ea835ee16685c74b2a0d89ba8afe117a Author: Greg Ungerer Date: Thu Jul 19 01:49:12 2007 -0700 m68knommu: generic irq handling Change the m68knommu irq handling to use the generic irq framework. Signed-off-by: Greg Ungerer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f8af0bb890d6cdcb09ec042c128e217a7c500355 Author: Akinobu Mita Date: Thu Jul 19 01:49:12 2007 -0700 hugetlb: use set_compound_page_dtor Use appropriate accessor function to set compound page destructor function. Cc: William Irwin Signed-off-by: Akinobu Mita Acked-by: Adam Litke Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ed5cb2b73d0c4165c0504c95454fade0c0bf3d9 Author: Hugh Dickins Date: Thu Jul 19 01:49:11 2007 -0700 Remove nid_lock from alloc_fresh_huge_page The fix to that race in alloc_fresh_huge_page() which could give an illegal node ID did not need nid_lock at all: the fix was to replace static int nid by static int prev_nid and do the work on local int nid. nid_lock did make sure that racers strictly roundrobin the nodes, but that's not something we need to enforce strictly. Kill nid_lock. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e3aded3cc289113c7bc729ef4cb75e56d9aa71be Author: Alexey Dobriyan Date: Thu Jul 19 01:49:10 2007 -0700 isdn/sc: compile breakage re check_reset() There is check_reset() -- global function in drivers/isdn/sc/ There is check_reset -- variable holding module param in aacraid driver. On allyesconfig they clash with: LD drivers/built-in.o drivers/isdn/built-in.o: In function `check_reset': : multiple definition of `check_reset' drivers/scsi/built-in.o:(.data+0xe458): first defined here ld: Warning: size of symbol `check_reset' changed from 4 in drivers/scsi/built-in.o to 219 in drivers/isdn/built-in.o ld: Warning: type of symbol `check_reset' changed from 1 to 2 in drivers/isdn/built-in.o Rename the former. Signed-off-by: Alexey Dobriyan Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ac674f52778b95450509357435320be1d795248 Author: Benjamin Herrenschmidt Date: Thu Jul 19 01:49:10 2007 -0700 vmalloc_32 should use GFP_KERNEL I've noticed lots of failures of vmalloc_32 on machines where it shouldn't have failed unless it was doing an atomic operation. Looking closely, I noticed that: #if defined(CONFIG_64BIT) && defined(CONFIG_ZONE_DMA32) #define GFP_VMALLOC32 GFP_DMA32 #elif defined(CONFIG_64BIT) && defined(CONFIG_ZONE_DMA) #define GFP_VMALLOC32 GFP_DMA #else #define GFP_VMALLOC32 GFP_KERNEL #endif Which seems to be incorrect, it should always -or- in the DMA flags on top of GFP_KERNEL, thus this patch. This fixes frequent errors launchin X with the nouveau DRM for example. Signed-off-by: Benjamin Herrenschmidt Cc: Andi Kleen Cc: Dave Airlie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ea02e3dde3509ffa7fda7f8de9c8a366e03f7bbd Author: David Howells Date: Thu Jul 19 01:49:09 2007 -0700 FRV: work around a possible compiler bug Work around a possible bug in the FRV compiler. What appears to be happening is that gcc resolves the __builtin_constant_p() in kmalloc() to true, but then fails to reduce the therefore constant conditions in the if-statements it guards to constant results. When compiling with -O2 or -Os, one single spurious error crops up in cpuup_callback() in mm/slab.c. This can be avoided by making the memsize variable const. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3abf7afd406866a84276d3ed04f4edf6070c9cb5 Author: Andrew Morton Date: Thu Jul 19 01:49:08 2007 -0700 dequeue_huge_page() warning fix mm/hugetlb.c: In function `dequeue_huge_page': mm/hugetlb.c:72: warning: 'nid' might be used uninitialized in this function Cc: Christoph Lameter Cc: Adam Litke Cc: David Gibson Cc: William Lee Irwin III Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd00cc486ab1c17049a535413d1751ef3482141c Author: Yoann Padioleau Date: Thu Jul 19 01:49:03 2007 -0700 some kmalloc/memset ->kzalloc (tree wide) Transform some calls to kmalloc/memset to a single kzalloc (or kcalloc). Here is a short excerpt of the semantic patch performing this transformation: @@ type T2; expression x; identifier f,fld; expression E; expression E1,E2; expression e1,e2,e3,y; statement S; @@ x = - kmalloc + kzalloc (E1,E2) ... when != \(x->fld=E;\|y=f(...,x,...);\|f(...,x,...);\|x=E;\|while(...) S\|for(e1;e2;e3) S\) - memset((T2)x,0,E1); @@ expression E1,E2,E3; @@ - kzalloc(E1 * E2,E3) + kcalloc(E1,E2,E3) [akpm@linux-foundation.org: get kcalloc args the right way around] Signed-off-by: Yoann Padioleau Cc: Richard Henderson Cc: Ivan Kokshaysky Acked-by: Russell King Cc: Bryan Wu Acked-by: Jiri Slaby Cc: Dave Airlie Acked-by: Roland Dreier Cc: Jiri Kosina Acked-by: Dmitry Torokhov Cc: Benjamin Herrenschmidt Acked-by: Mauro Carvalho Chehab Acked-by: Pierre Ossman Cc: Jeff Garzik Cc: "David S. Miller" Acked-by: Greg KH Cc: James Bottomley Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b5ad0797c0e4049001f961a8b58f1d0ce532072 Author: Johannes Berg Date: Thu Jul 19 01:49:02 2007 -0700 stacktrace: fix header file for !CONFIG_STACKTRACE The print_stack_trace macro in stacktrace.h has a wrong number of arguments, fix it. Signed-off-by: Johannes Berg Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c71063c9c9dc232d0d51f936f237f7dc5681e8e3 Author: Johannes Berg Date: Thu Jul 19 01:49:02 2007 -0700 lockdep debugging: give stacktrace for init_error When I started adding support for lockdep to 64-bit powerpc, I got a lockdep_init_error and with this patch was able to pinpoint why and where to put lockdep_init(). Let's support this generally for others adding lockdep support to their architecture. Signed-off-by: Johannes Berg Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d38e1d5aaee384698fcef9455d6e2df1d062a1d0 Author: Peter Zijlstra Date: Thu Jul 19 01:49:01 2007 -0700 lockstat: better class name representation optionally add class->name_version and class->subclass to the class name Signed-off-by: Peter Zijlstra Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 96645678cd726e87ce42a0664de71e047e32bca4 Author: Peter Zijlstra Date: Thu Jul 19 01:49:00 2007 -0700 lockstat: measure lock bouncing __acquire | lock _____ | \ | __contended | | | wait | _______/ |/ | __acquired | __release | unlock We measure acquisition and contention bouncing. This is done by recording a cpu stamp in each lock instance. Contention bouncing requires the cpu stamp to be set on acquisition. Hence we move __acquired into the generic path. __acquired is then used to measure acquisition bouncing by comparing the current cpu with the old stamp before replacing it. __contended is used to measure contention bouncing (only useful for preemptable locks) [akpm@linux-foundation.org: cleanups] Signed-off-by: Peter Zijlstra Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 443aef0eddfa44c158d1b94ebb431a70638fcab4 Author: Peter Zijlstra Date: Thu Jul 19 01:49:00 2007 -0700 lockdep: fixup sk_callback_lock annotation the two init sites resulted in inconsistend names for the lock class. Signed-off-by: Peter Zijlstra Acked-by: Ingo Molnar Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b32d0a4e9ec07808a5c406a416c6576c986b047 Author: Peter Zijlstra Date: Thu Jul 19 01:48:59 2007 -0700 lockdep: various fixes - update the copyright notices - use the default hash function - fix a thinko in a BUILD_BUG_ON - add a WARN_ON to spot inconsitent naming - fix a termination issue in /proc/lock_stat [akpm@linux-foundation.org: cleanups] Signed-off-by: Peter Zijlstra Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4fe87745a6722d42ff27a60768c77958fa1fc498 Author: Peter Zijlstra Date: Thu Jul 19 01:48:58 2007 -0700 lockstat: hook into spinlock_t, rwlock_t, rwsem and mutex Call the new lockstat tracking functions from the various lock primitives. Signed-off-by: Peter Zijlstra Acked-by: Ingo Molnar Acked-by: Jason Baron Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c46261de0d98372112d8edf16f74ce418a268d46 Author: Peter Zijlstra Date: Thu Jul 19 01:48:57 2007 -0700 lockstat: human readability tweaks Present all this fancy new lock statistics information: *warning, _wide_ output ahead* (output edited for purpose of brevity) # cat /proc/lock_stat lock_stat version 0.1 ----------------------------------------------------------------------------------------------------------------------------------------------------------------- class name contentions waittime-min waittime-max waittime-total acquisitions holdtime-min holdtime-max holdtime-total ----------------------------------------------------------------------------------------------------------------------------------------------------------------- &inode->i_mutex: 14458 6.57 398832.75 2469412.23 6768876 0.34 11398383.65 339410830.89 --------------- &inode->i_mutex 4486 [] pipe_wait+0x86/0x8d &inode->i_mutex 0 [] pipe_write_fasync+0x29/0x5d &inode->i_mutex 0 [] pipe_read+0x74/0x3a5 &inode->i_mutex 0 [] do_lookup+0x81/0x1ae ................................................................................................................................................................. &inode->i_data.tree_lock-W: 491 0.27 62.47 493.89 2477833 0.39 468.89 1146584.25 &inode->i_data.tree_lock-R: 65 0.44 4.27 48.78 26288792 0.36 184.62 10197458.24 -------------------------- &inode->i_data.tree_lock 46 [] __do_page_cache_readahead+0x69/0x24f &inode->i_data.tree_lock 31 [] add_to_page_cache+0x31/0xba &inode->i_data.tree_lock 0 [] __do_page_cache_readahead+0xc2/0x24f &inode->i_data.tree_lock 0 [] find_get_page+0x1a/0x58 ................................................................................................................................................................. proc_inum_idr.lock: 0 0.00 0.00 0.00 36 0.00 65.60 148.26 proc_subdir_lock: 0 0.00 0.00 0.00 3049859 0.00 106.81 1563212.42 shrinker_rwsem-W: 0 0.00 0.00 0.00 5 0.00 1.73 3.68 shrinker_rwsem-R: 0 0.00 0.00 0.00 633 2.57 246.57 10909.76 'contentions' and 'acquisitions' are the number of such events measured (since the last reset). The waittime- and holdtime- (min, max, total) numbers are presented in microseconds. If there are any contention points, the lock class is presented in the block format (as i_mutex and tree_lock above), otherwise a single line of output is presented. The output is sorted on absolute number of contentions (read + write), this should get the worst offenders presented first, so that: # grep : /proc/lock_stat | head will quickly show who's bad. The stats can be reset using: # echo 0 > /proc/lock_stat [bunk@stusta.de: make 2 functions static] [akpm@linux-foundation.org: fix printk warning] Signed-off-by: Peter Zijlstra Acked-by: Ingo Molnar Acked-by: Jason Baron Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f20786ff4da51e56b1956acf30be2552be266746 Author: Peter Zijlstra Date: Thu Jul 19 01:48:56 2007 -0700 lockstat: core infrastructure Introduce the core lock statistics code. Lock statistics provides lock wait-time and hold-time (as well as the count of corresponding contention and acquisitions events). Also, the first few call-sites that encounter contention are tracked. Lock wait-time is the time spent waiting on the lock. This provides insight into the locking scheme, that is, a heavily contended lock is indicative of a too coarse locking scheme. Lock hold-time is the duration the lock was held, this provides a reference for the wait-time numbers, so they can be put into perspective. 1) lock 2) ... do stuff .. unlock 3) The time between 1 and 2 is the wait-time. The time between 2 and 3 is the hold-time. The lockdep held-lock tracking code is reused, because it already collects locks into meaningful groups (classes), and because it is an existing infrastructure for lock instrumentation. Currently lockdep tracks lock acquisition with two hooks: lock() lock_acquire() _lock() ... code protected by lock ... unlock() lock_release() _unlock() We need to extend this with two more hooks, in order to measure contention. lock_contended() - used to measure contention events lock_acquired() - completion of the contention These are then placed the following way: lock() lock_acquire() if (!_try_lock()) lock_contended() _lock() lock_acquired() ... do locked stuff ... unlock() lock_release() _unlock() (Note: the try_lock() 'trick' is used to avoid instrumenting all platform dependent lock primitive implementations.) It is also possible to toggle the two lockdep features at runtime using: /proc/sys/kernel/prove_locking /proc/sys/kernel/lock_stat (esp. turning off the O(n^2) prove_locking functionaliy can help) [akpm@linux-foundation.org: build fixes] [akpm@linux-foundation.org: nuke unneeded ifdefs] Signed-off-by: Peter Zijlstra Acked-by: Ingo Molnar Acked-by: Jason Baron Signed-off-by: Andrew Morton