From: "S. P. Prasanna" Replace .popsection with the KPROBE_END() macro, as suggested by Jan Beulich similar to i386 architecture. This will be helpful for the conversions ike the recent .section -> .pushsection and .previous -> .popsection to be confined to the header defining these macros, without need to touch any assembly files. Signed-off-by: Prasanna S. P. Signed-off-by: Andrew Morton --- arch/x86_64/kernel/entry.S | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff -puN arch/x86_64/kernel/entry.S~kprobes-x86_64-add-kprobe_end-macro-for-popsection arch/x86_64/kernel/entry.S --- a/arch/x86_64/kernel/entry.S~kprobes-x86_64-add-kprobe_end-macro-for-popsection +++ a/arch/x86_64/kernel/entry.S @@ -903,8 +903,7 @@ error_kernelspace: cmpq $gs_change,RIP(%rsp) je error_swapgs jmp error_sti -END(error_entry) - .popsection +KPROBE_END(error_entry) /* Reload gs selector with exception handling */ /* edi: new selector */ @@ -1026,8 +1025,7 @@ ENDPROC(execve) KPROBE_ENTRY(page_fault) errorentry do_page_fault -END(page_fault) - .popsection +KPROBE_END(page_fault) ENTRY(coprocessor_error) zeroentry do_coprocessor_error @@ -1048,8 +1046,7 @@ KPROBE_ENTRY(debug) CFI_ADJUST_CFA_OFFSET 8 paranoidentry do_debug, DEBUG_STACK paranoidexit -END(debug) - .popsection +KPROBE_END(debug) /* runs on exception stack */ KPROBE_ENTRY(nmi) @@ -1063,8 +1060,7 @@ KPROBE_ENTRY(nmi) jmp paranoid_exit1 CFI_ENDPROC #endif -END(nmi) - .popsection +KPROBE_END(nmi) KPROBE_ENTRY(int3) INTR_FRAME @@ -1073,8 +1069,7 @@ KPROBE_ENTRY(int3) paranoidentry do_int3, DEBUG_STACK jmp paranoid_exit1 CFI_ENDPROC -END(int3) - .popsection +KPROBE_END(int3) ENTRY(overflow) zeroentry do_overflow @@ -1122,8 +1117,7 @@ END(stack_segment) KPROBE_ENTRY(general_protection) errorentry do_general_protection -END(general_protection) - .popsection +KPROBE_END(general_protection) ENTRY(alignment_check) errorentry do_alignment_check _