1.1 --- a/xen/arch/ia64/Rules.mk	Fri Jan 06 12:39:28 2006 -0600
     1.2 +++ b/xen/arch/ia64/Rules.mk	Fri Jan 13 08:52:05 2006 -0600
     1.3 @@ -23,10 +23,10 @@ CFLAGS  += -I$(BASEDIR)/include/asm-ia64
     1.4             -I$(BASEDIR)/include/asm-ia64/linux-xen 			\
     1.5  	   -I$(BASEDIR)/include/asm-ia64/linux-null 			\
     1.6             -I$(BASEDIR)/arch/ia64/linux -I$(BASEDIR)/arch/ia64/linux-xen
     1.7 -CFLAGS  += -Wno-pointer-arith -Wredundant-decls
     1.8 +#CFLAGS  += -Wno-pointer-arith -Wredundant-decls
     1.9  CFLAGS  += -DIA64 -DXEN -DLINUX_2_6 -DV_IOSAPIC_READY
    1.10  CFLAGS	+= -ffixed-r13 -mfixed-range=f12-f15,f32-f127
    1.11 -CFLAGS	+= -w -g
    1.12 +CFLAGS	+= -g
    1.13  #CFLAGS  += -DVTI_DEBUG
    1.14  ifeq ($(VALIDATE_VT),y)
    1.15  CFLAGS  += -DVALIDATE_VT

     2.1 --- a/xen/arch/ia64/linux-xen/sal.c	Fri Jan 06 12:39:28 2006 -0600
     2.2 +++ b/xen/arch/ia64/linux-xen/sal.c	Fri Jan 13 08:52:05 2006 -0600
     2.3 @@ -16,6 +16,7 @@
     2.4  
     2.5  #ifdef XEN
     2.6  #include <linux/smp.h>
     2.7 +#include <xen/lib.h>
     2.8  #endif
     2.9  #include <asm/page.h>
    2.10  #include <asm/sal.h>

     3.1 --- a/xen/arch/ia64/xen/sn_console.c	Fri Jan 06 12:39:28 2006 -0600
     3.2 +++ b/xen/arch/ia64/xen/sn_console.c	Fri Jan 13 08:52:05 2006 -0600
     3.3 @@ -4,6 +4,7 @@
     3.4   * Copyright (c) 2005 Silicon Graphics, Inc.  All Rights Reserved.
     3.5   */
     3.6  
     3.7 +#include <xen/lib.h>
     3.8  #include <asm/acpi.h>
     3.9  #include <asm/sn/sn_sal.h>
    3.10  #include <xen/serial.h>

     4.1 --- a/xen/include/asm-ia64/config.h	Fri Jan 06 12:39:28 2006 -0600
     4.2 +++ b/xen/include/asm-ia64/config.h	Fri Jan 13 08:52:05 2006 -0600
     4.3 @@ -92,7 +92,7 @@ extern char _end[]; /* standard ELF symb
     4.4  //#define __acquire(x) (void)0
     4.5  //#define __release(x) (void)0
     4.6  //#define __cond_lock(x) (x)
     4.7 -#define __must_check
     4.8 +//#define __must_check
     4.9  #define __deprecated
    4.10  #ifndef RELOC_HIDE
    4.11  # define RELOC_HIDE(ptr, off)					\
    4.12 @@ -187,7 +187,9 @@ void sort_extable(struct exception_table
    4.13  		  struct exception_table_entry *finish);
    4.14  void sort_main_extable(void);
    4.15  
    4.16 +#if 0 /* Already defined in xen/lib.h */
    4.17  #define printk printf
    4.18 +#endif
    4.19  
    4.20  #undef  __ARCH_IRQ_STAT
    4.21  
    4.22 @@ -205,7 +207,6 @@ void sort_main_extable(void);
    4.23  #define	OPT_CONSOLE_STR "com2"
    4.24  #endif
    4.25  
    4.26 -#define __attribute_used__	__attribute__ ((unused))
    4.27  #define __nocast
    4.28  
    4.29  // see include/asm-x86/atomic.h (different from standard linux)
    4.30 @@ -255,9 +256,6 @@ struct screen_info { };
    4.31  #define seq_printf(a,b...) printf(b)
    4.32  #define CONFIG_BLK_DEV_INITRD // needed to reserve memory for domain0
    4.33  
    4.34 -// needed for newer ACPI code
    4.35 -#define asmlinkage
    4.36 -
    4.37  #define FORCE_CRASH()	asm("break 0;;");
    4.38  
    4.39  void dummy_called(char *function);
    4.40 @@ -306,13 +304,8 @@ extern int ht_per_core;
    4.41  #endif
    4.42  
    4.43  
    4.44 -// FOLLOWING ADDED FOR XEN POST-NGIO and/or LINUX 2.6.7
    4.45 +#ifndef __ASSEMBLY__
    4.46 +#include <linux/linkage.h>
    4.47 +#endif
    4.48  
    4.49 -// following derived from linux/include/linux/compiler-gcc3.h
    4.50 -// problem because xen (over?)simplifies include/xen/compiler.h
    4.51 -#if __GNUC_MAJOR < 3 || __GNUC_MINOR__ >= 3
    4.52 -# define __attribute_used__	__attribute__((__used__))
    4.53 -#else
    4.54 -# define __attribute_used__	__attribute__((__unused__))
    4.55 -#endif
    4.56  #endif	/* _IA64_CONFIG_H_ */

     5.1 --- a/xen/include/asm-ia64/vmmu.h	Fri Jan 06 12:39:28 2006 -0600
     5.2 +++ b/xen/include/asm-ia64/vmmu.h	Fri Jan 13 08:52:05 2006 -0600
     5.3 @@ -151,8 +151,8 @@ typedef union thash_cch_mem {
     5.4  typedef u64 *(THASH_FN)(PTA pta, u64 va);
     5.5  typedef u64 *(TTAG_FN)(PTA pta, u64 va);
     5.6  typedef u64 *(GET_MFN_FN)(domid_t d, u64 gpfn, u64 pages);
     5.7 -typedef void *(REM_NOTIFIER_FN)(struct hash_cb *hcb, thash_data_t *entry);
     5.8 -typedef void (RECYCLE_FN)(struct hash_cb *hc, u64 para);
     5.9 +typedef void *(REM_NOTIFIER_FN)(struct thash_cb *hcb, thash_data_t *entry);
    5.10 +typedef void (RECYCLE_FN)(struct thash_cb *hc, u64 para);
    5.11  typedef ia64_rr (GET_RR_FN)(struct vcpu *vcpu, u64 reg);
    5.12  typedef thash_data_t *(FIND_OVERLAP_FN)(struct thash_cb *hcb, 
    5.13          u64 va, u64 ps, int rid, char cl, search_section_t s_sect);