into ppc970.osdl.org:/home/torvalds/v2.6/linux

I just stumbled across this patch that's been sitting in my tree for ages.

I thought I'd sent this in before.  It's a trivial fix for the printing
of task state in /proc and sysrq dumps and such, so that TASK_DEAD shows
up correctly.  This state is pretty much only ever there to be seen when
there are exit/reaping bugs, but it's not like that hasn't come up.
Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Patch from John Lenz

Add INITTIME macro to collie machine structure.

Patch from Ben Dooks

Fixed clock base for the H1940

thanks to Gerald Schneider <gerald@gerald-online.de>
for fixing this.

Patch from Ben Dooks

Patch for default configuration

Patch from Ben Dooks

Added more definitions for GPIO registers

New functions for modifying pin configuration and
bit-status (see include/asm-arm/arch-s3c2410/hardware.h)

Patch from Ben Dooks

Remove compile error with gcc-3.4 and empty part of case statememnt

Patch from Catalin Marinas

Gas translates the "msr [cs]psr, rN" instruction to "msr [cs]psr_cf, rN". This may cause problems on the ARMv6 architecture where the A and E bits can leak into the SVC mode from the USR mode via the exception handlers. The reverse can happen when returning to user mode. The patch adds _cxsf to all the msr instruction without the field specifier.

Patch from Catalin Marinas

The "err" is rotated in the blockops_check() function and all the error bits are cleared, the subsequent conditions being always true.

A number of drivers or special virtual devices really just want their
"read()" function to populate user space from some internal buffer.

This adds such a helper function - "simple_read_from_buffer()" - and
converts several ->read() instances to use it.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

For requests marked read-ahead, it can legitimately fail without it being a
path problem.  So don't fail a path just because this happens (can be the
atomic request allocation going nuts, for instance), or all paths will
quickly go away.

Cc: <neilb@cse.unsw.edu.au>
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

I tried to get multipathing failover running and failed. It seems to be
that there are two bugs in multipath.c :

- If a path/request fails mp_bh->path doesn't get updated to the new
  path.  Thus multipath_end_request will access a NULL pointer if a
  redirected request returns.

- After fixing this I experienced several other errors.  First of all in
  bio->bi_flags the BIO_UPTODATE flag is not set when redirecting a
  request.

  Causing the md driver to think that every redirected request failed
  when it returns.  Since that alone didn't fix the problems, I simply
  copied the master_bio again and it looks like everything seems to work.

Cc: <neilb@cse.unsw.edu.au>
Cc: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch reverts the i586 AES module.  A new one should be ready soon.
Signed-off-by: James Morris <jmorris@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into shinybook.infradead.org:/home/dwmw2/bk/mtd-2.6

Some G5 recent powermacs start with the fan control unit (FCU) disabled,
by the firmware, causing the thermal control driver to break. We have to
enable it before starting the feedback loops that set the fan speeds.
This patch adds the code to start the FCU.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

On old powermacs, it's possible that we get a stale edge interrupt when
doing request_irq(), that typically happens with the DBDMA controller
interrupts when the device was used by the firmware for booting.

I just tracked down a nasty memory corruption problem where that was
causing the bmac driver to try to process packets before the driver
internal data structures were properly initialized.

While I agree that the driver should (and will) be made more robust to
such things, Paulus and I decided that it makes little sense to keep
track of an "old" edge interrupt that happens before a driver does
request_irq.  (On those powermacs, those are only the DBDMA interrupts
anyway, and none of the DBDMA users will care). 

This patch implements a "startup" handler for the old Apple PIC that
will "ack" pending edge interrupts before unmasking, thus preventing
those stale interrupts to be delivered.

It also "fixes" the ppc32 irq core to call the startup() callback when
available instead of just calling enable().
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

blk_rq_map_user() is a bit of a hack currently, since it drops back to
kmalloc() if bio_map_user() fails.  This is unfortunate since it means we
do no real segment or size checking (and the request segment counts contain
crap, already found one bug in a scsi lld).  It's also pretty nasty for >
PAGE_SIZE requests, as we attempt to do higher order page allocations.
Even worse still, ide-cd will drop back to PIO for non-sg/bio requests. 
All in all, very suboptimal.

