# HG changeset patch
# User tristan.gingold@xxxxxxxx
# Node ID 998e14b66400906f7180d06eedc4a269e5faf290
# Parent  0ee00faf332d4f9eb828ab1ca7b846787d77b2ca
Enable warnings.
Fix a few obvious warnings.

diff -r 0ee00faf332d -r 998e14b66400 xen/arch/ia64/Rules.mk
--- a/xen/arch/ia64/Rules.mk	Wed Nov 23 21:23:28 2005
+++ b/xen/arch/ia64/Rules.mk	Thu Nov 24 07:43:51 2005
@@ -23,10 +23,10 @@
            -I$(BASEDIR)/include/asm-ia64/linux-xen 			\
 	   -I$(BASEDIR)/include/asm-ia64/linux-null 			\
            -I$(BASEDIR)/arch/ia64/linux -I$(BASEDIR)/arch/ia64/linux-xen
-CFLAGS  += -Wno-pointer-arith -Wredundant-decls
+#CFLAGS  += -Wno-pointer-arith -Wredundant-decls
 CFLAGS  += -DIA64 -DXEN -DLINUX_2_6 -DV_IOSAPIC_READY
 CFLAGS	+= -ffixed-r13 -mfixed-range=f12-f15,f32-f127
-CFLAGS	+= -w -g
+CFLAGS	+= -g
 ifeq ($(VALIDATE_VT),y)
 CFLAGS  += -DVALIDATE_VT
 endif
diff -r 0ee00faf332d -r 998e14b66400 xen/arch/ia64/linux-xen/sal.c
--- a/xen/arch/ia64/linux-xen/sal.c	Wed Nov 23 21:23:28 2005
+++ b/xen/arch/ia64/linux-xen/sal.c	Thu Nov 24 07:43:51 2005
@@ -16,6 +16,7 @@
 
 #ifdef XEN
 #include <linux/smp.h>
+#include <xen/lib.h>
 #endif
 #include <asm/page.h>
 #include <asm/sal.h>
diff -r 0ee00faf332d -r 998e14b66400 xen/arch/ia64/xen/sn_console.c
--- a/xen/arch/ia64/xen/sn_console.c	Wed Nov 23 21:23:28 2005
+++ b/xen/arch/ia64/xen/sn_console.c	Thu Nov 24 07:43:51 2005
@@ -7,6 +7,7 @@
 #include <asm/acpi.h>
 #include <asm/sn/sn_sal.h>
 #include <xen/serial.h>
+#include <xen/lib.h>
 
 void sn_putc(struct serial_port *, char);
 
diff -r 0ee00faf332d -r 998e14b66400 xen/include/asm-ia64/config.h
--- a/xen/include/asm-ia64/config.h	Wed Nov 23 21:23:28 2005
+++ b/xen/include/asm-ia64/config.h	Thu Nov 24 07:43:51 2005
@@ -187,7 +187,9 @@
 		  struct exception_table_entry *finish);
 void sort_main_extable(void);
 
+#if 0 /* Already defined in xen/lib.h */
 #define printk printf
+#endif
 
 #undef  __ARCH_IRQ_STAT
 
@@ -205,7 +207,6 @@
 #define	OPT_CONSOLE_STR "com2"
 #endif
 
-#define __attribute_used__	__attribute__ ((unused))
 #define __nocast
 
 // see include/asm-x86/atomic.h (different from standard linux)
@@ -255,9 +256,6 @@
 #define seq_printf(a,b...) printf(b)
 #define CONFIG_BLK_DEV_INITRD // needed to reserve memory for domain0
 
-// needed for newer ACPI code
-#define asmlinkage
-
 #define FORCE_CRASH()	asm("break 0;;");
 
 void dummy_called(char *function);
@@ -306,13 +304,8 @@
 #endif
 
 
-// FOLLOWING ADDED FOR XEN POST-NGIO and/or LINUX 2.6.7
-
-// following derived from linux/include/linux/compiler-gcc3.h
-// problem because xen (over?)simplifies include/xen/compiler.h
-#if __GNUC_MAJOR < 3 || __GNUC_MINOR__ >= 3
-# define __attribute_used__	__attribute__((__used__))
-#else
-# define __attribute_used__	__attribute__((__unused__))
-#endif
+#ifndef __ASSEMBLY__
+#include <linux/linkage.h>
+#endif
+
 #endif	/* _IA64_CONFIG_H_ */
diff -r 0ee00faf332d -r 998e14b66400 xen/include/asm-ia64/vmmu.h
--- a/xen/include/asm-ia64/vmmu.h	Wed Nov 23 21:23:28 2005
+++ b/xen/include/asm-ia64/vmmu.h	Thu Nov 24 07:43:51 2005
@@ -151,8 +151,8 @@
 typedef u64 *(THASH_FN)(PTA pta, u64 va, u64 rid, u64 ps);
 typedef u64 *(TTAG_FN)(PTA pta, u64 va, u64 rid, u64 ps);
 typedef u64 *(GET_MFN_FN)(domid_t d, u64 gpfn, u64 pages);
-typedef void *(REM_NOTIFIER_FN)(struct hash_cb *hcb, thash_data_t *entry);
-typedef void (RECYCLE_FN)(struct hash_cb *hc, u64 para);
+typedef void *(REM_NOTIFIER_FN)(struct thash_cb *hcb, thash_data_t *entry);
+typedef void (RECYCLE_FN)(struct thash_cb *hc, u64 para);
 typedef ia64_rr (GET_RR_FN)(struct vcpu *vcpu, u64 reg);
 typedef thash_data_t *(FIND_OVERLAP_FN)(struct thash_cb *hcb, 
         u64 va, u64 ps, int rid, char cl, search_section_t s_sect);