git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
linkage.h
diff --git
a/arch/x86/include/asm/linkage.h
b/arch/x86/include/asm/linkage.h
index
9320e2a
..
12d55e7
100644
(file)
--- a/
arch/x86/include/asm/linkage.h
+++ b/
arch/x86/include/asm/linkage.h
@@
-1,14
+1,11
@@
#ifndef _ASM_X86_LINKAGE_H
#define _ASM_X86_LINKAGE_H
#ifndef _ASM_X86_LINKAGE_H
#define _ASM_X86_LINKAGE_H
+#include <linux/stringify.h>
+
#undef notrace
#define notrace __attribute__((no_instrument_function))
#undef notrace
#define notrace __attribute__((no_instrument_function))
-#ifdef CONFIG_X86_64
-#define __ALIGN .p2align 4,,15
-#define __ALIGN_STR ".p2align 4,,15"
-#endif
-
#ifdef CONFIG_X86_32
#define asmlinkage CPP_ASMLINKAGE __attribute__((regparm(0)))
/*
#ifdef CONFIG_X86_32
#define asmlinkage CPP_ASMLINKAGE __attribute__((regparm(0)))
/*
@@
-50,16
+47,20
@@
__asmlinkage_protect_n(ret, "g" (arg1), "g" (arg2), "g" (arg3), \
"g" (arg4), "g" (arg5), "g" (arg6))
__asmlinkage_protect_n(ret, "g" (arg1), "g" (arg2), "g" (arg3), \
"g" (arg4), "g" (arg5), "g" (arg6))
-#endif
+#endif /* CONFIG_X86_32 */
+
+#ifdef __ASSEMBLY__
#define GLOBAL(name) \
.globl name; \
name:
#define GLOBAL(name) \
.globl name; \
name:
-#if
def CONFIG_X86_ALIGNMENT_16
-#define __ALIGN
.align 16,
0x90
-#define __ALIGN_STR
".align 16,0x90"
+#if
defined(CONFIG_X86_64) || defined(CONFIG_X86_ALIGNMENT_16)
+#define __ALIGN
.p2align 4,
0x90
+#define __ALIGN_STR
__stringify(__ALIGN)
#endif
#endif
+#endif /* __ASSEMBLY__ */
+
#endif /* _ASM_X86_LINKAGE_H */
#endif /* _ASM_X86_LINKAGE_H */