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

Patch from Richard Purdie

The Sharp SL-C7xx series of PDAs (Corgi, Shepherd, Husky) don't set
the machine type upon startup. Fixing this isn't possible as the
devices have been produced and the bootloaders are in ROM. 

This header code detects the differences between them and sets the
machine type accordingly. By doing this one kernel can support the
series of PXA25x machines.

The code also detects Poodle (Sharp SL-5600) which is also a PXA25x
device allowing a common kernel to support that device as well. (The
base machine code is under development for this device).

Signed-off-by: Richard Purdie
Signed-off-by: Russell King

Patch from Richard Purdie

Add base machine support for the Sharp SL-C7xx series of PDAs 
(Corgi - SL-C700, Shepherd - SL-C750 and Husky - SL-C760). See 
linux-arm-kernel for a support commitment for this code.

Depends on 2370/1 (SCOOP Driver).

Signed-off-by: Richard Purdie
Signed-off-by: Russell King

Patch from Richard Purdie

Add common driver code for the SCOOP I/O interface found on various 
Sharp PDAs (Collie, Poodle and Corgi models). It will be used by 
both SA1100 and PXA machines. 

[A patch to update Collie to use this driver will follow.]

Signed-off-by: Richard Purdie
Signed-off-by: Russell King

Patch from Ben Dooks

Remove code for decoding LCD Frame/FIFO IRQs
from the include/asm-arm/arch-s3c2410/entry-macro.S
file.

These are not currently implemented, and should be
decoded by a chained IRQ handler from the irq
code.

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

Patch from Ben Dooks

If we read the INTPEND register and get the wrong
result (details below) then it looks like a possible
loop to go back and re-read it after calculating
the possible correct value for it.

It seems that the INTPEND register, which should
show the unique number of the interrupt that we
need to handle. However, it seems that this register
can show the wrong interrupt under certain conditions.

Shannon's research shows that it is very possible that
the occurence of an external interrupt can end up
merging with the base interrupt number, causing
the wrong result in the register.

This patch also fixes the end position of the #ifdef
block and ensures as many registers as possible are
stacked before calling printk() for debug.

Original patch for 2.6.9 by Shannon Holland re-written
for 2.6.10 by Ben Dooks.

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

Patch from Ben Dooks

This is an old definition, and is no longer used anywhere.
Add a comment to that effect in the header file
include/asm-arm/arch-s3c2410/timex.h and remove all other
references.

Thanks to Klaus Fetscher for pointing out that it isn't
used anymore

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

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

The __ptrace_unlink code that checks for TASK_TRACED fixed the problem of a
thread being left in TASK_TRACED when no longer being ptraced. 

However, an oversight in the original fix made it fail to handle the
case where the child is ptraced by its real parent.

Fixed thus.
Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

As Alan says:

  "The '1.8' version is for the Moxa mxser driver.  Moxa haven't
   released any 2.6 driver for the ancient 'smartio' hardware"

so the smartio driver stil remains valid.

Cset exclude: james4765@gmail.com[torvalds]|ChangeSet|20050108220924|25457

David handed over the keys a few months ago.  Time to make sure everyone
knows to send stuff to me.
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 kroah.com:/home/greg/linux/BK/i2c-2.6

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

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>