From a84302cfedbe2578fa3a3cfccccb06a373809571 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 2 Oct 2009 16:12:39 +0100 Subject: [PATCH] --- yaml --- r: 166901 b: refs/heads/master c: ed3c661448a1b4b0b07c0a0d3c6e8a19c7d0ffd7 h: refs/heads/master i: 166899: 61c0469874378a62539c63beec541dd5aef73c9b v: v3 --- [refs] | 2 +- trunk/drivers/firmware/iscsi_ibft.c | 2 +- trunk/drivers/firmware/iscsi_ibft_find.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6cb123998b8b..5e3981f1c5d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 41cb6654eb2cf01476223a3742946b9f65bd1bbd +refs/heads/master: ed3c661448a1b4b0b07c0a0d3c6e8a19c7d0ffd7 diff --git a/trunk/drivers/firmware/iscsi_ibft.c b/trunk/drivers/firmware/iscsi_ibft.c index 420a96e7f2db..051d1ebbd287 100644 --- a/trunk/drivers/firmware/iscsi_ibft.c +++ b/trunk/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/trunk/drivers/firmware/iscsi_ibft_find.c b/trunk/drivers/firmware/iscsi_ibft_find.c index d53fbbfefa3e..dfb15c06c88f 100644 --- a/trunk/drivers/firmware/iscsi_ibft_find.c +++ b/trunk/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. */