From: djm@kirby.fc.hp.com <djm@kirby.fc.hp.com>
Date: Fri, 13 Jan 2006 14:52:05 +0000 (-0600)
Subject: Enable warnings and fix a few one (those which occur in almost every file).
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16541^2~38^2~11
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a3b63a0ab6effb3bae896659d6142a31ecb5c473;p=xen.git

Enable warnings and fix a few one (those which occur in almost every file).
The next step is to fix warnings one by one.

Signed-off-by: Tristan Gingold <tristan.gingold@bull.net>
# User tristan.gingold@bull.net
---

diff --git a/xen/arch/ia64/Rules.mk b/xen/arch/ia64/Rules.mk
index 9d02b6ef16..2a879dd2d1 100644
--- a/xen/arch/ia64/Rules.mk
+++ b/xen/arch/ia64/Rules.mk
@@ -23,10 +23,10 @@ CFLAGS  += -I$(BASEDIR)/include/asm-ia64 -I$(BASEDIR)/include/asm-ia64/linux \
            -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
 #CFLAGS  += -DVTI_DEBUG
 ifeq ($(VALIDATE_VT),y)
 CFLAGS  += -DVALIDATE_VT
diff --git a/xen/arch/ia64/linux-xen/sal.c b/xen/arch/ia64/linux-xen/sal.c
index a818818206..475435d374 100644
--- a/xen/arch/ia64/linux-xen/sal.c
+++ b/xen/arch/ia64/linux-xen/sal.c
@@ -16,6 +16,7 @@
 
 #ifdef XEN
 #include <linux/smp.h>
+#include <xen/lib.h>
 #endif
 #include <asm/page.h>
 #include <asm/sal.h>
diff --git a/xen/arch/ia64/xen/sn_console.c b/xen/arch/ia64/xen/sn_console.c
index d29a82935c..14d1a95bab 100644
--- a/xen/arch/ia64/xen/sn_console.c
+++ b/xen/arch/ia64/xen/sn_console.c
@@ -4,6 +4,7 @@
  * Copyright (c) 2005 Silicon Graphics, Inc.  All Rights Reserved.
  */
 
+#include <xen/lib.h>
 #include <asm/acpi.h>
 #include <asm/sn/sn_sal.h>
 #include <xen/serial.h>
diff --git a/xen/include/asm-ia64/config.h b/xen/include/asm-ia64/config.h
index 4d730b4b1a..ed89d2996a 100644
--- a/xen/include/asm-ia64/config.h
+++ b/xen/include/asm-ia64/config.h
@@ -92,7 +92,7 @@ extern char _end[]; /* standard ELF symbol */
 //#define __acquire(x) (void)0
 //#define __release(x) (void)0
 //#define __cond_lock(x) (x)
-#define __must_check
+//#define __must_check
 #define __deprecated
 #ifndef RELOC_HIDE
 # define RELOC_HIDE(ptr, off)					\
@@ -187,7 +187,9 @@ void sort_extable(struct exception_table_entry *start,
 		  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 @@ void sort_main_extable(void);
 #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 @@ struct screen_info { };
 #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 @@ extern int ht_per_core;
 #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__))
+#ifndef __ASSEMBLY__
+#include <linux/linkage.h>
 #endif
+
 #endif	/* _IA64_CONFIG_H_ */
diff --git a/xen/include/asm-ia64/vmmu.h b/xen/include/asm-ia64/vmmu.h
index 429c79b4dc..03d5f3644d 100644
--- a/xen/include/asm-ia64/vmmu.h
+++ b/xen/include/asm-ia64/vmmu.h
@@ -151,8 +151,8 @@ typedef union thash_cch_mem {
 typedef u64 *(THASH_FN)(PTA pta, u64 va);
 typedef u64 *(TTAG_FN)(PTA pta, u64 va);
 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);