diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-09-14 14:16:54 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-09-14 14:16:54 -0700 |
| commit | 0e4f19b4e5d6c4801d0ee2c26a5850de1b44f4af (patch) | |
| tree | cbd277d85dedfe2f64b94c5e385b311e2c017137 /arch/arm/mach-realview/include/mach/memory.h | |
| parent | 59255ac55ba6ecd195ef97c6bcd1303a7f838c94 (diff) | |
| parent | 4d869de174c78ae29ca91b41581367c8092d933d (diff) | |
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-rtlsk-v3.10-16.03-rtlsk-v3.10-16.02-rtlsk-v3.10-16.01-rtlsk-v3.10-15.12-rtlsk-v3.10-15.11-rtlsk-v3.10-15.10-rtlsk-v3.10-15.09-rtlinux-linaro-lsk-v3.10-rt
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 : \ |