summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@HansenPartnership.com>2009-02-13 12:52:44 -0600
committerIngo Molnar <mingo@elte.hu>2009-02-13 21:02:02 +0100
commitbf33a70a73876b163d62612e9567cbac6604ba7e (patch)
tree45c98959dbbfc5836d89dc4b7284cdef1971e810 /arch/x86/include/asm
parentbeb6943d8df7ce9278282101af4e0f6f7b648451 (diff)
downloadblackbird-op-linux-bf33a70a73876b163d62612e9567cbac6604ba7e.tar.gz
blackbird-op-linux-bf33a70a73876b163d62612e9567cbac6604ba7e.zip
x86: fix "__udivdi3" [drivers/scsi/aha1542.ko] undefined
Commit 976e8f677e42757e5586ea04a9ac8bb8ddaa037e ("x86: asm/io.h: unify virt_to_phys/phys_to_virt") changed the return of virt_to_phys from long to phys_addr_t which is unsigned long long on a PAE platform. So, I could suggest a fix below since isa addresses may never be above 32 bits. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm')
-rw-r--r--arch/x86/include/asm/io.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index e5a2ab44cd5c..4f8e820cf38f 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -125,7 +125,7 @@ static inline void *phys_to_virt(phys_addr_t address)
/*
* ISA I/O bus memory addresses are 1:1 with the physical address.
*/
-#define isa_virt_to_bus virt_to_phys
+#define isa_virt_to_bus (unsigned long)virt_to_phys
#define isa_page_to_bus page_to_phys
#define isa_bus_to_virt phys_to_virt
OpenPOWER on IntegriCloud