linux-2.6.git
16 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Fri, 22 Jul 2005 23:33:00 +0000 (16:33 -0700)]
Merge /pub/scm/linux/kernel/git/davem/net-2.6

16 years ago[PKT_SCHED]: em_meta: Kill TCF_META_ID_{INDEV,SECURITY,TCVERDICT}
David S. Miller [Fri, 22 Jul 2005 21:43:52 +0000 (14:43 -0700)]
[PKT_SCHED]: em_meta: Kill TCF_META_ID_{INDEV,SECURITY,TCVERDICT}

More unusable TCF_META_* match types that need to get eliminated
before 2.6.13 goes out the door.

Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Thomas Graf <tgraf@suug.ch>
16 years agox86: make restore_fpu() use alternative assembler instructions
Linus Torvalds [Fri, 22 Jul 2005 20:06:16 +0000 (16:06 -0400)]
x86: make restore_fpu() use alternative assembler instructions

It's really just a single instruction, conditional on whether the CPU
supports FXSR or not, so implement it as such instead of making it a
function that queries FXSR dynamically.

This means that the instruction just gets automatically rewritten to the
correct one at boot-time.

16 years ago[NETFILTER]: Fix ip6t_LOG MAC format
Patrick McHardy [Fri, 22 Jul 2005 19:52:47 +0000 (12:52 -0700)]
[NETFILTER]: Fix ip6t_LOG MAC format

I broke this in the patch that consolidated MAC logging.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[NETFILTER]: Use correct byteorder in ICMP NAT
Patrick McHardy [Fri, 22 Jul 2005 19:51:38 +0000 (12:51 -0700)]
[NETFILTER]: Use correct byteorder in ICMP NAT

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[NETFILTER]: Wait until all references to ip_conntrack_untracked are dropped on unload
Patrick McHardy [Fri, 22 Jul 2005 19:51:03 +0000 (12:51 -0700)]
[NETFILTER]: Wait until all references to ip_conntrack_untracked are dropped on unload

Fixes a crash when unloading ip_conntrack.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[NETFILTER]: Fix potential memory corruption in NAT code (aka memory NAT)
Patrick McHardy [Fri, 22 Jul 2005 19:50:29 +0000 (12:50 -0700)]
[NETFILTER]: Fix potential memory corruption in NAT code (aka memory NAT)

The portptr pointing to the port in the conntrack tuple is declared static,
which could result in memory corruption when two packets of the same
protocol are NATed at the same time and one conntrack goes away.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[NETFILTER]: Fix deadlock in ip6_queue
Patrick McHardy [Fri, 22 Jul 2005 19:49:30 +0000 (12:49 -0700)]
[NETFILTER]: Fix deadlock in ip6_queue

Already fixed in ip_queue, ip6_queue was missed.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years agoFix up incorrect "unlikely()" on %gs reload in x86 __switch_to
Linus Torvalds [Fri, 22 Jul 2005 19:23:47 +0000 (15:23 -0400)]
Fix up incorrect "unlikely()" on %gs reload in x86 __switch_to

These days %gs is normally the TLS segment, so it's no longer zero.  As
a result, we shouldn't just assume that %fs/%gs tend to be zero
together, but test them independently instead.

Also, fix setting of debug registers to use the "next" pointer instead
of "current".  It so happens that the scheduler will have set the new
current pointer before calling __switch_to(), but that's just an
implementation detail.

16 years ago[PKT_SCHED]: Kill TCF_META_ID_REALDEV from meta ematch.
David S. Miller [Fri, 22 Jul 2005 18:47:25 +0000 (11:47 -0700)]
[PKT_SCHED]: Kill TCF_META_ID_REALDEV from meta ematch.

It won't exist any longer when we shrink the SKB in 2.6.14,
and we should kill this off before anyone in userspace starts
using it.

Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Thomas Graf <tgraf@suug.ch>
16 years ago[EQL]: Proper num_slaves decrement
Loic Le Loarer [Thu, 21 Jul 2005 21:16:54 +0000 (14:16 -0700)]
[EQL]: Proper num_slaves decrement

Signed-off-by: Loic Le Loarer <loic.le-loarer+lk@polytechnique.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[NETFILTER]: ip_conntrack_expect_related must not free expectation
Rusty Russell [Thu, 21 Jul 2005 20:14:46 +0000 (13:14 -0700)]
[NETFILTER]: ip_conntrack_expect_related must not free expectation

If a connection tracking helper tells us to expect a connection, and
we're already expecting that connection, we simply free the one they
gave us and return success.

The problem is that NAT helpers (eg. FTP) have to allocate the
expectation first (to see what port is available) then rewrite the
packet.  If that rewrite fails, they try to remove the expectation,
but it was freed in ip_conntrack_expect_related.

This is one example of a larger problem: having registered the
expectation, the pointer is no longer ours to use.  Reference counting
is needed for ctnetlink anyway, so introduce it now.

To have a single "put" path, we need to grab the reference to the
connection on creation, rather than open-coding it in the caller.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[ATM]: zatm: mailbox converted to pci_alloc_consistent()
Francois Romieu [Wed, 20 Jul 2005 19:01:46 +0000 (12:01 -0700)]
[ATM]: zatm: mailbox converted to pci_alloc_consistent()

mailbox converted to pci_alloc_consistent()

- request_region() is not needed: zatm_init_one() issues
  pci_request_regions();
- the warning related to kfree(zatm_dev->mbx_start) disappears;

Compiled with i386 and sparc64 as target.

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[NET]: Fix tc_verd thinko in skb_clone()
David S. Miller [Tue, 19 Jul 2005 21:13:54 +0000 (14:13 -0700)]
[NET]: Fix tc_verd thinko in skb_clone()

