Adrian Cox has modified the Sandpoint code to once again work on the older
X2 version of the board.  The older version has a number of are on the
older version.
Signed-off-by: Adrian Cox <adrian@humboldt.co.uk>
Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Rune has determined that:
res6 should be 94 bytes long.

However... It does work @ 92 bytes because the compiler alligns the next
struct (pci_cpm2_t) on a int boundary anyways (no packing specified fo
the structs)

I tested it with a module that pronted out the address of the PCI struct
that follows the sit_cpm2_t struct.

Imap = 0xF0000000
With res6[92]
im-pci is @  0xf0010430

With res6[94]
im-pci is @  0xf0010430

So we're saved by the compiler.

Here's the patch
Signed-off-by: Rune Torgersen <runet@innovsys.com>
Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

PREEMPT_BITS, SOFTIRQ_BITS, PREEMPT_SHIFT, SOFTIRQ_SHIFT and HARDIRQ_SHIFT
are the same for all architectures (and chaning them in future ports
doesn't make a lot of sense), so move them to <linux/hardirq.h>.

Make the HARDIRQ_BITS definition guarded by #ifndef HARDIRQ_BITS instead of
CONFIG_GENERIC_HARDIRQS so we have a saner way to override it once ports
with lots of irq sources are changed to use the generic hardirq framework.

Ingo, maybe we should change the default for it back to 8 as that's what
most ports use?
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

My tmpfs superblock changes in 2.6.9 messed up mount -t tmpfs when
CONFIG_TMPFS is not enabled: it wrongly claimed to succeed, and left the
directory unusable, giving "Not a directory" errors thereafter.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

If NUMA is enabled, find_next_best_node is responsible for helping build
the zonelist for each pgdat in the system.  However, if one sets
PENALTY_FOR_NODE_WITH_CPUS to a large value in an attempt to prefer nodes
w/o CPUs, the local node is erroneously placed after all nodes w/o CPUs in
the pgdat's zonelist.  This small patch fixes that by just checking if the
local node is part of the zonelist yet, and if not, returns it first.
Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Add prio_tree.c documentation.
Signed-off-by: Rajesh Venkatasubramanian <vrajesh@umich.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Currently we use prio_tree_root->index_bits to optimize the height of both
the initial heap-and-radix indexed levels of a prio_tree as well as the
heap-and-size indexed overflow-sub-trees.  Please see the accompanying
prio_tree documentation patch for further details.

When index_bits is increased in prio_tree_expand we shuffle the initial
heap-and-radix indexed levels to make sure that vmas are placed in the tree
at appropriate places.  Similarly, since the overflow-sub-trees' heights
also depend on prio_tree_root->index_bits we should shuffle all the
overflow-sub-trees when index_bits changes.  However, I missed to take care
of this in my implementation.

Recently Stefan Hornburg (Racke) reported the problem and patiently tested
the trace patches.  Hugh Dickins produced the trace patches that helped to
detect the bug.  Moreover, Hugh reduced the crash test case to few lines of
code.  Thanks to both of them.

The easy fix is to disable prio_tree_expand code completely.  That may lead
to skewed trees in some common cases.  Hence, this patch takes a different
approach.

This patch fixes the problem by not optimizing the height of the
overflow-sub-trees using prio_tree_root->index_bits.  Now all
overflow-sub-trees use full BITS_PER_LONG bits of size_index to place the
vmas (that have the same start_vm_pgoff) in an overflow-sub-tree.

This may result in skewed overflow-sub-trees because all bits in vm_pgoff
above prio_tree_root->index_bits will be 0 (zero).  However, processes
rarely map many vmas with the same start_vm_pgoff and different
end_vm_pgoff.  Therefore, such skewed sub-trees should be very rare.
Signed-off-by: Rajesh Venkatasubramanian <vrajesh@umich.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Whilst looking at simplifying the implmentation of i386 initialisation code
I noticed the following.  This change allows these routines to be used in
both node based and flat memory models which allows more of the init code
to be common in these models.

Convert the default non-node based bootmem routines to use NODE_DATA(0).
This is semantically and functionally identical in any non-node
configuration as NODE_DATA(x) is defined as below.

#define NODE_DATA(nid)          (&contig_page_data)

For the node cases (CONFIG_NUMA and CONFIG_DISCONTIG_MEM) we can use these
non-node forms where all boot memory is defined on node 0.
Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Description: revert sys_setaltroot
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

It's static inline.  Weird.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

"PORT_ICOM" is not defined.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The new icom.o isn't in drivers/serial/Makefile.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fixup after mid-air collision between Christoph adding
time_interpolator.mask, and me removing a static time_interpolator struct
from hpet.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.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

Patch from Sascha Hauer

Here is an updated version of the patch:

- updated the patch according to Russell's comments
- added proper sysrq handling
- update rx counter

Sascha Hauer

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

Patch from Ben Dooks

Add missing RTCCON definitions

Signed-off-by: Ben Dooks 

Signed-off-by: Russell King

Patch from Marc Singer

As requested, this patch removes the
include/asm-arm/arch-lh7a40x/serial.h header.

Patch from Sascha Hauser

Update H720x for system timer changes.

Convert all platform serial tables to use a serial8250 platform device
rather than declaring a static table in
include/asm-arm/arch-*/serial.h.  This change integrates patches from
Sascha Hauser to update H720x serial support, and Tony Lindgren to
update OMAP serial support.

The PC110 touchpad driver used to just assume that the hardware
exists, even though in fact the hw is extremely rare indeed, and
just requesting all the resources might stomp on some _other_
hardware.

Try to minimize the damage by realizing that the touchpad hw only
exists on old ISA-only hardware, and if we have found a PCI device,
we should not try to load the touchpad driver.

Verified to fix things for Andries Brouwer. 

We should not claim to have filled in the ring_pages[] array
until we actually _do_ fill it in. It will confuse the code
that frees the structure if we claim there are pages there
that don't exist.

Noted by Darrick Wong.

Yes, they might be useful somewhere else too, but the EFI
discovery code is so fragile that it's not worth the bother.

EFI people informed.

I've got a Sony CDU33A drive with COR334 controller.  The Linux cdu31a
driver was not updated for 2.6 kernel so it does not work.

Here are patches that try to make the driver working with 2.6
kernel:
  - fix the timeout values in header file
  - Make the driver work in 2.6.X
  - Added workaround to fix hard lockups on eject
  - Fixed door locking problem after mounting empty drive
  - Set double-speed drives to double speed by default
  - Removed all readahead things - not needed anymore

It does work on my system. I also know that it's still broken - it uses 
cli(), MODULE_PARM and it's also not very fast (I _never_ reached full
300KB/s with it, but I know that it's possible in Windows) and probably 
many other things (I'm new to Linux kernel) - so I'm waiting for comments.

They happen with "bk cset -x" - it only undoes the data
changes, not the metadata updates.

For some as-yet unclear reason, it seems to break legacy
32-bit apps on x86-64.

Cset exclude: ak@suse.de[torvalds]|ChangeSet|20041102230307|11901

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

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

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

XFER_xxx is not necessarily "legacy IDE 'stuff'"

This is todays BK on a x86:

  CC [M]  drivers/usb/storage/freecom.o
In file included from include/linux/hdreg.h:4,
                 from drivers/usb/storage/freecom.c:32:
include/linux/ata.h:197: error: parse error before "u32"
...
and so on for tens of lines.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

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

I'm not setting the rover pointer at all.  Here's a patch to
fix that.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

When a mirred action is created it takes two references to the
device (dev_get_by_index + dev_hold), but only drops one when
it gets destroyed. It also leaks a reference when a mirred action
is replaced.
Signed-off-by: Patrick McHardy <kaber@trash.ne>
Signed-off-by: David S. Miller <davem@davemloft.net>

This patch gets rid of an unused global counter in neighbour.c.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

This patch fixes the return codes from sendmsg/recvmsg when a signal happens.
Instead of always returning ERESTARTSYS (which confuses X11 rather badly) it
should return EINTR for non-blocking operations.
Signed-off-by: Patrick Caulfield <patrick@tykepenguin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

This patch fixes a missing _bh in the 23 August locking update. 
Without this any attempt to read from /proc/net/decnet_cache causes a
'scheduling while atomic' crash.
Signed-off-by: Patrick Caulfield <patrick@tykepenguin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Fixes broken packets, noticed by Matthias Andree <matthias.andree@gmx.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>