I originally tried to send this a couple days ago, but does not
appear to have made it to LKML.  Sorry if it's a duplicate.

--

From: Dave Hansen <[email protected]>

I originally had matching user and kernel comments, but the kernel
one got improved.  Some errant conflict resolution kicked the commment
somewhere wrong.  Kill it.

Fixes: aa37c51b94 ("x86/mm: Break out user address space handling")
Reported-by: Eric W. Biederman <[email protected]>
Cc: [email protected]
Cc: Jann Horn <[email protected]>
Cc: Sean Christopherson <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Andy Lutomirski <[email protected]>
Cc: Ingo Molnar <[email protected]>
Signed-off-by: Dave Hansen <[email protected]>
---

 b/arch/x86/mm/fault.c |    1 -
 1 file changed, 1 deletion(-)

diff -puN arch/x86/mm/fault.c~x86-mm-kill-stray-kernel-fault-handling-comment 
arch/x86/mm/fault.c
--- a/arch/x86/mm/fault.c~x86-mm-kill-stray-kernel-fault-handling-comment       
2018-10-19 07:06:22.954631596 -0700
+++ b/arch/x86/mm/fault.c       2018-10-19 07:06:22.959631596 -0700
@@ -963,7 +963,6 @@ bad_area_access_error(struct pt_regs *re
                __bad_area(regs, error_code, address, vma, SEGV_ACCERR);
 }
 
-/* Handle faults in the kernel portion of the address space */
 static void
 do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long 
address,
          u32 *pkey, unsigned int fault)
_

Reply via email to