mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
[PATCH] freepgt: arm26 FIRST_USER_ADDRESS PAGE_SIZE
ARM26 define FIRST_USER_ADDRESS as PAGE_SIZE (beyond the machine vectors when they are mapped low), and use that definition in place of locally defined MIN_MAP_ADDR. Previously, ARM26 permitted user mappings at 0 if the machine vectors were mapped high; but that's inconsistent with ARM, and FIRST_USER_ADDRESS would then have to be determined at runtime. Let's fix it at PAGE_SIZE throughout the architecture. Signed-off-by: Hugh Dickins <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
6119be0bba
commit
cdfb82fff3
2 changed files with 11 additions and 5 deletions
|
|
@ -64,10 +64,10 @@ inline long do_mmap2(
|
|||
flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
|
||||
|
||||
/*
|
||||
* If we are doing a fixed mapping, and address < PAGE_SIZE,
|
||||
* If we are doing a fixed mapping, and address < FIRST_USER_ADDRESS,
|
||||
* then deny it.
|
||||
*/
|
||||
if (flags & MAP_FIXED && addr < PAGE_SIZE && vectors_base() == 0)
|
||||
if (flags & MAP_FIXED && addr < FIRST_USER_ADDRESS)
|
||||
goto out;
|
||||
|
||||
error = -EBADF;
|
||||
|
|
@ -121,11 +121,10 @@ sys_arm_mremap(unsigned long addr, unsigned long old_len,
|
|||
unsigned long ret = -EINVAL;
|
||||
|
||||
/*
|
||||
* If we are doing a fixed mapping, and address < PAGE_SIZE,
|
||||
* If we are doing a fixed mapping, and address < FIRST_USER_ADDRESS,
|
||||
* then deny it.
|
||||
*/
|
||||
if (flags & MREMAP_FIXED && new_addr < PAGE_SIZE &&
|
||||
vectors_base() == 0)
|
||||
if (flags & MREMAP_FIXED && new_addr < FIRST_USER_ADDRESS)
|
||||
goto out;
|
||||
|
||||
down_write(¤t->mm->mmap_sem);
|
||||
|
|
|
|||
Loading…
Reference in a new issue