From 0fa7bab8a2deefa30426182bef7ff32e0b188014 Mon Sep 17 00:00:00 2001 From: Jesper Nilsson Date: Tue, 3 Aug 2010 18:58:29 +0200 Subject: [PATCH] --- yaml --- r: 207146 b: refs/heads/master c: 2dc1c40c6e81ba406f2f6b00fe5eecb4c7cf1197 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/cris/include/arch-v32/arch/pgtable.h | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9b358661161e..45d54076dc75 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32e7a8ba8d435d03752be818a82748c5e3eadc36 +refs/heads/master: 2dc1c40c6e81ba406f2f6b00fe5eecb4c7cf1197 diff --git a/trunk/arch/cris/include/arch-v32/arch/pgtable.h b/trunk/arch/cris/include/arch-v32/arch/pgtable.h index 08cb7ff7e4e7..c1051a8da33d 100644 --- a/trunk/arch/cris/include/arch-v32/arch/pgtable.h +++ b/trunk/arch/cris/include/arch-v32/arch/pgtable.h @@ -2,8 +2,16 @@ #define _ASM_CRIS_ARCH_PGTABLE_H /* Define the kernels virtual memory area. */ + +/* See head.S for differences between ARTPEC-3 and ETRAX FS. */ +#ifdef CONFIG_CRIS_MACH_ARTPEC3 +#define VMALLOC_START KSEG_E +#define VMALLOC_END KSEG_F +#else #define VMALLOC_START KSEG_D #define VMALLOC_END KSEG_E +#endif + #define VMALLOC_VMADDR(x) ((unsigned long)(x)) #endif /* _ASM_CRIS_ARCH_PGTABLE_H */