13 years ago[PATCH] Remove compat ioctl semaphore
Andi Kleen [Sun, 20 Nov 2005 17:49:08 +0000]
[PATCH] Remove compat ioctl semaphore

Originally for 2.6.16, but the semaphore causes problems for some
people so get rid of it now.

It's not needed anymore because the ioctl hash table is never changed
at run time now.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

13 years ago[PATCH] Fix x86_64/msr.h interface to agree with i386/msr.h
Jacob.Shin@amd.com [Sun, 20 Nov 2005 17:49:07 +0000]
[PATCH] Fix x86_64/msr.h interface to agree with i386/msr.h

Ever since we remove msr.c from x86_64 branch and started grabbing it from
i386, msr device (read functionality) has been broken for us.

This is due to the differences between asm-i386/msr.h and asm-x86_64/msr.h interfaces.

Here is a patch to our side to fix this.

Thankfully, as of current (2.6.15-rc1-git6) tree, arch/i386/kernel/msr.c is the only file that uses rdmsr_safe macro.

Signed-off-by: Jacob Shin <jacob.shin@amd.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

13 years ago[PATCH] Register disabled CPUs
Ashok Raj [Sun, 20 Nov 2005 17:49:06 +0000]
[PATCH] Register disabled CPUs

Needed to make the earlier use disabled CPUs for CPU hotplug patch
actually work.

Need to register disabled processors as well, so we can count them
towards cpu_possible_map as hot pluggable cpus.

Signed-off-by: Ashok Raj <ashok.raj@intel.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

13 years ago[PATCH] i386: Use bigsmp for > 8 core Opteron systems
Andi Kleen [Sun, 20 Nov 2005 17:49:05 +0000]
[PATCH] i386: Use bigsmp for > 8 core Opteron systems

bigsmp is reported to work on large Opteron systems on 32bit too.
Enable it by default there.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

13 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6
Linus Torvalds [Sun, 20 Nov 2005 17:19:38 +0000]
Merge /pub/scm/linux/kernel/git/sfrench/cifs-2.6

13 years agoFix missing initialization in ir-kbd-gpio.c
Dmitry Torokhov [Sun, 20 Nov 2005 05:57:02 +0000]
Fix missing initialization in ir-kbd-gpio.c

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

13 years agoFix an OOPS when initializing IR remote on saa7134
Dmitry Torokhov [Sun, 20 Nov 2005 05:56:54 +0000]
Fix an OOPS when initializing IR remote on saa7134

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

13 years agoInput: make serio and gameport more swsusp friendly
Dmitry Torokhov [Sun, 20 Nov 2005 05:56:43 +0000]
Input: make serio and gameport more swsusp friendly

kseriod and kgameportd used to process all pending events before
checking for freeze condition. This may cause swsusp to time out
while stopping tasks when resuming. Switch to process events one
by one to check freeze status more often.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

13 years agoInput: handle failures in input_register_device()
Dmitry Torokhov [Sun, 20 Nov 2005 05:56:31 +0000]
Input: handle failures in input_register_device()

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

13 years agoInput: uinput - don't use "interruptible" in FF code
Dmitry Torokhov [Sun, 20 Nov 2005 05:51:43 +0000]
Input: uinput - don't use "interruptible" in FF code

If thread that submitted FF request gets interrupted somehow it
will release request structure and ioctl handler will work with
freed memory. TO prevent that from happening switch to using
wait_for_completion instead of wait_for_completion_interruptible.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

13 years agoInput: uinput - add UI_SET_SWBIT ioctl
Dmitry Torokhov [Sun, 20 Nov 2005 05:51:33 +0000]
Input: uinput - add UI_SET_SWBIT ioctl

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

13 years agoInput: uinput - convert to dynalloc allocation
Dmitry Torokhov [Sun, 20 Nov 2005 05:51:22 +0000]
Input: uinput - convert to dynalloc allocation

Also introduce proper locking when creating/deleting device.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

13 years agoInput: wistron - disable wifi/bluetooth on suspend
Miloslav Trmac [Sun, 20 Nov 2005 05:51:05 +0000]
Input: wistron - disable wifi/bluetooth on suspend

Try to save battery power by disabling wifi and bluetooth on suspend.

Signed-off-by: Miloslav Trmac <mitr@volny.cz>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

13 years agoInput: wistron - add PM support
Dmitry Torokhov [Sun, 20 Nov 2005 05:50:58 +0000]
Input: wistron - add PM support

Register wistron-bios as a platform device, restore WIFI and
Bluetooth state upon resume.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

13 years agoInput: wistron - convert to dynamic input_dev allocation
Dmitry Torokhov [Sun, 20 Nov 2005 05:50:46 +0000]
Input: wistron - convert to dynamic input_dev allocation

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

