Rather than having an assembly and C version performing the same
lookup, re-use the assembly version with a C wrapper around it.
This removes the duplication.
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 John Lenz

Update collie machine to use the new scoop driver written
by Richard Purdie.

Signed-off-by: John Lenz
Signed-off-by: Russell King

Patch from Ben Dooks

Update default configuraiton, configure support for the
common flash chips seen on 2410 board.

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

Patch from Ben Dooks

Add platform device for the onboard site for NOR flash,
similar to the Simtec BAST (EB2410ITX)

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

Patch from Ben Dooks

Serial platfrom device to add ttyS0..ttyS4 to the
system.

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

Patch from Ben Dooks

Add definition of the extra serial port area to the
file include/asm-arm/arch-s3c2410/vr1000-map.h

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

Patch from Deepak Saxena

Previous fixed showed negative time flow every few hours during
extensive testing. This new version is much simpler and has been
tested w/o any failures.

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

Patch from Richard Purdie

Add MMC support to enable the MMC device on the corgi machines
(Sharp SL-C7xx). This is a standard PXA implementation except the
interrupt needs to be delayed to see card removals.
Applies after 2405/1.

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

Patch from Richard Purdie

Add w100fb device definition to enable the framebuffer device on
the corgi machines (Sharp SL-C7xx).

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

Patch from Giorgio Padrin

Completes/fixes I2S GPIO modes definitions in file pxa-regs.h .
Needed by sound drivers using I2S interface; based onofficial microprocessor documentation.

Signed-off-by: Giorgio Padrin
Signed-off-by: Russell King

Patch from Ben Dooks

Add platform device data for the NAND slot and chips
on the Simtec BAST (EB2410ITX) for the 3 chips
and SmartMedia slot.
Note, this does not yet support hot-plug for the
SmartMedia slot.

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

Patch from Ben Dooks

Add call to find out the current source and destination
of the given dma channel

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

Patch from Ben Dooks

Remove the fixed base address from the IIS registers, and
add missing defines for the IISPSR register

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

profile_pc() used thread_saved_fp() with the current task.  However,
thread_saved_fp() only returns sane values when called for threads
which are presently sleeping, so this caused an oops.  Instead, use
regs->ARM_fp, which correspond with the frame pointer.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

RPC: Fix a module refcount leak in RPCSEC_GSS
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

The build is clean now.

God invented symbolic names to help you.  Repeating magic constants by hand
is begging to lose, especially when you get them wrong.  Don't be a loser.

