---

yaml
---
r: 83703
b: refs/heads/master
c: a57dae3
h: refs/heads/master
i:
  83701: 51d7bfe
  83699: 301842a
  83695: ad00025
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5556a67f08559b6c1597f6396c1f9ef460f62b4
+refs/heads/master: a57dae3aa4d00a000b5bac4238025438204c78b2

trunk/arch/x86/kernel/entry_64.S

@@ -582,7 +582,6 @@ retint_restore_args:	/* return to kernel space */
 	TRACE_IRQS_IRETQ
 restore_args:
 	RESTORE_ARGS 0,8,0						
-iret_label:	
 #ifdef CONFIG_PARAVIRT
 	INTERRUPT_RETURN
 #endif
@@ -920,7 +919,7 @@ error_kernelspace:
 	   iret run with kernel gs again, so don't set the user space flag.
 	   B stepping K8s sometimes report an truncated RIP for IRET 
 	   exceptions returning to compat mode. Check for these here too. */
-	leaq iret_label(%rip),%rbp
+	leaq native_iret(%rip),%rbp
 	cmpq %rbp,RIP(%rsp) 
 	je   error_swapgs
 	movl %ebp,%ebp	/* zero extend */