13 years agoInput: wistron - add support for Acer Aspire 1500 notebooks
Bernhard Rosenkraenzer [Sun, 20 Nov 2005 05:50:37 +0000]
Input: wistron - add support for Acer Aspire 1500 notebooks

Also fix a potential issue with some notebooks:

The current code assumes the response to bios_wifi_get_default_setting is
either 1 (disabled) or 3 (enabled), or wifi isn't supported.  The BIOS
response appears to be a bit field w/ 0x1 indicating hardware presence, 0x2
indicating actiation status, and the other 6 bits being unknown/reserved --
with the patch, these 6 bits are ignored.

Signed-off-by: Bernhard Rosenkraenzer <bero@arklinux.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

13 years agoInput: wistron - disable for x86_64
Andrew Morton [Sun, 20 Nov 2005 05:50:21 +0000]
Input: wistron - disable for x86_64

On x86_64:

{standard input}:233: Error: suffix or operands invalid for `push'
{standard input}:233: Error: suffix or operands invalid for `pop'

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

13 years agoInput: add Wistron driver
Dmitry Torokhov [Sun, 20 Nov 2005 05:50:06 +0000]
Input: add Wistron driver

A driver for laptop buttons using an x86 BIOS interface that is
apparently used on quite a few laptops and seems to be originating
from Wistron.

This driver currently "knows" only about Fujitsu-Siemens Amilo Pro V2000
(i.e. it can detect the laptop using DMI and it contains the
keycode->key meaning mapping for this laptop) and Xeron SonicPro X 155G
(probably can't be reliably autodetected, requires a module parameter),
adding other laptops should be easy.

In addition to reporting button presses to the input layer the driver
also allows enabling/disabling the embedded wireless NIC (using the
"Wifi" button); this is done using the same BIOS interface, so it seems
only logical to keep the implementation together.  Any flexibility
possibly gained by allowing users to remap the function of the "Wifi"
button is IMHO not worth it when weighted against the necessity to run
an user-space daemon to convert button presses to wifi state changes.

Signed-off-by: Miloslav Trmac <mitr@volny.cz>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

13 years agoInput: atkbd - speed up setting leds/repeat state
Dmitry Torokhov [Sun, 20 Nov 2005 05:49:42 +0000]
Input: atkbd - speed up setting leds/repeat state

Changing led state is pretty slow operation; when there are multiple
requests coming at a high rate they may interfere with normal typing.
Try optimize (skip) changing hardware state when multiple requests
are coming back-to-back.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

13 years agoMerge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Steve French [Sun, 20 Nov 2005 05:05:42 +0000]
Merge ... /linux/kernel/git/torvalds/linux-2.6.git

13 years ago[CIFS] Fix setattr of mode only (e.g. in some chmod cases) to Windows
Steve French [Sun, 20 Nov 2005 05:04:52 +0000]
[CIFS] Fix setattr of mode only (e.g. in some chmod cases) to Windows
so it does not return EACCESS (unless server really returns that).

Signed-off-by: Steve French <sfrench@us.ibm.com>

13 years agoLinux v2.6.15-rc2
Linus Torvalds [Sun, 20 Nov 2005 03:25:03 +0000]
Linux v2.6.15-rc2

13 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
Linus Torvalds [Sun, 20 Nov 2005 00:31:03 +0000]
Merge /pub/scm/linux/kernel/git/bart/ide-2.6

13 years agoMerge master.kernel.org:/home/rmk/linux-2.6-serial
Linus Torvalds [Sat, 19 Nov 2005 23:25:23 +0000]
Merge master.kernel.org:/home/rmk/linux-2.6-serial

13 years agoMerge master.kernel.org:/home/rmk/linux-2.6-drvmodel
Linus Torvalds [Sat, 19 Nov 2005 23:24:42 +0000]
Merge kernel.org:/home/rmk/linux-2.6-drvmodel

Manual fixups to ARM ixp4xxx by hand.

13 years agoMerge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Sat, 19 Nov 2005 23:21:51 +0000]
Merge master.kernel.org:/home/rmk/linux-2.6-arm

13 years ago[PATCH] ide: add missing __init tags to device drivers
Bartlomiej Zolnierkiewicz [Sat, 19 Nov 2005 21:24:35 +0000]
[PATCH] ide: add missing __init tags to device drivers

Also remove bogus comments for idefloppy_init() and idetape_init().

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

13 years ago[PATCH] ide: remove dead code from flagged_taskfile()
Bartlomiej Zolnierkiewicz [Sat, 19 Nov 2005 21:17:55 +0000]
[PATCH] ide: remove dead code from flagged_taskfile()

flagged_taskfile() is called from execute_drive_cmd()
(the only user) only if args->tf_out_flags.all != 0.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

13 years ago[PATCH] ide: remove dead DEBUG_TASKFILE code
Bartlomiej Zolnierkiewicz [Sat, 19 Nov 2005 21:04:10 +0000]
[PATCH] ide: remove dead DEBUG_TASKFILE code

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