It was overwriting the computer n->tc_verd value over
and over with skb->tc_verd, by mistake.

Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[NET]: Make ipip/ip6_tunnel independant of XFRM
Patrick McHardy [Tue, 19 Jul 2005 21:03:34 +0000 (14:03 -0700)]
[NET]: Make ipip/ip6_tunnel independant of XFRM

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[IPV4]: Fix up lots of little whitespace indentation stuff in fib_trie.
Stephen Hemminger [Tue, 19 Jul 2005 21:01:51 +0000 (14:01 -0700)]
[IPV4]: Fix up lots of little whitespace indentation stuff in fib_trie.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[NET]: NETCONSOLE must depend on INET
Adrian Bunk [Tue, 19 Jul 2005 21:00:53 +0000 (14:00 -0700)]
[NET]: NETCONSOLE must depend on INET

NETCONSOLE=y and INET=n results in the following compile error:

net/built-in.o: In function `netpoll_parse_options':
: undefined reference to `in_aton'
net/built-in.o: In function `netpoll_parse_options':
: undefined reference to `in_aton'

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[NET]: BRIDGE_EBT_ARPREPLY must depend on INET
Adrian Bunk [Tue, 19 Jul 2005 21:00:13 +0000 (14:00 -0700)]
[NET]: BRIDGE_EBT_ARPREPLY must depend on INET

BRIDGE_EBT_ARPREPLY=y and INET=n results in the following compile error:

net/built-in.o: In function `ebt_target_reply':
ebt_arpreply.c:(.text+0x68fb9): undefined reference to `arp_send'
make: *** [.tmp_vmlinux1] Error 1

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[IPV4]: Don't select XFRM for ip_gre
Patrick McHardy [Tue, 19 Jul 2005 20:59:17 +0000 (13:59 -0700)]
[IPV4]: Don't select XFRM for ip_gre

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[NET]: Only build flow.o if CONFIG_XFRM=y
Patrick McHardy [Tue, 19 Jul 2005 20:58:40 +0000 (13:58 -0700)]
[NET]: Only build flow.o if CONFIG_XFRM=y

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[ATM]: [speedtch] cure atm_printk() macro gcc-2.95 compile error
Duncan Sands [Tue, 19 Jul 2005 20:57:17 +0000 (13:57 -0700)]
[ATM]: [speedtch] cure atm_printk() macro gcc-2.95 compile error

Signed-off-by: Duncan Sands <baldrick@free.fr>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[ATM]: Trivial spelling fix patch for net/Kconfig
Jesper Juhl [Tue, 19 Jul 2005 20:56:53 +0000 (13:56 -0700)]
[ATM]: Trivial spelling fix patch for net/Kconfig

Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[ATM]: [ambassador] Fix the sparse warning "implicit cast to nocast type"
Victor Fusco [Tue, 19 Jul 2005 20:56:29 +0000 (13:56 -0700)]
[ATM]: [ambassador] Fix the sparse warning "implicit cast to nocast type"

Signed-off-by: Victor Fusco <victor@cetuc.puc-rio.br>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[ATM]: [firestream] fix the sparse warning "implicit cast to nocast type"
Victor Fusco [Tue, 19 Jul 2005 20:56:01 +0000 (13:56 -0700)]
[ATM]: [firestream] fix the sparse warning "implicit cast to nocast type"

Signed-off-by: Victor Fusco <victor@cetuc.puc-rio.br>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[ATM]: [he] remove linux/version.h include
Olaf Hering [Tue, 19 Jul 2005 20:55:38 +0000 (13:55 -0700)]
[ATM]: [he] remove linux/version.h include

Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[ATM]: [idt77252] use time_after() macro
Marcelo Feitoza Parisi [Tue, 19 Jul 2005 20:55:14 +0000 (13:55 -0700)]
[ATM]: [idt77252] use time_after() macro

