diff options
Diffstat (limited to 'drivers/firmware')
-rw-r--r-- | drivers/firmware/iscsi_ibft.c | 2 | ||||
-rw-r--r-- | drivers/firmware/iscsi_ibft_find.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c index 420a96e7f2db..051d1ebbd287 100644 --- a/drivers/firmware/iscsi_ibft.c +++ b/drivers/firmware/iscsi_ibft.c | |||
@@ -939,7 +939,7 @@ static int __init ibft_init(void) | |||
939 | 939 | ||
940 | if (ibft_addr) { | 940 | if (ibft_addr) { |
941 | printk(KERN_INFO "iBFT detected at 0x%llx.\n", | 941 | printk(KERN_INFO "iBFT detected at 0x%llx.\n", |
942 | (u64)virt_to_phys((void *)ibft_addr)); | 942 | (u64)isa_virt_to_bus(ibft_addr)); |
943 | 943 | ||
944 | rc = ibft_check_device(); | 944 | rc = ibft_check_device(); |
945 | if (rc) | 945 | if (rc) |
diff --git a/drivers/firmware/iscsi_ibft_find.c b/drivers/firmware/iscsi_ibft_find.c index d53fbbfefa3e..dfb15c06c88f 100644 --- a/drivers/firmware/iscsi_ibft_find.c +++ b/drivers/firmware/iscsi_ibft_find.c | |||
@@ -65,10 +65,10 @@ void __init reserve_ibft_region(void) | |||
65 | * so skip that area */ | 65 | * so skip that area */ |
66 | if (pos == VGA_MEM) | 66 | if (pos == VGA_MEM) |
67 | pos += VGA_SIZE; | 67 | pos += VGA_SIZE; |
68 | virt = phys_to_virt(pos); | 68 | virt = isa_bus_to_virt(pos); |
69 | if (memcmp(virt, IBFT_SIGN, IBFT_SIGN_LEN) == 0) { | 69 | if (memcmp(virt, IBFT_SIGN, IBFT_SIGN_LEN) == 0) { |
70 | unsigned long *addr = | 70 | unsigned long *addr = |
71 | (unsigned long *)phys_to_virt(pos + 4); | 71 | (unsigned long *)isa_bus_to_virt(pos + 4); |
72 | len = *addr; | 72 | len = *addr; |
73 | /* if the length of the table extends past 1M, | 73 | /* if the length of the table extends past 1M, |
74 | * the table cannot be valid. */ | 74 | * the table cannot be valid. */ |