linux-2.6.git
15 years ago[PATCH] uml: properly invoke x86_64 system calls
Jeff Dike [Tue, 22 Nov 2005 05:32:09 +0000 (21:32 -0800)]
[PATCH] uml: properly invoke x86_64 system calls

This patch makes stub_segv use the stub_syscall macros.  This was needed
anyway, but the bug that prompted this was the discovery that gcc was storing
stuff in RCX, which is trashed across a system call.  This is exactly the sort
of problem that the new macros fix.

There is a stub_syscall0 for getpid.  stub_segv was changed to be a libc file,
and that caused some include changes.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
15 years ago[PATCH] uml: eliminate anonymous union and clean up symlink lossage
Jeff Dike [Tue, 22 Nov 2005 05:32:08 +0000 (21:32 -0800)]
[PATCH] uml: eliminate anonymous union and clean up symlink lossage

This gives a name to the anonymous union introduced in skas-hold-own-ldt,
allowing to build on a wider range of gccs.

It also removes ldt.h, which somehow became real, and replaces it with a
symlink, and creates ldt-x86_64.h as a copy of ldt-i386.h for now.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
15 years ago[PATCH] uml: eliminate use of local in clone stub
Jeff Dike [Tue, 22 Nov 2005 05:32:04 +0000 (21:32 -0800)]
[PATCH] uml: eliminate use of local in clone stub

We have a bug in the i386 stub_syscall6 which pushes ebp before the system
call and pops it afterwards.  Because we use syscall6 to remap the stack, the
old contents of the stack (and the former value of ebp) are no longer
available.  Some versions of gcc make from a real local, accessed through ebp,
despite my efforts to make it obvious that references to from are really
constants.  This patch attempts to make it even more obvious by eliminating
from and using a macro to access the stub's data explicitly with constants.

My original thinking on this was to replace syscall6 with a remap_stack
interface which saved ebp someplace and restored it afterwards.  The problem
is that there are no registers to put it in, except for esp.  That could work,
since we can store a constant in esp after the mmap because we just replaced
the stack.  However, this approach seems a tad cleaner.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
15 years ago[PATCH] net: Fix compiler-error on dgrs.c when !CONFIG_PCI
Richard Knutsson [Tue, 22 Nov 2005 05:32:03 +0000 (21:32 -0800)]
[PATCH] net: Fix compiler-error on dgrs.c when !CONFIG_PCI

