Skip to contentSkip to conversation

x86/mm: kill stray kernel fault handling comment

PATCH New Dave Hansen 2 participants 2 messages Oct 19, 2018 – Oct 21, 2018

Subsystems (2)
lore
Share & tools
lore

Dave Hansen

author maintainer
#0 lore raw

PATCH 1/1 x86/mm: kill stray kernel fault handling comment

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")
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]>

---

 b/arch/x86/mm/fault.c |    1 -
 1 file changed, 1 deletion(-)
arch/x86/mm/fault.c renamed from arch/x86/mm/fault.c~x86-mm-kill-stray-kernel-fault-handling-comment +0 -1
diff -puN arch/x86/mm/fault.c~x86-mm-kill-stray-kernel-fault-handling-comment arch/x86/mm/fault.c
@@ -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)

_

#1 lore raw

[tip:x86/mm] x86/mm: Kill stray kernel fault handling comment

x86/mm: Kill stray kernel fault handling comment
Commit-ID:  162041425193602b15774c61740ad8e7dc157df3
Gitweb:     https://git.kernel.org/tip/162041425193602b15774c61740ad8e7dc157df3
Author:     Dave Hansen <[email protected]>
AuthorDate: Fri, 19 Oct 2018 07:08:42 -0700
Committer:  Ingo Molnar <[email protected]>
CommitDate: Sun, 21 Oct 2018 10:58:10 +0200

x86/mm: Kill stray kernel fault handling comment

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.

Cc Andy Lutomirski <[email protected]>
Cc Jann Horn <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Sean Christopherson <[email protected]>
Cc Thomas Gleixner <[email protected]>
Fixes aa37c51b94 ("x86/mm: Break out user address space handling")
---
 arch/x86/mm/fault.c | 1 -
 1 file changed, 1 deletion(-)
arch/x86/mm/fault.c +0 -1
index a16652982f98..bd047438d23d 100644
@@ -963,7 +963,6 @@ bad_area_access_error(struct pt_regs *regs, unsigned long error_code,
 		__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)