diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-27 10:11:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-27 10:11:12 -0700 |
| commit | a2508c0814c6d2c0259fa859a6184343b1e39ea3 (patch) | |
| tree | 3c42cb3daf50b419f8cc20ff1625647306b66e0d /arch/sparc/mm/io-unit.c | |
| parent | 0f5a2c553d1484141ebb369ecab61894e9cb074f (diff) | |
| parent | 6ee4e28be80add86a64908472e4b7ab01dab33d9 (diff) | |
| download | op-kernel-dev-a2508c0814c6d2c0259fa859a6184343b1e39ea3.zip op-kernel-dev-a2508c0814c6d2c0259fa859a6184343b1e39ea3.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC32]: Fix build-warning in io-unit.c
[SPARC64]: Fix BACKOFF_SPIN on non-SMP.
[SPARC32]: __inline__ --> inline
[SPARC64]: __inline__ --> inline
Diffstat (limited to 'arch/sparc/mm/io-unit.c')
| -rw-r--r-- | arch/sparc/mm/io-unit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/mm/io-unit.c b/arch/sparc/mm/io-unit.c index 1666087..b86dfce 100644 --- a/arch/sparc/mm/io-unit.c +++ b/arch/sparc/mm/io-unit.c @@ -144,7 +144,7 @@ static void iounit_get_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_bus spin_lock_irqsave(&iounit->lock, flags); while (sz != 0) { --sz; - sg->dvma_address = iounit_get_area(iounit, sg_virt(sg), sg->length); + sg->dvma_address = iounit_get_area(iounit, (unsigned long) sg_virt(sg), sg->length); sg->dvma_length = sg->length; sg = sg_next(sg); } |