Signed-off-by: Marcelo Feitoza Parisi <marcelo@feitoza.com.br>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[ATM]: allow bind() on point-to-multpoint svcs (from Martin Whitaker <martin_whitaker...
Chas Williams [Tue, 19 Jul 2005 20:54:44 +0000 (13:54 -0700)]
[ATM]: allow bind() on point-to-multpoint svcs (from Martin Whitaker <martin_whitaker@ntlworld.com>)

Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[ATM]: [zatm] eliminate kfree warning (from Tobias Hirning <sskyman@web.de>)
Chas Williams [Tue, 19 Jul 2005 20:54:19 +0000 (13:54 -0700)]
[ATM]: [zatm] eliminate kfree warning (from Tobias Hirning <sskyman@web.de>)

Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[EMATCH]: Kill TCF_META_ID_TCCLASSID reference from meta ematch as well.
David S. Miller [Tue, 19 Jul 2005 00:10:55 +0000 (17:10 -0700)]
[EMATCH]: Kill TCF_META_ID_TCCLASSID reference from meta ematch as well.

Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[IPV4]: fix IP_FIB_HASH kconfig warning
Adrian Bunk [Mon, 18 Jul 2005 20:55:19 +0000 (13:55 -0700)]
[IPV4]: fix IP_FIB_HASH kconfig warning

This patch fixes the following kconfig warning:
  net/ipv4/Kconfig:92:warning: defaults for choice values not supported

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[NET]: Kconfig: NETCONSOLE and NETPOLL together
Randy Dunlap [Mon, 18 Jul 2005 20:45:12 +0000 (13:45 -0700)]
[NET]: Kconfig: NETCONSOLE and NETPOLL together

Put NETCONSOLE and NETPOLL options together since they are related.
This cuts down on the hassle of flipping back and forth between
the Networking menu and the Network drivers menu to change their
config settings.

Tested with menuconfig, gconfig, and xconfig.
gconfig has a small problem with this.  I think that it's
a bug in gconfig and I will take it up with Romain Lievin.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[SCTP]: Fix potential null pointer dereference while handling an icmp error
Sridhar Samudrala [Mon, 18 Jul 2005 20:44:10 +0000 (13:44 -0700)]
[SCTP]: Fix potential null pointer dereference while handling an icmp error

Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[SCTP]: Audit return code of create_proc_*
Christophe Lucas [Mon, 18 Jul 2005 20:38:07 +0000 (13:38 -0700)]
[SCTP]: Audit return code of create_proc_*

From: Christophe Lucas <clucas@rotomalug.org>

Audit return of create_proc_* functions.

Signed-off-by: Christophe Lucas <clucas@rotomalug.org>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[NET]: Fix "nocast type" warnings in skbuff.h
Victor Fusco [Mon, 18 Jul 2005 20:36:38 +0000 (13:36 -0700)]
[NET]: Fix "nocast type" warnings in skbuff.h

From: Victor Fusco <victor@cetuc.puc-rio.br>

Fix the sparse warning "implicit cast to nocast type"

Signed-off-by: Victor Fusco <victor@cetuc.puc-rio.br>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[NETLINK]: Fix "nocast type" warnings
Victor Fusco [Mon, 18 Jul 2005 20:35:43 +0000 (13:35 -0700)]
[NETLINK]: Fix "nocast type" warnings

From: Victor Fusco <victor@cetuc.puc-rio.br>

Fix the sparse warning "implicit cast to nocast type"

Signed-off-by: Victor Fusco <victor@cetuc.puc-rio.br>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[PKT_SCHED]: Kill TCF_META_ID_TCCLASSID.
Patrick McHardy [Mon, 18 Jul 2005 20:34:35 +0000 (13:34 -0700)]
[PKT_SCHED]: Kill TCF_META_ID_TCCLASSID.

Thomas Graf states:

> I used to mark such ids as obsolete in the header but since
> skb is on diet anyway and there has been no official
> iproute2 release with the ematch bits included it might be
> a better idea to remove the ids from the header completely.
> Those that have picked up my patch on netdev shouldn't care
> about a ABI breakage, actually I doubt that someone is using
> it already.

So here's the patch to remove it.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[PKT_SCHED]: Reduce branch mispredictions in pfifo_fast_dequeue
Thomas Graf [Mon, 18 Jul 2005 20:30:53 +0000 (13:30 -0700)]
[PKT_SCHED]: Reduce branch mispredictions in pfifo_fast_dequeue

The current call to __qdisc_dequeue_head leads to a branch
misprediction for every loop iteration, the fact that the
most common priority is 2 makes this even worse.  This issue
has been brought up by Eric Dumazet <dada1@cosmosbay.com>
but unlike his solution which was to manually unroll the loop,
this approach preserves the possibility to increase the number
of bands at compile time.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[PKT_SCHED]: Remove debugging leftover from textsearch ematch
Thomas Graf [Mon, 18 Jul 2005 20:29:49 +0000 (13:29 -0700)]
[PKT_SCHED]: Remove debugging leftover from textsearch ematch

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years agoMerge master.kernel.org:/home/rmk/linux-2.6-serial
Linus Torvalds [Sun, 17 Jul 2005 03:06:51 +0000 (20:06 -0700)]
Merge master.kernel.org:/home/rmk/linux-2.6-serial

16 years agoMerge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Sun, 17 Jul 2005 03:05:41 +0000 (20:05 -0700)]
Merge master.kernel.org:/home/rmk/linux-2.6-arm

16 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6
Linus Torvalds [Sat, 16 Jul 2005 18:47:51 +0000 (11:47 -0700)]
Merge /pub/scm/linux/kernel/git/aia21/ntfs-2.6

16 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6
Linus Torvalds [Sat, 16 Jul 2005 17:24:32 +0000 (10:24 -0700)]
Merge /pub/scm/linux/kernel/git/tglx/mtd-2.6

16 years ago[PATCH] ARM: 2815/1: Shark: new defconfig, fixes with __io and serial ports
Alexander Schulz [Sat, 16 Jul 2005 16:17:18 +0000 (17:17 +0100)]
[PATCH] ARM: 2815/1: Shark: new defconfig, fixes with __io and serial ports

Patch from Alexander Schulz

This patch brings a new default config file for the shark and
fixes a compilation issue with io addressing and a runtime
problem with the serial ports, where I corrected a wrong
regshift value.
These are all shark specific files so I hope it is ok to
put them in one patch.

Signed-off-by: Alexander Schulz <alex@shark-linux.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[PATCH] ARM: 2794/1: Add "Image" and "mach-types.h" to dontdiff list
Michael Burian [Sat, 16 Jul 2005 15:43:49 +0000 (16:43 +0100)]
[PATCH] ARM: 2794/1: Add "Image" and "mach-types.h" to dontdiff list

Patch from Michael Burian

comment in "mach-types.h" tells that it should not be patched
"Image" is a binary, just as zImage, uImage and friends are

Signed-off-by: Michael Burian <dynmail1@gassner-waagen.at>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[PATCH] ARM: Allow register_undef_hook to be called with IRQs off
Russell King [Sat, 16 Jul 2005 15:43:33 +0000 (16:43 +0100)]
[PATCH] ARM: Allow register_undef_hook to be called with IRQs off

