From 0ae5540f51b83ae7f8e0773999098a9f2455be1e Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Mon, 26 Apr 2010 16:15:17 +0900 Subject: [PATCH] --- yaml --- r: 191633 b: refs/heads/master c: 364b97d9e2fec32b7c125f67e5a9e5f1cd0e6a37 h: refs/heads/master i: 191631: bcb3587559516473777db17b0807f452fbeb33c6 v: v3 --- [refs] | 2 +- trunk/arch/sh/mm/fault_32.c | 1 - trunk/arch/sh/mm/tlbflush_64.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d445278cb89d..939be027837e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e19553427c2e8fdb04fdd98e407164bb59a840ba +refs/heads/master: 364b97d9e2fec32b7c125f67e5a9e5f1cd0e6a37 diff --git a/trunk/arch/sh/mm/fault_32.c b/trunk/arch/sh/mm/fault_32.c index 93c3447ed40a..d4c34d757f0d 100644 --- a/trunk/arch/sh/mm/fault_32.c +++ b/trunk/arch/sh/mm/fault_32.c @@ -200,7 +200,6 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs, * make sure we exit gracefully rather than endlessly redo * the fault. */ -survive: fault = handle_mm_fault(mm, vma, address, writeaccess ? FAULT_FLAG_WRITE : 0); if (unlikely(fault & VM_FAULT_ERROR)) { if (fault & VM_FAULT_OOM) diff --git a/trunk/arch/sh/mm/tlbflush_64.c b/trunk/arch/sh/mm/tlbflush_64.c index 25bd64c0977c..03db41cc1268 100644 --- a/trunk/arch/sh/mm/tlbflush_64.c +++ b/trunk/arch/sh/mm/tlbflush_64.c @@ -189,7 +189,6 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long writeaccess, * make sure we exit gracefully rather than endlessly redo * the fault. */ -survive: fault = handle_mm_fault(mm, vma, address, writeaccess ? FAULT_FLAG_WRITE : 0); if (unlikely(fault & VM_FAULT_ERROR)) { if (fault & VM_FAULT_OOM)