The patch titled
m32r: fix ace_handler to pass full 32-bit address
has been removed from the -mm tree. Its filename was
m32r-fix-ace_handler-to-pass-full-32-bit-address.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: m32r: fix ace_handler to pass full 32-bit address
From: Hirokazu Takata <takata@xxxxxxxxxxxxxx>
Don't mask the lower 12-bit of the page fault address.
In the current m32r kernel implementation, we use an access exception
to detect page faults.
This patch fixes ace_handler (access exception handler) for m32r. In order to
check userspace address in do_page_fault, we have to pass full 32-bit address
to do_page_fault.
Signed-off-by: Hirokazu Takata <takata@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/m32r/kernel/entry.S | 2 --
arch/m32r/mm/fault.c | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
diff -puN arch/m32r/kernel/entry.S~m32r-fix-ace_handler-to-pass-full-32-bit-address arch/m32r/kernel/entry.S
--- a/arch/m32r/kernel/entry.S~m32r-fix-ace_handler-to-pass-full-32-bit-address
+++ a/arch/m32r/kernel/entry.S
@@ -596,8 +596,6 @@ ENTRY(ace_handler)
beqz r1, inst
oprand:
ld r2, @(low(MDEVA_offset),r2) ; set address
- srli r2, #12
- slli r2, #12
srli r1, #1
bra 1f
inst:
diff -puN arch/m32r/mm/fault.c~m32r-fix-ace_handler-to-pass-full-32-bit-address arch/m32r/mm/fault.c
--- a/arch/m32r/mm/fault.c~m32r-fix-ace_handler-to-pass-full-32-bit-address
+++ a/arch/m32r/mm/fault.c
@@ -173,7 +173,7 @@ asmlinkage void do_page_fault(struct pt_
goto good_area;
if (!(vma->vm_flags & VM_GROWSDOWN))
goto bad_area;
-#if 0
+
if (error_code & ACE_USERMODE) {
/*
* accessing the stack below "spu" is always a bug.
@@ -184,7 +184,7 @@ asmlinkage void do_page_fault(struct pt_
if (address + 4 < regs->spu)
goto bad_area;
}
-#endif
+
if (expand_stack(vma, address))
goto bad_area;
/*
_
Patches currently in -mm which might be from takata@xxxxxxxxxxxxxx are
m32r-fix-ace_handler-to-pass-full-32-bit-address.patch
m32r-bootloader-support-for-opsput-platform.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
