This patch is from Nishanth Aravamudan <nacc@us.ibm.com>.

Replace schedule_timeout() with ssleep to simplify the code and to express the
delay in seconds instead of HZ.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch is from Nishanth Aravamudan <nacc@us.ibm.com>.

Replace schedule_timeout() with msleep to simplify the code and to express the
delay in milliseconds instead of HZ.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch is from Nishanth Aravamudan <nacc@us.ibm.com>.

Replace schedule_timeout() with msleep to simplify the code and to express the
delay in milliseconds instead of HZ.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch is from Nishanth Aravamudan <nacc@us.ibm.com>.

Replace schedule_timeout() with msleep to simplify the code and to express the
delay in milliseconds instead of HZ.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch is from Craig Chaney <cchaney@us.ibm.com>.

This patch moves the restoring of the stack pointer in the system call exit
path to after the point where we clear the RI (recoverable interrupt) bit in
the MSR.  Normally, loading the stack pointer before clearing RI doesn't cause
any problem because there is no trap that can normally occur in between.  But
if we are tracing the code using a tool that single-steps instructions, this
can cause a problem.  In this case, clearing RI serves as an indication that
the following code can't be safely single-stepped.
Signed-off-by: Craig Chaney <cchaney@us.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch is from Jake Moilanen <moilanen@austin.ibm.com>.

The instruction syntax for the in_be64 inline asm was incorrect for the "m"
constraint for the address parameter.  This patch fixes the instruction in the
inline asm.
Signed-off-by: Jake Moilanen <moilanen@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch is originally from Jake Moilanen <moilanen@austin.ibm.com>,
substantially modified by me.

On PPC64 systems with a hypervisor, we can't set the Data Address Breakpoint
Register (DABR) directly, we have to do it through a hypervisor call.
Signed-off-by: Jake Moilanen <moilanen@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

We were allocating 48 segment tables on UP kernels.  Remove them and save
192kB of kernel memory on UP builds.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch, mostly from Sven Luther and reworked by me, adds support for
Pegasos machines to the ppc32 arch. The patch contains all of the arch
code. I'll send separately a few driver changes as well.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The ppc pci bus and resource fixups will automatically adjust the IO space
mappings by (hose->io_base_virt - isa_io_base).  Since we map all of PCI IO
space (PCI1 & PCI2) with a single mapping so it is continguious in virtual,
physical, and PCI IO space the offset will equal MPC85XX_PCI1_IO_SIZE.
There for we needed to reduce the setting by that amount for everything to
work properly on CDS.
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>

The PPC version of pci_iomap seems to be missing a call to ioremap.  This
patch corrects that oversight and has been tested on a IBM PPC750FX Eval
board.
Signed-off-by: Randy Vinson <rvinson@mvista.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Allows a platform to initialize serial_state completely from gen550_init
and no longer requires it to define SERIAL_PORT_DFNS.
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>

Adds default config files the MPC8540 ADS, MPC8560 ADS, and MPC8555 CDS
reference boards.  Hopefully people will stop asking me for mine :)
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>

Fix up an smp race introduced in 2.6.11-rc1
Signed-off-by: Andrea Arcangeli <andrea@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

With Rik van Riel <riel@redhat.com>

Simply running "dd if=/dev/zero of=/dev/hd<one you can miss>" can cause
excessive amounts of dirty lowmem pagecache, due to the blockdev's
non-highmem page allocation strategy.

This patch effectively lowers the dirty limit for mappings which cannot be
cached in highmem, counting the dirty limit as a percentage of lowmem
instead.  This should prevent heavy block device writers from pushing the
VM over the edge and triggering OOM kills.
Signed-off-by: Rik van Riel <riel@redhat.com>
Acked-by: Andrea Arcangeli <andrea@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix a bug spotted by "Michael S. Tsirkin" <mst@mellanox.co.il>

Introduce a simple helper, vfs_ioctl(), so that both sys_ioctl() and
compat_sys_ioctl() call the security hook in all cases and without
duplication.
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