Preserve the interrupt status across a call to register_undef_hook.
This allows it to be called while interrupts are disabled.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[PATCH] ARM: Convert bitops to use ARMv6 ldrex/strex instructions
Russell King [Sat, 16 Jul 2005 14:21:51 +0000 (15:21 +0100)]
[PATCH] ARM: Convert bitops to use ARMv6 ldrex/strex instructions

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[PATCH] Serial: Remove linux/version.h
Olaf Hering [Sat, 16 Jul 2005 08:59:00 +0000 (09:59 +0100)]
[PATCH] Serial: Remove linux/version.h

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[PATCH] Serial: Move deprecation of register_serial forward to September
Russell King [Sat, 16 Jul 2005 08:30:53 +0000 (09:30 +0100)]
[PATCH] Serial: Move deprecation of register_serial forward to September

I think it's about time to make the build a little more vocal about the
expiry of these functions.  Due to recent discussions with problems in
the console initialisation vs power manglement, I'd like to move the
date forward to September.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[MTD] NAND: Fix broken bad block scan for 16 bit devices
Thomas Gleixner [Fri, 15 Jul 2005 13:53:51 +0000 (14:53 +0100)]
[MTD] NAND: Fix broken bad block scan for 16 bit devices

The previous change to read a single byte from oob breaks the
bad block scan on 16 bit devices, when the byte is on an odd
address. Read the complete oob for now.
Remove the unused arguments from check_short_pattern()
Move the wait for ready function so it is only executed when
consecutive reads happen.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
16 years agoMerge with rsync://fileserver/linux
Thomas Gleixner [Sat, 16 Jul 2005 07:20:01 +0000 (09:20 +0200)]
Merge with rsync://fileserver/linux

16 years ago[PATCH] x86_64: TASK_SIZE fixes for compatibility mode processes
Siddha, Suresh B [Sat, 16 Jul 2005 02:17:44 +0000 (19:17 -0700)]
[PATCH] x86_64: TASK_SIZE fixes for compatibility mode processes

A malicious 32bit app can have an elf section at 0xffffe000.  During
exec of this app, we will have a memory leak as insert_vm_struct() is
not checking for return value in syscall32_setup_pages() and thus not
freeing the vma allocated for the vsyscall page.

Check the return value and free the vma incase of failure.

Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Linus Torvalds [Sat, 16 Jul 2005 00:52:13 +0000 (17:52 -0700)]
Merge /pub/scm/linux/kernel/git/aegl/linux-2.6

16 years ago[PATCH] dvb: cx88 output mode fix
Patrick Boettcher [Fri, 15 Jul 2005 19:20:26 +0000 (12:20 -0700)]
[PATCH] dvb: cx88 output mode fix

The output_mode needs to be set for the Hauppauge Nova-T DVB-T
(cx88-dvb.c).

Cc: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[NET PCMCIA]: drivers/net/pcmcia/smc91c92_cs.c : Use of time_after macro
Marcelo Feitoza Parisi [Fri, 15 Jul 2005 17:00:41 +0000 (10:00 -0700)]
[NET PCMCIA]: drivers/net/pcmcia/smc91c92_cs.c : Use of time_after macro

From: Marcelo Feitoza Parisi <marcelo@feitoza.com.br>

Use of the time_after() macro, defined at linux/jiffies.h, which deal
with wrapping correctly and are nicer to read.

Signed-off-by: Marcelo Feitoza Parisi <marcelo@feitoza.com.br>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[WAN]: drivers/net/wan/: use of time_after macro
Marcelo Feitoza Parisi [Fri, 15 Jul 2005 16:59:26 +0000 (09:59 -0700)]
[WAN]: drivers/net/wan/: use of time_after macro

From: Marcelo Feitoza Parisi <marcelo@feitoza.com.br>

Use of the time_after() macro, defined at linux/jiffies.h, which deal
with wrapping correctly and are nicer to read.

Signed-off-by: Marcelo Feitoza Parisi <marcelo@feitoza.com.br>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[PATCH] inotify: MAINTAINERS
Robert Love [Fri, 15 Jul 2005 16:21:07 +0000 (12:21 -0400)]
[PATCH] inotify: MAINTAINERS

Add a MAINTAINERS entry for Inotify.

Signed-off-by: Robert Love <rml@novell.com>
Signed-off-by: John McCutchan <ttb@tentacle.dhs.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] md/raid1: clear bitmap when fullsync completes
NeilBrown [Fri, 15 Jul 2005 10:56:35 +0000 (03:56 -0700)]
[PATCH] md/raid1: clear bitmap when fullsync completes

We need to be careful differentiating between a resync of a complete array,
in which we can clear the bitmap, and a resync of a degraded array, in
which we cannot.

This patch cleans all that up.

Cc: Paul Clements <paul.clements@steeleye.com>
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] rocket.c: Fix ldisc ref count handling
Michal Ostrowski [Fri, 15 Jul 2005 10:56:33 +0000 (03:56 -0700)]
[PATCH] rocket.c: Fix ldisc ref count handling

If bailing out because there is nothing to receive in rp_do_receive(),
tty_ldisc_deref is not called.  Failure to do so increases the ref count
and causes release_dev() to hang since it can't get the ref count to 0.

Signed-off-by: Michal Ostrowski <mostrows@watson.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] inotify: documentation update
Robert Love [Fri, 15 Jul 2005 10:56:33 +0000 (03:56 -0700)]
[PATCH] inotify: documentation update

Clean up and expand some of the inotify documentation.

Signed-off-by: Robert Love <rml@novell.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] visws: reexport pm_power_off
Alexey Dobriyan [Fri, 15 Jul 2005 10:56:32 +0000 (03:56 -0700)]
[PATCH] visws: reexport pm_power_off