13 years ago[PATCH] ide: remove unused ide_action_t:ide_next
Bartlomiej Zolnierkiewicz [Sat, 19 Nov 2005 21:01:35 +0000]
[PATCH] ide: remove unused ide_action_t:ide_next

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

13 years ago[PATCH] ide: remove duplicate documentation for ide_do_drive_cmd()
Bartlomiej Zolnierkiewicz [Sat, 19 Nov 2005 20:54:04 +0000]
[PATCH] ide: remove duplicate documentation for ide_do_drive_cmd()

Remove duplicate documentation for ide_do_drive_cmd() from
<linux/ide.h>, this function is already documented in ide-io.c.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

13 years ago[PATCH] sis5513: enable ATA133 for the SiS965 southbridge
Aurelien Jarno [Sat, 19 Nov 2005 20:43:45 +0000]
[PATCH] sis5513: enable ATA133 for the SiS965 southbridge

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

13 years ago[PATCH] via82cxxx: add VIA VT6410 IDE support
Mathias Kretschmer [Sat, 19 Nov 2005 20:32:38 +0000]
[PATCH] via82cxxx: add VIA VT6410 IDE support

From: Mathias Kretschmer <posting@blx4.net>

Signed-off-by: Daniel Drake <dsd@gentoo.org>
Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

13 years ago[SERIAL] Remove unused variable in sa1100.c
Russell King [Sat, 19 Nov 2005 11:26:17 +0000]
[SERIAL] Remove unused variable in sa1100.c

Since the spinlock was removed from sa1100_start_tx(), the "flags"
variable becomes redundant.  Remove it.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

13 years ago[SERIAL] Fix status reporting with PL011 serial driver
Russell King [Sat, 19 Nov 2005 11:10:35 +0000]
[SERIAL] Fix status reporting with PL011 serial driver

The receiver status register reports latched error conditions, which
must be cleared by writing to it.  However, the data register reports
unlatched conditions which are associated with the current character.
Use the data register to interpret error status rather than the RSR.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

13 years agopowerpc: Fix bug in timebase synchronization on 32-bit SMP powermac
Paul Mackerras [Sat, 19 Nov 2005 10:24:55 +0000]
powerpc: Fix bug in timebase synchronization on 32-bit SMP powermac

We were using udelay in the loop on the primary cpu waiting for the
secondary cpu to take the timebase value.  Unfortunately now that
udelay uses the timebase, and the timebase is stopped at this point,
the udelay never terminated.  This fixes it by not using udelay, and
increases the number of loops before we time out to compensate.

Signed-off-by: Paul Mackerras <paulus@samba.org>

13 years ago[ARM] 3168/1: Update ARM signal delivery and masking
Daniel Jacobowitz [Sat, 19 Nov 2005 10:01:07 +0000]
[ARM] 3168/1: Update ARM signal delivery and masking

Patch from Daniel Jacobowitz

After delivering a signal (creating its stack frame) we must check for
additional pending unblocked signals before returning to userspace.
Otherwise signals may be delayed past the next syscall or reschedule.

Once that was fixed it became obvious that the ARM signal mask manipulation
was broken.  It was a little bit broken before the recent SA_NODEFER
changes, and then very broken after them.  We must block the requested
signals before starting the handler or the same signal can be delivered
again before the handler even gets a chance to run.

Signed-off-by: Daniel Jacobowitz <dan@codesourcery.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

13 years agopowerpc: Merge spinlock.h
Paul Mackerras [Sat, 19 Nov 2005 09:50:46 +0000]
powerpc: Merge spinlock.h

The result is mostly similar to the original ppc64 version but with
some adaptations for 32-bit compilation.

include/asm-ppc64 is now empty!

Signed-off-by: Paul Mackerras <paulus@samba.org>

13 years agopowerpc: move include/asm-ppc64/ptrace-common.h to arch/powerpc/kernel
Paul Mackerras [Sat, 19 Nov 2005 09:47:22 +0000]
powerpc: move include/asm-ppc64/ptrace-common.h to arch/powerpc/kernel

It's only used by arch/powerpc/kernel/ptrace{,32}.c.

Signed-off-by: Paul Mackerras <paulus@samba.org>

13 years agopowerpc: Merge pci.h
Paul Mackerras [Sat, 19 Nov 2005 09:46:04 +0000]
powerpc: Merge pci.h

This involves some minor changes: a few unused functions that the
ppc32 pci.c provides are no longer declared here or exported;
pcibios_assign_all_busses now just refers to the pci_assign_all_buses
variable on both 32-bit and 64-bit; pcibios_scan_all_fns is now
just 0 instead of a function that always returns 0 on 64-bit.

Signed-off-by: Paul Mackerras <paulus@samba.org>

