On Fri, Mar 16, 2007 at 10:14:11AM +0100, Ingo Molnar wrote:

* Jeremy Fitzhardinge [off-list ref] wrote:

quoted

Core Xen Implementation

This patch is a rollup of all the core pieces of the Xen 
implementation, including booting, memory management, interrupts, time 
and so on.

quoted

--- a/arch/i386/kernel/head.S
+++ b/arch/i386/kernel/head.S

@@ -535,6 +535,10 @@ unhandled_paravirt:
 	ud2
 #endif
 
+#ifdef CONFIG_XEN
+#include "../xen/xen-head.S"
+#endif

i'd suggest to remove the #ifdef and push it into xen-head.S.

Even better would be an explanation of why this needs to be included
at all.  Life would be much simpler if this was simply a totally
separate file.