- PCI_DMA_BUS_IS_PHYS is only true if we don't have an IOMMU.  Getting this
   wrong results in system panics when we run out of bounce buffers.
 - parisc_vmerge_boundary and parisc_vmerge_max_size need to be available on
   all machines, not just ones with GSC.
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>

_dbg_write_trylock() needs to return an int.
Also update Thibaut's email address
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Make access_ok an inline function to get rid of an unused variable warning
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 - Match other architectures by initialising preempt_count to 1.
 - PREEMPT_ACTIVE needs to not overlap with HARDIRQ_MASK
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The extraneous semicolon in mb() breaks the SMP build in the new skbuff.h

From: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The result from __raw_readX() can never be const so use __fswabXX() instead
of cpu_to_leXX()
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

We no longer need to define our own HARDIRQ_BITS
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Copy some DMA definitions from x86 to get crufty drivers to build
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Use nonatomic bitops for ext2/3 where possible.
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Add definition of SHRREG
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>

 - Update stale url to documentation

From: Kyle McMartin <kyle@parisc-linux.org>

 - Make unwinding from modules work, mostly
 - Fix unwinding from millicode
Signed-off-by: Randolph Chung <tausq@debian.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

Egbert Eich reported a bug 2673 on bugs.freedesktop.org and tracked it
down to a missing memset in the setversion ioctl, this causes X server
crashes so I would like to see the fix in a 2.6.11.x tree if possible..

From: Egbert Eich <eich@pdx.freedesktop.org>
Signed-off-by: Dave Airlie <airlied@linux.ie>

into starflyer.(none):/foo/airlied/bitkeeper/drm-linus

into starflyer.(none):/foo/airlied/bitkeeper/drm-linus

into starflyer.(none):/foo/airlied/bitkeeper/drm-linus

add support for texture micro tiling on radeon/r200. 
Add support for r100 cube maps (since it also requires a version bump).

From: Roland Scheidegger <rscheidegger_lists@hispeed.ch>
Signed-off-by: Dave Airlie <airlied@linux.ie>

Cleanup patch for i810/i830 

From: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Dave Airlie <airlied@linux.ie>

This makes a lot of functions static and cleans up a few
other minor things.

From: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Dave Airlie <airlied@linux.ie>

fd.o bug #2576: Add support for ATI RN50/ES1000. (ATI Technologies Inc.)

From: Michel Daenzer <michel@daenzer.net>
Signed-off-by: Dave Airlie <airlied@linux.ie>

This patch splits out the main drm structures for future multi-head support.
It just sets up the structures and the stub functions for putting/getting heads

From: Jon Smirl <jonsmirl@gmail.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>

Add myself to MAINTAINERS for drm, and fixup my CREDITS.
Signed-off-by: Dave Airlie <airlied@linux.ie>

This patch fixes a bug in ppc64 local implementation of iounmap() that
would cause it to incorrectly flush the hash table since the changes to
set_pte have been applied.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

There seems little point in doing otherwise.

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

* move default_do_request() to ide-default.c
* fix drivers to set ide_driver_t->{do_request,end_request,error,abort}
* kill setup_driver_defaults()
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

* add private /proc/ide/hd?/capacity handlers to ide-{cd,disk,floppy}.c
* use generic proc_ide_read_capacity() for ide-{scsi,tape}.c
* kill ->capacity, default_capacity() and generic_subdriver_entries[]
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Add ide_drive_t->post_reset flag and use it to signal post reset
condition to the ide-tape driver (the only user of ->pre_reset).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Some rare races between ide-default and ide-disk are possible, i.e.:
* ide-default is used, I/O request is triggered (ie. /proc/ide/hd?/identify),
  drive->special is cleared silently (so CHS is not initialized properly),
  ide-disk is loaded and fails if drive uses CHS
* ide-disk is used, drive is resetted, ide-disk is unloaded, ide-default
  takes control over drive and on the first I/O request silently clears
  drive->special without restoring settings

Fix them by moving idedisk_{special,pre_reset}() and company to IDE core.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Move PM code from ide-cd.c and ide-disk.c to IDE core so:
* PM is supported for other ATAPI devices (floppy, tape)
* PM is supported even if specific driver is not loaded

Also s/HWIF(drive)/drive->hwif/ while at it.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

ATAPI devices ignore DRDY bit so drive->ready_stat must be set to zero.
It is currently done by device drivers (including ide-default fake driver)
but for PMAC driver it is too late as wait_for_ready() may be called during
probe: probe_hwif()->pmac_ide_dma_check()->pmac_ide_{mdma,udma}_enable()->
->pmac_ide_do_setfeature()->wait_for_ready().

Fixup drive->ready_stat just after detecting ATAPI device.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

From: Bram Verweij <bram.verweij@wanadoo.nl>

The problem seems to be that ide-disk.c tries to use PIO mode for
blocks > 137 GB (which is good), and LBA48 + DMA for blocks <= 137GB
(which is known to be a problem, i.e., this is why the no_lba48_dma 
field was introduced in the first place).  Attached is a small patch
that makes ide-disk.c use PIO mode for blocks > 137 GB, and LBA28 DMA
(instead of LBA48 DMA) for blocks <= 137 GB.

bart: argh, I forgot about 'lba48' flag; patch slightly modified by me
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Rename ctr to create etc.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Some multipath code/formatting cleanups
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Tag multipath exports GPL.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Outline Hardware Handler for EMC CLARiiON AX/CX-series.
Signed-Off-By: Alasdair G Kergon <agk@redhat.com>
From: Lars Marowsky-Bree <lmb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Each multipath instance can use a Hardware Handler with hooks for the
particular hardware you're using.

This patch provides the hw_handler infrastructure.

So far 3 hooks are available:

  A status function invoked by device-mapper table and status requests.

  An initialisation function called when a Priority Group is selected for
  use but before any I/O is sent to it.  This function should return straight
  away, and I/O is queued until dm_pg_init_complete() is called indicating
  whether or not the initialisation was successful.  The are three error
  flags, any or all of which may be set: MP_FAIL_PATH, MP_BYPASS_PG,
  MP_ERROR_IO.

  An error handler which gets the opportunity to decode any error that a bio
  generated.  Patches are pending to make scsi error details available for
  dm_scsi_err_handler() to decode.
Signed-Off-By: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>