diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-09-14 15:14:19 -0400 |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2011-11-15 22:30:38 -0500 |
commit | 8da54a0b47a0c3f2cbb31e92472d5d3887b620b8 (patch) | |
tree | 674808e2d62474e359b731a46243ff8445f2602d | |
parent | 1a4c1c966958ec602c5efd46eb2e53a9cb17f5e4 (diff) | |
download | linux-3.10-8da54a0b47a0c3f2cbb31e92472d5d3887b620b8.tar.gz linux-3.10-8da54a0b47a0c3f2cbb31e92472d5d3887b620b8.tar.bz2 linux-3.10-8da54a0b47a0c3f2cbb31e92472d5d3887b620b8.zip |
ARM: mach-prima2: don't define SIRFSOC_VA in terms of VMALLOC_END
... since it is going to change.
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Tested-by: Barry Song <baohua.song@csr.com>
-rw-r--r-- | arch/arm/mach-prima2/include/mach/map.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-prima2/include/mach/map.h b/arch/arm/mach-prima2/include/mach/map.h index 66b1ae2e553..6f243532570 100644 --- a/arch/arm/mach-prima2/include/mach/map.h +++ b/arch/arm/mach-prima2/include/mach/map.h @@ -9,8 +9,10 @@ #ifndef __MACH_PRIMA2_MAP_H__ #define __MACH_PRIMA2_MAP_H__ -#include <mach/vmalloc.h> +#include <linux/const.h> -#define SIRFSOC_VA(x) (VMALLOC_END + ((x) & 0x00FFF000)) +#define SIRFSOC_VA_BASE _AC(0xFEC00000, UL) + +#define SIRFSOC_VA(x) (SIRFSOC_VA_BASE + ((x) & 0x00FFF000)) #endif |