Merge branch 'fix/misc' into topic/misc

2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c
index 420a96e7f2d..051d1ebbd28 100644
--- a/drivers/firmware/iscsi_ibft.c
+++ b/drivers/firmware/iscsi_ibft.c
@@ -939,7 +939,7 @@ static int __init ibft_init(void)
 
         if (ibft_addr) {
                 printk(KERN_INFO "iBFT detected at 0x%llx.\n",
-                       (u64)virt_to_phys((void *)ibft_addr));
+                       (u64)isa_virt_to_bus(ibft_addr));
 
                 rc = ibft_check_device();
                 if (rc)
diff --git a/drivers/firmware/iscsi_ibft_find.c b/drivers/firmware/iscsi_ibft_find.c
index d53fbbfefa3..dfb15c06c88 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)
                  * so skip that area */
                 if (pos == VGA_MEM)
                         pos += VGA_SIZE;
-                virt = phys_to_virt(pos);
+                virt = isa_bus_to_virt(pos);
                 if (memcmp(virt, IBFT_SIGN, IBFT_SIGN_LEN) == 0) {
                         unsigned long *addr =
-                            (unsigned long *)phys_to_virt(pos + 4);
+                            (unsigned long *)isa_bus_to_virt(pos + 4);
                         len = *addr;
                         /* if the length of the table extends past 1M,
                          * the table cannot be valid. */