When some hardware setups or architectures do not allow OProfile to use
performance counters, OProfile operates in timer mode.

But, from 2.6.11-rc1, we need to specify the module parameter "timer=1" to
work on timer interrupt mode.  Change things so that we detect the absence of
the high-resolution timer and fall back to timer-based profiling
automatically.

Furthermore we can easily get oops by reading /dev/oprofile/cpu_type.
Signed-off-by: Akinobu Mita <amgta@yacht.ocn.ne.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

arch/mips/lib/csum_partial_copy.c:21: error: conflicting types for `csum_partial_copy_nocheck'
include/asm/checksum.h:65: error: previous declaration of `csum_partial_copy_nocheck'
arch/mips/lib/csum_partial_copy.c:38: error: conflicting types for `csum_partial_copy_from_user'
include/asm/checksum.h:38: error: previous declaration of `csum_partial_copy_from_user'
make[1]: *** [arch/mips/lib/csum_partial_copy.o] Error 1
make: *** [arch/mips/lib] Error 2
Signed-off-by: Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

We have two global variables called "debug".

The attached patch cleans up various aspects of dibusb module argument
handling, so it's a bit larger than just renaming "debug".
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- Build fix for older gcc's

- Don't typecast when assigning between void*'s and other pointers.

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

arguments.

And make it non-inlined.

This fixes a bug in the current tree preventing the sysfs module
parameters from being able to be changed at all from userspace.  It's as
if someone just forgot to write this function...
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The gcc4 signedness warning fix forgot to update the declarations in
include/asm-m68k/checksum.h.

Remove __exit from aoeblk_exit (to allow it to be called from __init code).

Remove register_blkdev into aoe_init (it's done in aoemain.c).
Signed-off-by: Ed L. Cashin <ecashin@coraid.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

into cantab.net:/home/src/ntfs-2.6

      compiled without debug.  This avoids a possible denial of service
      attack.  Thanks to Carl-Daniel Hailfinger from SuSE for pointing this
      out.

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

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

- Fix TSO for 5750 chips by setting tcp checksum field to 0 for TSO packets
- Add TG3_FLG2_HW_TSO flag for 5750 and newer chips that use the same TSO
  scheme
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

If we forward a fragmented packet, we can have ip_summed
set to CHECKSUM_HW or similar.  This is fine for local
protocol processing, but once if we are forwarding this
packet we want to reset ip_summed to CHECKSUM_NONE.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

Nothing in the kernel is using bcopy right know, and that is a good thing.
Why? Because a lot of the architectures implement a broken bcopy()....
the userspace standard bcopy() is basically a memmove() with a weird
parameter order, however a bunch of architectures implement a memcpy() not a
memmove().

Instead of fixing this inconsistency, I decided to remove it entirely,
explicit memcpy() and memmove() are prefered anyway (welcome to the 1990's)
and nothing in the kernel is using these functions, so this saves code size
as well for everyone.
Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Adrian Bunk <bunk@stusta.de>

[ Side note: the only reason for bcopy appears to be totally ancient
  gcc versions for OSF/1, used to originally cross-compile Linux on
  alpha. Possibly some other similar cases. Time to move on ;-]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

Duh. Freeing the main buffers can _cause_ the temporary
page to be created.

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

Patch from Ben Dooks

This patch moves all the machine/arch specific bits out of
arch/arm/kernel/debug.S and places them into the include
directories for those given architectures. The debug macros
are placed into include/asm-arm/arch-*/debug-macro.S.
The aim is to clean-up the debug.S code and make it easier to
modify a single-architecture without affecting the entire
debug.S file.
The patch also removes CONFIG_ARCH_FTVPCI, which no longer
exists anywhere else in the kernel.
All new include files have the original copyright notice
from arch/arm/kernel/debug.S.
Note, not all architectures modified here have been built
and/or tested due to lack of available machines, or
problems building for them (no defconfig available, or
problems with kernel build).

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Unfortunately, some changes to GCC prevents fiq.c expressing the
constraints for the assembly setting the FIQ register set.  Warn
people with later gcc toolchains that they can expect failure to
occur.
Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>