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

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

Patch from Ben Dooks

Support for s3c2400 uarts in the s3c2410.c driver,
to go with the s3c2410 and s3c2440 support already
in there.
Add PORT_S3C2400 to include/linux/serial_core.h

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

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

Patch from Ben Dooks

Update info on supported CPUs, add Lucas to
the list of contributors.
Add section on adding new machines

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

I'm oopsing on shutdown on a machine that has a Via Rhine adapter in it:

Unable to handle kernel paging request at virtual address e0803003
[...]
EIP is at ioread8+0x2c/0x40
Call Trace:
 [<c0103d5f>] show_stack+0x7f/0xa0
 [<c0103efa>] show_registers+0x15a/0x1c0
 [<c01040ce>] die+0xce/0x150
 [<c0113406>] do_page_fault+0x356/0x692
 [<c01039ff>] error_code+0x2b/0x30
 [<c026b490>] rhine_shutdown+0x60/0x140
 [<c0253ad9>] device_shutdown+0x89/0x8b
 [<c012461c>] sys_reboot+0xac/0x200
 [<c0102f71>] sysenter_past_esp+0x52/0x75


Seems like it is the ioread8 in:

        /* Hit power state D3 (sleep) */
        iowrite8(ioread8(ioaddr + StickyHW) | 0x03, ioaddr + StickyHW);

that fails. StickyHW is 0x83. lspci says:

0000:00:07.0 Ethernet controller: VIA Technologies, Inc. VT86C100A [Rhine] (rev 06)
        Flags: bus master, medium devsel, latency 32, IRQ 18
        I/O ports at ec00 [size=128]
        Memory at dfffff80 (32-bit, non-prefetchable) [size=128]

In other words, it's trying to read outside of the I/O range (0x80),
which matches the fauling address.

I'm guessing my chip revision doesn't support WOL, it's a crappy noname
card.

It does seem as if rhine_power_init checks quirks for rqWOL before
touching any registers. Should rhine_shutdown do the same? Proposed
patch below, which resolves the problem on my system.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

From: Herbert Xu <herbert@gondor.apana.org.au>

Fix bug #4223.

OK, this happened because we got preempted before sis900_mii_probe
finished setting the sis_priv->mii.  Theoretically this can happen
with SMP as well but I suppose the number of SMP machines with sis900
is fairly small.

Anyway, the fix is to make sure that sis900_mii_probe is done before
the device can be opened.  This patch does it by moving the setup
before register_netdevice.

Since the netdev name is not available before register_netdev, I've
changed the relevant printk's to use pci_name instead.  Note that
one of those printk's may be called after register_netdev as well.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

Thanks to Alessandro Rubini <rubini@gnudd.com> for pointing this out.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Thanks to Alessandro Rubini <rubini@gnudd.com> for pointing this out.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

The attached patch makes read/write semaphores use interrupt disabling
spinlocks in the slow path, thus rendering the up functions and trylock
functions available for use in interrupt context.  This matches the
regular semaphore behaviour.

I've assumed that the normal down functions must be called with interrupts
enabled (since they might schedule), and used the irq-disabling spinlock
variants that don't save the flags.
Signed-Off-By: David Howells <dhowells@redhat.com>
Tested-by: Badari Pulavarty <pbadari@us.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

As promised to Andrew, here are the latest bits that fixup the block io
barrier handling.

- Add io scheduler ->deactivate hook to tell the io scheduler is a
  request is suspended from the block layer. cfq and as needs this hook.

- Locking updates

- Make sure a driver doesn't reuse the flush rq before a previous one
  has completed

- Typo in the scsi_io_completion() function, the bit shift was wrong

- sd needs proper timeout on the flush

- remove silly debug leftover in ide-disk wrt "hdc"
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 - Move the bits_wide parameter from txn_alloc_data to txn_alloc_irq.
   It's too late by the time it hits txn_alloc_data(), we can only panic.
   In txn_alloc_irq, we can fail the allocation and continue.
 - Also fix a bug where we'd only allow up to half the interrupts to be
   allocated.  Not a problem for iosapic machines, but might have sucked
   on a really big GSC-based machine.
 - Add missing irq_enter() / irq_exit()
 - Allow interrupt processing to be interrupted by the timer tick so we
   actually account hard interrupts.  Also speed up the handling of CPU
   interrupts by not masking with cpu_eiem again.
 - Remove sufficiently obsolete DEBUG_IRQ code
 - Remove limit on times around the loop.  If we exit the loop while
   interrupts are still pending, we'll only be re-interrupted as soon
   as we exit the function.
 - Remove unnecessary includes
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix "make configcheck | fgrep 'not needed' | fgrep parisc"
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>

 - The entire silence buffer is now being filled, instead of just 1/8th of it.
 - The silence buffer is now prepared during initialisation of the driver.
 - snd_pcm_format_size() is missing from the ALSA headers:
   using snd_pcm_format_physical_width() instead.
Signed-off-by: Stuart Brady <sdbrady@ntlworld.com>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 - Missing UL on large integers
 - 0/NULL confusion
 - __user annotations
 - C99-style array elements
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>

 - Convert ldil/ldo to using the load32 macro.