13 years agopowerpc: Trivially merge several headers from asm-ppc64 to asm-powerpc
Paul Mackerras [Sat, 19 Nov 2005 09:17:32 +0000]
powerpc: Trivially merge several headers from asm-ppc64 to asm-powerpc

For these, I have just done the lame-o merge where the file ends up
looking like:

#ifndef CONFIG_PPC64
#include <asm-ppc/foo.h>
#else
... contents from asm-ppc64/foo.h
#endif

so nothing has changed, really, except that we reduce include/asm-ppc64
a bit more.

Signed-off-by: Paul Mackerras <paulus@samba.org>

13 years ago[CIFS] Fix mknod of block and chardev over SFU mounts
Steve French [Sat, 19 Nov 2005 04:25:31 +0000]
[CIFS] Fix mknod of block and chardev over SFU mounts

Signed-off-by: Steve French <sfrench@us.ibm.com>

13 years ago[PATCH] powerpc: Remove imalloc.h
David Gibson [Wed, 16 Nov 2005 04:43:48 +0000]
[PATCH] powerpc: Remove imalloc.h

asm-ppc64/imalloc.h is only included from files in arch/powerpc/mm.
We already have a header for mm local definitions,
arch/powerpc/mm/mmu_decl.h.  Thus, this patch moves the contents of
imalloc.h into mmu_decl.h.  The only exception are the definitions of
PHBS_IO_BASE, IMALLOC_BASE and IMALLOC_END.  Those are moved into
pgtable.h, next to similar definitions of VMALLOC_START and
VMALLOC_SIZE.

Built for multiplatform 32bit and 64bit (ARCH=powerpc).

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

13 years agoMerge branch 'mymerge' of ssh://ozlabs.org/home/sfr/kernel-sfr
Paul Mackerras [Sat, 19 Nov 2005 03:25:23 +0000]
Merge branch 'mymerge' of ssh://ozlabs.org/home/sfr/kernel-sfr

13 years ago[PATCH] powerpc: Fix setting MPIC priority
Benjamin Herrenschmidt [Fri, 18 Nov 2005 06:18:15 +0000]
[PATCH] powerpc: Fix setting MPIC priority

Trying to set the priority would just disable the interrupt due to an
incorrect mask used. We rarely use that call, in fact, I think only in
the powermac code for the cmd-power key combo that triggers xmon. So it
got unnoticed for a while.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

13 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
Linus Torvalds [Fri, 18 Nov 2005 23:58:38 +0000]
Merge /pub/scm/linux/kernel/git/bart/ide-2.6

13 years ago[COMPAT]: EXT3_IOC_SETVERSION is _IOW() not _IOR().
David S. Miller [Fri, 18 Nov 2005 22:50:20 +0000]
[COMPAT]: EXT3_IOC_SETVERSION is _IOW() not _IOR().

Noticed by Helge Deller.

Signed-off-by: David S. Miller <davem@davemloft.net>

13 years agoMerge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
Linus Torvalds [Fri, 18 Nov 2005 22:33:03 +0000]
Merge branch 'for-linus' of /linux/kernel/git/roland/infiniband

13 years agoMerge branch 'parisc' of master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
Linus Torvalds [Fri, 18 Nov 2005 22:25:40 +0000]
Merge branch 'parisc' of /linux/kernel/git/kyle/parisc-2.6

13 years agoIB/umad: make sure write()s have sufficient data
Roland Dreier [Fri, 18 Nov 2005 22:18:26 +0000]
IB/umad: make sure write()s have sufficient data

Make sure that userspace passes in enough data when sending a MAD.  We
always copy at least sizeof (struct ib_user_mad) + IB_MGMT_RMPP_HDR
bytes from userspace, so anything less is definitely invalid.  Also,
if the length is less than this limit, it's possible for the second
copy_from_user() to get a negative length and trigger a BUG().

Signed-off-by: Roland Dreier <rolandd@cisco.com>

13 years ago[PATCH] ide: fix ide_toggle_bounce() to not try to bounce if we have an IOMMU
James Bottomley [Fri, 18 Nov 2005 22:13:33 +0000]
[PATCH] ide: fix ide_toggle_bounce() to not try to bounce if we have an IOMMU

The following patch fixes a crash caused by attempting to bounce buffer
when an IDE CD-ROM is used on a machine with an IO-MMU. [At least, this
patch fixes things so I can use my IDE CD-ROM behind an ns87415 on a
HP PA-RISC workstation.]

Signed-off-by: James Bottomley <jejb@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

13 years ago[PATCH] ide: make comment match reality
Ralf Baechle [Fri, 18 Nov 2005 22:11:24 +0000]
[PATCH] ide: make comment match reality

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

13 years agoIB/mthca: Safer max_send_sge/max_recv_sge calculation
Michael S. Tsirkin [Fri, 18 Nov 2005 22:11:17 +0000]
IB/mthca: Safer max_send_sge/max_recv_sge calculation

