From d8d39837a6f59e425a2e9f174ff3de4b126cd112 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@linux.intel.com>
Date: Fri, 18 Feb 2011 15:50:36 -0800
Subject: [PATCH] --- yaml --- r: 235164 b: refs/heads/master c:
 1c4badbdeae53d2584bb5395a062cfebed76696e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 3d22f4ae2134..8349df5c530c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee1b06ea6aed979da3b4e6b6ffea98ad55a3c5c1
+refs/heads/master: 1c4badbdeae53d2584bb5395a062cfebed76696e
diff --git a/trunk/arch/x86/kernel/trampoline_64.S b/trunk/arch/x86/kernel/trampoline_64.S
index 49c77a682522..09ff51799e96 100644
--- a/trunk/arch/x86/kernel/trampoline_64.S
+++ b/trunk/arch/x86/kernel/trampoline_64.S
@@ -157,8 +157,6 @@ startup_64_vector:
 	.word	__KERNEL_CS, 0
 
 	.balign 4
-fixup_base:
-	.long	0
 ENTRY(trampoline_status)
 	.long	0