aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* [PATCH] s390: merge cmb into dasdcChristoph Hellwig2006-03-24
| | | | | | | | | | | | | dasd_cmd just implements three ioctls which are wrappers around functionality in the core kernel or other modules. When merging those into dasd_mod they just add 22 lines of code which is far less than the amount of code removed in the last two patches, and which doesn't spill into another 4k pages when build modular, while removing a 128lines module. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] s390: use normal switch statement for ioctls in dasd_ioctlcChristoph Hellwig2006-03-24
| | | | | | | | | | | | | | | Add an ->ioctl method to the dasd_discipline structure. This allows to apply the same kind of cleanups the last patch applied to dasd_ioctl.c to dasd_eckd.c (the only dasd discipline with special ioctls) aswell. Again lots of code removed. During auditing the ioctls I found two fishy return value propagations from copy_{from,to}_user, maintainers please check those, I've marked them with XXX comments. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] s390: use normal switch statement for ioctls in dasd_ioctlcChristoph Hellwig2006-03-24
| | | | | | | | | | | | | | | Handle ioctls implemented in dasd_ioctl through the normal switch statement that most drivers use instead of the awkward dasd_ioctl_no_register routine. This avoids searching a linear list on every call to dasd_ioctl(), and allows to give the various ioctl implementation functions sane prototypes, aswell as moving the check for bdev->bd_disk->private_data from the individual functions to dasd_ioctl. (I think it can't actually every be NULL, but let's keep that for later) Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] s390: connector supportMartin Schwidefsky2006-03-24
| | | | | | | | | Include connector config in the s390 arch Kconfig to get support for connectors. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] s390: cpu up retriesMichael Ryan2006-03-24
| | | | | | | | | Retry starting of new cpu if sigp restart returns condition code 2 (busy). Signed-off-by: Michael Ryan <ryan@funsoft.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] s390: BUG() warningsMartin Schwidefsky2006-03-24
| | | | | | | | | Use __builtin_trap instead of an inline assembly in the BUG() macro. That way the compiler knows that BUG() won't return. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] s390: /proc/sys/vm/cmm_* permission bitsMartin Schwidefsky2006-03-24
| | | | | | | | Set permissoin of /proc/sys/vm/cmm_* files to 0644. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] s390: early parameter parsingHeiko Carstens2006-03-24
| | | | | | | | | Use common code parser for early parameters instead of our own. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] s390: channel path measurementsCornelia Huck2006-03-24
| | | | | | | | | | Gather extended measurements for channel paths from the channel subsystem and expose them to userspace via a sysfs attribute. Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] s390: cio documentation updateCornelia Huck2006-03-24
| | | | | | | | | | | | | Update documentation of the common I/O layer: - Add MSS-specific example. - Add more information on ccwgroup devices. - Add channel path type attribute. - Fix typo. Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] s390: wrong interrupt delivered for hsch() or csch()Cornelia Huck2006-03-24
| | | | | | | | | | | | | When cio waits for the interrupt for a basic sense, interrupts for hsch() or csch() issued in the meantime are wrongly counted as interrupts for the basic sense and the accumulated irb is passed to the device driver. In ccw_device_w4sense(), check for clear or halt function in the irb and pass the irb for the csch() or hsch() to the device driver. Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] x86_64: {set,clear,test}_bit() related cleanup and pci_mmcfg_init() fixAkinobu Mita2006-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While working on these patch set, I found several possible cleanup on x86-64 and ia64. akpm: I stole this from Andi's queue. Not only does it clean up bitops. It also unrelatedly changes the prototype of pci_mmcfg_init() and removes its arch_initcall(). It seems that the wrong two patches got joined together, but this is the one which has been tested. This patch fixes the current x86_64 build error (the pci_mmcfg_init() declaration in arch/i386/pci/pci.h disagrees with the definition in arch/x86_64/pci/mmconfig.c) This also means that x86_64's pci_mmcfg_init() gets called in the same (new) manner as x86's: from arch/i386/pci/init.c:pci_access_init(), rather than via initcall. The bitops cleanups came along for free. All this worked OK in -mm testing (since 2.6.16-rc4-mm1) because x86_64 was tested with both patches applied. Signed-off-by: Akinobu Mita <mita@miraclelinux.com> Signed-off-by: Andi Kleen <ak@suse.de> Cc: Con Kolivas <kernel@kolivas.org> Cc: Jean Delvare <khali@linux-fr.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] vfs: MS_VERBOSE should be MS_SILENTTheodore Ts'o2006-03-24
| | | | | | | | | | | | | | | | | | | | | | The meaning of MS_VERBOSE is backwards; if the bit is set, it really means, "don't be verbose". This is confusing and counter-intuitive. In addition, there is also no way to set the MS_VERBOSE flag in the mount(8) program in util-linux, but interesting, it does define options which would do the right thing if MS_SILENT were defined, which unfortunately we do not: #ifdef MS_SILENT { "quiet", 0, 0, MS_SILENT }, /* be quiet */ { "loud", 0, 1, MS_SILENT }, /* print out messages. */ #endif So the obvious fix is to deprecate the use of MS_VERBOSE and replace it with MS_SILENT. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] add sys_unshare to syscalls.hArnd Bergmann2006-03-24
| | | | | | | | | All architecture independent system calls should be declared in syscalls.h, add the one that is missing. Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] more-for_each_cpu-conversions fixAndrew Morton2006-03-24
| | | | | | | | | | | I screwed up this conversion - we should be iterating across online CPUs, not possible ones. Spotted by Joe Perches <joe@perches.com> Cc: Dave Jones <davej@codemonkey.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] w1: use kthread api.Evgeniy Polyakov2006-03-23
| | | | | | | | | This patch removes old-style kernel thread initialization and changes w1 to use kthread api. It is based on Christoph Hellwig <hch@lst.de> work. Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* [PATCH] W1: u64 is not long longAndrew Morton2006-03-23
| | | | | | | You don't know what type a u64 is, hence you cannot print it without a cast. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* [PATCH] W1: Remove incorrect MODULE_ALIASPatrick McHardy2006-03-23
| | | | | | | | | | The w1 netlink socket is created by a hardware specific driver calling w1_add_master_device, so there is no point in including a module alias for netlink autoloading in the core. Signed-off-by: Patrick McHardy <kaber@trash.net> Acked-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* [PATCH] fix W1_MASTER_DS9490_BRIDGE dependenciesAdrian Bunk2006-03-23
| | | | | | | | W1_DS9490 was renamed to W1_MASTER_DS9490, but the entry in the dependencies of W1_MASTER_DS9490_BRIDGE was forgotten. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* [PATCH] w1: misc cleanupsAdrian Bunk2006-03-23
| | | | | | | | | | | | This patch contains the following cleanups: - make needlessly global code static - declarations for global code belong into header files - w1.c: #if 0 the unused struct w1_slave_device Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* [PATCH] W1: Add the DS2482 I2C-to-w1 bridge driver.Evgeniy Polyakov2006-03-23
| | | | | | Signed-off-by: Ben Gardner <bgardner@wabtec.com> Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* [PATCH] W1: Move w1 bus master code into 'w1/masters' and move w1 slave code ↵Evgeniy Polyakov2006-03-23
| | | | | | | | into 'w1/slaves' Signed-off-by: Ben Gardner <bgardner@wabtec.com> Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* [PATCH] W1: Change the type 'unsigned long' member of 'struct w1_bus_master' ↵Evgeniy Polyakov2006-03-23
| | | | | | | | to 'void *'. Signed-off-by: Ben Gardner <bgardner@wabtec.com> Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6Linus Torvalds2006-03-23
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6: NTFS: 2.1.27 - Various bug fixes and cleanups. NTFS: Semaphore to mutex conversion. NTFS: Handle the recently introduced -ENAMETOOLONG return value from NTFS: Add a missing call to flush_dcache_mft_record_page() in NTFS: Fix a bug in fs/ntfs/inode.c::ntfs_read_locked_index_inode() where we NTFS: Improve comments on file attribute flags in fs/ntfs/layout.h. NTFS: Limit name length in fs/ntfs/unistr.c::ntfs_nlstoucs() to maximum NTFS: Remove all the make_bad_inode() calls. This should only be called NTFS: Add support for sparse files which have a compression unit of 0. NTFS: Fix comparison of $MFT and $MFTMirr to not bail out when there are NTFS: Use buffer_migrate_page() for the ->migratepage function of all ntfs NTFS: Fix a buggette in an "should be impossible" case handling where we NTFS: Fix an (innocent) off-by-one error in the runlist code. NTFS: Fix two compiler warnings on Alpha. Thanks to Andrew Morton for
| * Merge branch 'master' of git://imp.csi.cam.ac.uk/home/src/ntfs-2.6-devel/Anton Altaparmakov2006-03-23
| |\
| | * Merge branch 'master' of /usr/src/ntfs-2.6/Anton Altaparmakov2006-03-23
| | |\
| | * | NTFS: 2.1.27 - Various bug fixes and cleanups.Anton Altaparmakov2006-03-23
| | | | | | | | | | | | | | | | Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
| | * | NTFS: Semaphore to mutex conversion.Ingo Molnar2006-03-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The conversion was generated via scripts, and the result was validated automatically via a script as well. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
| | * | NTFS: Handle the recently introduced -ENAMETOOLONG return value fromAnton Altaparmakov2006-03-23
| | | | | | | | | | | | | | | | | | | | | | | | fs/ntfs/unistr.c::ntfs_nlstoucs() in fs/ntfs/namei.c::ntfs_lookup(). Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
| | * | NTFS: Add a missing call to flush_dcache_mft_record_page() inAnton Altaparmakov2006-03-23
| | | | | | | | | | | | | | | | | | | | | | | | fs/ntfs/inode.c::ntfs_write_inode(). Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
| | * | NTFS: Fix a bug in fs/ntfs/inode.c::ntfs_read_locked_index_inode() where weAnton Altaparmakov2006-03-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | forgot to update a temporary variable so loading index inodes which have an index allocation attribute failed. Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
| | * | NTFS: Improve comments on file attribute flags in fs/ntfs/layout.h.Anton Altaparmakov2006-03-23
| | | | | | | | | | | | | | | | Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
| | * | NTFS: Limit name length in fs/ntfs/unistr.c::ntfs_nlstoucs() to maximumAnton Altaparmakov2006-03-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | allowed by NTFS, i.e. 255 Unicode characters, not including the terminating NULL (which is not stored on disk). Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
| | * | NTFS: Remove all the make_bad_inode() calls. This should only be calledAnton Altaparmakov2006-03-23
| | | | | | | | | | | | | | | | | | | | | | | | from read inode and new inode code paths. Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
| | * | NTFS: Add support for sparse files which have a compression unit of 0.Anton Altaparmakov2006-03-23
| | | | | | | | | | | | | | | | Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
| | * | NTFS: Fix comparison of $MFT and $MFTMirr to not bail out when there areAnton Altaparmakov2006-03-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | unused, invalid mft records which are the same in both $MFT and $MFTMirr. Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
| | * | NTFS: Use buffer_migrate_page() for the ->migratepage function of all ntfsAnton Altaparmakov2006-03-23
| | | | | | | | | | | | | | | | | | | | | | | | address space operations. Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
| | * | NTFS: Fix a buggette in an "should be impossible" case handling where weAnton Altaparmakov2006-03-23
| | | | | | | | | | | | | | | | | | | | | | | | continued the attribute lookup loop instead of aborting it. Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
| | * | NTFS: Fix an (innocent) off-by-one error in the runlist code.Anton Altaparmakov2006-03-23
| | | | | | | | | | | | | | | | Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
| | * | Merge branch 'master' of /usr/src/ntfs-2.6/Anton Altaparmakov2006-03-23
| | |\ \
| * | \ \ Merge branch 'master' of /home/aia21/ntfs-2.6/Anton Altaparmakov2006-03-23
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'master' of /home/aia21/ntfs-2.6/Anton Altaparmakov2006-03-23
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| * | | NTFS: Fix two compiler warnings on Alpha. Thanks to Andrew Morton forAnton Altaparmakov2006-03-07
| | | | | | | | | | | | | | | | | | | | | | | | reporting them. Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
* | | | Merge branch 'upstream-linus' of ↵Linus Torvalds2006-03-23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (45 commits) [PATCH] Restore channel setting after scan. [PATCH] hostap: Fix memory leak on PCI probe error path [PATCH] hostap: Remove dead code (duplicated idx != 0) [PATCH] hostap: Fix unlikely read overrun in CIS parsing [PATCH] hostap: Fix double free in prism2_config() error path [PATCH] hostap: Fix ap_add_sta() return value verification [PATCH] hostap: Fix hw reset after CMDCODE_ACCESS_WRITE timeout [PATCH] wireless/airo: cache wireless scans [PATCH] wireless/airo: define default MTU [PATCH] wireless/airo: clean up printk usage to print device name [PATCH] WE-20 for kernel 2.6.16 [PATCH] softmac: remove function_enter() [PATCH] skge: version 1.5 [PATCH] skge: compute available ring buffers [PATCH] skge: dont free skb until multi-part transmit complete [PATCH] skge: multicast statistics fix [PATCH] skge: rx_reuse called twice [PATCH] skge: dont use dev_alloc_skb for rx buffs [PATCH] skge: align receive buffers [PATCH] sky2: dont need to use dev_kfree_skb_any ...
| * \ \ \ Merge branch 'upstream' of ↵Jeff Garzik2006-03-23
| |\ \ \ \ | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
| | * | | | [PATCH] Restore channel setting after scan.David Woodhouse2006-03-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After a scan, we weren't switching back to the original channel if we were associated with an AP. So NetworkManager's periodic scans would disrupt connectivity until the ESSID was manually set again. Fix that. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | | | [PATCH] hostap: Fix memory leak on PCI probe error pathJouni Malinen2006-03-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Coverity checker (CID: 659, 660) spotted this resource leak on PCI probe error path. Free private data structure if pci_enable_device() fails. Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | | | [PATCH] hostap: Remove dead code (duplicated idx != 0)Jouni Malinen2006-03-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Coverity checker (CID: 58) spotted this duplicated idx != 0 validation for unicast keys in prism2_ioctl_siwencodeext(). Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | | | [PATCH] hostap: Fix unlikely read overrun in CIS parsingJouni Malinen2006-03-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Coverity checker (CID: 452, 453, 454, 455, 456) spotted this unlikely read overrun of CIS buffer. Abort if CISTPL_CONFIG or CISTPL_MANFID would not fit in buffer. Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | | | [PATCH] hostap: Fix double free in prism2_config() error pathEugene Teo2006-03-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Coverity checker (CID: 930) spotted this double free on error path (allocation failure). Do not free these here since generic error path will take care of this. Signed-off-by: Eugene Teo <eugene.teo@eugeneteo.net> Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi> Signed-off-by: John W. Linville <linville@tuxdriver.com>