From Martin Bligh.

This patch remaps the lmem_map (struct page) arrays for each node onto
their own nodes.  This is non-trivial, since all of ZONE_NORMAL, and
hence permanently mapped KVA resides on node 0.

Very early in the boot sequence, it calculates the size of the lmem_map
arrays (rounding up to the nearest large page size), and reserves a
suitable amount of permanent KVA by shifting down max_low_pfn to create
a gap between max_low_pfn and highstart_pfn (both of which are normally
about 896Mb).

It then uses the new set_pmd_pfn function to set up the pmds correctly
so that the large pages point at the physical addresses reserved from
the remote nodes.

Tested on NUMA-Q and some ratty old i386 PC kicking around under my
desk (on 2.5.36-mm1).  Was good for a 20% improvement in system time on
kernel compile when I initially benchmarked it against 2.5.32 or
something - due to a reduction in inter-node traffic, better
interconnect cache usage and locality.  Should have no effect on any
system other than i386 NUMA systems.

From Martin Bligh

This patch fixes a nasty bug that wli found in buffer.c which
cause an oops - we were using contig_page_data on a discontigmem
machine. It's a slightly modified version of the fix wli suggested,
tested on NUMA-Q.

I've also added code to not define contig_page_data for discontigmem
systems, to stop this from happening again. I wrapped a couple of
bootmem functions that were using it in #ifndef CONFIG_DISCONTIGMEM.
I suppose it's possible (though unlikely) that some other discontig
arch might need to wrap a couple of functions in their tree similarly,
but any borkage will just give a simple clear compiler error telling
them exactly where the problem is.

A discontigmem compilation fix From Bill Irwin

- Don't convert READA into READ in ll_rw_block().

This patch basically just renames usages of CONFIG_MULTIQUAD to
CONFIG_X86_NUMAQ. The original multiquad option covered a variety
of sins, and just made a mess (my fault). After extensive community
discussion, this is the naming scheme everyone agreed to - the
CONFIG_X86_NUMAQ option already exists, we're just renaming usages
of MULTIQUAD to it, and removing the MULTIQUAD option.

Stuff that's really to do with clustered APIC mode is put under
CONFIG_CLUSTERED_APIC instead, as it's not specific to the NUMA-Q.

Note that the definitions of clustered_apic_mode are still duplicated,
so the changes appear twice.  I'm not making it worse, just haven't
fixed this one yet, will do that next.

Patch was written by Matt Dobson.

Or in this case two.  This makes the migration and ksoftirq threads
match the naming convention of the workqueue threads.

Apply it and marvel at how neater a ps looks.

I tried building the aacraid driver in 2.5.41 and got an error
saying that O_TARGET usage was obsolete.  The following change
to the Makefile allows me to build.

Adds missing return values checking of
misc_register(), scsi_register(), request_region()
and does some code cleanup in the process..

As per the FIXME. Work done by Eric Blade

Just reconfigure on resume..

cpqarray uses disk_alloc instead of alloc_disk.  Same typo is in cciss,
rd.c sets ->first_minor to 0 for all units and HD_IRQ definition is
needed if CONFIG_BLK_DEV_HD is defined.

into home.transmeta.com:/home/torvalds/v2.5/linux

This makes sure we clear the user_tid in copy_thread, and that we
don't pass a bogus tid parameter in sys_clone when the CLONE_SETTID
and CLONE_CLEARTID flags are clear.

into samba.org:/home/paulus/kernel/for-linus-ppc

This also puts the file in include/asm-ppc/offsets.h rather
than arch/ppc/kernel/asm-offsets.h.  This changes PPC to do things
similarly to other ports, and makes make -j work reliably.