diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-09-14 14:16:21 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-09-14 14:16:21 -0700 |
| commit | f0b7ed42af0d718fc11d45f6c05948e9a11e08be (patch) | |
| tree | fc1ed011273f1f503570b3595f018eb84b3872a1 /arch/arm/mach-realview/include/mach/memory.h | |
| parent | 4dddf720534a9a14fa9b048e7930dcc55b1b1e40 (diff) | |
| parent | 4d869de174c78ae29ca91b41581367c8092d933d (diff) | |
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-androidlsk-v3.10-15.09-android
Diffstat (limited to 'arch/arm/mach-realview/include/mach/memory.h')
| -rw-r--r-- | arch/arm/mach-realview/include/mach/memory.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-realview/include/mach/memory.h b/arch/arm/mach-realview/include/mach/memory.h index 2022e092f0ca..db09170e3832 100644 --- a/arch/arm/mach-realview/include/mach/memory.h +++ b/arch/arm/mach-realview/include/mach/memory.h @@ -56,6 +56,8 @@ #define PAGE_OFFSET1 (PAGE_OFFSET + 0x10000000) #define PAGE_OFFSET2 (PAGE_OFFSET + 0x30000000) +#define PHYS_OFFSET PLAT_PHYS_OFFSET + #define __phys_to_virt(phys) \ ((phys) >= 0x80000000 ? (phys) - 0x80000000 + PAGE_OFFSET2 : \ (phys) >= 0x20000000 ? (phys) - 0x20000000 + PAGE_OFFSET1 : \ |