More fallout from the i386_ksyms.c cleanups.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] execute-in-place fixes
Carsten Otte [Fri, 15 Jul 2005 10:56:30 +0000 (03:56 -0700)]
[PATCH] execute-in-place fixes

This patch includes feedback from Andrew and Christoph. Thanks for
taking time to review.

Use of empty_zero_page was eliminated to fix compilation for architectures
that don't have it.

This patch removes setting pages up-to-date in ext2_get_xip_page and all
bug checks to verify that the page is indeed up to date.  Setting the page
state on mapping to userland is bogus.  None of the code patchs involved
with these pages in mm cares about the page state.

still on my ToDo list: identify a place outside second extended where
__inode_direct_access should reside

Signed-off-by: Carsten Otte <cotte@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] v4l: bug fixes for tuner, cx88 and tea5767
Mauro Carvalho Chehab [Fri, 15 Jul 2005 10:56:28 +0000 (03:56 -0700)]
[PATCH] v4l: bug fixes for tuner, cx88 and tea5767

- In CX88 code, some cards needs to have audio reprogramed after changing
  video channel;

- Tuner autodetection code seems not to work on some cards.  Now,
  no_autodetect insmod option allows disabling autodetection code;

- Minor fixes in tea5767 to reduce integer trunc;

- There are some new Pixelview Ultra Pro cards that doesn't use TEA5767
  for radio.  As autodetection is capable of checking for tea, radio tuners
  and addresses removed.

- CX88 version number incremented.

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] Fix raid0's attempt to divide by 64bit numbers
Neil Brown [Fri, 15 Jul 2005 10:56:27 +0000 (03:56 -0700)]
[PATCH] Fix raid0's attempt to divide by 64bit numbers

Apparently sector_div is only guaranteed to work with a 32bit divisor, even
on 64bit architectures.  So allow for this in raid0.

Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] vt.c build fix
Nishanth Aravamudan [Fri, 15 Jul 2005 10:56:25 +0000 (03:56 -0700)]
[PATCH] vt.c build fix

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[CRYPTO]: Fix zero-extension bug on 64-bit architectures.
Herbert Xu [Fri, 15 Jul 2005 14:41:31 +0000 (07:41 -0700)]
[CRYPTO]: Fix zero-extension bug on 64-bit architectures.

Noticed by Ken-ichirou MATSUZAWA.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[JFFS2] Fix node allocation leak
Thomas Gleixner [Fri, 15 Jul 2005 06:14:44 +0000 (08:14 +0200)]
[JFFS2] Fix node allocation leak

In the rare case of failing to write the cleanmarker
the allocated node was not freed.

Pointed out by Forrest Zhao
Initial cleanup by Joern Engel

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
16 years ago[IA64] Fix undefined reference to can_cpei_retarget for simulator
Ian Wienand [Thu, 14 Jul 2005 04:09:00 +0000 (21:09 -0700)]
[IA64] Fix undefined reference to can_cpei_retarget for simulator

The simulator build doesn't turn on ACPI, so doesn't have a definition
of can_cpei_retarget.

Signed-off-by: Tony Luck <tony.luck@intel.com>
16 years ago[PATCH] Option Card driver update, Maintainer entry
Matthias Urlichs [Thu, 14 Jul 2005 07:33:47 +0000 (00:33 -0700)]
[PATCH] Option Card driver update, Maintainer entry

This patch updates the Option Card driver:
- remove a deadlock
- add sponsor notice
- add new card
- renamed the device to what's usually printed on it
- removed some dead code
- clean up a bunch of irregular whitespace (end-of-line, tabs)

Also add a MAINTAINERS entry for the Option Card driver.

Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] ratelimit the ieee1394 IR legacy activated messages
Olaf Hering [Thu, 14 Jul 2005 07:33:45 +0000 (00:33 -0700)]
[PATCH] ratelimit the ieee1394 IR legacy activated messages

running coriander1 with an Apple iSight produces lots of dmesg output.

Jul 13 22:14:17 ibook kernel: ieee1394: raw1394: /dev/raw1394 device initialized
Jul 13 22:15:28 ibook kernel: ohci1394: fw-host0: IR legacy activated
Jul 13 22:15:59 ibook last message repeated 208 times
Jul 13 22:17:00 ibook last message repeated 762 times
Jul 13 22:18:01 ibook last message repeated 914 times
Jul 13 22:18:17 ibook last message repeated 238 times
Jul 13 22:18:17 ibook kernel: ieee1394: unsolicited response packet received - no tlabel match
Jul 13 22:18:17 ibook kernel: ohci1394: fw-host0: IR legacy activated

its less noisy with the patch:

Jul 14 08:03:08 ibook kernel: ieee1394: raw1394: /dev/raw1394 device initialized
Jul 14 08:03:26 ibook kernel: ohci1394: fw-host0: IR legacy activated
Jul 14 08:03:42 ibook last message repeated 10 times
Jul 14 08:03:47 ibook kernel: printk: 63 messages suppressed.
Jul 14 08:03:47 ibook kernel: ohci1394: fw-host0: IR legacy activated
Jul 14 08:03:52 ibook kernel: printk: 74 messages suppressed.

Signed-off-by: Olaf Hering <olh@suse.de>
Cc: Jody McIntyre <scjody@modernduck.com>
Cc: Ben Collins <bcollins@debian.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] remove EXPORT_SYMBOL for root_dev
Paolo 'Blaisorblade' Giarrusso [Thu, 14 Jul 2005 07:33:44 +0000 (00:33 -0700)]
[PATCH] remove EXPORT_SYMBOL for root_dev

