into kernel.bkbits.net:/home/davem/sparc-2.6

VIA chipsets are broken and don't work with IOMMU enabled. For some mysterious
reason (the IOMMU logic is actually in the CPU) they manage to corrupt all
data going through the aperture to PCI devices.

There was a workaround previously that enabled the slower softmmu when VIA is 
detected on the normal IOMMU path (when there is more than 3GB of memory). But
CONFIG_IOMMU_DEBUG took a short cut that was not handled, which ended up with 
VIA systems not booting when this option is enabled.

This patch enables the workaround with CONFIG_IOMMU_DEBUG/iommu=force too

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

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

Signed-off-by: Ben Collins <bcollins@debian.org>

Signed-off-by: Ben Collins <bcollins@debian.org>

Signed-off-by: Ben Collins <bcollins@debian.org>

Submitted-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Ben Collins <bcollins@debian.org>

Submitted-by: Hiromasa YOSHIMOTO <yosimoto@limu.is.kyushu-u.ac.jp>
Signed-off-by: Ben Collins <bcollins@debian.org>

  - Use vmalloc instead of kmalloc
  - Change delayed_reset_bus() to operate in a work_queue instead of a timer
    interrupt.
  - Fix hpsb_allocate_and_register_addrspace() to not allocate space on top
    of already allocated space.
  - Fix problems in csr1212.c filling ConfigROM images when extend ROMs are
    present.
Signed-off-by: Steve Kinneberg <kberg@linux1394.org>
Signed-off-by: Ben Collins <bcollins@debian.org>

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

This adds the definition for Apple XServe G5 motherboard to the
pmac_feature support file.

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

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

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

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

The fast system-call fall-back-path has a race: it reads PSR, modifies
some bits, then writes back the new PSR.  Unfortunately, the contents
of PSR may change between reading and writing it.  For example, an
interrupt could occur which could trigger a context-switch.  The
context-switch might in turn flush the floating-point-high (FPH)
partition to memory, clear PSR.MFH, and set PSR.DFH.  To prevent this
race, the patch below turns off PSR.I before reading PSR.

This fixes a floating-point corruption problem that was observed on a
system with a libc which has the fast system-call support enabled.

The performance impact is minimal (on the order of a handful of cycles).
Signed-off-by: Kevin Tian <kevin.tian@intel.com>
Signed-off-by: Ken Chen <kenneth.w.chen@intel.com>
Signed-off-by: Asit Mallick <asit.k.mallick@intel.com>
Signed-off-by: David Mosberger <davidm@hpl.hp.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

I waffled over this for ages.  On balance, I think it's best to mark those
bh's as uptodate.

And on reflection, I'm not sure why we go bringing ramdisk blockdev pages
uptodate all over the place anyway.  But ramdisk is weird and it passes
testing.  Let those dogs sleep.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Chris Wright <chrisw@osdl.org>

  CHECK   security/selinux/hooks.c
security/selinux/hooks.c:1383:34: warning: return expression in void function
security/selinux/hooks.c:3548:30: warning: return expression in void function
  CC      security/selinux/hooks.o

From: Mika Kukkonen <mika@osdl.org>
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

From: Stefan Bader <shbader@de.ibm.com>

tape driver changes:
 - Create seperate debug areas for core and discipline modules.
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>

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

From: Frank Pavlic <pavlic@de.ibm.com>
From: Thomas Spatzier <tspat@de.ibm.com>

qeth network driver changes:
 - Use correct request length in arp/snmp requests.
 - Simplify handling of empty vs. primed buffers.
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>

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

xpram device driver changes:
 - Allocate request queue with blk_alloc_queue.
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>

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

From: Cornelia Huck <cohuck@de.ibm.com>

Common i/o layer changes:
 - Remove bogus defines.
 - Fix length of strncmp on bus id.
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>

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

Cleanup s390* string functions.  This replaces the 31/64 bit assembler
files (strcmp[64].S, strcpy[64].S & strncpy[64].S) with a single string.c
file that uses some inline assemblies to issue the string instructions.  In
addition some more of the generic string function got an architecture
dependent implementation.
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>

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

Introduce a TIF_SINGLE_STEP bit that causes do_debugger_trap to get called
at the end of a system call.  This way some code duplication in the program
check handler can get removed.
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>

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

Speedup strncpy_from_user and strnlen_from_user by using the search string
instruction in the secondary space mode.
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>

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

From: Guillaume Morin <guillaume@morinfr.org>

This patch improves the memory detection logic.  It detects any amount of
holes in the memory layout up to MEMORY_CHUNK blocks of available memory.
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>

From: Arnd Bergmann <arnd@arndb.de>

This should catch almost all s390 device drivers
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Arnd Bergmann <arnd@arndb.de>

Lots of trivial changes to make sparse happy on s390 arch code, mostly
__user annotations.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Karsten Keil <kkeil@suse.de>

Solves a endless IRQ loop for Tigerjet 320 based ISDN cards.
Signed-off-by: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Jorn Engel <joern@wohnheim.fh-wedel.de>

Remove Volker as an NCP maintainer, he hasn't touched it in about 7 or
8 years, according to himself.  Volker has acked this change.
Signed-off-by: Jörn Engel <joern@wohnheim.fh-wedel.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Hugh Dickins <hugh@veritas.com>

Oleg's patch was good in that exit_mmap usually does the un-accounting; but
dup_mmap still needs its own un-accounting for the case when it has charged
for a vma, but error before it's inserted into child mm's list.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Davide Libenzi <davidel@xmailserver.org>

This is a sanity check on the size parameter.  Nothing explodes w/out, but
the conversion to unsigned simply triggers a big allocation.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

As Roland McGrath <roland@redhat.com> points out, we need to zero
task->it_virt_value to prevent timer-based signal delivery, not
->it_virt_incr.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Lack of argument decls causes this warning:

arch/i386/mach-generic/../mach-es7000/es7000plat.c:53: warning: function declaration isn't a prototype

Let's stick the extern declaration in a header, which is where they always
should be.

Cc: "Brown, Len" <len.brown@intel.com>
Cc: "Protasevich, Natalie" <Natalie.Protasevich@UNISYS.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Andy Whitcroft <apw@shadowen.org>

Both modprobe_path and hotplug_path are arbitrarily sized at 256 bytes and
that size is also expressed directly in the sysctl code.  It seems
reasonable to define a standard length and use that for consitancy.  This
patch introduces the constant KMOD_PATH_LEN and uses that.
Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Anton Altaparmakov <aia21@cam.ac.uk>

A filesystem's ->writepage() implementation nowadays must run either
redirty_page_for_writepage() or the combination of set_page_writeback()/
end_page_writeback().  Failure to do so leaves the page itself marked clean
but it is tagged as dirty in the radix tree (PAGECACHE_TAG_DIRTY).  This
incoherency can lead to all sorts of hard-to-debug problems in the
filesystem like having dirty inodes at umount and losing written data.

The patch updates Documentation/filesystems/Locking to reflect this
requirement.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Reduce stack consumption in sync_inodes_sb() via read_page_state().
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Use the new read_page_state() in page-writeback.c to avoid large on-stack
structures.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Use the new read_page_state() in vmscan.c to avoid large on-stack structures.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>