diff -urN oldtree/arch/x86_64/kernel/entry.S newtree/arch/x86_64/kernel/entry.S
--- oldtree/arch/x86_64/kernel/entry.S	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/x86_64/kernel/entry.S	2006-08-19 17:07:10.099449750 -0400
@@ -903,8 +903,7 @@
 	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 */ 
@@ -1023,8 +1022,7 @@
 
 KPROBE_ENTRY(page_fault)
 	errorentry do_page_fault
-END(page_fault)
-	.popsection
+KPROBE_END(page_fault)
 
 ENTRY(coprocessor_error)
 	zeroentry do_coprocessor_error
@@ -1045,8 +1043,7 @@
 	CFI_ADJUST_CFA_OFFSET 8		
 	paranoidentry do_debug, DEBUG_STACK
 	paranoidexit
-END(debug)
-	.popsection
+KPROBE_END(debug)
 
 	/* runs on exception stack */	
 KPROBE_ENTRY(nmi)
@@ -1060,8 +1057,7 @@
 	jmp paranoid_exit1
  	CFI_ENDPROC
 #endif
-END(nmi)
-	.popsection
+KPROBE_END(nmi)
 
 KPROBE_ENTRY(int3)
  	INTR_FRAME
@@ -1070,8 +1066,7 @@
  	paranoidentry do_int3, DEBUG_STACK
  	jmp paranoid_exit1
  	CFI_ENDPROC
-END(int3)
-	.popsection
+KPROBE_END(int3)
 
 ENTRY(overflow)
 	zeroentry do_overflow
@@ -1119,8 +1114,7 @@
 
 KPROBE_ENTRY(general_protection)
 	errorentry do_general_protection
-END(general_protection)
-	.popsection
+KPROBE_END(general_protection)
 
 ENTRY(alignment_check)
 	errorentry do_alignment_check