[PATCH for review] [41/145] x86_64: Add proper alignment to ENTRY

Andi Kleen
2006-08-10T20:22:31Z

r

Previously it didn't align. Use the same one as the C compiler
in blended mode, which is good for K8 and Core2 and doesn't hurt
on P4.

Signed-off-by: Andi Kleen <ak@suse.de>

---
arch/x86_64/kernel/entry.S | 3 +--
include/asm-x86_64/linkage.h | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)

Index: linux/arch/x86_64/kernel/entry.S
===================================================================
--- linux.orig/arch/x86_64/kernel/entry.S
+++ linux/arch/x86_64/kernel/entry.S
@@ -617,8 +617,7 @@ retint_signal:
#ifdef CONFIG_PREEMPT
/* Returning to kernel space. Check if we need preemption */
/* rcx: threadinfo. interrupts off. */
- .p2align
-retint_kernel:
+ENTRY(retint_kernel)
cmpl $0,threadinfo_preempt_count(%rcx)
jnz retint_restore_args
bt $TIF_NEED_RESCHED,threadinfo_flags(%rcx)
Index: linux/include/asm-x86_64/linkage.h
===================================================================
--- linux.orig/include/asm-x86_64/linkage.h
+++ linux/include/asm-x86_64/linkage.h
@@ -1,6 +1,6 @@
#ifndef __ASM_LINKAGE_H
#define __ASM_LINKAGE_H

-/* Nothing to see here... */
+#define __ALIGN .p2align 4,,15

#endif