tree e06fe6c70972feac1c0ba1f6451c9b3d825c84c9
parent 6119be0bba10e7e7b1e5650a87812fa2fd8d3a60
author Hugh Dickins <[EMAIL PROTECTED]> Wed, 20 Apr 2005 03:29:22 -0700
committer Linus Torvalds <[EMAIL PROTECTED](none)> Wed, 20 Apr 2005 03:29:22
-0700
[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]>
arm26/kernel/sys_arm.c | 9 ++++-----
asm-arm26/pgtable.h | 7 +++++++
2 files changed, 11 insertions(+), 5 deletions(-)
Index: arch/arm26/kernel/sys_arm.c
===================================================================
--- 5acc21e0611f1caf7163c120ca4214b2ee452b0d/arch/arm26/kernel/sys_arm.c
(mode:100644 sha1:e7edd201579abd9ea2f3c0b898c08957898c2cf3)
+++ e06fe6c70972feac1c0ba1f6451c9b3d825c84c9/arch/arm26/kernel/sys_arm.c
(mode:100644 sha1:85457897b8a9cb756fe983dd4ab44588c8ef4499)
@@ -64,10 +64,10 @@
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 @@
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);
Index: include/asm-arm26/pgtable.h
===================================================================
--- 5acc21e0611f1caf7163c120ca4214b2ee452b0d/include/asm-arm26/pgtable.h
(mode:100644 sha1:af0b8907dc143af8b48fcbab175e5cef61686a1e)
+++ e06fe6c70972feac1c0ba1f6451c9b3d825c84c9/include/asm-arm26/pgtable.h
(mode:100644 sha1:4a0a00da425f3886d01ed24be565188f96a89cb7)
@@ -62,6 +62,13 @@
#define PTRS_PER_PMD 1
#define PTRS_PER_PTE 32
+/*
+ * 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/PGD_SIZE) - FIRST_USER_PGD_NR)
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
