diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2007-10-12 16:11:45 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2007-10-12 16:13:09 +0200 |
| commit | e39394b84156bc0822785e379977fe75a5662aad (patch) | |
| tree | 0331fbe89df3327d0d0e4123ccf0cdcc6c529fc2 /include/asm-s390 | |
| parent | [S390] zcore: fix inline assembly in memcpy_real() (diff) | |
| download | linux-e39394b84156bc0822785e379977fe75a5662aad.tar.xz linux-e39394b84156bc0822785e379977fe75a5662aad.zip | |
[S390] Make vmalloc area start at address > 4GB.
Prevent that modules get loaded at addresses below 4GB to
prevent exchanging system call table entries.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'include/asm-s390')
| -rw-r--r-- | include/asm-s390/pgtable.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/include/asm-s390/pgtable.h b/include/asm-s390/pgtable.h index 3208dc6c412c..39bb5192dc31 100644 --- a/include/asm-s390/pgtable.h +++ b/include/asm-s390/pgtable.h @@ -107,11 +107,18 @@ extern char empty_zero_page[PAGE_SIZE]; * any out-of-bounds memory accesses will hopefully be caught. * The vmalloc() routines leaves a hole of 4kB between each vmalloced * area for the same reason. ;) + * vmalloc area starts at 4GB to prevent syscall table entry exchanging + * from modules. */ extern unsigned long vmalloc_end; -#define VMALLOC_OFFSET (8*1024*1024) -#define VMALLOC_START (((unsigned long) high_memory + VMALLOC_OFFSET) \ - & ~(VMALLOC_OFFSET-1)) + +#ifdef CONFIG_64BIT +#define VMALLOC_ADDR (max(0x100000000UL, (unsigned long) high_memory)) +#else +#define VMALLOC_ADDR ((unsigned long) high_memory) +#endif +#define VMALLOC_OFFSET (8*1024*1024) +#define VMALLOC_START ((VMALLOC_ADDR + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1)) #define VMALLOC_END vmalloc_end /* |