Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3731c68 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86, mm: fault.c, remove #ifdef from do_page_fault() 



Impact: cleanup

do_page_fault() has this ugly #ifdef in its prototype:

  #ifdef CONFIG_X86_64
  asmlinkage
  #endif
  void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)

Replace it with 'dotraplinkage' which maps to exactly the above
construct: nothing on 32-bit and asmlinkage on 64-bit.

Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 1cc99544

arch/x86/mm/fault.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -972,10 +972,8 @@ static int fault_in_kernel_space(unsigned long address) 
 * and the problem, and then passes it off to one of the appropriate

 * and the problem, and then passes it off to one of the appropriate

 * routines.

 * routines.

 */

 */

#ifdef CONFIG_X86_64

dotraplinkage void __kprobes

asmlinkage

do_page_fault(struct pt_regs *regs, unsigned long error_code)

#endif

void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)

{

{

	struct vm_area_struct *vma;

	struct vm_area_struct *vma;

	struct task_struct *tsk;

	struct task_struct *tsk;