Remove ROOT_DEV after unexporting it in the previous patch, as requested time
ago by Christoph Hellwig.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] uml: hostfs: unuse ROOT_DEV
Paolo 'Blaisorblade' Giarrusso [Thu, 14 Jul 2005 07:33:43 +0000 (00:33 -0700)]
[PATCH] uml: hostfs: unuse ROOT_DEV

Minimal patch removing uses of ROOT_DEV; next patch unexports it.  I've
opposed this, but I've planned to reintroduce the functionality without using
ROOT_DEV.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] uml: allow building as 32-bit binary on 64bit host
Paolo 'Blaisorblade' Giarrusso [Thu, 14 Jul 2005 07:33:43 +0000 (00:33 -0700)]
[PATCH] uml: allow building as 32-bit binary on 64bit host

This patch makes the command:

make ARCH=um SUBARCH=i386

work on x86_64 hosts (with support for building 32-bit binaries).  This is
especially needed since 64-bit UMLs don't support 32-bit emulation for guest
binaries, currently.  This has been tested in all possible cases and works.

Only exception is that I've built but not tested a 64-bit binary, because I
hadn't a 64-bit filesystem available.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] uml: reintroduce pcap support
Paolo 'Blaisorblade' Giarrusso [Thu, 14 Jul 2005 07:33:41 +0000 (00:33 -0700)]
[PATCH] uml: reintroduce pcap support

The pcap support was not working because of some linking problems (expressing
the construct in Kbuild was a bit difficult) and because there was no user
request.  Now that this has come back, here's the support.

This has been tested and works on both 32 and 64-bit hosts, even when
"cross-"building 32-bit binaries.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] uml: fix hppfs error path
Paolo 'Blaisorblade' Giarrusso [Thu, 14 Jul 2005 07:33:41 +0000 (00:33 -0700)]
[PATCH] uml: fix hppfs error path

Fix the error message to refer to the error code, i.e.  err, not count, plus
add some cosmetical fixes.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] uml: gcc 2.95 fix and Makefile cleanup
Paolo 'Blaisorblade' Giarrusso [Thu, 14 Jul 2005 07:33:38 +0000 (00:33 -0700)]
[PATCH] uml: gcc 2.95 fix and Makefile cleanup

1) Cleanup an ugly hyper-nested code in Makefile (now only the arith.
   expression is passed through the host bash).

2) Fix a problem with GCC 2.95: according to a report from Raphael Bossek,
   .remap_data : { arch/um/sys-SUBARCH/unmap_fin.o (.data .bss) } is expanded
   into: .remap_data : { arch/um/sys-i386 /unmap_fin.o (.data .bss) }

(because I didn't use ## to join the two tokens), thus stopping linking.  Pass
the whole path from the Makefile as a simple and nice fix.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Raphael Bossek <raphael.bossek@gmx.de>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] uml: consolidate modify_ldt
Paolo 'Blaisorblade' Giarrusso [Thu, 14 Jul 2005 07:33:37 +0000 (00:33 -0700)]
[PATCH] uml: consolidate modify_ldt

*) Reorganize the two cases of sys_modify_ldt to share all the reasonably
   common code.

*) Avoid memory allocation when unneeded (i.e.  when we are writing and the
   passed buffer size is known), thus not returning ENOMEM (which isn't
   allowed for this syscall, even if there is no strict "specification").

*) Add copy_{from,to}_user to modify_ldt for TT mode.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] uml: workaround host bug in "TT mode vs. NPTL link fix"
Paolo 'Blaisorblade' Giarrusso [Thu, 14 Jul 2005 07:33:36 +0000 (00:33 -0700)]
[PATCH] uml: workaround host bug in "TT mode vs. NPTL link fix"

A big bug has been diagnosed on hosts running the SKAS patch and built with
CONFIG_REGPARM, due to some missing prevent_tail_call().

On these hosts, this workaround is needed to avoid triggering that bug,
because "to" is kept by GCC only in EBX, which is corrupted at the return of
mmap2().

Since to trigger this bug int 0x80 must be used when doing the call, it rarely
manifests itself, so I'd prefer to get this merged to workaround that host
bug, since it should cause no functional change.  Still, you might prefer to
drop it, I'll leave this to you.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] uml: fix lvalue for gcc4
Paolo 'Blaisorblade' Giarrusso [Thu, 14 Jul 2005 07:33:34 +0000 (00:33 -0700)]
[PATCH] uml: fix lvalue for gcc4

      Russell King <rmk+lkml@arm.linux.org.uk>

This construct is refused by GCC 4, so here's the (corrected) fix.  Thanks to
Russell for noticing a stupid mistake I did when first sending this.

As he noted, the code is largely suboptimal however it currently works, and
will be fixed shortly.  Just read the access_ok check on fp which is NULL, or
the pointer arithmetic below which should be done with a cast to void*:

  frame = (struct rt_sigframe __user *)
  round_down(stack_top - sizeof(struct rt_sigframe), 16) - 8;

The code shows clearly that has been taken from
arch/x86_64/kernel/signal.c:setup_rt_frame(), maybe in a bit of a hurry.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] dvb: LGDT3302 QAM lock bug fix
Michael Krufky [Thu, 14 Jul 2005 07:33:33 +0000 (00:33 -0700)]
[PATCH] dvb: LGDT3302 QAM lock bug fix

Fix QAM lock bug.  Previously, it was necessary to first scan in VSB before
attempting to get a QAM lock.

Signed-off-by: Mac Michaels <wmichaels1@earthlink.net>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Linus Torvalds [Wed, 13 Jul 2005 22:48:33 +0000 (15:48 -0700)]
Merge /pub/scm/linux/kernel/git/aegl/linux-2.6

