commit 9a79b2274186fade17134929d4f85b70d59a3840 Merge: 75473c1... 20c2df8... Author: Linus Torvalds Date: Thu Jul 19 18:38:13 2007 -0700 Merge branch 'kmem_death' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 * 'kmem_death' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: mm: Remove slab destructors from kmem_cache_create(). 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 64fb98fc40738ae1a98bcea9ca3145b89fb71524 Merge: 5f47c7e... 89636af... Author: Linus Torvalds Date: Thu Jul 19 16:31:22 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6: (23 commits) ide: add support for SCSI ioctls to ide-floppy ide: remove stale changelog from setup-pci.c ide: remove stale changelog/comments/TODO from ide.c ide-cris: handle PIO auto-tuning in tune_cris_ide() ide: add PIO masks ide: remove ide_find_best_pio_mode() ide: drop "PIO data" argument from ide_get_best_pio_mode() ide: ide_find_best_pio_mode() fixes (take 2) ide: add ide_pio_cycle_time() helper (take 2) sc1200: remove stale Power Management code ide: ide_start_power_step() fix WRT disabling DMA serverworks: fix DMA serverworks: always tune PIO ide: add ide_pci_device_t.host_flags (take 2) ide: add ide_dev_has_iordy() helper (take 4) ide: make ide_get_best_pio_mode() print info if overriding PIO mode siimage: PIO mode setup fixes (take 2) atiixp: PIO mode setup fixes ide: Stop mapping ROMs IDE: Remove references to dead ETRAX-related variables. ... 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 721e2629fa2167c0e5a9f10d704b1fee1621a8cb Merge: fdb64f9... f36158c... Author: Linus Torvalds Date: Thu Jul 19 14:42:40 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6: SELinux: use SECINITSID_NETMSG instead of SECINITSID_UNLABELED for NetLabel SELinux: enable dynamic activation/deactivation of NetLabel/SELinux enforcement commit fdb64f93b38a3470fa4db8cd5720b8c731922d1a Merge: 2d9ce17... c32676e... Author: Linus Torvalds Date: Thu Jul 19 14:41:33 2007 -0700 Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6 * 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6: [XFS] Fix inode size update before data write in xfs_setattr [XFS] Allow punching holes to free space when at ENOSPC [XFS] Implement ->page_mkwrite in XFS. [FS] Implement block_page_mkwrite. Manually fix up conflict with Nick's VM fault handling patches in fs/xfs/linux-2.6/xfs_file.c Signed-off-by: Linus Torvalds 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 3e1f900bff40460d7bbab0ccd1a9efc3c70aee49 Merge: 1279506... 0a87cf1... Author: Linus Torvalds Date: Thu Jul 19 14:33:41 2007 -0700 Merge git://git.linux-nfs.org/pub/linux/nfs-2.6 * git://git.linux-nfs.org/pub/linux/nfs-2.6: NFSv4: handle lack of clientaddr in option string NFSv4: debug print ntohl(status) in nfs client callback xdr code SUNRPC: Clean up the sillyrename code NFS: Introduce struct nfs_removeargs+nfs_removeres NFS: Use dentry->d_time to store the parent directory verifier. SUNRPC: move bkl locking and xdr proc invocation into a common helper NFSv4: Fix the nfsv4 readlink reply buffer alignment NFSv4: Fix the readdir reply buffer alignment NFSv4: More NFSv4 xdr cleanups NFSv4: Try to recover from getfh failures in nfs4_xdr_dec_open NFSv4: 'constify' lookup arguments. NFSv4: Don't fail nfs4_xdr_dec_open if decode_restorefh() failed NFSv4: Fix open state recovery NFSD/SUNRPC: Fix the automatic selection of RPCSEC_GSS 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 efffbeee5bc4168059683714b300d307f5193d69 Merge: 40b42f1... b824325... Author: Linus Torvalds Date: Thu Jul 19 14:28:19 2007 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (33 commits) xtensa: use DATA_DATA in xtensa powerpc: add missing DATA_DATA to powerpc cris: use DATA_DATA in cris kallsyms: remove usage of memmem and _GNU_SOURCE from scripts/kallsyms.c kbuild: use -fno-optimize-sibling-calls unconditionally kconfig: reset generated values only if Kconfig and .config agree. kbuild: fix the warning when running make tags kconfig: strip 'CONFIG_' automatically in kernel configuration search kbuild: use POSIX BRE in headers install target Whitelist references from __dbe_table to .init modpost white list pattern adjustment kbuild: do section mismatch check on full vmlinux kbuild: whitelist references from variables named _timer to .init.text kbuild: remove hardcoded _logo names from modpost kbuild: remove hardcoded apic_es7000 from modpost kbuild: warn about references from .init.text to .exit.text kbuild: consolidate section checks kbuild: refactor code in modpost to improve maintainability kbuild: ignore section mismatch warnings originating from .note section kbuild: .paravirtprobe section is obsolete, so modpost doesn't need to handle it ... commit 40b42f1ebf653cd72c32eb1a1a0b9fea2dfbfd7d Merge: 5a021e9... e24b8cb... Author: Linus Torvalds Date: Thu Jul 19 14:24:57 2007 -0700 Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6 * 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6: (44 commits) i2c: Delete the i2c-isa pseudo bus driver hwmon: refuse to load abituguru driver on non-Abit boards hwmon: fix Abit Uguru3 driver detection on some motherboards hwmon/w83627ehf: Be quiet when no chip is found hwmon/w83627ehf: No need to initialize fan_min hwmon/w83627ehf: Export the thermal sensor types hwmon/w83627ehf: Enable VBAT monitoring hwmon/w83627ehf: Add support for the VID inputs hwmon/w83627ehf: Fix timing issues hwmon/w83627ehf: Add error messages for two error cases hwmon/w83627ehf: Convert to a platform driver hwmon/w83627ehf: Update the Kconfig entry make coretemp_device_remove() static hwmon: Add LM93 support hwmon: Improve the pwmN_enable documentation hwmon/smsc47b397: Don't report missing fans as spinning at 82 RPM hwmon: Add support for newer uGuru's hwmon/f71805f: Add temperature-tracking fan control mode hwmon/w83627ehf: Preserve speed reading when changing fan min hwmon: fix detection of abituguru volt inputs ... Manual fixup of trivial conflict in MAINTAINERS file 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 f745bb1c73e2395e6b9961d4d915a8f8e2cd32cd Merge: ff86303... 385820a... Author: Linus Torvalds Date: Thu Jul 19 14:16:44 2007 -0700 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: ocfs2: ->fallocate() support commit ff86303e3021587c49a14df1bc54fe2d393e2223 Merge: 626ac54... e436d80... Author: Linus Torvalds Date: Thu Jul 19 14:11:14 2007 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched * git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched: [PATCH] sched: implement cpu_clock(cpu) high-speed time source [PATCH] sched: fix the all pinned logic in load_balance_newidle() [PATCH] sched: fix newly idle load balance in case of SMT [PATCH] sched: sched_cacheflush is now unused 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 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 ce8c2293be47999584908069e78bf6d94beadc53 Merge: 41e9d34... ee6a99b... Author: Linus Torvalds Date: Thu Jul 19 10:23:21 2007 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (25 commits) [TG3]: Fix msi issue with kexec/kdump. [NET] XFRM: Fix whitespace errors. [NET] TIPC: Fix whitespace errors. [NET] SUNRPC: Fix whitespace errors. [NET] SCTP: Fix whitespace errors. [NET] RXRPC: Fix whitespace errors. [NET] ROSE: Fix whitespace errors. [NET] RFKILL: Fix whitespace errors. [NET] PACKET: Fix whitespace errors. [NET] NETROM: Fix whitespace errors. [NET] NETFILTER: Fix whitespace errors. [NET] IPV4: Fix whitespace errors. [NET] DCCP: Fix whitespace errors. [NET] CORE: Fix whitespace errors. [NET] BLUETOOTH: Fix whitespace errors. [NET] AX25: Fix whitespace errors. [PATCH] mac80211: remove rtnl locking in ieee80211_sta.c [PATCH] mac80211: fix GCC warning on 64bit platforms [GENETLINK]: Dynamic multicast groups. [NETLIKN]: Allow removing multicast groups. ... 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 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