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

With Olaf Hering <olh@suse.de>.

Parameters were interchanged.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

From: Prarit Bhargava <prarit@sgi.com>

I discovered an issue where a hwif_init() failure lead to /proc/ide files
being created for devices that failed probes.  This resulted in
oops/WARN_ON/BUG_ON executions through the kernel depending on what
actions were on going.

slightly changed by me (bart)
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

ide_hwgroup_t.polling field added.  0 in poll_timeout field
used to indicate inactive polling but because 0 is a valid
jiffy value, though slim, there's a chance that something
weird can happen.
Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

ide_drive_t.sleeping field added.  0 in sleep field used to
indicate inactive sleeping but because 0 is a valid jiffy
value, though slim, there's a chance that something can go
weird.  And while at it, explicit jiffy comparisons are
converted to use time_before() macros.
Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

In ide_error(), drive cannot be NULL.  ide_dump_status() can't
handle NULL drive.

From: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Explicit jiffy comparision converted to time_after() macro.
Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

In __ide_do_rw_disk(), ide_started used to be returned blindly
after issusing PIO write.  This can cause hang if
pre_task_out_intr() returns ide_stopped due to failed
ide_wait_stat() test.  Fixed to pass the return value of
pre_task_out_intr().
Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

In __ide_do_rw_disk(), the shifted block, instead of the
original rq->sector, should be used when checking range for
lba48 dma.
Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

In drivers/ide/pci/piix.[hc], init_setup_piix() is defined and
used but only one init_setup function is defined and no
demultiplexing is done using init_setup callback.  As other
drivers call ide_setup_pci_device() directly in such cases,
this patch removes init_setup_piix() and makes piix_init_one()
call ide_setup_pci_device() directly.
Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

In drivers/ide/pci/opti612.[hc], init_setup_opti621() is
declared, defined and referenced but never actually used.
This patch removes the function.
Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

In drivers/ide/pci/it8172.h, it8172_ratefilter() and
init_setup_it8172() are declared and the latter is referenced
in it8172_chipsets.  Both functions are not defined or used
anywhere.  This patch removes the prototypes and reference.
it8172 should be compilable now.
Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Removes drivers/ide/pci/adma100.[hc].  The driver isn't
compilable (missing functions) and no Kconfig actually enables
CONFIG_BLK_DEV_ADMA100.

On Wed, 02 Feb 2005 03:31:59 -0500, Jeff Garzik <jgarzik@pobox.com> wrote:
> Also, the libata-dev-2.6 tree has an "ata_adma" driver which is
> complete, but needs some testing (and I have h/w).
Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

This patch contains the following possible cleanups:
- make some needlessly global code static
- ide-dma.c: remove the unneeded EXPORT_SYMBOL(__ide_dma_test_irq)

slightly changed by me (bart)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

From: Arjan van de Ven <arjan@infradead.org>

* make atapi_{input,output}_bytes() static, fix users to use drive->hwif
* remove ide_read_24() export; it's unused since the ide-io.c reorganization
* add a FIXME comment to the ide_fix_driveid() export

slightly changed by me (bart)
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

PPC_MULTIPLATFORM exists both for ppc32 and ppc64; chrp and pegasos,
OTOH, are ppc32-only.  The ifdef in via82cxxx should be for
PPC_MULTIPLATFORM and PPC32 - it makes no sense for ppc64 multiplatform
and, as the matter of fact, simply won't compile there.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

compile fix on sparc64 - missed pgd_val() bites now that we have
STRICT_MM_TYPECHECKS set.  Incidentally, shifting _by_ unsigned long is
useless - type of result is determined by the type of first argument... 
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

I accidentally introduced a leak in there, because the end_io function
doesn't do a bio_put() like most others. Fortunately it's not critical,
as it only happens on the md super block read. So just drop the initial
bio_get(), since it's sync we can just bio_put() safely at the end after
it has completed.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Markus Trippelsdorf reported a non-working bt848 card with the recent
DVB update. 

It's an initialization order bug which changes the default state of the
tda9887 output ports.

Verified to fix the problem by Markus Trippelsdorf <markus@trippelsdorf.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

isdnhdlc_decode is called multiple times for bigger frames, so
decrementing dsize is a bad idea and can cause a overflow of
the dst buffer.
Signed-off-by: Karsten Keil <kkeil@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

On the one hand APM isn't enabled on all laptops.
On the other hand, this also affects regular PCs with APM support (or
using a distribution kernel with APM support).

The time for the !APM case was already increased from 30msec in 2.4 .
Isn't there a timeout that is suitable for all cases?

Alan Cox answered:
> The five seconds should be just fine for all cases. The smaller value
> with no
> power manglement should help speed up recovery however. It probably
> doesn't belong CONFIG_APM now ACPI and friends are involved either.

Until someone has a real good solution (consider e.g. that most PC users 
might have ACPI support enabled), this patch unconditionally sets 
WAIT_READY to 5 seconds.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

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

Remove code from platform independent code, which is not used
in Linux.
Signed-off-by: Armin Schindler <armin@melware.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Removed check for NULL pointer before doing vfree(), it's done in
vfree().
Signed-off-by: Armin Schindler <armin@melware.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch adds asm/uaccess.h to files which uses copy_to/from_user()
and adds the use of the drivers internal API call to copy_to/from_user()
in platform independent code.
Signed-off-by: Armin Schindler <armin@melware.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

reiserfs_file_write() casts its (size_t) count parameter to int, which can become
a problem on 64-bit architectures

This attempts to fix this by changing the variables dealing with count
and offset and the "min_t" comparisons to use "size_t" through-out.
Acked-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Acked-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix signedness and remove the now unnecessary cast.
Acked-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This adds BTFIXUPs needed for sparc32.
Signed-off-by: Tom 'spot' Callaway <tcallawa@redhat.com>
Acked-by: William Irwin <wli@holomorphy.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Patch submitted by H.J. Lu
New ia64 assembler complains if the END(tag) doesn't match
the ENTRY(tag).
Signed-off-by: Tony Luck <tony.luck@intel.com>

This replaces a K&R-style function definition with its ANSI counterpart.

This fixes a bug where attempting to remove the viocd module when no
virtual cdroms where actually present would cause an oops.  The driver
was not completing its initialisation in this case.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

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

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

The flush_tlb_kernel_range call in drm_memory.h was removed in 2003, so
there's no more reason for this #include.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Dave Airlie <airlied@linux.ie>

unify the initializer.
Signed-off-by: Dave Airlie <airlied@linux.ie>