summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [PATCH] compat_sys_pselect7() fixAndrew Morton2006-02-011-1/+1
| | | | | | | | fs/compat.c: In function `compat_sys_pselect7': fs/compat.c:1820: warning: passing arg 5 of `compat_core_sys_select' from incompatible pointer type Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] lp486e: remove SLOW_DOWN_IOAlexey Dobriyan2006-02-011-2/+0
| | | | | | | | | | | | It's not used. Fix the following on alpha-eb66 as a side effect: In file included from drivers/net/lp486e.c:75: include/asm/io.h:20:1: warning: "SLOW_DOWN_IO" redefined drivers/net/lp486e.c:59:1: warning: this is the location of the previous definition Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] tsunami_flash: fix "parse error before ';' token"Alexey Dobriyan2006-02-011-1/+1
| | | | | | Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] powerpc: enable irq's for platform functions.Ben Collins2006-02-012-6/+12
| | | | | | | | | | | | | Make the platform function interrupt functions actually work. Calls irq_enable() for the first in the list, and irq_disable() for the last. Added *func to struct irq_client so the the user can pass just that to pmf_unregister_irq_client(). Signed-off-by: Ben Collins <bcollins@ubuntu.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] ide-scsi: fix for IDE probe/remove ops changesMikael Pettersson2006-02-011-9/+5
| | | | | | | | | | | | | | | | | | | | Kernel 2.6.16-rc1 broke the ide-scsi driver: ide-scsi loads but fails to find any devices to bind to. It also triggers a message "Driver 'ide-scsi' needs updating - please use bus_type methods" from the driver core. The IDE core in 2.6.16-rc1 changed the location of an IDE driver's ->probe()/->remove()/->shutdown() methods: they are now in the ide_driver_t struct not in the gen_driver sub-struct. drivers/ide/ was updated for this change but ide-scsi.c wasn't. Hence the breakage. This patch repairs ide-scsi and also eliminates the driver core warning. Signed-off-by: Mikael Pettersson <mikpe@csd.uu.se> Cc: Russell King <rmk@arm.linux.org.uk> Cc: Greg KH <greg@kroah.com> Acked-by: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] __cpuinit functions wrongly marked __meminitAshok Raj2006-02-011-3/+3
| | | | | | | | | __meminit has overzelously been modified and crept its way into marking cpuup callbacks as __meminit. Signed-off-by: Ashok Raj <ashok.raj@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] sound/ppc/pmac.c typoBenjamin Herrenschmidt2006-02-011-1/+1
| | | | | | | | | | | | | | | | | | | In 2.6.16-rc1 there is a small typo introduced by the 'Remove device_node addrs/n_addr' changes which prevents my Powerbook G4 sound from working: Advanced Linux Sound Architecture Driver Version 1.0.11rc2 (Wed Jan 04 08:57:20 2006 UTC). snd: can't request rsrc 0 (Sound Control: 0x80000000:80004fff) ALSA device list: No soundcards found. The patch below fixes it. Of course, the patch fixing the i2c issues ('i2c_smbus_write_i2c_block_data' patch) needs to be applied to in order for the sound to completly work. Signed-off-by: Stelian Pop <stelian@popies.net> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] fuse: fix async read for legacy filesystemsMiklos Szeredi2006-02-014-6/+36
| | | | | | | | | | | | | | | | | | | | | | | While asynchronous reads mean a performance improvement in most cases, if the filesystem assumed that reads are synchronous, then async reads may degrade performance (filesystem may receive reads out of order, which can confuse it's own readahead logic). With sshfs a 1.5 to 4 times slowdown can be measured. There's also a need for userspace filesystems to know whether asynchronous reads are supported by the kernel or not. To achive these, negotiate in the INIT request whether async reads will be used and the maximum readahead value. Update interface version to 7.6 If userspace uses a version earlier than 7.6, then disable async reads, and set maximum readahead value to the maximum read size, as done in previous versions. Signed-off-by: Miklos Szeredi <miklos@szeredi.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] smbfs readdir vs signal fixAndrew Morton2006-02-011-1/+4
| | | | | | | | | | | | | | | An old patch designed to fix http://bugme.osdl.org/show_bug.cgi?id=4497, "getdents gives empty/random result upon signal". If smbfs's readdir() is interupted by a signal, smb_readdir() failed to noticed that and proceeded to treat the unread-into page as valid directory contents. Fix that up by handling the -ERESTARTSYS. Thanks to Stian Skjelstad for reporting and testing. Cc: Stian Skjelstad <stian@nixia.no> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] CONFIG_DOUBLEFAULT Kconfig fixIngo Molnar2006-02-011-9/+9
| | | | | | | | | Move CONFIG_DOUBLEFAULT from the main Kconfig menu (!) into its proper place: the "Processor Type and features" submenu. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] knfsd: Restore recently broken ACL functionality to NFS serverAndreas Gruenbacher2006-02-011-27/+49
| | | | | | | | | | | | | A recent patch to Allow run-time selection of NFS versions to export meant that NO nfsacl service versions were exported. This patch restored that functionality. Signed-off-by: Andreas Gruenbacher <agruen@suse.de> Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] prototypes for *at functions & typo fixUlrich Drepper2006-02-012-1/+34
| | | | | | | | | Here's the follow-up patch which introduces the prototypes for the new syscalls. There was also a typo in one of the new symbols. Signed-off-by: Ulrich Drepper <drepper@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] CONFIG_ISA does not make sense for CONFIG_PPC_PSERIESOlaf Hering2006-02-011-4/+0
| | | | | | | | | | | | Older pSeries systems with serial ports dont get any console output after recent changes. CONFIG_ISA does not make sense for CONFIG_PPC_PSERIES because it enables lots of old drivers. Instead, remove the dependency on CONFIG_ISA from the serial port discovery code. Signed-off-by: Olaf Hering <olh@suse.de> Cc: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] x86_64: compat_sys_futimesat fixAndrew Morton2006-02-011-1/+1
| | | | | | | | | | We need to use the compat function here. Pointer out by Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Andi Kleen <ak@muc.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge branch 'for-linus' of ↵Linus Torvalds2006-01-319-61/+58
|\ | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
| * IB/mthca: Semaphore to mutex conversionsRoland Dreier2006-01-306-36/+37
| | | | | | | | | | | | | | Convert semaphores to mutexes in mthca. Leave firmware command interface poll_sem and event_sem as semaphores. Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * IB/mthca: Don't cancel commands on a signalMichael S. Tsirkin2006-01-302-16/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have run into the following problem: if a task receives a signal while in the process of e.g. destroying a resource (which could be because the relevant file was closed) mthca could bail out from trying to take a command interface semaphore without performing the appropriate command to tell hardware that the resource is being destroyed. As a result we see messages like ib_mthca 0000:04:00.0: HW2SW_CQ failed (-4) In this case, hardware could access the resource after the memory has been freed, possibly causing memory corruption. A simple solution is to replace down_interruptible() by down() in command interface activation. Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il> [ It's also not safe to bail out on multicast table operations, since they may be invoked on the cleanup path too. So use down() for mcg_table.sem too. ] Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * IB/srp: Semaphore to mutex conversionIngo Molnar2006-01-302-10/+9
| | | | | | | | | | | | | | Convert srp_host->target_mutex from a semaphore to a mutex. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * IB/mthca: Relax UAR size checkMichael S. Tsirkin2006-01-301-2/+8
| | | | | | | | | | | | | | | | | | | | There are some cards around that have UAR (user access region) size different from 8 MB. Relax our sanity check to make sure that the PCI BAR is big enough to access the UAR size reported by the device firmware instead. Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il> Signed-off-by: Roland Dreier <rolandd@cisco.com>
* | Merge branch 'upstream-fixes' of ↵Linus Torvalds2006-01-311-4/+15
|\ \ | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
| * | [libata ahci] add another JMicron pci idJeff Garzik2006-01-291-0/+2
| | |
| * | [libata ahci] Isolate Intel-ism, add JMicron JMB360 supportJeff Garzik2006-01-291-4/+13
| | | | | | | | | | | | | | | | | | | | | Isolate some PCI config register bitbanging to Intel hardware, as it should have been all along. Add support for JMicron JMB360.
* | | Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/inputLinus Torvalds2006-01-3118-266/+545
|\ \ \
| * | | Input: hiddev - fix off-by-one for num_values in uref_multi requestsBen Collins2006-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Found this when working with a HAPP UGCI device. It has a usage with 7 indexes. I could read them all one at a time, but using a multiref it would only allow me to read the first 6. The patch below fixed it. Signed-off-by: Ben Collins <bcollins@ubuntu.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input: iforce - fix detection of USB devicesDmitry Torokhov2006-01-312-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recent conversion to wait_event_interruptible_timeout() caused USB detection routine erroneously report timeouts for perfectly working devices. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input: a3d - convert to dynamic input_dev allocationDmitry Torokhov2006-01-291-42/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also set .owner in driver structure so we'll have a link between module and driver in sysfs. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input: tmdc - handle errors from input_register_device()Dmitry Torokhov2006-01-291-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also set .owner in driver structure so we'll have a link between module and driver in sysfs. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input: turbografx - handle errors from input_register_device()Dmitry Torokhov2006-01-291-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also tgfx_remove shouldn't be marked __exit as it is also called from __init code. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input: gamecon - handle errors from input_register_device()Dmitry Torokhov2006-01-291-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also gc_remove shouldn't be marked __exit as it is also called from __init code. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input: gamecon - fix crash when accessing deviceDmitry Torokhov2006-01-291-149/+194
| | | | | | | | | | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input: sidewinder - handle errors from input_register_device()Dmitry Torokhov2006-01-291-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also set .owner in driver structure so we'll have a link between module and driver in sysfs. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input: sidewinder - fix an oopsZinx Verituse2006-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Dynalloc conversion strikes again... Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input: db9 - handle errors from input_register_device()Dmitry Torokhov2006-01-291-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also db9_remove shouldn't be marked __exit as it is also called from __init code. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input: db9 - fix possible crash with Saturn gamepadsDmitry Torokhov2006-01-291-34/+36
| | | | | | | | | | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input: grip - handle errors from input_register_device()Dmitry Torokhov2006-01-291-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also set .owner in driver structure so we'll have a link between module and driver in sysfs. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input: grip - fix crash when accessing deviceDmitry Torokhov2006-01-291-0/+3
| | | | | | | | | | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input: make needlessly global code staticAdrian Bunk2006-01-292-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input: mousedev - fix memory leakKimball Murray2006-01-291-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently, "while true; do cat </dev/null >/dev/input/mice; done" causes an OOM in a short amount of time. Funny that nobody noticed, it actually is very easy to trigger just by switching between VT1 and VT7... Signed-off-by: Pete Zaitcev <zaitcev@redhat.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input: iforce - do not return ENOMEM upon successful allocationAlexey Dobriyan2006-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input: psmouse - set name for Genius miceDmitry Torokhov2006-01-291-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input: add ixp4xx beeper driverAlessandro Zummo2006-01-293-0/+196
| |/ / | | | | | | | | | | | | | | | | | | | | | This is a driver for beeper found in LinkSys NSLU2 boxes. It should work on any ixp4xx based platform. Signed-off-by: Alessandro Zummo <a.zummo@towertech.it> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | | Merge git://oss.sgi.com:8090/oss/git/xfs-2.6Linus Torvalds2006-01-312-18/+39
|\ \ \
| * | | [XFS] Fix regression in xfs_buf_rele dealing with non-hashed buffers, asNathan Scott2006-02-011-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | occur during log replay. Novell bug 145204, Fedora bug 177848. SGI-PV: 948860 SGI-Modid: xfs-linux-melb:xfs-kern:25064a Signed-off-by: Nathan Scott <nathans@sgi.com>
| * | | [XFS] Interim solution for attribute insertion failure during fileYingping Lu2006-02-011-18/+32
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creation due to ENOSPC. The current solution removes the inode when the attribute insertion fails. Long term solution would be to make the inode creation and attribute insertion atomic. SGI-PV: 947610 SGI-Modid: xfs-linux-melb:xfs-kern:205193a Signed-off-by: Yingping Lu <yingping@sgi.com> Signed-off-by: Nathan Scott <nathans@sgi.com>
* | | [PATCH] Make sure to always check upper bits of tv_nsec in timespec_valid.Chris Wright2006-01-311-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Chris Wright <chrisw@sous-sol.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/bnx2-2.6Linus Torvalds2006-01-313-524/+643
|\ \ \
| * | | [BNX2]: Update version and copyright yearMichael Chan2006-01-233-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update version to 1.4.31 and add 2006 copyright. Skip the last digit when reporting the firmware version. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [BNX2]: Add PHY loopback testMichael Chan2006-01-231-22/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Enhance the ethtool loopback test with PHY loopback test. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [BNX2]: Use netdev_priv()Michael Chan2006-01-231-40/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace dev->priv with netdev_priv(dev) Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [BNX2]: Fix nvram sizingMichael Chan2006-01-232-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add code to correctly determine nvram size. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
OpenPOWER on IntegriCloud