drivers/net/dgrs.c: In function `dgrs_init_module':
drivers/net/dgrs.c:1598: `dgrs_pci_driver' undeclared (first use in this function)

Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
15 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/scjody...
Linus Torvalds [Tue, 22 Nov 2005 03:04:44 +0000 (19:04 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/scjody/ieee1394

15 years agoMerge master.kernel.org:/home/rmk/linux-2.6-serial
Linus Torvalds [Tue, 22 Nov 2005 03:00:43 +0000 (19:00 -0800)]
Merge master.kernel.org:/home/rmk/linux-2.6-serial

15 years agoMerge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Tue, 22 Nov 2005 03:00:05 +0000 (19:00 -0800)]
Merge master.kernel.org:/home/rmk/linux-2.6-arm

15 years agoMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Linus Torvalds [Tue, 22 Nov 2005 01:44:56 +0000 (17:44 -0800)]
Merge branch 'release' of git://git./linux/kernel/git/aegl/linux-2.6

15 years ago[IA64-SGI] bte_copy nasid_index fix
Russ Anderson [Fri, 11 Nov 2005 22:52:02 +0000 (16:52 -0600)]
[IA64-SGI] bte_copy nasid_index fix

The nasid_index was not being incremented if the
pointer was null, causing an infinite loop.

Signed-off-by: Russ Anderson (rja@sgi.com)
Signed-off-by: Tony Luck <tony.luck@intel.com>
15 years ago[IA64-SGI] support for older versions of PROM
Jack Steiner [Fri, 18 Nov 2005 22:11:27 +0000 (16:11 -0600)]
[IA64-SGI] support for older versions of PROM

Add support for old versions of the SN PROMs. Eventually this
support will be deleted but it is useful right now to continue
supporting older PROMs.

Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
15 years ago[IA64] fix bug in sn/ia64 for sparse CPU numbering
hawkes@sgi.com [Fri, 18 Nov 2005 19:30:34 +0000 (11:30 -0800)]
[IA64] fix bug in sn/ia64 for sparse CPU numbering

The kernel's use of the for_each_*cpu(i) macros has allowed for sparse CPU
numbering.  When I hacked the kernel to test sparse cpu_present_map[] and
cpu_possible_map[] cpumasks, I discovered one remaining spot, in
sn_hwperf_ioctl() during sn initialization, that needs to be fixed.

Signed-off-by: John Hawkes <hawkes@sgi.com>
Signed-off-by: Dean Roe <roe@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
15 years ago[IA64] Prevent sn2 ptc code from executing on all ia64 subarches
Prarit Bhargava [Mon, 21 Nov 2005 18:00:38 +0000 (13:00 -0500)]
[IA64] Prevent sn2 ptc code from executing on all ia64 subarches

Patch to prevent sn2_ptc_init code from attempting to load on non-sn2 systems
when sn2_smp.c is built-in to generic kernel.

Signed-off-by: Prarit Bhargava <prarit@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
15 years ago[PATCH] as-iosched: remove state assertion in as_add_request()
Jens Axboe [Mon, 21 Nov 2005 18:49:41 +0000 (19:49 +0100)]
[PATCH] as-iosched: remove state assertion in as_add_request()

Kill the arq->state poison statement in as_add_request(), it can trigger
for perfectly valid code that just reuses a request after io completion
instead of freeing it and allocating a new one. We probably should
introduce a blk_init_request() to start from scratch, but for now just
kill it as we will be removing the as specific poisoning soon.

Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
15 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
Linus Torvalds [Mon, 21 Nov 2005 18:56:30 +0000 (10:56 -0800)]
Merge /pub/scm/linux/kernel/git/davej/agpgart

15 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Mon, 21 Nov 2005 18:46:34 +0000 (10:46 -0800)]
Merge /pub/scm/linux/kernel/git/davem/net-2.6

15 years ago[SERIAL] imx: Fix missed platform_driver_unregister
Russell King [Mon, 21 Nov 2005 17:05:21 +0000 (17:05 +0000)]
[SERIAL] imx: Fix missed platform_driver_unregister

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
15 years ago[ARM] Shut up gcc warning in clps7500 core.c
Russell King [Mon, 21 Nov 2005 17:03:15 +0000 (17:03 +0000)]
[ARM] Shut up gcc warning in clps7500 core.c

core.c:263: warning: initialization makes integer from pointer without a cast

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
15 years ago[ARM] Shut up gcc warning in assabet.c
Russell King [Mon, 21 Nov 2005 17:01:13 +0000 (17:01 +0000)]
[ARM] Shut up gcc warning in assabet.c

assabet.c:291: warning: 'scr' may be used uninitialized in this function

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
15 years ago[ARM] ebsa110: __arch_ioremap should be 3 args
Russell King [Mon, 21 Nov 2005 15:26:52 +0000 (15:26 +0000)]
[ARM] ebsa110: __arch_ioremap should be 3 args

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
15 years ago[ARM] Add asm/memory.h to asm/numnodes.h
Russell King [Mon, 21 Nov 2005 15:26:18 +0000 (15:26 +0000)]
[ARM] Add asm/memory.h to asm/numnodes.h

Since the defintion of NODES_SHIFT may be overridden in asm/arch/memory.h
it's important to include asm/memory.h into asm/numnodes.h to ensure
that the correct value is always defined.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
15 years ago[ARM] 3171/1: To add missing QMGR region size for IXP4XX
Kenneth Tan [Mon, 21 Nov 2005 15:17:07 +0000 (15:17 +0000)]
[ARM] 3171/1: To add missing QMGR region size for IXP4XX

