From 26b342baf49422659c94b579fcbfc79484180feb Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Sat, 14 Feb 2009 00:50:22 +0300
Subject: [PATCH] --- yaml --- r: 136901 b: refs/heads/master c:
 2d4eeecb98ade6a736940d43311275b7d32dab21 h: refs/heads/master i:   136899:
 1fd9220227bed3cc1a5bb6572e51af012e76aa51 v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/x86/boot/compressed/head_64.S | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 79ac8c494eb7..1c94b77565c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 324bda9e47f53aebec1376ee89bba8128c8455e2
+refs/heads/master: 2d4eeecb98ade6a736940d43311275b7d32dab21
diff --git a/trunk/arch/x86/boot/compressed/head_64.S b/trunk/arch/x86/boot/compressed/head_64.S
index 1d5dff4123e1..ba9229ba7f0d 100644
--- a/trunk/arch/x86/boot/compressed/head_64.S
+++ b/trunk/arch/x86/boot/compressed/head_64.S
@@ -35,9 +35,7 @@
 
 .section ".text.head"
 	.code32
-	.globl startup_32
-
-startup_32:
+ENTRY(startup_32)
 	cld
 	/* test KEEP_SEGMENTS flag to see if the bootloader is asking
 	 * us to not reload segments */
@@ -176,6 +174,7 @@ startup_32:
 
 	/* Jump from 32bit compatibility mode into 64bit mode. */
 	lret
+ENDPROC(startup_32)
 
 no_longmode:
 	/* This isn't an x86-64 CPU so hang */
@@ -295,7 +294,6 @@ relocated:
 	call	decompress_kernel
 	popq	%rsi
 
-
 /*
  * Jump to the decompressed kernel.
  */