From 294948659397279fd0ffc27f79fd09925cbb404a Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Mon, 13 Oct 2008 17:49:02 +0200 Subject: [PATCH] --- yaml --- r: 115199 b: refs/heads/master c: 3a1dfe6eefe483589c99c909202ffe1a20d589b5 h: refs/heads/master i: 115197: 6e46d4a54fffbc567ff7c6e1858c8225249d37b8 115195: 66257fe33490e80be08b3eb9a79c4ad1d30a4dfc 115191: ca3578213de9529e75e56a1417841f0ad8d9722c 115183: c9d51d6a32e6c87008602eaeee7baa4a7030483e 115167: 0f6852e12e8041fbcf58b4ea5cf19c0806f566da 115135: 83b93201b84ace0f1066c3c896064efe1637fa86 115071: ba9c770cec0c1f1a1bae619b14aac64cdded498a 114943: 7e4cd730d806fc176addaa70a9cec977dab98bdf 114687: b5e6a135573c779a59c8ee52a2b1c8f9dfd54520 v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/fault.c | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index a66362658938..0cf2759b1879 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 891cffbd6bcba26409869c19c07ecd4bfc0c2460 +refs/heads/master: 3a1dfe6eefe483589c99c909202ffe1a20d589b5 diff --git a/trunk/arch/x86/mm/fault.c b/trunk/arch/x86/mm/fault.c index ac2ad781da00..8bc5956e1af4 100644 --- a/trunk/arch/x86/mm/fault.c +++ b/trunk/arch/x86/mm/fault.c @@ -671,7 +671,8 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code) goto bad_area_nosemaphore; again: - /* When running in the kernel we expect faults to occur only to + /* + * When running in the kernel we expect faults to occur only to * addresses in user space. All other faults represent errors in the * kernel and should generate an OOPS. Unfortunately, in the case of an * erroneous fault occurring in a code path which already holds mmap_sem @@ -734,9 +735,6 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code) goto bad_area; } -#ifdef CONFIG_X86_32 -survive: -#endif /* * If for any reason at all we couldn't handle the fault, * make sure we exit gracefully rather than endlessly redo @@ -871,12 +869,11 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code) up_read(&mm->mmap_sem); if (is_global_init(tsk)) { yield(); -#ifdef CONFIG_X86_32 - down_read(&mm->mmap_sem); - goto survive; -#else + /* + * Re-lookup the vma - in theory the vma tree might + * have changed: + */ goto again; -#endif } printk("VM: killing process %s\n", tsk->comm);