summaryrefslogtreecommitdiff
path: root/arch/x86/machine/asm.h
diff options
context:
space:
mode:
authorRichard Braun <rbraun@sceen.net>2012-10-15 21:43:16 +0200
committerRichard Braun <rbraun@sceen.net>2012-10-15 21:43:16 +0200
commitf2a3b2e722ad42b783ae7168adc22b64a71c6e26 (patch)
treee075f2632c6015c261038c351fe13716c65e58f1 /arch/x86/machine/asm.h
parent9256c0a825b65cef8f0a928d52c0b59b1b80cce0 (diff)
x86/cpu: add support for amd64
This change provides the cpu module with the subtle differences that apply to the processor data structures in 64-bit mode. A few bits were added to the boot module to complete SMP initialization.
Diffstat (limited to 'arch/x86/machine/asm.h')
-rw-r--r--arch/x86/machine/asm.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/machine/asm.h b/arch/x86/machine/asm.h
index 3d2da75..6f1da5d 100644
--- a/arch/x86/machine/asm.h
+++ b/arch/x86/machine/asm.h
@@ -38,6 +38,12 @@ x:
.size x, . - x; \
x ## _end:
+#ifdef __LP64__
+#define IRET iretq
+#else /* __LP64__ */
+#define IRET iret
+#endif /* __LP64__ */
+
#endif /* __ASSEMBLY__ */
#endif /* _X86_ASM_H */