summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/head_64.S
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2008-07-08 15:06:44 -0700
committerIngo Molnar <mingo@elte.hu>2008-07-16 10:58:41 +0200
commit8c5e5ac32fe08793246709fbb94c055ec76a7c0e (patch)
tree1aaaa79ab8351f406d79f7e60fdf7991566dc5c4 /arch/x86/kernel/head_64.S
parentc7b75947f89d45493562ede6d9ee7311dfa5c4ce (diff)
downloadlinux-8c5e5ac32fe08793246709fbb94c055ec76a7c0e.tar.bz2
xen64: add xen-head code to head_64.S
Add the Xen entrypoint and ELF notes to head_64.S. Adapts xen-head.S to compile either 32-bit or 64-bit. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Cc: Stephen Tweedie <sct@redhat.com> Cc: Eduardo Habkost <ehabkost@redhat.com> Cc: Mark McLoughlin <markmc@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/head_64.S')
-rw-r--r--arch/x86/kernel/head_64.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
index 4b6bda21837f..2240f823676a 100644
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
@@ -401,6 +401,7 @@ ENTRY(phys_base)
/* This must match the first entry in level2_kernel_pgt */
.quad 0x0000000000000000
+#include "../../x86/xen/xen-head.S"
.section .bss, "aw", @nobits
.align L1_CACHE_BYTES