diff options
| author | Russell King | 2009-10-25 23:42:38 +0100 |
|---|---|---|
| committer | Russell King | 2009-10-25 23:44:30 +0100 |
| commit | ce63e6bd0ac7eca242562ee07f518bacc8eaa5ce (patch) | |
| tree | 6ac07bf89cba22f558f5e04c6298f02c9d2385ba | |
| parent | ARM: Fix signal restart issues with NX and OABI compat (diff) | |
| download | kernel-qcow2-linux-ce63e6bd0ac7eca242562ee07f518bacc8eaa5ce.tar.gz kernel-qcow2-linux-ce63e6bd0ac7eca242562ee07f518bacc8eaa5ce.tar.xz kernel-qcow2-linux-ce63e6bd0ac7eca242562ee07f518bacc8eaa5ce.zip | |
ARM: integrator: allow Integrator to be built with highmem
This fixes Integrator builds with highmem enabled; we need to
translate from 'struct page' to a DMA address, and this is not
possible without __pfn_to_bus().
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-integrator/include/mach/memory.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-integrator/include/mach/memory.h b/arch/arm/mach-integrator/include/mach/memory.h index 2b2e7a110724..4891828454f5 100644 --- a/arch/arm/mach-integrator/include/mach/memory.h +++ b/arch/arm/mach-integrator/include/mach/memory.h @@ -28,5 +28,6 @@ #define BUS_OFFSET UL(0x80000000) #define __virt_to_bus(x) ((x) - PAGE_OFFSET + BUS_OFFSET) #define __bus_to_virt(x) ((x) - BUS_OFFSET + PAGE_OFFSET) +#define __pfn_to_bus(x) (((x) << PAGE_SHIFT) + BUS_OFFSET) #endif |