Calculation of QP capabilities still isn't exactly right in mthca:
max_send_sge/max_recv_sge fields returned in create_qp can exceed the
handware supported limits.

Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

13 years ago[PATCH] cs5520: fix return value of cs5520_init_one()
Amit Gud [Fri, 18 Nov 2005 22:03:19 +0000]
[PATCH] cs5520: fix return value of cs5520_init_one()

From: Amit Gud <amitg@calsoftinc.com>

Patch follows from the suggestions by AC and Felipe W Damasio for fixing the
return codes from IDE drivers.

[ bart: fix coding style while at it ]

Signed-off-by: Amit Gud <gud@eth.net>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

13 years ago[PATCH] siimage: docs urls
Jeff Garzik [Fri, 18 Nov 2005 21:55:47 +0000]
[PATCH] siimage: docs urls

Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

13 years ago[PATCH] aec62xxx: remove all dead (#if0'd) code
Thibaut VARENE [Fri, 18 Nov 2005 21:51:48 +0000]
[PATCH] aec62xxx: remove all dead (#if0'd) code

Signed-off-by: Thibaut VARENE <varenet@parisc-linux.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

13 years agoMerge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
Linus Torvalds [Fri, 18 Nov 2005 21:49:44 +0000]
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block

13 years agoMerge branch 'master'
Kyle McMartin [Fri, 18 Nov 2005 21:39:20 +0000]
Merge branch 'master'

13 years ago[PATCH] pmac IDE: don't release empty interfaces
Thibaut VARENE [Fri, 18 Nov 2005 21:37:37 +0000]
[PATCH] pmac IDE: don't release empty interfaces

From: Thibaut VARENE <T-Bone@parisc-linux.org>

Cleaning up the hwif without knowing its previous state in pmac.c is a big
and potentially dangerous job, and there seems to be no generic code interface
that would provide either a way to properly release an hwif or to clean it up.

Fixes OOPS for empty PMAC interface and add-on PCI controller.

Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

13 years ago[PATCH] alim15x3: use KERN_WARNING
Alexey Dobriyan [Fri, 18 Nov 2005 21:22:21 +0000]
[PATCH] alim15x3: use KERN_WARNING

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

13 years ago[PARISC] Update CREDITS entries
Kyle McMartin [Fri, 18 Nov 2005 21:21:12 +0000]
[PARISC] Update CREDITS entries

Update Randolph Chung's location, and add Thibaut Varene.

Signed-off-by: Randolph Chung <tausq@parisc-linux.org>
Signed-off-by: Thibaut Varene <varenet@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>

13 years ago[PARISC] Mark hisax and pcbit ISDN drivers as not for parisc
Matthew Wilcox [Fri, 18 Nov 2005 21:20:10 +0000]
[PARISC] Mark hisax and pcbit ISDN drivers as not for parisc

These drivers do not compile on big endian systems, and parisc
is big endian. Also mark some as broken on m68k as well.

Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>

13 years ago[PATCH] alim15x3: replace pci_find_device() with pci_dev_present()
Hanna Linder [Fri, 18 Nov 2005 21:19:15 +0000]
[PATCH] alim15x3: replace pci_find_device() with pci_dev_present()

From: Hanna Linder <hannal@us.ibm.com>

The dev returned from pci_find_device() was not used so it can be
replaced with pci_dev_present().  Compile tested.

Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

13 years ago[PARISC] Mention PA-RISC in NS87415 help
Matthew Wilcox [Fri, 18 Nov 2005 21:18:40 +0000]
[PARISC] Mention PA-RISC in NS87415 help

Mention PA-RISC in NS87415 help. PA-RISC [BCJ]xxx0 workstations come with
NS87415 integrated for their CD-ROM drives.

Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>

13 years ago[PARISC] Make Serial MUX depend on a specific bus type.
Matthew Wilcox [Fri, 18 Nov 2005 21:17:50 +0000]
[PARISC] Make Serial MUX depend on a specific bus type.

Depend on GSC, not PARISC.  Machines without GSC don't have a MUX.

Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>

13 years ago[PARISC] Fix compile warning caused by conflicting types of expand_upwards()
Matthew Wilcox [Fri, 18 Nov 2005 21:16:42 +0000]
[PARISC] Fix compile warning caused by conflicting types of expand_upwards()

Fix compile warning caused by conflicting types of expand_upwards. IA64
requires it to not be static inline, as it's used outside mm/mmap.c

Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>

13 years ago[PATCH] ide: remove ide_driver_t.owner field
Laurent Riffard [Fri, 18 Nov 2005 21:15:40 +0000]
[PATCH] ide: remove ide_driver_t.owner field

The structure ide_driver_t have a .owner field which is a duplicate
of .gendriver.owner field (.gen_driver is a struct device_driver).

This patch removes ide_driver_t's owner field.

Signed-off-by: Laurent Riffard <laurent.riffard@free.fr>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

13 years ago[PATCH] via82cxxx IDE: support multiple controllers
Daniel Drake [Fri, 18 Nov 2005 21:09:45 +0000]
[PATCH] via82cxxx IDE: support multiple controllers

Support multiple controllers in the via82cxxx IDE driver.
Cable detection and ISA bridge finding have been moved into
their own functions.

Signed-off-by: Daniel Drake <dsd@gentoo.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

13 years ago[PATCH] via82cxxx IDE: remove /proc/via entry
Daniel Drake [Fri, 18 Nov 2005 21:08:29 +0000]
[PATCH] via82cxxx IDE: remove /proc/via entry

This entry adds needless complication to the driver as it requires the use of
global variables to be passed into via_get_info(), making things quite ugly
when we try and make this driver support multiple controllers simultaneously.

This patch removes /proc/via for simplicity.

On 10/13/05, Daniel Drake <dsd@gentoo.org> wrote:
> Per Bart's suggestion, I've created a user-space app which shows identical
> data (and doesn't even rely on the via82cxxx IDE driver).
>
> http://www.reactivated.net/software/viaideinfo/
>
> So, I think we should be clear to drop /proc/ide/via now.

Signed-off-by: Daniel Drake <dsd@gentoo.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

13 years ago[PATCH 3/3] cciss: add put_disk into cleanup routines
mikem [Fri, 18 Nov 2005 21:05:36 +0000]
[PATCH 3/3] cciss: add put_disk into cleanup routines

Jeff Garzik pointed me to his code to see how to remove a disk from
the system _properly_. Well, here it is...
Every place we remove disks we are now testing before calling del_gendisk
or blk_cleanup_queue and then call put_disk.

Signed-off-by: Mike Miller <mike.miller@hp.com>
Signed-off-by: Jens Axboe <axboe@suse.de>

13 years ago[PATCH 2/3] cciss: bug fix for BIG_PASS_THRU
Jens Axboe [Fri, 18 Nov 2005 21:02:44 +0000]
[PATCH 2/3] cciss: bug fix for BIG_PASS_THRU

Applications using CCISS_BIG_PASSTHRU complained that the data written
was zeros. The problem is that the buffer is being cleared after the
user copy, unless the user copy has failed... Correct that logic.

Signed-off-by: Mike Miller <mike.miller@hp.com>
Signed-off-by: Jens Axboe <axboe@suse.de>

13 years ago[PATCH 1/3] cciss: bug fix for hpacucli
mikem [Fri, 18 Nov 2005 21:00:17 +0000]
[PATCH 1/3] cciss: bug fix for hpacucli

This patch fixes a bug that breaks hpacucli, a command line interface
for the HP Array Config Utility. Without this fix the utility will
not detect any controllers in the system. I thought I had already fixed
this, but I guess not.

Thanks to all who reported the issue. Please consider this this inclusion.

Signed-off-by: Mike Miller <mikem@beardog.cca.cpqcorp.net>
Signed-off-by: Jens Axboe <axboe@suse.de>

13 years ago[BLOCK] new block/ directory comment tidy
Coywolf Qi Hunt [Wed, 16 Nov 2005 14:27:24 +0000]
[BLOCK] new block/ directory comment tidy

Some leftover comments referring to drivers/block that are now block/.
They don't add any information we don't already have, so kill them.

Signed-off-by: Coywolf Qi Hunt <qiyong@fc-cn.com>
Signed-off-by: Jens Axboe <axboe@suse.de>

13 years ago[CIFS] Missing part of previous patch
Steve French [Fri, 18 Nov 2005 20:27:27 +0000]
[CIFS] Missing part of previous patch

Signed-off-by: Steve French <sfrench@us.ibm.com>

13 years agoMerge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Fri, 18 Nov 2005 20:23:07 +0000]
Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/netdev-2.6

13 years agoMerge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Fri, 18 Nov 2005 20:19:12 +0000]
Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/libata-dev

13 years ago[wireless hermes] build fix
Jeff Garzik [Fri, 18 Nov 2005 20:06:59 +0000]
[wireless hermes] build fix

13 years ago[CIFS] Fix scheduling while atomic when pending writes at file close time
Steve French [Fri, 18 Nov 2005 19:31:10 +0000]
[CIFS] Fix scheduling while atomic when pending writes at file close time
Fix the case in which readdir reset file type when SFU mount option
specified.

Also fix sfu related functions to not request EAs (xattrs) when not
configured in Kconfig

Signed-off-by: Steve French <sfrench@us.ibm.com>

13 years ago[libata sata_mv] update copyright, driver version
Jeff Garzik [Fri, 18 Nov 2005 19:04:23 +0000]
[libata sata_mv] update copyright, driver version

13 years agoMerge branch 'upstream-fixes' of git://git.tuxdriver.com/git/netdev-jwl
Jeff Garzik [Fri, 18 Nov 2005 18:57:44 +0000]
Merge branch 'upstream-fixes' of git://git.tuxdriver.com/git/netdev-jwl

13 years ago[PATCH] ipw2100: Fix 'Driver using old /proc/net/wireless...' message
James Ketrenos [Sat, 12 Nov 2005 18:50:12 +0000]
[PATCH] ipw2100: Fix 'Driver using old /proc/net/wireless...' message

ipw2100: Fix 'Driver using old /proc/net/wireless...' message

Wireless extensions moved the get_wireless_stats handler from being
in net_device into wireless_handler.

A prior instance of this patch resolved the issue for the ipw2200.
This one fixes it for the ipw2100.

Signed-off-by: Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

13 years ago[PATCH] fec_8xx: make CONFIG_FEC_8XX depend on CONFIG_8xx
John W. Linville [Mon, 7 Nov 2005 18:24:59 +0000]
[PATCH] fec_8xx: make CONFIG_FEC_8XX depend on CONFIG_8xx

Change CONFIG_FEC_8XX to depend on CONFIG_8xx instead of CONFIG_FEC.
CONFIG_FEC depends on ColdFire CPUs, which does not apply for the
PPC 8xx processors.

Signed-off-by: John W. Linville <linville@tuxdriver.com>

13 years ago[PATCH] update Documentation/00-INDEX
Greg Kroah-Hartman [Fri, 18 Nov 2005 17:31:15 +0000]
[PATCH] update Documentation/00-INDEX

Update the index file with descriptions of the stable_api_nonsense.txt
and stable_kernel_rules.txt files.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

13 years ago[PATCH] Add HOWTO do kernel development document to the Documentation directory
Greg Kroah-Hartman [Fri, 18 Nov 2005 17:31:11 +0000]
[PATCH] Add HOWTO do kernel development document to the Documentation directory

Here's a document that describes the process and procedures of how to do Linux
kernel development.  It has gone through a number of rounds of review on the
linux-kernel mailing list, and contains contributions and help from Paolo
Ciarrocchi, Randy Dunlap, Gerrit Huizenga, Pat Mochel, Hanna Linder, Kay
Sievers, Vojtech Pavlik, Jan Kara, Josh Boyer, Kees Cook, Andrew Morton, Andi
Kleen, Vadim Lobanov, Jesper Juhl, Adrian Bunk, Keri Harris, Frans Pop, David
A. Wheeler, Junio Hamano, Michael Kerrisk, and Alex Shepard.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

13 years ago[PATCH] Add SCM info to MAINTAINERS
Jody McIntyre [Fri, 18 Nov 2005 17:31:06 +0000]
[PATCH] Add SCM info to MAINTAINERS

Add tree information to MAINTAINERS file.

Signed-off-by: Jody McIntyre <scjody@steamballoon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

13 years ago[PATCH] git-netdev-all-ieee80211_get_payload-warning-fix
Andrew Morton [Wed, 9 Nov 2005 19:30:51 +0000]
[PATCH] git-netdev-all-ieee80211_get_payload-warning-fix

include/net/ieee80211.h: In function `ieee80211_get_payload':
include/net/ieee80211.h:1046: warning: control reaches end of non-void function

Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

13 years ago[PATCH] drivers/net/wireless/hermes.c unsigned int comparision
Gabriel A. Devenyi [Sat, 12 Nov 2005 21:00:46 +0000]
[PATCH] drivers/net/wireless/hermes.c unsigned int comparision

hermas_bap_pread,  hermes_bap_pwrite, and hermes_bap_pwrite_pad all have a parameter "len" that is declared unsigned,
but checked for a value less than zero. Auditing the callers, it is possible for len to be passed a negative value, so len should be an int.

Thanks to LinuxICC (http://linuxicc.sf.net)

Signed-off-by: Gabriel A. Devenyi <ace@staticwave.ca>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

13 years ago[PATCH] prism54 : Remove extraneous udelay/register read
Roger While [Mon, 14 Nov 2005 10:50:46 +0000]
[PATCH] prism54 : Remove extraneous udelay/register read

In isl_38xx.c
In routine isl38xx_trigger-device

Move unnecessary udelay/register read.
This is only required when hand-compiling the driver and
setting  VERBOSE > SHOW_ERROR_MESSAGES

Signed-off-by: Roger While <simrw@sim-basis.de>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

13 years ago[PATCH] SAA9730: Add missing header bits.
Ralf Baechle [Mon, 14 Nov 2005 00:19:44 +0000]
[PATCH] SAA9730: Add missing header bits.

This header file patch was missing from the recent SAA9730 patch.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

13 years ago[PATCH] au1000_eth: Include <linux/config.h>
Ralf Baechle [Mon, 14 Nov 2005 00:16:29 +0000]
[PATCH] au1000_eth: Include <linux/config.h>

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

The Au1000 ethernet driver references plenty of CONFIG_* symbols.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

13 years ago[PATCH] IOC3: Replace obsolete PCI API
Ralf Baechle [Sun, 13 Nov 2005 10:13:05 +0000]
[PATCH] IOC3: Replace obsolete PCI API

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

13 years ago[PATCH] i82593.h: make header comment GPL-compatible
John W. Linville [Wed, 16 Nov 2005 21:09:53 +0000]
[PATCH] i82593.h: make header comment GPL-compatible

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

13 years ago[PATCH] e100: re-enable microcode with more useful defaults
Jesse Brandeburg [Mon, 14 Nov 2005 21:15:49 +0000]
[PATCH] e100: re-enable microcode with more useful defaults

For the four versions of hardware that we (currently) support microcode
download on, the default configuration of our receive interrupt mitigation
microcode was too aggressive, and caused unnecessary delays when pinging,
and low(er) throughput on single connection latency sensitive performance
tests.

This code adds microcode support, and sets the defaults to more reasonable
settings. It also explains the functionality in the code in more detail.
Compile and load tested, shows expected behavior for slight delay of ping
packets (1-2ms) when ucode is loaded, and decent interrupt moderation for
small packets, while maintaining good throughput.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

13 years agoMerge branch 'halasa-hdlc' of git://git.tuxdriver.com/git/netdev-jwl
Jeff Garzik [Fri, 18 Nov 2005 18:24:33 +0000]
Merge branch 'halasa-hdlc' of git://git.tuxdriver.com/git/netdev-jwl

13 years agoMerge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6
Jeff Garzik [Fri, 18 Nov 2005 18:21:24 +0000]
Merge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6

13 years ago[PATCH] sil24: make error_intr less verbose
Tejun Heo [Fri, 18 Nov 2005 05:22:03 +0000]
[PATCH] sil24: make error_intr less verbose

sil24_error_intr logs all error interrupts.  ATAPI devices generates
many harmless errors which can be ignored and all serious ones are
reported via sense data by SCSI layer.  Don't log device errors from
ATAPI devices.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

13 years ago[PATCH] sil24: add ATAPI support
Tejun Heo [Fri, 18 Nov 2005 05:16:45 +0000]
[PATCH] sil24: add ATAPI support

This patch implements ATAPI support for sil24 and bumps driver version
to 0.23.

Signed-off-by: Tejun Heo <htejun@gmail.com>

--

Jeff, it has been converted to use ->dev_config as pointed out.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

13 years ago[PATCH] sil24: use SRST for phy_reset
Tejun Heo [Fri, 18 Nov 2005 05:14:01 +0000]
[PATCH] sil24: use SRST for phy_reset

There seems to be no way to obtain device signature from sil24 after
SATA phy reset and SRST is needed anyway for later port multiplier
suppport.  This patch converts sil24_phy_reset to use SRST instaed.

Signed-off-by: Tejun Heo <htejun@gmail.com>

--

Jeff, I didn't remove the 10ms sleep just to be on the safe side.  I
think we can live with 10ms sleep on SRST.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

13 years ago[PATCH] sil24: add sil24_restart_controller
Tejun Heo [Fri, 18 Nov 2005 05:09:05 +0000]
[PATCH] sil24: add sil24_restart_controller

When an error condition is raised by device via D2H FIS or SDB.  sil24
controller should be restarted by setting PORT_CS_INIT and waiting
until PORT_CS_RDY is asserted instead of resetting the controller.
This patch implements sil24_restart_controller for those cases.  This
patch also makes sure that PORT_CS_RDY is asserted on
sil24_reset_controller completion.

Signed-off-by: Tejun Heo <htejun@gmail.com>

--

Jeff, delay is reduced to 1us and cnt increased to 10k.  My sil3124
turns on PORT_CS_RDY on the second iteration even without any delay.
I think 10k * 1us should be more than enough.

I tried to convert both restart and reset to use msleep's with work
queue, but if we do that, host_set lock should be released after
initiating restart or reset, leading to race condition among
reset/restart, other interrupts and timeout.  Implementing
synchronization among those in low-level driver doesn't seem right.
Well, reduced timeout should work for the time being.

Thanks.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

13 years ago[PATCH] smc91x: fix bank mismatch
Russell King [Fri, 18 Nov 2005 17:57:55 +0000]
[PATCH] smc91x: fix bank mismatch

The smc91x driver relies upon register bank 2 being selected whenever
the interrupt handler is called.  This isn't always so, especially if
we have a link change event during PHY configuration.

This results in register bank 0 being selected when the interrupt
handler is called, causing the wrong registers to be read for the
IRQ mask and status.  In turn, this causes us to spin with a
permanently asserted IRQ.

The patch ensures that smc_phy_configure always exits with register
bank 2 selected.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>