Skip to content

Commit

Permalink
[PATCH] freepgt: arm FIRST_USER_ADDRESS PAGE_SIZE
Browse files Browse the repository at this point in the history
ARM 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.

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Hugh Dickins authored and Linus Torvalds committed Apr 19, 2005
1 parent 8462e20 commit 6119be0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
11 changes: 2 additions & 9 deletions arch/arm/kernel/sys_arm.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,6 @@ asmlinkage int sys_pipe(unsigned long __user *fildes)
return error;
}

/*
* This is the lowest virtual address we can permit any user space
* mapping to be mapped at. This is particularly important for
* non-high vector CPUs.
*/
#define MIN_MAP_ADDR (PAGE_SIZE)

/* common code for old and new mmaps */
inline long do_mmap2(
unsigned long addr, unsigned long len,
Expand All @@ -69,7 +62,7 @@ inline long do_mmap2(

flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);

if (flags & MAP_FIXED && addr < MIN_MAP_ADDR)
if (flags & MAP_FIXED && addr < FIRST_USER_ADDRESS)
goto out;

error = -EBADF;
Expand Down Expand Up @@ -122,7 +115,7 @@ sys_arm_mremap(unsigned long addr, unsigned long old_len,
{
unsigned long ret = -EINVAL;

if (flags & MREMAP_FIXED && new_addr < MIN_MAP_ADDR)
if (flags & MREMAP_FIXED && new_addr < FIRST_USER_ADDRESS)
goto out;

down_write(&current->mm->mmap_sem);
Expand Down
7 changes: 7 additions & 0 deletions include/asm-arm/pgtable.h
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,13 @@ extern void __pgd_error(const char *file, int line, unsigned long val);
#define PGDIR_SIZE (1UL << PGDIR_SHIFT)
#define PGDIR_MASK (~(PGDIR_SIZE-1))

/*
* This is the lowest virtual address we can permit any user space
* mapping to be mapped at. This is particularly important for
* non-high vector CPUs.
*/
#define FIRST_USER_ADDRESS PAGE_SIZE

#define FIRST_USER_PGD_NR 1
#define USER_PTRS_PER_PGD ((TASK_SIZE/PGDIR_SIZE) - FIRST_USER_PGD_NR)

Expand Down

0 comments on commit 6119be0

Please sign in to comment.