16 years agoAutomatic merge with /usr/src/ntfs-2.6.git.
Anton Altaparmakov [Wed, 13 Jul 2005 22:09:23 +0000 (23:09 +0100)]
Automatic merge with /usr/src/ntfs-2.6.git.

16 years ago[PATCH] v850: Align ___start___param to match parameter alignment
Miles Bader [Wed, 13 Jul 2005 05:40:03 +0000 (14:40 +0900)]
[PATCH] v850: Align ___start___param to match parameter alignment

Signed-off-by: Miles Bader <miles@gnu.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6
Linus Torvalds [Wed, 13 Jul 2005 19:19:30 +0000 (12:19 -0700)]
Merge /pub/scm/linux/kernel/git/tglx/mtd-2.6

16 years agoAuto merge with /home/aegl/GIT/linus
Tony Luck [Wed, 13 Jul 2005 19:15:43 +0000 (12:15 -0700)]
Auto merge with /home/aegl/GIT/linus

16 years ago[IA64] Make PCDP work again.
David Mosberger-Tang [Wed, 13 Jul 2005 04:51:00 +0000 (21:51 -0700)]
[IA64] Make PCDP work again.

Mark's patch added "attribute((packed))" for pcdp_uart, without
accounting for the fact that the structure definition _relied_ on
implicit padding by 6 bytes.  Fix is to make the padding explicit.

Signed-off-by: David Mosberger-Tang <David.Mosberger@acm.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
16 years ago[IA64] fix call of smp_processor_id() by XPC while
Dean Nelson [Wed, 13 Jul 2005 12:45:00 +0000 (05:45 -0700)]
[IA64] fix call of smp_processor_id() by XPC while

XPC calls smp_processor_id() twice from xpc_setup_infrastructure() with
preemption enabled, which gets flagged if 'DEBUG_PREEMPT=y'. This patch
replaces the two calls to smp_processor_id() by a single call to
raw_smp_processor_id() since any CPU within the partition will do.

Signed-off-by: Dean Nelson <dcn@sgi.com>
Acked-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
16 years ago[PATCH] Amiga joystick: Fix typo introduced by the open/close race fixes
Geert Uytterhoeven [Wed, 13 Jul 2005 10:56:42 +0000 (12:56 +0200)]
[PATCH] Amiga joystick: Fix typo introduced by the open/close race fixes

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] ppc64: add 970MP PVR
Olof Johansson [Wed, 13 Jul 2005 08:11:44 +0000 (01:11 -0700)]
[PATCH] ppc64: add 970MP PVR

Add PVR value and tests for 970MP.  Also switch to a simpler (but slightly
longer) check at init time for simplicity.

Signed-off-by: Olof Johansson <olof@austin.ibm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] ppc64: kill bitfields in ppc64 hash code
David Gibson [Wed, 13 Jul 2005 08:11:42 +0000 (01:11 -0700)]
[PATCH] ppc64: kill bitfields in ppc64 hash code

This patch removes the use of bitfield types from the ppc64 hash table
manipulation code.

Signed-off-by: David Gibson <dwg@au1.ibm.com>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] ppc32: make -j12 all fails in uImage target
Olaf Hering [Wed, 13 Jul 2005 08:11:41 +0000 (01:11 -0700)]
[PATCH] ppc32: make -j12 all fails in uImage target

make -j zImage may call if_changed twice at the same time, the result is a
corrupted vmlinux.gz

Write to a temporary file for the time being until someone with make skills
fix the serialization properly.

Signed-off-by: Olaf Hering <olh@suse.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] NFS: procfs/sysctl interfaces for lockd do not work on x86_64
Steve Dickson [Wed, 13 Jul 2005 08:10:47 +0000 (01:10 -0700)]
[PATCH] NFS: procfs/sysctl interfaces for lockd do not work on x86_64

Allow the setting of NLM timeouts and grace periods through the proc and
sysclt interfaces on x86_64 architectures

Signed-off-by: Steve Dickson <steved@redhat.com>
Acked-by: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] s390: fadvise hint values.
Martin Schwidefsky [Wed, 13 Jul 2005 08:10:46 +0000 (01:10 -0700)]
[PATCH] s390: fadvise hint values.

Add special case for the POSIX_FADV_DONTNEED and POSIX_FADV_NOREUSE hint
values for s390-64.  The user space values in the s390-64 glibc headers for
these two defines have always been 6 and 7 instead of 4 and 5.  All 64 bit
applications therefore use the "wrong" values.  To get these applications
working without recompiling the kernel needs to accept the "wrong" values.
Since the values for s390-31 are 4 and 5 the compat wrapper for fadvise64
and fadvise64_64 need to rewrite the values for 31 bit system calls.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] ppc32: fix destroy_context() race condition
Guillaume Autran [Wed, 13 Jul 2005 08:10:45 +0000 (01:10 -0700)]
[PATCH] ppc32: fix destroy_context() race condition

Fix for a race condition when a task gets preempted by another task while
executing the destroy_context(...) in a FEW_CONTEXTS environment.
mm->context == NO_CONTEXT but the context_map may indicate all contexts are
in use.

The solution to this problem is to disable kernel preemption while
destroying a MMU context.

Signed-off-by: Guillaume Autran <gautran@mrv.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] Fix soft lockup due to NTFS: VFS part and explanation
Anton Altaparmakov [Wed, 13 Jul 2005 08:10:44 +0000 (01:10 -0700)]
[PATCH] Fix soft lockup due to NTFS: VFS part and explanation

Something has changed in the core kernel such that we now get concurrent
inode write outs, one e.g via pdflush and one via sys_sync or whatever.
This causes a nasty deadlock in ntfs.  The only clean solution
unfortunately requires a minor vfs api extension.

First the deadlock analysis:

