I fixed the code to compile with CONFIG_ACPI_NUMA and
!CONFIG_DISCONTIG since it's actually possible to compile that
configuration as well as cleaned up the #include usage a litte.

	dropped from GCC at some point in the future.

This patch does a couple things:
      * Allows iommu page size different than PAGE_SIZE.  This was
        largely done by Bjorn.  The motivation for this is that sx1000
        hardware officially only supports use of the iommu with a 4k
        page size.  Thus the default is now 4k for sx1000 and PAGE_SIZE
        for zx1.
      * Cleanup the runtime statistics gathering such that we can turn
        it on for some info w/o impacting runtime performance.

	arguments.

When building a highly modular, non-generic kernel it can happen that
arch/ia64/lib/io.o is not included in the image because nothing built-in
needs __ia64_memcpy_fromio, etc., yet it may be called from a module.  We
should force it to be linked in.

Just a quick update for the sn2_defconfig file now that some more config
options have been added.

This patch adds a little noise on the console.  I like to see this
info because it matches up with the AGPGART aperture info later on.

	Here's a generic_defconfig that works on all the ia64
	platforms I'm aware of, and we can always update it if it's
	missing a driver or two.  Compile tested 'make compressed' and
	'make modules', and boot tested on sn2, and I think Alex boot
	tested on an HP machine.

into tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5

into lips.borg.umn.edu:/export/music/bkroot/xfs-linux-2.6

We must not mark the process TASK_STOPPED early, because
that might allow a signal to wake it up before we actually
got to the "wake_up_forked_process()" state. Total confusion
would happen.

Make wake_up_forked_process() verify the new world order.

into home.osdl.org:/home/torvalds/v2.5/linux

Spotted by Andreas Henriksson <andreas@scream.fjortis.info>

Also consolidate a bunch of convoluted if's into a single
"is this an r200 or r300" function.

From: Anton Blanchard <anton@samba.org>

For a laugh we moved the BSS and our world exploded. Turns out we zero
from __bss_start to _end. Add __bss_stop to our section definitions so
we can use it instead.

From: Anton Blanchard <anton@samba.org>

Linas Vepstas has audited the ppc64 proc code and found a number of issues.

This fixes loading of modules compiled with debugging on
some platforms.

From Rusty.

into home.osdl.org:/home/torvalds/v2.5/linux

into home.osdl.org:/home/torvalds/v2.5/linux

Get off the drugs, Linus.

constant expression properly.

into nuts.ninka.net:/disk1/davem/BK/net-2.6

into nuts.ninka.net:/disk1/davem/BK/sparc-2.6

From: Christoph Hellwig <hch@lst.de>

JFS currently clears i_sb in some error pathes which can make the
core kernel OOPS because it may never be NULL.  Noticed because some
IBM people try to "fix" the core kernel for it now..

From: Ingo Molnar <mingo@elte.hu>,

Voyager is getting odd deadlocks due to the taking of xtime_lock() in
sched_clock()->get_jiffies_64().

I had this patch queued up to fix a different deadlock, which occurs when we
relax the requirement that TSC's be synchronised across CPUs.  But it will
fix James' deadlock too.

From: Michael Hunold <hunold@convergence.de>

- move around sp887x firmware file entry to be close to sp887x selection

- fix a bunch of filenames to point to /usr/lib/hotplug/firmware/ rather
  then /etc/dvb

- fix the av7110 firmware config entry for "make allyesconfig"

From: Dave Kleikamp <shaggy@austin.ibm.com>

After Jose debugged the problem down to the routine jfs_get_parent, we
were able to find the problem.  I believe it only affects users of
NFS-exported JFS file systems on big-endian hardware.

The problem was a missing le32_to_cpu macro.  The patch also fixes a
return code to be more consistent other implementations of get_parent.

From: Greg KH <greg@kroah.com>

This fixes an oops when a kobject is unregistered before it's child is.
The usb-serial devices show this bug very easily (yank out a device
while its port is opened...)

Patch was originally written by Mike Gorse <mgorse@mgorse.dhs.org>

Add missing NR_VECTORS definition to visws and pc9800.  Also, make MSI
support dependent on CONFIG_X86_IO_APIC, as it won't build without IOAPIC
support.

into home.osdl.org:/home/torvalds/v2.5/linux