diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-12 15:53:08 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-13 17:33:19 +0100 |
| commit | c7baab5d1e97437a2fca63b71d467f193dbebb02 (patch) | |
| tree | 227c8a1ffb2465035c1fd4466301d1bf5617892a /arch/arm/mach-integrator/include/mach/memory.h | |
| parent | ARM: VFP: fix vfp thread init bug and document vfp notifier entry conditions (diff) | |
| download | linux-c7baab5d1e97437a2fca63b71d467f193dbebb02.tar.xz linux-c7baab5d1e97437a2fca63b71d467f193dbebb02.zip | |
ARM: fix clps711x, footbridge, integrator, ixp2000, ixp2300 and s3c build bug
Anders Grafström reports that footbridge fails to build after 1c4a4f4.
Fix this by adding the necessary definitions for __pfn_to_bus and
__bus_to_pfn.
Reported-by: Anders Grafström <anders.grafstrom@netinsight.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-integrator/include/mach/memory.h')
| -rw-r--r-- | arch/arm/mach-integrator/include/mach/memory.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/include/mach/memory.h b/arch/arm/mach-integrator/include/mach/memory.h index 4891828454f5..991f24d2c115 100644 --- a/arch/arm/mach-integrator/include/mach/memory.h +++ b/arch/arm/mach-integrator/include/mach/memory.h @@ -28,6 +28,7 @@ #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) +#define __pfn_to_bus(x) (__pfn_to_phys(x) + (BUS_OFFSET - PHYS_OFFSET)) +#define __bus_to_pfn(x) __phys_to_pfn((x) - (BUS_OFFSET - PHYS_OFFSET)) #endif |