summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ARM] 3295/1: Fix oprofile init return valueRuss Dill2006-02-011-2/+3
| | | | | | | | | | | Patch from Russ Dill The oprofile init code was broken in commit c6b9da. The new logic will always return -ENODEV. This fixes oprofile_arch_init to return 0 on success, and return the return value of spec->init() if applicable. Signed-off-by: Russ Dill <Russ.Dill@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 3294/1: don't invalidate individual BTB entries on ARMv6Nicolas Pitre2006-02-011-12/+6
| | | | | | | | | | Patch from Nicolas Pitre Doing so adds a much larger cost to the loop than the cost implied by simply invalidating the whole BTB at once. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 3293/1: don't invalidate the whole I-cache with xscale_coherent_user_rangeNicolas Pitre2006-02-011-5/+11
| | | | | | | | | | Patch from Nicolas Pitre The mini I-cache issue is valid only for kernel space since debuggers would not fly if they used user space addresses for their stubs. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 3292/1: Fix memory corruption in asm-arm/checksum.h: ip_fast_csum()Richard Purdie2006-02-011-1/+1
| | | | | | | | | | | | | Patch from Richard Purdie ip_fast_csum() accesses memory via a pointer (iph) within an asm function. To prevent memory corruption when the function is inlined, it needs "memory" on the clobber list. This fixes ip checksum errors reported by a Zaurus user. Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 3291/1: PXA27x: Correct get_clk_frequency_khz turbo flag handlingRichard Purdie2006-02-011-1/+1
| | | | | | | | | | | Patch from Richard Purdie The turbo flag is in bit 0 of the CLKCFG register, not bit 1. This patch corrects this so get_clk_frequency_khz returns a correct value. Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 3290/1: Fix the FIFO size detectionCatalin Marinas2006-02-011-4/+10
| | | | | | | | | | | | Patch from Catalin Marinas AACI reports TX FIFO full after the first write to it if the AC97 is not enabled. This patch enables the AC97 probing before the check for the TX FIFO size. The patch also adds a warning if the TX FIFO size is not multiple of 16. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* 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>
| * | | [BNX2]: Workaround hw interrupt bugMichael Chan2006-01-231-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add workaround for a hardware interrupt issue. When using INTA, unmasking of the interrupt and the tag update should be done separately to avoid some spurious interrupts, Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [BNX2]: Fix UDP checksum verificationMichael Chan2006-01-233-418/+439
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix TCP/UDP checksum verification. Use status bits in the buffer descriptor instead of the checksum value to verify rx checksum. Using the checksum value will be incorrect if the UDP packet has zero in the UDP checksum field. Firmware update required for this fix. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [BNX2]: Misc. fixesMichael Chan2006-01-232-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Some misc. fixes for WoL, 5708 B1, and a typo '=' instead of '=='. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [BNX2]: Improve handshake with firmwareMichael Chan2006-01-232-23/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve handshake with bootcode with the following changes: 1. Increase timeout to 100msec and use msleep instead of udelay. 2. Add more error checking for timeouts and errors. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [BNX2]: Fix VLAN on ASFMichael Chan2006-01-232-3/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Always set up the device to strip incoming VLAN tags when ASF is enabled. ASF firmware will not parse packets correctly if VLAN tags are not stripped. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2006-01-319-45/+51
|\ \ \
| * | | [DCCP] ipv6: dccp_v6_send_response() has a DST leak too.David S. Miller2006-01-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was copy&pasted from tcp_v6_send_synack() which has a DST leak recently fixed by Eric W. Biederman. So dccp_v6_send_response() needs the same fix too. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [IPV6] tcp_v6_send_synack: release the destinationEric W. Biederman2006-01-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fix dst reference counting in tcp_v6_send_synack Analysis: Currently tcp_v6_send_synack is never called with a dst entry so dst always comes in as NULL. ip6_dst_lookup calls ip6_route_output which calls dst_hold before it returns the dst entry. Neither xfrm_lookup nor tcp_make_synack consume the dst entry so we still have a dst_entry with a bumped refrence count at the end of this function. Therefore we need to call dst_release just before we return just like tcp_v4_send_synack does. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
OpenPOWER on IntegriCloud