From 9531333d12a60f755791cc9c812e256f9ed6c254 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Wed, 6 Feb 2008 22:39:45 +0100
Subject: [PATCH] --- yaml --- r: 83703 b: refs/heads/master c:
 a57dae3aa4d00a000b5bac4238025438204c78b2 h: refs/heads/master i:   83701:
 51d7bfe30455133db01add99042f803a86f68f54   83699:
 301842a9d3953e29b01c8990d6f217f2e2404ad7   83695:
 ad00025c807ae5c89b895774fa2d3f2ce6d77a2d v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/kernel/entry_64.S | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d6c092d19816..77232f4d6da0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5556a67f08559b6c1597f6396c1f9ef460f62b4
+refs/heads/master: a57dae3aa4d00a000b5bac4238025438204c78b2
diff --git a/trunk/arch/x86/kernel/entry_64.S b/trunk/arch/x86/kernel/entry_64.S
index e518928114db..c7341e81941c 100644
--- a/trunk/arch/x86/kernel/entry_64.S
+++ b/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 */