Signed-Off-By: Kyle McMartin <kyle@parisc-linux.org>

 - loop on signal delivery like other archs
 - unify VM initialization code for 32/64-bit
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>

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

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

Resolve a problem where a Sony Ericsson GC79 Cardbus device was not
being correctly resumed across a S3 suspend, as reported by Hendrik
Hoeth.
Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Patch from Petr Vandrovec

XScale detection needs access to Interrupt Enable Register on UART.
But this register shares position with high byte clock divisor, and
previous detection steps were leaving clock divisor and not IER
selected, causing misdetection of all 16550A chips as XScale.
 
Fix this by disabling access to clock divisor at the end of previous
detection step, so chip is in same mode after each detection step.
 
Signed-off-by: Petr Vandrovec

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

Patch from Tony Lindgren

This patch adds support for 32k timer on OMAP 16xx, and 64-bit
sched clock to the MPU timer.
This is an update version of ARM patch 2337/1. The 32k timer
modulo code has been left out, and the dynamic tick (VST) timer
will be submitted in a separate patch.

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

Oops, it broke.  Glue the bits back together, replacing yrs with
tm->tm_year + 1900.

I will not merge untested changes into Linus' tree.
I will not merge untested changes into Linus' tree.
I will not merge untested changes into Linus' tree.
I will not ...
Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Patch from Richard Purdie

Sharp SCOOP: Devices with multiple scoop interfaces are now
available so:
* add support for mutliple device support to the driver
* Update corgi, collie and poodle to share the scoop
  device structure so a device can be selected in drivers
* Update drivers to use the device structures

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

Patch from Lennert Buytenhek

Another round of ixp2000 typo fixes.

Signed-off-by: Lennert Buytenhek
Signed-off-by: Russell King

Patch from Ben Dooks

Add the Acer N30 machine, from Christer Weinigel

Signed-off-by: Christer Weinigel

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

into pobox.com:/garz/repo/net-drivers-2.6

into pobox.com:/garz/repo/net-drivers-2.6

into pobox.com:/garz/repo/netdev-2.6/janitor

into suse.de:/home/greg/linux/BK/usb-2.6

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

into pobox.com:/garz/repo/net-drivers-2.6

This patch is from Nathan Lynch <ntl@pobox.com>.

Use static inlines instead of #defines for stub functions when
CONFIG_EEH=n, to eliminate "statement with no effect" warnings with
some toolchains.
Signed-off-by: Nathan Lynch <ntl@pobox.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch is from Nathan Lynch <ntl@pobox.com>.

When offlining a cpu, any device interrupts which are bound to the cpu
have their affinity forcibly reset to all cpus (the default).
However, the value in /proc/irq/XXX/smp_affinity remains unchanged.
Since we're doing this while all the other cpus are stopped, it should
be safe to just call desc->handler->set_affinity and manually update
the irq_affinity array.
Signed-off-by: Nathan Lynch <ntl@pobox.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch is from Nathan Lynch <ntl@pobox.com>.

Seeing this very occasionally during cpu hotplug testing:

 Badness in slb_flush_and_rebolt at arch/ppc64/mm/slb.c:52
 Call Trace:
 [c0000000ef0efbe0] [c0000000000127a0] .__switch_to+0xa4/0xf0 (unreliable)
 [c0000000ef0efc80] [c000000000050178] .idle_task_exit+0xbc/0x15c
 [c0000000ef0efd10] [c00000000000d108] .cpu_die+0x18/0x68
 [c0000000ef0efd90] [c00000000001023c] .dedicated_idle+0x1fc/0x254
 [c0000000ef0efe80] [c00000000000fc80] .cpu_idle+0x3c/0x54
 [c0000000ef0eff00] [c00000000003aa90] .start_secondary+0x108/0x148
 [c0000000ef0eff90] [c00000000000bd28] .enable_64b_mode+0x0/0x28

idle_task_exit can result in a call to slb_flush_and_rebolt, which
must not be called with interrupts enabled.  Make the call with
interrupts disabled.
Signed-off-by: Nathan Lynch <ntl@pobox.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch is from John Rose <johnrose@austin.ibm.com>

This patch changes the RPA PCI Hotplug and DLPAR modules to use more
conventional error values for return codes.  The goal is to make failure
conditions obvious in the wrapper functions and in the caller code.
Signed-off-by: John Rose <johnrose@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch is from John Rose <johnrose@austin.ibm.com>

This patch changes the rtas wrapper functions in rtas.c to map RTAS
failure codes to conventional error values.  The goal is to make
failure conditions obvious in the wrapper functions and in the caller
code.
Signed-off-by: John Rose <johnrose@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch "inverts" the PPC64 dma mapping routines so that the pci_ and
vio_ ... routines are implemented in terms of the dma_ ... routines (the
vio_ routines disappear anyway as noone uses them directly any more).

The most noticable change after this patch is applied will be that the
flags passed to dma_alloc_coherent will now be honoured (whereas they were
previously silently ignored since we used to just call
pci_alloc_consistent).
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Now that we cleaned up the guard page handling in vmalloc, we have to
remove the p-PAGE_SIZE hack that was put in there for the original guard
page handling.  This also removes some spurious tab.
Signed-off-by: Andrea Arcangeli <andrea@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>