This patch adds bio_copy_user() which simply sets up a bio with kernel
pages and copies data as needed for reads and writes.  It also changes
bio_map_user() to return an error pointer like bio_copy_user(), so we can
return something sane to the user instead of always -ENOMEM.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Fix the fact that we were not the signal processing engine status and
control register (SPEFSCR) on giveup_spe.  Causes problems when the kernel
tries to read or modify the SPEFSCR.
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Small change to bictcp based on the BIC 1.1 patches for web100.
Keep track of last time congestion was computed, and recompute
if cwnd changes or every 1/32 of a second.

Also changes the initialization location for the parameters.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

This patch moves xfrm[46]_tunnel_check_size() into xfrm[46]_output.c
where it can be made static since it's only used there.

While moving the icmp.h inclusions over I also discovered that the
tunnel files are missing an inclusion of net/protocol.h.  So I've
added them as well.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@redhat.com>

This is a couple of clean-ups stemming from the xfrm_output change.

I should've removed the inet_ecn.h inclusions in that change as the
ECN code has been moved to xfrm[46]_output.c.  This patch does exactly
that.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@redhat.com>

ipv6_addr_hash doesn't do what it's comment says.  The comment was
probably what was intended, not that it'll make much difference in
practice.
Signed-off-by: Ralph Loader <suckfish@ihug.co.nz>
Signed-off-by: Yoshifuji Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@redhat.com>

gcc-2.95.c does not support anonymous unions.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

into nuts.davemloft.net:/disk1/BK/net-2.6

Previously, fatfs was using NLS_DEFAULT if users didn't specify the
codepage or iocharset option.  This became cause of trouble (filename
access).

This patch removes the complicated default config in kernel.

Instead of it, by default, fatfs uses builtin nls ("default"), also reports
it and mounts as read-only.  This default will limit the access more or
less.  Note: If peoples want to write on this default, it still can switch
by remount.

Therefore, basically users will need to specify mount options always.
("codepage" for msdos, and "codepage" and "iocharset" for vfat) However, it
can be done simply by script or shell alias or something else in userland.

Thanks to Andries Brouwer for your many advice.
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

There is a lonstanding off-by-one error that results from an incorrect
comparison when checking whether a process has consumed CPU time in
excess of its RLIMIT_CPU limits. 

This means, for example, that if we use setrlimit() to set the soft CPU 
limit (rlim_cur) to 5 seconds and the hard limit (rlim_max) to 10 seconds, 
then the process only receives a SIGXCPU signal after consuming 6 seconds
of CPU time, and, if it continues consuming CPU after handling that
signal, only receives SIGKILL after consuming 11 seconds of CPU time.

The fix is trivial.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Author: Armin Schindler, Nishanth Aravamudan

Use kernel provided msleep() instead of own sleep
implementation.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

There's a stupid error in the fall back logic, it fails to increment the
user pointer so the wave file is corrupt. We should also clear
last_sense just to be sure.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Here are some oops I found in error paths in the mounting pathes while
debugging something else...  I sent it out a while ago, but it didn't seem
to get any traction....

The nfs_fill_super() fix is obvious and in nfs4_fill_super(), the
server->client ptr needs to be set before the cl_idmap check, since
rpc_shutdown_client() needs it when the check fails.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Remove the unused symbol_is() macro.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Below is a patch by Hans Ulrich Niedermann
<linux-kernel@n-dimensional.de> to change all references in comments to 
files in Documentation/ to start with Documentation/
Signed-off-by: Adrian Bunk <bunk@fs.tum.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This file does not exist in 2.6.
Signed-off-by: Adrian Bunk <bunk@fs.tum.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch
	- adds copyright and license info
	- changes sense of mmap config option (setting option enables mmap
	  instead of disabling it, to avoid the double negative)
	- removes an #ifdef CONFIG_IA64 now that acpi_register_gsi()
	  is generic.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Sync nmi_watchdog.txt with reality on x86-64.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Actually, the problem has its origin in my removal of all in-kernel
syscalls (except execve, which is non-trivial) earlier this year.  This
change was blindly reverted by the maintainer, while at the same time the
local errno variable was removed.  See also
http://linux.bkbits.net:8080/linux-2.5/hist/drivers/media/dvb/frontends/tda=
1004x.c

This patch is the one that was already merged earlier.  I'm now also
removing the definitions for the kernel syscalls on i386 to make it harder
to reintroduce them again.  This was already done for ppc64, the others
should probably follow.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Tom is looking after PPC8xx and the PPC boot code.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>