Patch from Kenneth Tan

To add queue manager region size which is missing from ixp4xx-regs.h

Signed-off-by: Kenneth Tan <chong.yin.tan@intel.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
15 years ago[ARM] 3170/1: Sharp SL-6000x: platform device conversion fixup
Dirk Opfer [Mon, 21 Nov 2005 15:17:06 +0000 (15:17 +0000)]
[ARM] 3170/1: Sharp SL-6000x: platform device conversion fixup

Patch from Dirk Opfer

Fix an error in tosa.c after the platform device conversion.

Signed-off-by: Dirk Opfer <Dirk@Opfer-Online.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
15 years agoMerge ../linus/
Dave Jones [Mon, 21 Nov 2005 14:56:52 +0000 (06:56 -0800)]
Merge ../linus/

15 years ago[AGPGART] Support VIA P4M800CE bridge.
Dave Jones [Mon, 21 Nov 2005 14:53:16 +0000 (06:53 -0800)]
[AGPGART] Support VIA P4M800CE bridge.

Signed-off-by: Dave Jones <davej@redhat.com>
15 years ago[NET]: kernel-doc fixes
Randy Dunlap [Mon, 21 Nov 2005 05:25:15 +0000 (21:25 -0800)]
[NET]: kernel-doc fixes

Fix kernel-doc warnings in network files.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
15 years ago[NET]: Use unused bit for ipvs_property field in struct sk_buff
Patrick McHardy [Mon, 21 Nov 2005 05:19:21 +0000 (21:19 -0800)]
[NET]: Use unused bit for ipvs_property field in struct sk_buff

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
15 years ago[DCCP]: Add missing no_policy flag to struct net_protocol
Patrick McHardy [Mon, 21 Nov 2005 05:16:13 +0000 (21:16 -0800)]
[DCCP]: Add missing no_policy flag to struct net_protocol

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
15 years ago[NETFILTER]: Remove ARRAY_SIZE duplicate
Nicolas Kaiser [Mon, 21 Nov 2005 05:11:31 +0000 (21:11 -0800)]
[NETFILTER]: Remove ARRAY_SIZE duplicate

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
15 years ago[NETFILTER]: fixed dependencies between modules related with ip_conntrack
Yasuyuki Kozakai [Mon, 21 Nov 2005 05:09:55 +0000 (21:09 -0800)]
[NETFILTER]: fixed dependencies between modules related with ip_conntrack

- IP_NF_CONNTRACK_MARK is bool and depends on only IP_NF_CONNTRACK
  which is tristate. If a variable depends on IP_NF_CONNTRACK_MARK and
  doesn't care about IP_NF_CONNTRACK, it can be y. This must be avoided.
- IP_NF_CT_ACCT has same problem.
- IP_NF_TARGET_CLUSTERIP also depends on IP_NF_MANGLE.

Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
15 years ago[FIB_TRIE]: Don't show local table in /proc/net/route output
Patrick McHardy [Mon, 21 Nov 2005 05:09:00 +0000 (21:09 -0800)]
[FIB_TRIE]: Don't show local table in /proc/net/route output

Don't show local table to behave similar to fib_hash.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
15 years agoMerge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6.14+advapi-fix/
David S. Miller [Mon, 21 Nov 2005 04:52:16 +0000 (20:52 -0800)]
Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6.14+advapi-fix/

15 years ago[PATCH] Fix an OOPS is CinergyT2
Dmitry Torokhov [Sun, 20 Nov 2005 16:13:29 +0000 (11:13 -0500)]
[PATCH] Fix an OOPS is CinergyT2

