[PATCH 03/19] ARM: mach-prima2: don't define SIRFSOC_VA in terms of VMALLOC_END

Barry Song 21cnbao at gmail.com
Fri Sep 16 03:25:09 EDT 2011


2011/9/16 Nicolas Pitre <nico at fluxnic.net>:
> From: Nicolas Pitre <nicolas.pitre at linaro.org>
>
> ... since it is going to change.
>
> Signed-off-by: Nicolas Pitre <nicolas.pitre at linaro.org>

Tested-by: Barry Song <baohua.song at csr.com>

> ---
>  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 66b1ae2e55..6f24353257 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
> --
> 1.7.7-rc0



More information about the linux-arm-kernel mailing list