The following commit has been merged in the linux branch: commit ce63e6bd0ac7eca242562ee07f518bacc8eaa5ce Author: Russell King rmk+kernel@arm.linux.org.uk Date: Sun Oct 25 22:42:38 2009 +0000
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
diff --git a/arch/arm/mach-integrator/include/mach/memory.h b/arch/arm/mach-integrator/include/mach/memory.h index 2b2e7a1..4891828 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