Signed-off-by: Russell King

Patch from Dave Jiang

This cleans up the PCI mem and I/O resources assignments for all IOP
platforms. All addresses should be cleanly defined and correctly
assigned now.

Signed-off-by: Dave Jiang
Signed-off-by: Russell King

Patch from Michael Opdenacker

"GPIO23_SCLK_md" renamed to "GPIO23_SCLK_MD" (uppercase)
in include/asm-arm/arch-pxa/pxa-regs.h.
Done for consistency with all other GPIO_*_MD settings.
No other file impacted in mainstream kernel sources.
Reported by Nicolas Pouillon.

Signed-off-by: Michael Opdenacker
Signed-off-by: Russell King

Patch from Tony Lindgren

This patch adds a defconfig for OMAP H2 board to build
a bootable kernel.

Signed-off-by: Tony Lindgren
Signed-off-by: Russell King

Patch from Nicolas Pitre

It appears that the EF_ARM_SOFT_FLOAT is a reserved bit with the new
ARM EABI.  Since EABI is said to not support FPA (FPA emulation being
the reason why we'd want to disable iWMMXt access) we now test for any
EABI version as well to turn on iWMMXt access.

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

Patch from Nicolas Pitre

This implements TLS support in the most efficient way for all ARM
processors in use today.  The trick is to define a specific address in
kernel area that is made readable from user space to hold the TLS
pointer so it is highly efficient to retrieve it with no overhead.
Since the kernel already maps a page at 0xffff0000 to hold the exception
vectors, we can use the top of that page for storing the TLS ptr at
0xffff0ffc. This address has the advantage of fitting optimally with the
ARM load addressing mode as follows:
	mov	rd, #0xffff0fff
	ldr	rd, [rd, #-3]
Considering load scheduling, this means 2 cycles to retrieve the TLS
value which is even faster than a coprocessor access.  Even gcc
generates the above assembly when given:
	void *tls = *((void **)0xffff0ffc);
This is fine to make the vector page readable from user space since it
contains nothing that could compromize security and doesn't require an
extra memory page to be allocated.
On SMP (which should be ARMv6 and above only) the special reg for
TLS will be available.  Since ARMv6 binaries are most likely to use
strex/ldrex insns instead of swp to implement user space atomic
primitives, those ARMv6 binaries won't execute on pre ARMv6 processors
anyway.  So the abscence of a tls reg is a non issue for them already.
Also on SMP targets, since the hivec page can't be relied upon to get
the TLS value, we'll have the kernel emulate access to it through the
data abort vector for backward compatibility with pre ARMv6 binaries.
Otherwise, non SMP ARMv6 kernels will support both methods
simultaneously.
So the decision to use hivec or tlsreg could depend on whether given
library is optimized for ARMv6+ or not. And since ARM SMP devices are
still far from becoming mainstream we can safely go with the hivec (and
hivec emulation on SMP) for the time being.

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

The adrsvc macro was used to allow the entry-* files to be built on
ARM32 and ARM26 processors.  Since we no longer support ARM26 CPUs,
eliminate this macro.

Patch from Richard Purdie

Add a device definition to enable the backlight on the corgi
machines (Sharp SL-C7xx series).
[The backlight driver has been submitted to linux-fbdev-devel]
[Applies after 2426/1]

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

Patch from Richard Purdie

PXA Corgi - Bugfix + Cleanups:
* Make sure the MMC timer init is called *before* enabling the
  interrupt (thanks Nicholas for pointing this out).
* Add externs for the exported ssp functions
* Finish commenting Corgi specific GPIOs
[Applies after 2428/1]

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

Patch from George Joseph

Machine number 641 already assigned.
Changes...
arch/arm/boot/compressed/head-xscale.S
arch/arm/mach-ixp4xx/Kconfig
arch/arm/mach-ixp4xx/Makefile
include/asm-arm/arch-ixp4xx/uncompress.h
Adds...
arch/arm/mach-ixp4xx/gtwx5715-pci.c
arch/arm/mach-ixp4xx/gtwx5715-setup.c
include/asm-arm/arch-ixp4xx/gtwx5715.h
Includes changes requested by Russell King

Signed-off-by: George T Joseph
Signed-off-by: Deepak Saxena
Signed-off-by: Russell King

The SMP patch set for ARM contained a fair amount of comments in
addition to code changes.  Merge relevant comments separately from
the code.

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

This is the third of 4 patches which factor out common code in
the ARM exception entry assembly code, aiming towards a reduction
in the size of the changes required here for SMP support.  These
patches are low impact, and will be merged over the coarse of the
next few days.

This patch addresses the code handling exception entry from user
modes.

Thanks to Russell King for some excellent debugging.

Conntrack defragments locally generated packets before they hit
ip_fragment.  In this case the fragments have skb->dst set, and
that needs to be released.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

This is the second of 4 patches which factor out common code in
the ARM exception entry assembly code, aiming towards a reduction
in the size of the changes required here for SMP support.  These
patches are low impact, and will be merged over the coarse of the
next 3 days.

This patch addresses the code handling exception entry from
invalid (irq, fiq, abort) modes.  However, in converting to a
macro, a minor bug has been fixed which would merely cause a
misleading register dump.

Yet another accounting bug, this time hits on requeue. It is possible
for ->accounted to be set with ->in_flight, so don't nest the
cfq_account_completion() inside the ->in_flight check.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Handle empty nodes in SRAT parsing. Avoids an oops at boot time.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix bug in change_page_attr - with multiple pages it would not flush
correctly. Also add a small optimization of not flushing when not needed.

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

Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

Document atkbd.softraw (and shorten a few long lines nearby).

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

Added support for the ICH4-M, ICH6, ICH6R, ICH6-M, ICH6W and ICH6RW
chipsets. Also added support for the "undocumented" ICH7.

This is the first of 4 patches which factor out common code in
the ARM exception entry assembly code, aiming towards a reduction
in the size of the changes required here for SMP support.  These
patches are low impact, and will be merged over the coarse of the
next 4 days.

This patch addresses the code handling exception entry from
supervisor (kernel) mode.

Patch from Marc Singer

The special case for the Sharp LH processors is unnecessary.  A macro
override makes it cleaner and concentrates the change where it ought
to be.  The default in include/asm-arm/numnodes.h means that only
platforms that care to change the default need to do anything.

Signed-off-by: Marc Singer
Signed-off-by: Russell King

Patch from Ben Dooks

Patch from Shannon Holland
Enable automatic flow control if requested.

Signed-off-by: Shannon Holland

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

Patch from Ben Dooks

Patch from Dimitry Andric.
The s3c2410 serial driver selects the opposite parity
mode if parity is enabled.

Signed-off-by: Dimitry Andric

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

Patch from Ben Dooks

Patch from Dimitry Andric.
The include/asm-arm/arch-s3c2410/io.h file converts
PC style port addresses to real ARM addresses, and
needs to return an `void __iomem *` to avoid a number
of warnings:
  CC      drivers/ide/ide-iops.o
drivers/ide/ide-iops.c: In function `ide_insw':
drivers/ide/ide-iops.c:49: warning: passing arg 1 of `__raw_readsw' makes pointer from integer without a cast
drivers/ide/ide-iops.c: In function `ide_insl':
drivers/ide/ide-iops.c:59: warning: passing arg 1 of `__raw_readsl' makes pointer from integer without a cast
drivers/ide/ide-iops.c: In function `ide_outsw':
drivers/ide/ide-iops.c:79: warning: passing arg 1 of `__raw_writesw' makes pointer from integer without a cast
drivers/ide/ide-iops.c: In function `ide_outsl':
drivers/ide/ide-iops.c:89: warning: passing arg 1 of `__raw_writesl' makes pointer from integer without a cast
  CC      lib/iomap.o
lib/iomap.c: In function `ioread8_rep':
lib/iomap.c:140: warning: passing arg 1 of `__raw_readsb' makes pointer from integer without a cast
lib/iomap.c: In function `ioread16_rep':
lib/iomap.c:144: warning: passing arg 1 of `__raw_readsw' makes pointer from integer without a cast
lib/iomap.c: In function `ioread32_rep':
lib/iomap.c:148: warning: passing arg 1 of `__raw_readsl' makes pointer from integer without a cast
lib/iomap.c: In function `iowrite8_rep':
lib/iomap.c:156: warning: passing arg 1 of `__raw_writesb' makes pointer from integer without a cast
lib/iomap.c: In function `iowrite16_rep':
lib/iomap.c:160: warning: passing arg 1 of `__raw_writesw' makes pointer from integer without a cast
lib/iomap.c: In function `iowrite32_rep':
lib/iomap.c:164: warning: passing arg 1 of `__raw_writesl' makes pointer from integer without a cast

Signed-off-by: Dimitry Andric

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

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

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

Patch from David Vrabel

Use some #define'd constants in the ixp4xx's arch_reset().

Signed-off-by: David Vrabel
Signed-off-by: Russell King

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

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

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

Use netdev_priv() and get rid of the PRIV() macro by using the correct
data element. Also eliminate casts, where type is correct.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

When the skfddi driver was converted to the new PCI netdevice interface,
it never got tested with real hardware. The initialization got broken, this
should fix it.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

Fixes instances where gfar_read() was invoked in debug codewith a value,
rather than a pointer.
Signed-of-by: Andy Fleming <afleming@freescale.com>
Signed-of-by: Kumar Gala <afleming@freescale.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

From: Steven Rostedt <rostedt@goodmis.org>

If the transmit buffer of the e100 overflowed, then the system would hang.
This was caused because the e100 driver would stop the queue, and
netpoll_send_pkt in netpoll.c would then loop forever.  This is because the
e100 net_poll would never start the queue again after the transmits have
completed.

For those that use the e100 and netconsole, all you need to do is a sysreq
't' to lock up the system.
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>