Patch from Nicolas Pitre

Now that MTD XIP support is merged this part is
not relevant anymore.

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

Patch from Ben Dooks

MAINTAINERS entries for currently supported Simtec Electronics
development boards.

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

Patch from Catalin Marinas

The patch adds the "ax" attributes to the .sched.text section to
avoid a compiler warning.

Signed-off-by: Catalin Marinas
Signed-off-by: Russell King

Patch from Richard Purdie

The Sharp SL-C7xx Series (Corgi) has 3 devices connected to the SSP
interface each needing different configurations of the port.
This code provides the necessary access and locking so drivers can
access these components. It uses the functions provided by the PXA
SSP driver to access the port.
It also adds some machine specific GPIO definitions used by this
code and adds some comments to existing definitions.

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

asm/processor.h doesn't use atomic operations nor types, so
there's no need to include asm/atomic.h.
Signed-off-by: Russell King <rmk@arm.linux.org.uk>

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

Patch from Richard Purdie

Tidy up a couple of coding style issues in the Sharp SCOOP Driver

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

Patch from Deepak Saxena

We should be including <linux/kernel.h> to pick up various important
constants that might be needed by other include files.

Signed-off-by: Deepak Saxena
Signed-off-by: Russell King

Patch from Deepak Saxena

Signed-off-by: Deepak Saxena
Signed-off-by: Russell King

Patch from Ben Dooks

This cleans up a few items in arch/arm/mach-s3c2410
with naming of functions and a build problem. Items
which are general to s3c2410 and s3c2440 are now
named s3c24xx_ instead of s3c2410_, as well as
moving them to the correct headers.
The patch also fixes a problem where at least one
s3c2410 target had to be selected to allow an s3c2440
target to build without error.
The following have been renamed:
	s3c2410_init_irq -> s3c24xx_init_irq
	s3c2410_timer -> s3c24xx_timer

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

Remove asm/smp.h include, use linux/smp.h instead.
Add linux/cpu.h include.

This removes ipi_count from the globally visible per-cpu cpu data
structure.

Provide /proc/irq/*/smp_affinity support, and add necessary methods
to allow a machine to route the interrupt to the desired CPU.

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>