Fix an OOPS is CinergyT2 driver when registering IR remote

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
15 years ago[IPV6]: Acquire addrconf_hash_lock for read in addrconf_verify(...)
Yan Zheng [Sun, 20 Nov 2005 21:42:20 +0000 (13:42 -0800)]
[IPV6]: Acquire addrconf_hash_lock for read in addrconf_verify(...)

addrconf_verify(...) only traverse address hash table when
addrconf_hash_lock is held for writing, and it may hold
addrconf_hash_lock for a long time. So I think it's better to acquire
addrconf_hash_lock for reading instead of writing

Signed-off-by: Yan Zheng <yanzheng@21cn.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
15 years ago[COMPAT] net: SIOCGIFCONF data corruption
Alexandra Kossovsky [Sun, 20 Nov 2005 21:41:59 +0000 (13:41 -0800)]
[COMPAT] net: SIOCGIFCONF data corruption

From: Alexandra Kossovsky <Alexandra.Kossovsky@oktetlabs.ru>

From http://bugzilla.kernel.org/show_bug.cgi?id=4746

There is user data corruption when using ioctl(SIOCGIFCONF) in 32-bit
application running amd64 kernel. I do not think that this problem is
exploitable, but any data corruption may lead to security problems.
Following code demonstrates the problem

#include <stdint.h>
#include <stdio.h>
#include <sys/time.h>
#include <sys/socket.h>
#include <net/if.h>
#include <sys/ioctl.h>

char buf[256];

main()
{
int s = socket(AF_INET, SOCK_DGRAM, 0);
struct ifconf req;
int i;

req.ifc_buf = buf;
req.ifc_len = 41;

printf("Result %d\n", ioctl(s, SIOCGIFCONF, &req));
printf("Len %d\n", req.ifc_len);
for (i = 41; i < 256; i++)
if (buf[i] != 0)
printf("Byte %d is corrupted\n", i);
}

Steps to reproduce:
Compile the code above into 32-bit elf and run it. You'll get
Result 0
Len 32
Byte 48 is corrupted
Byte 52 is corrupted
Byte 53 is corrupted
Byte 54 is corrupted
Byte 55 is corrupted

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
15 years ago[NET]: Reject socket filter if division by constant zero is attempted.
Kris Katterjohn [Sun, 20 Nov 2005 21:41:34 +0000 (13:41 -0800)]
[NET]: Reject socket filter if division by constant zero is attempted.

This way we don't have to check it in sk_run_filter().

Signed-off-by: Kris Katterjohn <kjak@users.sourceforge.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
15 years ago[PKT_SCHED]: sch_netem: correctly order packets to be sent simultaneously
Andrea Bittau [Sun, 20 Nov 2005 21:41:05 +0000 (13:41 -0800)]
[PKT_SCHED]: sch_netem: correctly order packets to be sent simultaneously

If two packets were queued to be sent at the same time in the future,
their order would be reversed.  This would occur because the queue is
traversed back to front, and a position is found by checking whether
the new packet needs to be sent before the packet being examined.  If
the new packet is to be sent at the same time of a previous packet, it
would end up before the old packet in the queue.  This patch places
packets in the correct order when they are queued to be sent at a same
time in the future.

