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

The grows-up and grows-down cases had all the same issues, but
differered in the details. Additionlly, historical evolution of
the tests had caused the result to be pretty unreadable with some
rather long and complex conditionals.

Fix it all up in a more readable helper function.

This also adds the missing RLIMIT_MEMLOCK test.

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

The nls_ascii conversion table is just for 128 entries, but should be
256.
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

We use a non-atomic kmap() to clear the page, which cannot be
used from atomic contexts.

It doesn't do the virtual cache synchronization that clear_user_highpage()
does.

Pointed out by Hugh Dickins.

This not only makes sense, it fixes DEBUG_PAGEALLOC together with
the new page zeroing, since we must map the page before we zero it.

As per Chris Wright.

into kroah.com:/home/greg/linux/BK/pci-2.6

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

Drop -Werror to allow compilation with gcc 4
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

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

For some reason the asm versions of atomic_dec_and_test and friends were
masked by inefficient and big macros. With it I spare up to 8k in the text
size of my coldfire linux and 5k on my cpu32 version.

Patch originally submitted by Philippe De Muyter <phdm@macqel.be>
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

A number of small updates to the ColdFire serial driver:

. support the SNEHA platform
. set the default baud rate for console different on the FEITH boards
. add support for the 527x ColdFire CPU's
. schedule_timeout() should not add in current jiffies value
. optimize way that receive error characters are processed
. fix condition where receiver interrupts could be left disabled after flush
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Remove duplicated definition of THREAD_SIZE, it is defined in page.h.
Also modify asm constraints to explicilty let gas know that the input
arg is a constant in the current_thread_info() function.

Patch originally submitted by Philippe De Muyter <phdm@macqel.be>
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Add definitions for the SDRAM configuration registers on the 528x
ColdFire CPU's.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The 527[01] ColdFire devices and the 527[45] devices have a very similar
SDRAM register setup. But some registers are at different addresses.
Define them appropriately so common sizing code can work for all ColdFire
platforms.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Move some platform specific setup code into the ColdFire 5249 header.
Doing this for platforms that needs it means the startup code can be
identical for all ColdFire based platforms.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Change the SDRAM register names to be consistent across all ColdFire
header files. Simplied their use in common memory sizing code at
startup time.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Cache initialization code for the ColdFire CPU's. They are not
all identical. This code is used as part of the common head
start code for all ColdFire platforms.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Create a common head.S for all ColdFire architecture platforms.
Currently there is 20 (yep 20 of them), and they are 95% the
same code. This file with some header file support will replace
all of them.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix a stupid unbalanced lock bug in the ppc64 hugepage code.  Lead
rapidly to a crash if both CONFIG_HUGETLB_PAGE and CONFIG_PREEMPT were
enabled (even without actually using hugepages at all).
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Acked-by: William Irwin <wli@holomorphy.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

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

Include module.h to cleanup compiler warnings.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Remove use of obsolate MAP_NR macro.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Remove unused header file from include/asm-m68knommu.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Convert KTHREAD_SIZE to THREAD_SIZE.
Patch original submitted by Philippe De Muyter <phdm@macqel.be>
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Here is a patch to provide faster bitops for m68knommu, using bset/bclr/bchg
and btst instructions, that do test-and-set on m68k and coldfire processors.
We do thus avoid the need for local_irq_save/local_irq_restore.

Patch original submitted by Philippe De Muyter <phdm@macqel.be>.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Convert KTHREAD_SIZE to THREAD_SIZE.
Remove obsolate MAP_NR and VALID_PAGE macros.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix comment formatting in m68knommu linker script.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Export the udelay symbol so modules get access to it as well.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Remove duplicate M5275EVB entry.
Remove unused HIMEMKERNEL config option.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Remove unused keyboard.h include.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Remove unneccessary SUN conditionals from m68knommu elf.h.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Remove use of obsolete MAP_NR macro.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into flint.arm.linux.org.uk:/usr/src/bk/linux-2.6-rmk

Patch from Nicolas Pitre

Those defines are incomplete and not using them by
instead using the explicit flags makes for clearer code.

Signed-off-by: Nicolas Pitre
Signed-off-by: Russell King

Essentially, this set of changes:
1. makes the register usage in head.S more sane
2. makes way for passing the location of the tagged list via "r2"
   (as the booting document suggests)