Prerequisive knowledge: NTFS has a file $MFT (inode 0) loaded at mount
time.  The NTFS driver uses the page cache for storing the file contents as
usual.  More interestingly this file contains the table of on-disk inodes
as a sequence of MFT_RECORDs.  Thus NTFS driver accesses the on-disk inodes
by accessing the MFT_RECORDs in the page cache pages of the loaded inode
$MFT.

The situation: VFS inode X on a mounted ntfs volume is dirty.  For same
inode X, the ntfs_inode is dirty and thus corresponding on-disk inode,
which is as explained above in a dirty PAGE_CACHE_PAGE belonging to the
table of inodes ($MFT, inode 0).

What happens:

Process 1: sys_sync()/umount()/whatever...  calls __sync_single_inode() for
$MFT -> do_writepages() -> write_page for the dirty page containing the
on-disk inode X, the page is now locked -> ntfs_write_mst_block() which
clears PageUptodate() on the page to prevent anyone else getting hold of it
whilst it does the write out (this is necessary as the on-disk inode needs
"fixups" applied before the write to disk which are removed again after the
write and PageUptodate is then set again).  It then analyses the page
looking for dirty on-disk inodes and when it finds one it calls
ntfs_may_write_mft_record() to see if it is safe to write this on-disk
inode.  This then calls ilookup5() to check if the corresponding VFS inode
is in icache().  This in turn calls ifind() which waits on the inode lock
via wait_on_inode whilst holding the global inode_lock.

Process 2: pdflush results in a call to __sync_single_inode for the same
VFS inode X on the ntfs volume.  This locks the inode (I_LOCK) then calls
write-inode -> ntfs_write_inode -> map_mft_record() -> read_cache_page() of
the page (in page cache of table of inodes $MFT, inode 0) containing the
on-disk inode.  This page has PageUptodate() clear because of Process 1
(see above) so read_cache_page() blocks when tries to take the page lock
for the page so it can call ntfs_read_page().

Thus Process 1 is holding the page lock on the page containing the on-disk
inode X and it is waiting on the inode X to be unlocked in ifind() so it
can write the page out and then unlock the page.

And Process 2 is holding the inode lock on inode X and is waiting for the
page to be unlocked so it can call ntfs_readpage() or discover that
Process 1 set PageUptodate() again and use the page.

Thus we have a deadlock due to ifind() waiting on the inode lock.

The only sensible solution: NTFS does not care whether the VFS inode is
locked or not when it calls ilookup5() (it doesn't use the VFS inode at
all, it just uses it to find the corresponding ntfs_inode which is of
course attached to the VFS inode (both are one single struct); and it uses
the ntfs_inode which is subject to its own locking so I_LOCK is irrelevant)
hence we want a modified ilookup5_nowait() which is the same as ilookup5()
but it does not wait on the inode lock.

Without such functionality I would have to keep my own ntfs_inode cache in
the NTFS driver just so I can find ntfs_inodes independent of their VFS
inodes which would be slow, memory and cpu cycle wasting, and incredibly
stupid given the icache already exists in the VFS.

Below is a patch that does the ilookup5_nowait() implementation in
fs/inode.c and exports it.

ilookup5_nowait.diff:

Introduce ilookup5_nowait() which is basically the same as ilookup5() but
it does not wait on the inode's lock (i.e. it omits the wait_on_inode()
done in ifind()).

This is needed to avoid a nasty deadlock in NTFS.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] inotify: misc cleanup
Robert Love [Wed, 13 Jul 2005 17:49:23 +0000 (13:49 -0400)]
[PATCH] inotify: misc cleanup

Really simple, basic cleanup.

Signed-off-by: Robert Love <rml@novell.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] inotify: event ordering
Robert Love [Wed, 13 Jul 2005 16:38:39 +0000 (12:38 -0400)]
[PATCH] inotify: event ordering

This rearranges the event ordering for "open" to be consistent with the
ordering of the other events.

Signed-off-by: Robert Love <rml@novell.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] inotify: move sysctl
Robert Love [Wed, 13 Jul 2005 16:38:18 +0000 (12:38 -0400)]
[PATCH] inotify: move sysctl

This moves the inotify sysctl knobs to "/proc/sys/fs/inotify" from
"/proc/sys/fs".  Also some related cleanup.

Signed-off-by: Robert Love <rml@novell.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] fix voyager subarchitecture EXPORT_SYMBOL breakage caused by i386_ksym reduction
James Bottomley [Wed, 13 Jul 2005 13:38:05 +0000 (09:38 -0400)]
[PATCH] fix voyager subarchitecture EXPORT_SYMBOL breakage caused by i386_ksym reduction

This patch:

[PATCH] Remove i386_ksyms.c, almost

made files like smp.c do their own EXPORT_SYMBOLS.  This means that all
subarchitectures that override these symbols now have to do the exports
themselves.  This patch adds the exports for voyager (which is the most
affected since it has a separate smp harness).  However, someone should
audit all the other subarchitectures to see if any others got broken.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years agoMerge head 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6
Linus Torvalds [Wed, 13 Jul 2005 17:37:36 +0000 (10:37 -0700)]
Merge head 'for-linus' of /linux/kernel/git/shaggy/jfs-2.6

16 years ago[PATCH] Lindent: ignore .indent.pro
Jeff Mahoney [Wed, 13 Jul 2005 15:55:42 +0000 (11:55 -0400)]
[PATCH] Lindent: ignore .indent.pro

 When I recently submitted a Lindent patch, it turned out that my .indent.pro
 options were also applied to the tree. This patch directs indent(1) to ignore
 the .indent.pro directives and only use options specified on the command
 line.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>