Skip to contentSkip to conversation

fix ia64 build

PATCH In review Alex Williamson 2 participants 2 messages Jan 4, 2007

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix ia64 build

This patch is necessary to build on ia64 with xen-unstable.hg cset
13214. Thanks,

Alex

---

xen/include/xen/kernel.h +2 -1
diff -r 60f91c9f1a24 xen/include/xen/kernel.h
@@ -56,6 +56,7 @@
 	1;                                      \
 })
 
+#ifndef __ASSEMBLY__
 extern char _start[], _end[];
 #define is_kernel(p) ({                         \
     char *__p = (char *)(unsigned long)(p);     \
@@ -73,6 +74,6 @@ extern char _sinittext[], _einittext[];
     char *__p = (char *)(unsigned long)(p);     \
     (__p >= _sinittext) && (__p <= _einittext); \
 })
-
+#endif /* !__ASSEMBLY__ */
 #endif /* _LINUX_KERNEL_H */
#1 lore raw

There's nothing in kernel.h of use to asm files. If erroneous inclusion is happening due to some include spaghetti, let's clean that up rather than work around it.

-- Keir

Quoted 30 lines · Alex Williamson

This patch is necessary to build on ia64 with xen-unstable.hg cset
13214. Thanks,

Alex

---

diff -r 60f91c9f1a24 xen/include/xen/kernel.h

xen/include/xen/kernel.h Wed Jan 03 19:55:42 2007 -0700 renamed from xen/include/xen/kernel.h Wed Jan 03 23:53:27 2007 +0000 +2 -1
@@ -56,6 +56,7 @@
 1;                                      \
 })
 
+#ifndef __ASSEMBLY__
 extern char _start[], _end[];
 #define is_kernel(p) ({                         \
     char *__p = (char *)(unsigned long)(p);     \
@@ -73,6 +74,6 @@ extern char _sinittext[], _einittext[];
     char *__p = (char *)(unsigned long)(p);     \
     (__p >= _sinittext) && (__p <= _einittext); \
 })
-
+#endif /* !__ASSEMBLY__ */
 #endif /* _LINUX_KERNEL_H */