commit 9702785a747aa27baf46ff504beab6528f21f2dd
author Thomas Gleixner <tglx@linutronix.de> Thu Oct 11 11:16:51 2007 +0200
committer Thomas Gleixner <tglx@linutronix.de> Thu Oct 11 11:16:51 2007 +0200
tree ab69d6f802f5b680c33999dc089e44982c74595d
parent 334e621a01f86d5bc25e4f742e1eaae6e2d2a97a

i386: move xen

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

arch/i386/kernel/head_32.S

diff --git a/arch/i386/kernel/head_32.S b/arch/i386/kernel/head_32.S
index 8f03821..9150ca9 100644
--- a/arch/i386/kernel/head_32.S
+++ b/arch/i386/kernel/head_32.S
@@ -537,7 +537,7 @@
 	.ascii "Int %d: CR2 %p  err %p  EIP %p  CS %p  flags %p\n"
 	.asciz "Stack: %p %p %p %p %p %p %p %p\n"
 
-#include "../xen/xen-head.S"
+#include "../../x86/xen/xen-head.S"
 
 /*
  * The IDT and GDT 'descriptors' are a strange 48-bit object

arch/i386/kernel/vsyscall-note_32.S

diff --git a/arch/i386/kernel/vsyscall-note_32.S b/arch/i386/kernel/vsyscall-note_32.S
index 07c0daf..fcf376a 100644
--- a/arch/i386/kernel/vsyscall-note_32.S
+++ b/arch/i386/kernel/vsyscall-note_32.S
@@ -33,7 +33,7 @@
  * at boot time we set VDSO_NOTE_NONEGSEG_BIT if running under Xen.
  */
 
-#include "../xen/vdso.h"	/* Defines VDSO_NOTE_NONEGSEG_BIT.  */
+#include "../../x86/xen/vdso.h"	/* Defines VDSO_NOTE_NONEGSEG_BIT.  */
 
 	.globl VDSO_NOTE_MASK
 ELFNOTE_START(GNU, 2, "a")