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

Patch to provide support for the following two boards:

	- Simtec BAST (EB2410ITX)
	- Thorcom VR1000
Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

From: Carsten Haustein <chaus@cs.uni-potsdam.de>

A bug in function piix_config_drive_xfer_rate() allows a call of
hwif->ide_dma_on(drive) without prior call of piix_config_drive_for_dma().
This results in harddisk configured for UDMA (default?) whereas the highest
DMA mode supported by PIIX3 is MWORD2.

This bug is supposed to be present in any 2.6.x kernel release and any
2.4.x kernel release since 2.4.21.

bart: this should also fix the same bug for PIIXa and PIIXb

Fixes bugzilla bug #3473.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

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

ide-default driver was added long time ago.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

- CONFIG_IDE_TASK_IOCTL_DEBUG cannot be defined
- function declarations are used instead of calls
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

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

Fixes OOPS on two single channel controllers.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

In sys_mlockall(), flags validation and can_do_mlock() check don't
require holding mmap_sem.  Move down_write() down a bit, and adjust
appropriately.
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Move the simple can_do_mlock() check before the full rlimits based
restriction checks for mlock() and mlockall().  As it is, the check
adds nothing.  This has a side-effect of eliminating an unnecessary call
to can_do_mlock() on the munlockall() path.
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Only check memlock rlimit against mm->total_vm when mlockall() flags
include MCL_CURRENT.
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Calling mlockall(MCL_FUTURE) will erroneously unlock any currently locked
mappings.  Fix this up, and while we're at it, remove the essentially
unused error variable.
Signed-off-by: Chris Wright <chrisw@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

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

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

Patch from Ben Dooks

Added code to remove the serial ports registered when
the module is unloaded.

Cleaned up ifdef'd code, and added copyright header

Signed-off-by: Ben Dooks 

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

Patch from Ben Dooks

Fixed bug where wrong bits where being masked in the
configuration registers for the GPIO pins

Signed-off-by: Ben Dooks 

Patch from Ben Dooks

Fix IRQ number for USB over-current on Simtec BAST

Signed-off-by: Ben Dooks 

Patch from Catalin Marinas

On ARM926EJ-S, the "always assume write" for Jazelle data aborts
causes Java code exit with segmentation fault every time it tries
to access a read-only page. This patch puts some restrictions on what 
can be done in the Jazelle state but it allows it to run.

Signed-off-by: Catalin Marinas 

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

From: <janitor@sternwelten.at>

Remove unnecessary cs_to_timeout() macro.  Use msleep() instead of
schedule_timeout() to guarantee the task delays for the desired
time.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Fix NAT helper code to update TCP window tracking information
if it resizes payload (and thus alrers sequence numbers).

This patchlet was somehow lost during 2.4.x->2.6.x port of TCP 
window tracking :(
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

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

Signed-off-by: Yasuyuki KOZAKAI <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

into kernel.crashing.org:/home/trini/work/kernel/pristine/for-linus-ppc

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

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

We recently changed the VSID allocation on PPC64 to use a new scheme
based on a multiplicative hash.  It turns out our choice of multiplier
(the largest 28-bit prime) wasn't so great: with large contiguous
mappings, we can get very poor hash scattering.  In particular earlier
machines (without 16M pages) which had a reasonable about of RAM (>2G
or so) wouldn't boot, because the linear mapping overflowed some hash
buckets.

This patch changes the multiplier to something which seems to work
better (it is, rather arbitrarily, the median of the primes between
2^27 and 2^28).  Some more theory should almost certainly go into the
choice of this constant, to avoid more pathological cases.  But for
now, this choice fixes a serious bug, and seems to do at least as well
at scattering as the old choice on a handful of simple testcases.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The two patches below (compile)fix some fall-out from the tty cleanups.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Move extern declarations of ia64_{reg,unreg}_MCA_extension()
to mca.h.  Delete declaration of ia64_mca_ucmc_other_recover_fp()
which doesn't exist.

Patch supplied by Hidetoshi Seto.
Signed-off-by: Tony Luck <tony.luck@intel.com>

This is the latest/Updated OS_MCA handler which try to do recovery
from multibit-ECC/poisoned memory-read error on user-land.
(Thank you very much for comments, Keith and Grant!)

I'd still appreciate it if anyone having good test environment
could apply my patch and could report how it works.
(especially reports on non-Tiger/non-Intel platform are welcome.)
Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

into agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.9

change the return value of PFM_CREATE_CONTEXT from
EAGAIN to ENOMEM when the sampling buffer size is
larger than the RLIMIT_MEMLOCK limit of the task.
signed-off-by: Stephane Eranian <eranian@hpl.hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

fix a problem in pfm_check_task_state() and pfm_task_incompatible()
which was caused by the introduction of the new TASK_TRACED state.
Tool would fail to attach to a process,i.e., PFM_LOAD_CONTEXT would
fail. With the fix perfmon now accepts to operate on tasks which are
in either TASK_STOPPED or TASK_TRACED state. The problem was tracked
down by Alex Williamson from HP who also submitted the patch.
signed-off-by: Stephane Eranian <eranian@hpl.hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

Patch from Ian Campbell

Patch 2113 broke drivers/char/watchdog/sa1100-wdt.c on SA1100.

Signed-off-by: Ian Campbell 

Patch from Ian Campbell

The include of asm/arch/pxa-regs.h has been removed from
asm-arm/arch-pxa/hardware.h and now needs to be included
from the relevant files. 

I have verified the fixes to arch/arm/mach-pxa/sleep.S and 
drivers/char/watchdog/sa1100_wdt.c myself. My local tree
has other changes to include/asm-arm/arch-pxa/serial.h
but I beleive that the attached is necessary and correct.

Signed-off-by: Ian Campbell 

Some dual use type errors still exist, where the
bios mapping is type-confused.