From c88391ebaf87dab19a94295d4740fd4ea8ebdb85 Mon Sep 17 00:00:00 2001
From: Jan Beulich <JBeulich@suse.com>
Date: Tue, 29 Nov 2011 11:24:10 +0000
Subject: [PATCH] --- yaml --- r: 277453 b: refs/heads/master c:
 f6b2bc847641ea38e2655c8424fef5d2d19f35f9 h: refs/heads/master i:   277451:
 c5ddd95c07ab79065d8d45ce81e6bea9bc0d56bd v: v3

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

diff --git a/[refs] b/[refs]
index dd8ff509605e..fef83785443b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46db09d3fd847f185a7d23a96bc8fe7a4be0cd05
+refs/heads/master: f6b2bc847641ea38e2655c8424fef5d2d19f35f9
diff --git a/trunk/arch/x86/ia32/ia32entry.S b/trunk/arch/x86/ia32/ia32entry.S
index 0d5c279f3732..3e274564f6bf 100644
--- a/trunk/arch/x86/ia32/ia32entry.S
+++ b/trunk/arch/x86/ia32/ia32entry.S
@@ -453,8 +453,8 @@ quiet_ni_syscall:
 	CFI_ENDPROC
 	
 	.macro PTREGSCALL label, func, arg
-	.globl \label
-\label:
+	ALIGN
+GLOBAL(\label)
 	leaq \func(%rip),%rax
 	leaq -ARGOFFSET+8(%rsp),\arg	/* 8 for return address */
 	jmp  ia32_ptregs_common	
@@ -471,7 +471,8 @@ quiet_ni_syscall:
 	PTREGSCALL stub32_vfork, sys_vfork, %rdi
 	PTREGSCALL stub32_iopl, sys_iopl, %rsi
 
-ENTRY(ia32_ptregs_common)
+	ALIGN
+ia32_ptregs_common:
 	popq %r11
 	CFI_ENDPROC
 	CFI_STARTPROC32	simple
diff --git a/trunk/arch/x86/kernel/entry_64.S b/trunk/arch/x86/kernel/entry_64.S
index 75f72a50cf26..cfad7fce6163 100644
--- a/trunk/arch/x86/kernel/entry_64.S
+++ b/trunk/arch/x86/kernel/entry_64.S
@@ -465,7 +465,7 @@ ENTRY(system_call)
 	 * after the swapgs, so that it can do the swapgs
 	 * for the guest and jump here on syscall.
 	 */
-ENTRY(system_call_after_swapgs)
+GLOBAL(system_call_after_swapgs)
 
 	movq	%rsp,PER_CPU_VAR(old_rsp)
 	movq	PER_CPU_VAR(kernel_stack),%rsp