[Xen-ia64-devel] [patch 6/6] SN2+Machvec support changes needed to enable build

[jes@xxxxxxx]

Changes required to build SN2 and machvec support.

Signed-off-by: Jes Sorensen <jes@xxxxxxx>

---
 arch/ia64/Makefile                      |    3 +++
 arch/ia64/linux/Makefile                |    1 +
 include/asm-ia64/linux-xen/asm/page.h   |   12 ++++++++----
 include/asm-ia64/linux-xen/asm/system.h |    1 +
 4 files changed, 13 insertions(+), 4 deletions(-)

Index: xen/arch/ia64/Makefile
===================================================================
--- xen.orig/arch/ia64/Makefile
+++ xen/arch/ia64/Makefile
@@ -2,6 +2,9 @@ subdir-y += xen
 subdir-y += vmx
 subdir-y += linux
 subdir-y += linux-xen
+subdir-y += sn
+subdir-y += hp
+subdir-y += dig
 
 $(TARGET)-syms: linux-xen/head.o $(ALL_OBJS) xen.lds.s
        $(MAKE) -f $(BASEDIR)/Rules.mk $(BASEDIR)/common/symbols-dummy.o
Index: xen/arch/ia64/linux/Makefile
===================================================================
--- xen.orig/arch/ia64/linux/Makefile
+++ xen/arch/ia64/linux/Makefile
@@ -13,6 +13,7 @@ obj-y += machvec.o
 obj-y += memcpy_mck.o
 obj-y += memset.o
 obj-y += strlen.o
+obj-y += io.o
 
 obj-y += __divsi3.o
 obj-y += __udivsi3.o
Index: xen/include/asm-ia64/linux-xen/asm/page.h
===================================================================
--- xen.orig/include/asm-ia64/linux-xen/asm/page.h
+++ xen/include/asm-ia64/linux-xen/asm/page.h
@@ -12,6 +12,10 @@
 #include <asm/intrinsics.h>
 #include <asm/types.h>
 
+#define RGN_SHIFT      61
+#define RGN_BASE(r)    (r << RGN_SHIFT)
+#define RGN_BITS       RGN_BASE(-1)
+
 /*
  * PAGE_SHIFT determines the actual kernel page size.
  */
@@ -36,10 +40,10 @@
 
 #define RGN_MAP_LIMIT  ((1UL << (4*PAGE_SHIFT - 12)) - PAGE_SIZE)      /* per 
region addr limit */
 
+# define RGN_HPAGE             (4UL)   /* note: this is hardcoded in 
reload_context()!*/
 #ifdef CONFIG_HUGETLB_PAGE
-# define REGION_HPAGE          (4UL)   /* note: this is hardcoded in 
reload_context()!*/
 # define REGION_SHIFT          61
-# define HPAGE_REGION_BASE     (REGION_HPAGE << REGION_SHIFT)
+# define HPAGE_REGION_BASE     (RGN_HPAGE << REGION_SHIFT)
 # define HPAGE_SHIFT           hpage_shift
 # define HPAGE_SHIFT_DEFAULT   28      /* check ia64 SDM for architecture 
supported size */
 # define HPAGE_SIZE            (__IA64_UL_CONST(1) << HPAGE_SHIFT)
@@ -141,8 +145,8 @@ typedef union ia64_va {
                                 | (REGION_OFFSET(x) >> 
(HPAGE_SHIFT-PAGE_SHIFT)))
 # define HUGETLB_PAGE_ORDER    (HPAGE_SHIFT - PAGE_SHIFT)
 # define is_hugepage_only_range(mm, addr, len)         \
-        (REGION_NUMBER(addr) == REGION_HPAGE &&        \
-         REGION_NUMBER((addr)+(len)-1) == REGION_HPAGE)
+        (REGION_NUMBER(addr) == RGN_HPAGE &&   \
+         REGION_NUMBER((addr)+(len)-1) == RGN_HPAGE)
 extern unsigned int hpage_shift;
 #endif
 
Index: xen/include/asm-ia64/linux-xen/asm/system.h
===================================================================
--- xen.orig/include/asm-ia64/linux-xen/asm/system.h
+++ xen/include/asm-ia64/linux-xen/asm/system.h
@@ -190,6 +190,7 @@ do {                                                        
        \
 #ifdef XEN
 #define local_irq_is_enabled() (!irqs_disabled())
 extern struct vcpu *ia64_switch_to(struct vcpu *next_task);
+#define ia64_platform_is(x) (strcmp(x, platform_name) == 0)
 #else
 #ifdef __KERNEL__
 

--

_______________________________________________
Xen-ia64-devel mailing list
Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ia64-devel