Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

into nuts.davemloft.net:/disk1/BK/net-2.6

This makes us do the proper copy_to_user() for the new
posix timers code.

Acked by Christoph Lameter <clameter@sgi.com>.

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

I forgot to add 'const volatile' to the I/O read/write functions in the last
patch, and also forgot to update the _relaxed variants.  This patch fixes
that by adding 'const volatile' to the sn2 specific read/write routines as
well as the ia64 machine vector wrappers.
Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

This is a big patch mostly because I trimmed shub_mmr.h down from 17M to 11k
or so.  It fixes a number of things sparse discovered and removes some dead
code, fixes up some prototypes, etc.  Of note:
 
o sn_proc_fs.c was directly dereferencing user pointers, fixed
o sn_hwperf.c was missing an include and was using asm-ia64 directly
o the I/O routines were all missing proper sparse annotations
o dead code in prominfo_proc.c has been removed
o fix generic build by putting numionodes into asm/sn/io.h

With this patch applied, the check build is pretty clean.  The sn_console bit
depends on some of the other changes, so it's included here.
Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

sba_iommu.c needs to include linux/nodemask.h for node_online now.  Here's a
patch to add it.
Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

Signed-off-by: Patrick Gefre <pfg@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

The sn system controller driver needs asm/sn/io.h in order to build correctly
(it was missing the numionodes declaration).
Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

Signed-off-by: Patrick Gefre <pfg@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

Clean up a couple of places that were using 0 instead of NULL, which is the
more proper value.
Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

Looks like we were casting a value into a union and sparse doesn't like that.
Why not just assign it directly to the appropriate field?
Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

Some have noticed that the overlapping sched domains code doesn't quite work
as intended (it results in disjoint domains on some machines), and that a top
level, machine spanning domain is needed.  This patch from John Hawkes adds
it to the ia64 code.  This allows processes to run on all CPUs in large
systems, though balancing is limited.  It should go to Linus soon now
otherwise large systems will only have ~16p (depending on topology) usable by
the scheduler.  I sanity checked it on a small system after rediffing John's
original, and he's done some testing on very large systems.
 
 Nick, can you buy off on the sched.c change?  Alternatively, do you want to
 send that fix separately John? Nick did indeed ACK this change, but it isn't
 dependent on this ia64 specific part ... so it's going to be submitted
 separately.
Signed-off-by: John Hawkes <hawkes@sgi.com>
Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

into intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.10

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

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

	ioremap() is capable of dealing with addresses that are not
page-aligned; no need to duplicate that in driver.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

aic7xxx annotations - trivial part
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

	Annotated.  Original reused the structure that contained pointers into
remapped iomem for storing offsets in such area, so we need to split that
beast.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

a bunch of missing readb() and check of 64Kb alignment of physical address
done on remapped one.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

annotated ioctl structure
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

	a) CONFIG_VT should set CONFIG_INPUT
	b) parport_pc and serial/8250 are broken for sparc32 same as for
sparc64
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

Use PIO code from ide-taskfile.c in ide-disk.c so:
* drive status is checked after PIO read
* request is failed if invalid data phase
  is detected during PIO write
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Merge multwrite_intr() into write_intr().

The only change in functionality is that rq->errors is
now also cleared for multiwrite PIO (if there is no error).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Convert CONFIG_IDE_TASKFILE_IO=n code
to use scatterlists for PIO transfers.

Fixes longstanding 'data integrity on error'
issue and makes barriers work with PIO.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Use scatterlists for taskfile based PIO transfers
instead of directly walking rq->[bio,cbio] lists.

If CONFIG_IDE_TASKFILE_IO is defined
this code will be used for fs requests.

ide_pio_sector() is based on ata_pio_sector()
from libata-core.c so kudos to Jeff.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Allocate hwif->sg_table in hwif_init() so it can also be used for PIO.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Use dmatable_dma, sg_table, sg_nents and sg_dma_direction fields
of ide_hwif_t and remove their equivalents from pmac_ide_hwif_t.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

A couple of functions got themselves lost.

cc: <Markus.Lidel@shadowconnect.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Missing parts of the v4l update

Cc: Gerd Knorr <kraxel@bytesex.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>