Signed-off-by: Andrea Bittau <a.bittau@cs.ucl.ac.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
15 years ago[PATCH] Remove compat ioctl semaphore
Andi Kleen [Sun, 20 Nov 2005 17:49:08 +0000 (18:49 +0100)]
[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>
15 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 (18:49 +0100)]
[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>
15 years ago[PATCH] Register disabled CPUs
Ashok Raj [Sun, 20 Nov 2005 17:49:06 +0000 (18:49 +0100)]
[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>
15 years ago[PATCH] i386: Use bigsmp for > 8 core Opteron systems
Andi Kleen [Sun, 20 Nov 2005 17:49:05 +0000 (18:49 +0100)]
[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>
15 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6
Linus Torvalds [Sun, 20 Nov 2005 17:19:38 +0000 (09:19 -0800)]
Merge /pub/scm/linux/kernel/git/sfrench/cifs-2.6

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

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
15 years agoFix an OOPS when initializing IR remote on saa7134
Dmitry Torokhov [Sun, 20 Nov 2005 05:56:54 +0000 (00:56 -0500)]
Fix an OOPS when initializing IR remote on saa7134

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
15 years agoInput: make serio and gameport more swsusp friendly
Dmitry Torokhov [Sun, 20 Nov 2005 05:56:43 +0000 (00:56 -0500)]
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>
15 years agoInput: handle failures in input_register_device()
Dmitry Torokhov [Sun, 20 Nov 2005 05:56:31 +0000 (00:56 -0500)]
Input: handle failures in input_register_device()

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
15 years agoInput: uinput - don't use "interruptible" in FF code
Dmitry Torokhov [Sun, 20 Nov 2005 05:51:43 +0000 (00:51 -0500)]
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>
15 years agoInput: uinput - add UI_SET_SWBIT ioctl
Dmitry Torokhov [Sun, 20 Nov 2005 05:51:33 +0000 (00:51 -0500)]
Input: uinput - add UI_SET_SWBIT ioctl

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
15 years agoInput: uinput - convert to dynalloc allocation
Dmitry Torokhov [Sun, 20 Nov 2005 05:51:22 +0000 (00:51 -0500)]
Input: uinput - convert to dynalloc allocation

Also introduce proper locking when creating/deleting device.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
15 years agoInput: wistron - disable wifi/bluetooth on suspend
Miloslav Trmac [Sun, 20 Nov 2005 05:51:05 +0000 (00:51 -0500)]
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>
15 years agoInput: wistron - add PM support
Dmitry Torokhov [Sun, 20 Nov 2005 05:50:58 +0000 (00:50 -0500)]
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>
15 years agoInput: wistron - convert to dynamic input_dev allocation
Dmitry Torokhov [Sun, 20 Nov 2005 05:50:46 +0000 (00:50 -0500)]
Input: wistron - convert to dynamic input_dev allocation

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
15 years agoInput: wistron - add support for Acer Aspire 1500 notebooks
Bernhard Rosenkraenzer [Sun, 20 Nov 2005 05:50:37 +0000 (00:50 -0500)]
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>
15 years agoInput: wistron - disable for x86_64
Andrew Morton [Sun, 20 Nov 2005 05:50:21 +0000 (00:50 -0500)]
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>
15 years agoInput: add Wistron driver
Dmitry Torokhov [Sun, 20 Nov 2005 05:50:06 +0000 (00:50 -0500)]
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>
15 years agoInput: atkbd - speed up setting leds/repeat state
Dmitry Torokhov [Sun, 20 Nov 2005 05:49:42 +0000 (00:49 -0500)]
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>
15 years agoMerge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Steve French [Sun, 20 Nov 2005 05:05:42 +0000 (21:05 -0800)]
Merge ... /linux/kernel/git/torvalds/linux-2.6.git

15 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 (21:04 -0800)]
[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>
15 years agoLinux v2.6.15-rc2
Linus Torvalds [Sun, 20 Nov 2005 03:25:03 +0000 (19:25 -0800)]
Linux v2.6.15-rc2

15 years ago[IPV6]: Fix sending extension headers before and including routing header.
YOSHIFUJI Hideaki [Sun, 20 Nov 2005 03:23:18 +0000 (12:23 +0900)]
[IPV6]: Fix sending extension headers before and including routing header.

Based on suggestion from Masahide Nakamura <nakam@linux-ipv6.org>.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
15 years ago[IPV6]: Fix calculation of AH length during filling ancillary data.
Ville Nuorvala [Sun, 20 Nov 2005 03:21:59 +0000 (12:21 +0900)]
[IPV6]: Fix calculation of AH length during filling ancillary data.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
15 years ago[IPV6]: Fix memory management error during setting up new advapi sockopts.
YOSHIFUJI Hideaki [Sun, 20 Nov 2005 03:18:17 +0000 (12:18 +0900)]
[IPV6]: Fix memory management error during setting up new advapi sockopts.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
15 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
Linus Torvalds [Sun, 20 Nov 2005 00:31:03 +0000 (16:31 -0800)]
Merge /pub/scm/linux/kernel/git/bart/ide-2.6

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

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

Manual fixups to ARM ixp4xxx by hand.

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

15 years ago[PATCH] ide: add missing __init tags to device drivers
Bartlomiej Zolnierkiewicz [Sat, 19 Nov 2005 21:24:35 +0000 (22:24 +0100)]
[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>
15 years ago[PATCH] ide: remove dead code from flagged_taskfile()
Bartlomiej Zolnierkiewicz [Sat, 19 Nov 2005 21:17:55 +0000 (22:17 +0100)]
[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>
15 years ago[PATCH] ide: remove dead DEBUG_TASKFILE code
Bartlomiej Zolnierkiewicz [Sat, 19 Nov 2005 21:04:10 +0000 (22:04 +0100)]
[PATCH] ide: remove dead DEBUG_TASKFILE code

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
15 years ago[PATCH] ide: remove unused ide_action_t:ide_next
Bartlomiej Zolnierkiewicz [Sat, 19 Nov 2005 21:01:35 +0000 (22:01 +0100)]
[PATCH] ide: remove unused ide_action_t:ide_next

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
15 years ago[PATCH] ide: remove duplicate documentation for ide_do_drive_cmd()
Bartlomiej Zolnierkiewicz [Sat, 19 Nov 2005 20:54:04 +0000 (21:54 +0100)]
[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>
15 years ago[PATCH] sis5513: enable ATA133 for the SiS965 southbridge
Aurelien Jarno [Sat, 19 Nov 2005 20:43:45 +0000 (21:43 +0100)]
[PATCH] sis5513: enable ATA133 for the SiS965 southbridge

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
15 years ago[PATCH] via82cxxx: add VIA VT6410 IDE support
Mathias Kretschmer [Sat, 19 Nov 2005 20:32:38 +0000 (21:32 +0100)]
[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>
15 years ago[SERIAL] Remove unused variable in sa1100.c
Russell King [Sat, 19 Nov 2005 11:26:17 +0000 (11:26 +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>
15 years ago[SERIAL] Fix status reporting with PL011 serial driver
Russell King [Sat, 19 Nov 2005 11:10:35 +0000 (11:10 +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>
15 years agopowerpc: Fix bug in timebase synchronization on 32-bit SMP powermac
Paul Mackerras [Sat, 19 Nov 2005 10:24:55 +0000 (21:24 +1100)]
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>
15 years ago[ARM] 3168/1: Update ARM signal delivery and masking
Daniel Jacobowitz [Sat, 19 Nov 2005 10:01:07 +0000 (10:01 +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>
15 years agopowerpc: Merge spinlock.h
Paul Mackerras [Sat, 19 Nov 2005 09:50:46 +0000 (20:50 +1100)]
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>
15 years agopowerpc: move include/asm-ppc64/ptrace-common.h to arch/powerpc/kernel
Paul Mackerras [Sat, 19 Nov 2005 09:47:22 +0000 (20:47 +1100)]
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>
15 years agopowerpc: Merge pci.h
Paul Mackerras [Sat, 19 Nov 2005 09:46:04 +0000 (20:46 +1100)]
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>
15 years agopowerpc: Trivially merge several headers from asm-ppc64 to asm-powerpc
Paul Mackerras [Sat, 19 Nov 2005 09:17:32 +0000 (20:17 +1100)]
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>
15 years ago[CIFS] Fix mknod of block and chardev over SFU mounts
Steve French [Sat, 19 Nov 2005 04:25:31 +0000 (20:25 -0800)]
[CIFS] Fix mknod of block and chardev over SFU mounts

Signed-off-by: Steve French <sfrench@us.ibm.com>
15 years ago[PATCH] powerpc: Remove imalloc.h
David Gibson [Wed, 16 Nov 2005 04:43:48 +0000 (15:43 +1100)]
[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>
15 years agoMerge branch 'mymerge' of ssh://ozlabs.org/home/sfr/kernel-sfr
Paul Mackerras [Sat, 19 Nov 2005 03:25:23 +0000 (14:25 +1100)]
Merge branch 'mymerge' of ssh://ozlabs.org/home/sfr/kernel-sfr

15 years ago[PATCH] powerpc: Fix setting MPIC priority
Benjamin Herrenschmidt [Fri, 18 Nov 2005 06:18:15 +0000 (17:18 +1100)]
[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>
15 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
Linus Torvalds [Fri, 18 Nov 2005 23:58:38 +0000 (15:58 -0800)]
Merge /pub/scm/linux/kernel/git/bart/ide-2.6

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

Noticed by Helge Deller.

Signed-off-by: David S. Miller <davem@davemloft.net>
15 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 (14:33 -0800)]
Merge branch 'for-linus' of /linux/kernel/git/roland/infiniband

15 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 (14:25 -0800)]
Merge branch 'parisc' of /linux/kernel/git/kyle/parisc-2.6

15 years agoIB/umad: make sure write()s have sufficient data
Roland Dreier [Fri, 18 Nov 2005 22:18:26 +0000 (14:18 -0800)]
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>
15 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 (23:13 +0100)]
[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>
15 years ago[PATCH] ide: make comment match reality
Ralf Baechle [Fri, 18 Nov 2005 22:11:24 +0000 (23:11 +0100)]
[PATCH] ide: make comment match reality

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
15 years agoIB/mthca: Safer max_send_sge/max_recv_sge calculation
Michael S. Tsirkin [Fri, 18 Nov 2005 22:11:17 +0000 (14:11 -0800)]
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>
15 years ago[PATCH] cs5520: fix return value of cs5520_init_one()
Amit Gud [Fri, 18 Nov 2005 22:03:19 +0000 (23:03 +0100)]
[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>
15 years ago[PATCH] siimage: docs urls
Jeff Garzik [Fri, 18 Nov 2005 21:55:47 +0000 (22:55 +0100)]
[PATCH] siimage: docs urls

Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
15 years ago[PATCH] aec62xxx: remove all dead (#if0'd) code
Thibaut VARENE [Fri, 18 Nov 2005 21:51:48 +0000 (22:51 +0100)]
[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>
15 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 (13:49 -0800)]
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block

15 years agosbp2_command_orb_lock must be held when accessing the _orb_inuse list.
Jody McIntyre [Mon, 7 Nov 2005 11:29:39 +0000 (06:29 -0500)]
sbp2_command_orb_lock must be held when accessing the _orb_inuse list.
Fixes an oops in sbp2util_find_command_for_SCpnt after sbp2scsi_abort:
https://bugzilla.novell.com/show_bug.cgi?id=113734

Signed-off-by: Jody McIntyre <scjody@steamballoon.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
(cherry picked from 7945619794314414a5c44df11fca4d3f2a3389cf commit)

15 years agoMerge branch 'master'
Kyle McMartin [Fri, 18 Nov 2005 21:39:20 +0000 (16:39 -0500)]
Merge branch 'master'

15 years ago[PATCH] pmac IDE: don't release empty interfaces
Thibaut VARENE [Fri, 18 Nov 2005 21:37:37 +0000 (22:37 +0100)]
[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>
15 years ago[PATCH] alim15x3: use KERN_WARNING
Alexey Dobriyan [Fri, 18 Nov 2005 21:22:21 +0000 (22:22 +0100)]
[PATCH] alim15x3: use KERN_WARNING

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