[ Editor's hint: 0xfffe000 vs 0xffffe000 ]
Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Remove unreferenced file
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 - sparse annotations for ioremap/iounmap (Randolph Chung)
 - Turn gsc_readb, __raw_readb and readb functions into static inline
   functions (Matthew Wilcox)
 - Document the difference between the gsc_readb, __raw_readb and readb
   families of functions (Matthew Wilcox)
 - Add a debugging option to determine when they are being used incorrectly
   (Matthew Wilcox)
 - Make memcpy_fromio's second argument const (Matthew Wilcox)
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix _syscallN wrappers (Mike Frysinger)
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix ptrace(SINGLESTEP) through system call
Signed-off-by: Randolph Chung <tausq@parisc-linux.org>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Remove some unused definitions
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Add PDC Stable Storage wrappers (Thibaut Varene)
Rewrite PDC Initiator (Matthew Wilcox)
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Implement the iomap interfaces on PA-RISC
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 - Remove declaration of sys_setpgid
 - __user annotations
 - Rewrite hpux_statfs
 - Add hpux_fstatfs
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 - Removes the hardware path from /proc/interrupts for Dino to make
   it consistant with the rest of /proc/interrupts
Signed-off-by: Ryan Bradetich

 - Remove iomem related warnings from dino.c
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>

 - Convert SPIN_LOCK_UNLOCKED to spin_lock_init (Thomas Gleixner)
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Ingo Molnar <mingo@elte.hu>

Signed-off-by: Matthew Wilcox
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Defconfig updates from Grant Grundler and Paul Bame
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 - Remove parent/child/sibling links from parisc_device in favour of the
   ones in the embedded struct device.
 - Display irq and device IDs through sysfs
 - Translate a PA-RISC firmware path into a struct device (Thibaut Varene)
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Cache flush optimization for UP/SMP; remove hardcoded threshold
for selecting whole cache vs region flush

From: Randolph Chung <tausq@parisc-linux.org>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Make PA-RISC use the generic interrupt handling code.  We need one tiny
change to the generic code -- the addition of a data pointer to irq_desc.
This shouldn't be a problem in terms of increasing size of irq_desc for
other architectures as the struct is cacheline aligned.  It's now 32
bytes on 32-bit platforms and 44/48 bytes on 64-bit platforms (assuming
spinlock_t is 4 bytes on 32-bit and 4 or 8 bytes on 64-bit).
Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Vadim Lobanov <vlobanov@speakeasy.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Here are some Kconfig fixes:

- typo fixes
- unused token removes (empty or duplicated  'help')
- non ASCII characters replaces
- e-mail address and URL format corrections
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The input layer wants to send us an entropy event per input event and who are
we to argue?  Create add_input_randomness with an input-friendly interface and
kill the remaining two keyboard and mouse sources.

This eliminates lots of duplicate entropy events while covering all the input
bases nicely.  We now get two events per keystroke as we should, one down and
one up.
Signed-off-by: Matt Mackall <mpm@selenic.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The input layer is now sending us a bunch of events in a row for each actual
event.  This shows up weaknesses in the periodicity detector and using the
high clock rate from get_clock: each keystroke is getting accounted as 10
different maximal-entropy events.

A brief touch on a trackpad will generate as much as 2000 maximal entropy
events which is more than 2k of /dev/random output.  IOW, we're WAY
overestimating input entropy.  Here's one keystroke:

random 0024 0000 0000: mouse event
random 0035 0000 0000: added 11 entropy credits to input
random 0035 0000 0000: mouse event
random 0046 0000 0000: added 11 entropy credits to input
random 0046 0000 0000: mouse event
random 0056 0000 0000: added 10 entropy credits to input
random 0056 0000 0000: keyboard event
random 0067 0000 0000: added 11 entropy credits to input
random 0067 0000 0000: mouse event
random 0078 0000 0000: added 11 entropy credits to input
random 0078 0000 0000: awake
random 0078 0000 0000: reading 128 bits
random 0078 0000 0000: going to reseed blocking with 128 bits (128 of 0 requested)
random 0078 0000 0000: trying to extract 128 bits from input
random 0006 0000 0000: debiting 72 entropy credits from input
random 0006 0072 0000: added 72 entropy credits to blocking
random 0006 0072 0000: trying to extract 128 bits from blocking
random 0006 0000 0000: debiting 72 entropy credits from blocking
random 0006 0000 0000: read got 72 bits (56 still needed)
random 0006 0000 0000: reading 56 bits
random 0006 0000 0000: going to reseed blocking with 64 bits (56 of 0 requested
random 0006 0000 0000: trying to extract 64 bits from input
random 0006 0000 0000: debiting 0 entropy credits from input
random 0006 0000 0000: trying to extract 56 bits from blocking
random 0006 0000 0000: debiting 0 entropy credits from blocking
random 0006 0000 0000: read got 0 bits (56 still needed)
random 0006 0000 0000: sleeping
random 0006 0000 0000: mouse event
random 0017 0000 0000: added 11 entropy credits to input
random 0017 0000 0000: mouse event
random 0028 0000 0000: added 11 entropy credits to input
random 0028 0000 0000: mouse event
random 0038 0000 0000: added 10 entropy credits to input
random 0038 0000 0000: keyboard event
random 0049 0000 0000: added 11 entropy credits to input
random 0049 0000 0000: mouse event
random 0060 0000 0000: added 11 entropy credits to input

The first step to fixing this is to check periodicity and estimate entropy
against a slow clock like jiffies.  We continue to mix in get_clock() rather
than jiffies where available.

This throws away most of the duplicate events and gives us more sensible
entropy estimates, but we still duplicates from input.c and keyboard.c.
Signed-off-by: Matt Mackall <mpm@selenic.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>