direct-io.hg

changeset 10231:003157eafd66

[IA64] remaining warnings removed

Warnings cleanup.
-Werror added when no_warns=y

Signed-off-by: Tristan Gingold <tristan.gingold@bull.net>
author awilliam@xenbuild.aw
date Wed May 31 11:29:50 2006 -0600 (2006-05-31)
parents a9d58ef8e4e7
children 3be4c8288737
files xen/arch/ia64/Rules.mk xen/arch/ia64/linux-xen/iosapic.c xen/arch/ia64/linux-xen/sal.c xen/arch/ia64/linux-xen/smp.c xen/arch/ia64/linux-xen/smpboot.c xen/arch/ia64/linux-xen/time.c xen/arch/ia64/vmx/pal_emul.c xen/arch/ia64/vmx/vmmu.c xen/arch/ia64/vmx/vmx_ivt.S xen/arch/ia64/xen/irq.c xen/arch/ia64/xen/process.c xen/arch/ia64/xen/vcpu.c xen/arch/ia64/xen/xentime.c xen/include/asm-ia64/linux-xen/linux/interrupt.h
line diff
     1.1 --- a/xen/arch/ia64/Rules.mk	Wed May 31 11:28:03 2006 -0600
     1.2 +++ b/xen/arch/ia64/Rules.mk	Wed May 31 11:29:50 2006 -0600
     1.3 @@ -40,7 +40,7 @@ ifeq ($(xen_ia64_dom0_virtual_physical),
     1.4  CFLAGS	+= -DCONFIG_XEN_IA64_DOM0_VP
     1.5  endif
     1.6  ifeq ($(no_warns),y)
     1.7 -CFLAGS	+= -Wa,--fatal-warnings
     1.8 +CFLAGS	+= -Wa,--fatal-warnings -Werror -Wno-uninitialized
     1.9  endif
    1.10  
    1.11  LDFLAGS := -g
     2.1 --- a/xen/arch/ia64/linux-xen/iosapic.c	Wed May 31 11:28:03 2006 -0600
     2.2 +++ b/xen/arch/ia64/linux-xen/iosapic.c	Wed May 31 11:29:50 2006 -0600
     2.3 @@ -1112,12 +1112,14 @@ map_iosapic_to_node(unsigned int gsi_bas
     2.4  }
     2.5  #endif
     2.6  
     2.7 +#ifndef XEN
     2.8  static int __init iosapic_enable_kmalloc (void)
     2.9  {
    2.10  	iosapic_kmalloc_ok = 1;
    2.11  	return 0;
    2.12  }
    2.13  core_initcall (iosapic_enable_kmalloc);
    2.14 +#endif
    2.15  
    2.16  #ifdef XEN
    2.17  /* nop for now */
     3.1 --- a/xen/arch/ia64/linux-xen/sal.c	Wed May 31 11:28:03 2006 -0600
     3.2 +++ b/xen/arch/ia64/linux-xen/sal.c	Wed May 31 11:29:50 2006 -0600
     3.3 @@ -229,7 +229,12 @@ ia64_sal_init (struct ia64_sal_systab *s
     3.4  		return;
     3.5  	}
     3.6  
     3.7 +#ifdef XEN /* warning cleanup */
     3.8 +	if (strncmp((char *)systab->signature, "SST_", 4) != 0)
     3.9 +#else
    3.10  	if (strncmp(systab->signature, "SST_", 4) != 0)
    3.11 +#endif
    3.12 +		
    3.13  		printk(KERN_ERR "bad signature in system table!");
    3.14  
    3.15  	check_versions(systab);
     4.1 --- a/xen/arch/ia64/linux-xen/smp.c	Wed May 31 11:28:03 2006 -0600
     4.2 +++ b/xen/arch/ia64/linux-xen/smp.c	Wed May 31 11:29:50 2006 -0600
     4.3 @@ -196,7 +196,9 @@ handle_IPI (int irq, void *dev_id, struc
     4.4  		mb();	/* Order data access and bit testing. */
     4.5  	}
     4.6  	put_cpu();
     4.7 +#ifndef XEN
     4.8  	return IRQ_HANDLED;
     4.9 +#endif
    4.10  }
    4.11  
    4.12  /*
     5.1 --- a/xen/arch/ia64/linux-xen/smpboot.c	Wed May 31 11:28:03 2006 -0600
     5.2 +++ b/xen/arch/ia64/linux-xen/smpboot.c	Wed May 31 11:29:50 2006 -0600
     5.3 @@ -197,7 +197,11 @@ sync_master (void *arg)
     5.4   * negative that it is behind.
     5.5   */
     5.6  static inline long
     5.7 +#ifdef XEN /* warning cleanup */
     5.8 +get_delta (unsigned long *rt, unsigned long *master)
     5.9 +#else
    5.10  get_delta (long *rt, long *master)
    5.11 +#endif
    5.12  {
    5.13  	unsigned long best_t0 = 0, best_t1 = ~0UL, best_tm = 0;
    5.14  	unsigned long tcenter, t0, t1, tm;
     6.1 --- a/xen/arch/ia64/linux-xen/time.c	Wed May 31 11:28:03 2006 -0600
     6.2 +++ b/xen/arch/ia64/linux-xen/time.c	Wed May 31 11:29:50 2006 -0600
     6.3 @@ -158,7 +158,11 @@ ia64_init_itm (void)
     6.4  {
     6.5  	unsigned long platform_base_freq, itc_freq;
     6.6  	struct pal_freq_ratio itc_ratio, proc_ratio;
     6.7 +#ifdef XEN /* warning cleanup */
     6.8 +	unsigned long status, platform_base_drift, itc_drift;
     6.9 +#else
    6.10  	long status, platform_base_drift, itc_drift;
    6.11 +#endif
    6.12  
    6.13  	/*
    6.14  	 * According to SAL v2.6, we need to use a SAL call to determine the platform base
    6.15 @@ -197,7 +201,11 @@ ia64_init_itm (void)
    6.16  	itc_freq = (platform_base_freq*itc_ratio.num)/itc_ratio.den;
    6.17  
    6.18  	local_cpu_data->itm_delta = (itc_freq + HZ/2) / HZ;
    6.19 +#ifdef XEN /* warning cleanup */
    6.20 +	printk(KERN_DEBUG "CPU %d: base freq=%lu.%03luMHz, ITC ratio=%u/%u, "
    6.21 +#else
    6.22  	printk(KERN_DEBUG "CPU %d: base freq=%lu.%03luMHz, ITC ratio=%lu/%lu, "
    6.23 +#endif
    6.24  	       "ITC freq=%lu.%03luMHz", smp_processor_id(),
    6.25  	       platform_base_freq / 1000000, (platform_base_freq / 1000) % 1000,
    6.26  	       itc_ratio.num, itc_ratio.den, itc_freq / 1000000, (itc_freq / 1000) % 1000);
     7.1 --- a/xen/arch/ia64/vmx/pal_emul.c	Wed May 31 11:28:03 2006 -0600
     7.2 +++ b/xen/arch/ia64/vmx/pal_emul.c	Wed May 31 11:29:50 2006 -0600
     7.3 @@ -204,6 +204,10 @@ pal_debug_info(VCPU *vcpu){
     7.4  
     7.5  static struct ia64_pal_retval
     7.6  pal_fixed_addr(VCPU *vcpu){
     7.7 +	struct ia64_pal_retval result;
     7.8 +
     7.9 +	result.status= -1; //unimplemented
    7.10 +	return result;
    7.11  }
    7.12  
    7.13  static struct ia64_pal_retval
     8.1 --- a/xen/arch/ia64/vmx/vmmu.c	Wed May 31 11:28:03 2006 -0600
     8.2 +++ b/xen/arch/ia64/vmx/vmmu.c	Wed May 31 11:29:50 2006 -0600
     8.3 @@ -199,8 +199,11 @@ void machine_tlb_insert(struct vcpu *d, 
     8.4      mtlb.page_flags = tlb->page_flags & ~PAGE_FLAGS_RV_MASK;
     8.5      mtlb.ppn = get_mfn(d->domain,tlb->ppn);
     8.6      mtlb_ppn=mtlb.ppn;
     8.7 +
     8.8 +#if 0
     8.9      if (mtlb_ppn == INVALID_MFN)
    8.10          panic_domain(vcpu_regs(d),"Machine tlb insert with invalid mfn number.\n");
    8.11 +#endif
    8.12  
    8.13      psr = ia64_clear_ic();
    8.14      if ( cl == ISIDE_TLB ) {
     9.1 --- a/xen/arch/ia64/vmx/vmx_ivt.S	Wed May 31 11:28:03 2006 -0600
     9.2 +++ b/xen/arch/ia64/vmx/vmx_ivt.S	Wed May 31 11:29:50 2006 -0600
     9.3 @@ -180,6 +180,7 @@ vmx_itlb_loop:
     9.4      st8 [r17] = r27
     9.5      ;;
     9.6      itc.i r25
     9.7 +    dv_serialize_data
     9.8      mov r17=cr.isr
     9.9      mov r23=r31
    9.10      mov r22=b0
    9.11 @@ -253,6 +254,7 @@ vmx_dtlb_loop:
    9.12      st8 [r17] = r27
    9.13      ;;    
    9.14      itc.d r25
    9.15 +    dv_serialize_data
    9.16      mov r17=cr.isr
    9.17      mov r23=r31
    9.18      mov r22=b0
    10.1 --- a/xen/arch/ia64/xen/irq.c	Wed May 31 11:28:03 2006 -0600
    10.2 +++ b/xen/arch/ia64/xen/irq.c	Wed May 31 11:29:50 2006 -0600
    10.3 @@ -619,10 +619,9 @@ void process_soft_irq(void)
    10.4  
    10.5  // this is a temporary hack until real console input is implemented
    10.6  extern void domain_pend_keyboard_interrupt(int irq);
    10.7 -irqreturn_t guest_forward_keyboard_input(int irq, void *nada, struct pt_regs *regs)
    10.8 +void guest_forward_keyboard_input(int irq, void *nada, struct pt_regs *regs)
    10.9  {
   10.10  	domain_pend_keyboard_interrupt(irq);
   10.11 -	return 0;
   10.12  }
   10.13  
   10.14  void serial_input_init(void)
    11.1 --- a/xen/arch/ia64/xen/process.c	Wed May 31 11:28:03 2006 -0600
    11.2 +++ b/xen/arch/ia64/xen/process.c	Wed May 31 11:29:50 2006 -0600
    11.3 @@ -407,8 +407,9 @@ void trap_init (void)
    11.4  }
    11.5  
    11.6  static fpswa_ret_t
    11.7 -fp_emulate (int fp_fault, void *bundle, long *ipsr, long *fpsr, long *isr, long *pr, long *ifs,
    11.8 -            struct pt_regs *regs)
    11.9 +fp_emulate (int fp_fault, void *bundle, unsigned long *ipsr,
   11.10 +	    unsigned long *fpsr, unsigned long *isr, unsigned long *pr,
   11.11 +	    unsigned long *ifs, struct pt_regs *regs)
   11.12  {
   11.13  	fp_state_t fp_state;
   11.14  	fpswa_ret_t ret;
   11.15 @@ -437,10 +438,8 @@ fp_emulate (int fp_fault, void *bundle, 
   11.16  	 *      unsigned long    *pifs,
   11.17  	 *      void             *fp_state);
   11.18  	 */
   11.19 -	ret = (*fpswa_interface->fpswa)((unsigned long) fp_fault, bundle,
   11.20 -					(unsigned long *) ipsr, (unsigned long *) fpsr,
   11.21 -					(unsigned long *) isr, (unsigned long *) pr,
   11.22 -					(unsigned long *) ifs, &fp_state);
   11.23 +	ret = (*fpswa_interface->fpswa)(fp_fault, bundle,
   11.24 +					ipsr, fpsr, isr, pr, ifs, &fp_state);
   11.25  
   11.26  	return ret;
   11.27  }
    12.1 --- a/xen/arch/ia64/xen/vcpu.c	Wed May 31 11:28:03 2006 -0600
    12.2 +++ b/xen/arch/ia64/xen/vcpu.c	Wed May 31 11:29:50 2006 -0600
    12.3 @@ -18,6 +18,7 @@
    12.4  #include <asm/vhpt.h>
    12.5  #include <asm/tlbflush.h>
    12.6  #include <xen/event.h>
    12.7 +#include <asm/vmx_phy_mode.h>
    12.8  
    12.9  /* FIXME: where these declarations should be there ? */
   12.10  extern void getreg(unsigned long regnum, unsigned long *val, int *nat, struct pt_regs *regs);
    13.1 --- a/xen/arch/ia64/xen/xentime.c	Wed May 31 11:28:03 2006 -0600
    13.2 +++ b/xen/arch/ia64/xen/xentime.c	Wed May 31 11:29:50 2006 -0600
    13.3 @@ -105,7 +105,7 @@ void do_settime(unsigned long secs, unsi
    13.4      return;
    13.5  }
    13.6  
    13.7 -irqreturn_t
    13.8 +void
    13.9  xen_timer_interrupt (int irq, void *dev_id, struct pt_regs *regs)
   13.10  {
   13.11  	unsigned long new_itm, old_itc;
   13.12 @@ -134,7 +134,7 @@ xen_timer_interrupt (int irq, void *dev_
   13.13  	new_itm = local_cpu_data->itm_next;
   13.14  
   13.15  	if (!VMX_DOMAIN(current) && !time_after(ia64_get_itc(), new_itm))
   13.16 -		return IRQ_HANDLED;
   13.17 +		return;
   13.18  
   13.19  	while (1) {
   13.20  		new_itm += local_cpu_data->itm_delta;
   13.21 @@ -185,8 +185,6 @@ xen_timer_interrupt (int irq, void *dev_
   13.22  		/* double check, in case we got hit by a (slow) PMI: */
   13.23  	} while (time_after_eq(ia64_get_itc(), new_itm));
   13.24  	raise_softirq(TIMER_SOFTIRQ);
   13.25 -
   13.26 -	return IRQ_HANDLED;
   13.27  }
   13.28  
   13.29  static struct irqaction xen_timer_irqaction = {
    14.1 --- a/xen/include/asm-ia64/linux-xen/linux/interrupt.h	Wed May 31 11:28:03 2006 -0600
    14.2 +++ b/xen/include/asm-ia64/linux-xen/linux/interrupt.h	Wed May 31 11:29:50 2006 -0600
    14.3 @@ -27,7 +27,11 @@
    14.4   * IRQ_HANDLED means that we did have a valid interrupt and handled it.
    14.5   * IRQ_RETVAL(x) selects on the two depending on x being non-zero (for handled)
    14.6   */
    14.7 +#ifdef XEN
    14.8 +typedef void irqreturn_t;
    14.9 +#else
   14.10  typedef int irqreturn_t;
   14.11 +#endif
   14.12  
   14.13  #define IRQ_NONE	(0)
   14.14  #define IRQ_HANDLED	(1)