Fix a race identified by Chris Mason <mason@suse.com>

journal_unmap_buffer -> __dispose_buffers has the j_list_lock and the
jbd_lock_bh_state held.

journal_get_write_access calls journal_put_journal_head, which takes
jbd_lock_bh_journal_head(bh) and doesn't seem to have any other locks held.

Since journal_unmap_buffers trusts the buffer_jbd bit to see if we need to
call __dispose_buffer, and nobody seems to test buffer_jbd after taking
jbd_lock_bh_journal_head.  The kernel dereferences a null jh pointer in
__journal_remove_journal_head.


The patch fixes this by using journal_grab_journal_head() in
journal_unmap_buffer().  It ensures that we either grab and pin the
journal_head if the bh has one, or we bale out if the bh doesn't have a
journal_head.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Karsten Keil's patch entitled "[ISDN]: Fix kernel PPP/IPPP active/passiv
filter code" that went in back in April was an attempt to solve a real
problem - namely that the libpcap maintainers have removed useful
functionality that pppd was using - but his fix broke existing pppd
binaries and IMO didn't end up actually solving the problem.

This patch reverts the change to ppp_generic.c so that existing pppd
binaries work again.  I am going to have to work out a proper fix, which
may involve further changes to ppp_generic.c, but I will make sure existing
pppd binaries still work.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

In the top-level Makefile a number of locale related environment
variables were preset to give a small speed up when building the kernel.

Unfortunately this had the bad sideeffect that the variable
CFLAGS_vmlinux.lds.o lost the exported vaule in some setups (obviously
not mine).  This smells like a make issue - but the best solution is
simply to drop presetting the locale related variables.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

We use a FMODE_LSEEK flag to match the existing read/write
bits. This allows us to check for seekability on a VFS level
for lseek/pread/pwrite, and cleans things up.

Update some sites that used the numeric constants to use 
the symbolic values instead.

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

Patch from: Nishanth Aravamudan

Use msleep() instead of schedule_timeout() to
guarantee the task delays for the desired time.

Signed-off-by: Nishanth Aravamudan
Signed-off-by: Russell King

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

We're only 32-bit ARMs, so testing this symbol in 32-bit only code
is unnecessary.

Patch from: Nishanth Aravamudan

Use msleep() instead of schedule_timeout() to
guarantee the task delays for the desired time.

Signed-off-by: Nishanth Aravamudan
Signed-off-by: Russell King

Patch from Ben Dooks

Fixed mis-spelled time initialisation calls and
a bad prototype in the time header

Fixes for patch 1962/1

Patch from Ben Dooks

Rename to Thorcom, and added extra lines to help

Patch from Ben Dooks

Updated default configuration file to include all the
boards possible with this architecture

Patch from Kevin Hilman

The following patch allows the bootpImage to be loaded and executed
from a non-zero address.  On OMAP platforms for example, the physical
address for SDRAM is 0x10000000 and not zero.

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

Signed-off-by: David S. Miller <davem@redhat.com>

The following corrects how we pass CPU flags to gas.  Previous, AFLAGS
was incorrectly assumed to be pased directly to $(AS), which is not the
case.

Concept ack'd by Sam Ravnborg.
Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch removes proc_rtas.c and error_log.[ch] from
arch/ppc/platforms.  It turns out that the code in error_log.[ch] is
completely unused, and the code in proc_rtas.c is buggy, almost
impossible to understand, and rarely used.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This code is a rework of the original Gladman AES code, and does not
include any supposed BSD licensed work by Jari Ruusu. 

Linus converted the Intel asm to Gas format, and made some minor
alterations.

Fruhwirth's glue module has also been retained, although I rebased the
table generation and key scheduling back to Gladman's code.  I've tested
this code with some standard FIPS test vectors, and large FTP transfers
over IPSec (both locally and over the wire to a system running the
generic AES implementation).
Signed-off-by: James Morris <jmorris@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

buffer without complaints.

*grrrrrrrr*

Wrong diff sent.  Sorry - normally the tree I'm working in is cp -rl'ed
from the -current, but right now it's a big mess.

This is the incremental fix.

This converts the 32-bit ppc htab code to use the seq_file interfaces.

Less code means fewer bugs..

This does the seq_file conversion + annotation + cleanup + race fixes
for arch/ppc64/kernel/rtas-proc.c.

How the fuck did that file manage to get anywhere near the tree, anyway?
Take a look at guy's "implementation" of sprintf(buf, "%04d", num), for
example:

<vomit>
	/* construct the sensor number like 0003 */
	/* fill with zeros */
	n = sprintf(tmp, "%d", s.token);
	len = strlen(tmp);
	while (strlen(tmp) < 4)
		n += sprintf (tmp+n, "0");

	/* invert the string */
	while (tmp[i]) {
		if (i<len)
			tmp2[4-len+i] = tmp[i];
		else
			tmp2[3-i] = tmp[i];
		i++;
	}
	tmp2[4] = '\0';
</vomit>

And it's full of that level of lusing ;-/

It would potentially remove dentries from the LRU list
without re-initializing the d_lru fields, causing later
accesses to that dentry to do bad things to the LRU list.

The following patch changes some 'unsigned long's into 'uint32_t's in
mktree (a program that runs on the host to frob the kernel image for
some firmwares).  Without it, the program is not correct when run
on/compiled on a 64bit host.
Signed-off-by: Dan Zink <dan.zink@hp.com>
Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix bug #3125:

This should fix the problem; however, we will need to repeat that for all
PIO SCSI drivers (another immediate victim is ppa.c).

We should start looking for sane solution; I _really_ don't like the kludge
with using ->slave_alloc() for fixups after scsi_alloc_queue().
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

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>