Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-02-08 21:17:57 -0800
committerLinus Torvalds <torvalds@home.transmeta.com>2002-02-08 21:17:57 -0800
commite4526d920f9550171e853771a44c509ad3a3de53 (patch)
tree76d335bd86e0b3333c74d0574ebe2bf16e8b2720
parent42c7ef7947f12ee0ba56e9bd971411a4a15cb654 (diff)
parent76a58ab34f6cc2614a599e6360e0b1171cac23e3 (diff)
Merge penguin:v2.5/linux
into home.transmeta.com:/home/torvalds/v2.5/linux
-rw-r--r--drivers/char/agp/agpgart_be.c10
-rw-r--r--drivers/scsi/aha1542.c6
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/char/agp/agpgart_be.c b/drivers/char/agp/agpgart_be.c
index 2f717b9111ea..3c4b24e1006a 100644
--- a/drivers/char/agp/agpgart_be.c
+++ b/drivers/char/agp/agpgart_be.c
@@ -2391,7 +2391,7 @@ static int amd_create_gatt_table(void)
agp_bridge.gatt_table_real = page_dir.real;
agp_bridge.gatt_table = page_dir.remapped;
- agp_bridge.gatt_bus_addr = virt_to_bus(page_dir.real);
+ agp_bridge.gatt_bus_addr = virt_to_phys(page_dir.real);
/* Get the address for the gart region.
* This is a bus address even on the alpha, b/c its
@@ -2405,7 +2405,7 @@ static int amd_create_gatt_table(void)
/* Calculate the agp offset */
for(i = 0; i < value->num_entries / 1024; i++, addr += 0x00400000) {
page_dir.remapped[GET_PAGE_DIR_OFF(addr)] =
- virt_to_bus(amd_irongate_private.gatt_pages[i]->real);
+ virt_to_phys(amd_irongate_private.gatt_pages[i]->real);
page_dir.remapped[GET_PAGE_DIR_OFF(addr)] |= 0x00000001;
}
@@ -3027,7 +3027,7 @@ static int serverworks_create_gatt_table(void)
for(i = 0; i < 1024; i++) {
serverworks_private.scratch_dir.remapped[i] = (unsigned long) agp_bridge.scratch_page;
page_dir.remapped[i] =
- virt_to_bus(serverworks_private.scratch_dir.real);
+ virt_to_phys(serverworks_private.scratch_dir.real);
page_dir.remapped[i] |= 0x00000001;
}
@@ -3040,7 +3040,7 @@ static int serverworks_create_gatt_table(void)
agp_bridge.gatt_table_real = page_dir.real;
agp_bridge.gatt_table = page_dir.remapped;
- agp_bridge.gatt_bus_addr = virt_to_bus(page_dir.real);
+ agp_bridge.gatt_bus_addr = virt_to_phys(page_dir.real);
/* Get the address for the gart region.
* This is a bus address even on the alpha, b/c its
@@ -3056,7 +3056,7 @@ static int serverworks_create_gatt_table(void)
for(i = 0; i < value->num_entries / 1024; i++) {
page_dir.remapped[i] =
- virt_to_bus(serverworks_private.gatt_pages[i]->real);
+ virt_to_phys(serverworks_private.gatt_pages[i]->real);
page_dir.remapped[i] |= 0x00000001;
}
diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c
index a93ff6dd3d6a..b49fb0e75b98 100644
--- a/drivers/scsi/aha1542.c
+++ b/drivers/scsi/aha1542.c
@@ -58,7 +58,7 @@ static void BAD_DMA(void *address, unsigned int length)
{
printk(KERN_CRIT "buf vaddress %p paddress 0x%lx length %d\n",
address,
- SCSI_BUS_PA(address),
+ SCSI_BUF_PA(address),
length);
panic("Buffer at physical address > 16Mb used for aha1542");
}
@@ -68,7 +68,7 @@ static void BAD_SG_DMA(Scsi_Cmnd * SCpnt,
int nseg,
int badseg)
{
- printk(KERN_CRIT "sgpnt[%d:%d] page %p/0x%lx length %d\n",
+ printk(KERN_CRIT "sgpnt[%d:%d] page %p/0x%x length %d\n",
badseg, nseg,
page_address(sgpnt[badseg].page) + sgpnt[badseg].offset,
SCSI_SG_PA(&sgpnt[badseg]),
@@ -727,7 +727,7 @@ static int aha1542_queuecommand(Scsi_Cmnd * SCpnt, void (*done) (Scsi_Cmnd *))
panic("Foooooooood fight!");
};
any2scsi(cptr[i].dataptr, SCSI_SG_PA(&sgpnt[i]));
- if (SCSI_SG_PA(&sgpnt[i].page) + sgpnt[i].length - 1 > ISA_DMA_THRESHOLD)
+ if (SCSI_SG_PA(&sgpnt[i]) + sgpnt[i].length - 1 > ISA_DMA_THRESHOLD)
BAD_SG_DMA(SCpnt, sgpnt, SCpnt->use_sg, i);
any2scsi(cptr[i].datalen, sgpnt[i].length);
};