lkml.org 
[lkml]   [2005]   [Apr]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 3/6] freepgt2: arm FIRST_USER_ADDRESS PAGE_SIZE
    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>
    ---

    arch/arm/kernel/sys_arm.c | 11 ++---------
    include/asm-arm/pgtable.h | 7 +++++++
    2 files changed, 9 insertions(+), 9 deletions(-)

    --- 2.6.12-rc2-mm1/arch/arm/kernel/sys_arm.c 2005-04-05 15:20:23.000000000 +0100
    +++ linux/arch/arm/kernel/sys_arm.c 2005-04-05 18:59:00.000000000 +0100
    @@ -51,13 +51,6 @@ asmlinkage int sys_pipe(unsigned long __
    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,
    @@ -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;
    @@ -122,7 +115,7 @@ sys_arm_mremap(unsigned long addr, unsig
    {
    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);
    --- 2.6.12-rc2-mm1/include/asm-arm/pgtable.h 2005-04-05 15:20:55.000000000 +0100
    +++ linux/include/asm-arm/pgtable.h 2005-04-05 18:59:00.000000000 +0100
    @@ -102,6 +102,13 @@ extern void __pgd_error(const char *file
    #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)

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2005-04-07 03:22    [W:0.024 / U:90.132 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site