# HG changeset patch # User gingold@virtu10 # Node ID d9db44dbe4ba59fcea8e559429626bff17e02345 # Parent 2c2ff77fb60f638185be56ee3a31460e757cf437 Warnings cleanup. -Werror added when no_warns=y Signed-off-by: Tristan Gingold diff -r 2c2ff77fb60f -r d9db44dbe4ba xen/arch/ia64/Rules.mk --- a/xen/arch/ia64/Rules.mk Wed May 31 11:58:37 2006 +0200 +++ b/xen/arch/ia64/Rules.mk Wed May 31 12:37:48 2006 +0200 @@ -40,7 +40,7 @@ CFLAGS += -DCONFIG_XEN_IA64_DOM0_VP CFLAGS += -DCONFIG_XEN_IA64_DOM0_VP endif ifeq ($(no_warns),y) -CFLAGS += -Wa,--fatal-warnings +CFLAGS += -Wa,--fatal-warnings -Werror -Wno-uninitialized endif LDFLAGS := -g diff -r 2c2ff77fb60f -r d9db44dbe4ba xen/arch/ia64/linux-xen/iosapic.c --- a/xen/arch/ia64/linux-xen/iosapic.c Wed May 31 11:58:37 2006 +0200 +++ b/xen/arch/ia64/linux-xen/iosapic.c Wed May 31 12:37:48 2006 +0200 @@ -1112,12 +1112,14 @@ map_iosapic_to_node(unsigned int gsi_bas } #endif +#ifndef XEN static int __init iosapic_enable_kmalloc (void) { iosapic_kmalloc_ok = 1; return 0; } core_initcall (iosapic_enable_kmalloc); +#endif #ifdef XEN /* nop for now */ diff -r 2c2ff77fb60f -r d9db44dbe4ba xen/arch/ia64/linux-xen/sal.c --- a/xen/arch/ia64/linux-xen/sal.c Wed May 31 11:58:37 2006 +0200 +++ b/xen/arch/ia64/linux-xen/sal.c Wed May 31 12:37:48 2006 +0200 @@ -229,7 +229,7 @@ ia64_sal_init (struct ia64_sal_systab *s return; } - if (strncmp(systab->signature, "SST_", 4) != 0) + if (strncmp((char *)systab->signature, "SST_", 4) != 0) printk(KERN_ERR "bad signature in system table!"); check_versions(systab); diff -r 2c2ff77fb60f -r d9db44dbe4ba xen/arch/ia64/linux-xen/smp.c --- a/xen/arch/ia64/linux-xen/smp.c Wed May 31 11:58:37 2006 +0200 +++ b/xen/arch/ia64/linux-xen/smp.c Wed May 31 12:37:48 2006 +0200 @@ -196,7 +196,9 @@ handle_IPI (int irq, void *dev_id, struc mb(); /* Order data access and bit testing. */ } put_cpu(); +#ifndef XEN return IRQ_HANDLED; +#endif } /* diff -r 2c2ff77fb60f -r d9db44dbe4ba xen/arch/ia64/linux-xen/smpboot.c --- a/xen/arch/ia64/linux-xen/smpboot.c Wed May 31 11:58:37 2006 +0200 +++ b/xen/arch/ia64/linux-xen/smpboot.c Wed May 31 12:37:48 2006 +0200 @@ -197,7 +197,7 @@ sync_master (void *arg) * negative that it is behind. */ static inline long -get_delta (long *rt, long *master) +get_delta (unsigned long *rt, unsigned long *master) { unsigned long best_t0 = 0, best_t1 = ~0UL, best_tm = 0; unsigned long tcenter, t0, t1, tm; diff -r 2c2ff77fb60f -r d9db44dbe4ba xen/arch/ia64/linux-xen/time.c --- a/xen/arch/ia64/linux-xen/time.c Wed May 31 11:58:37 2006 +0200 +++ b/xen/arch/ia64/linux-xen/time.c Wed May 31 12:37:48 2006 +0200 @@ -158,7 +158,7 @@ ia64_init_itm (void) { unsigned long platform_base_freq, itc_freq; struct pal_freq_ratio itc_ratio, proc_ratio; - long status, platform_base_drift, itc_drift; + unsigned long status, platform_base_drift, itc_drift; /* * According to SAL v2.6, we need to use a SAL call to determine the platform base @@ -197,7 +197,7 @@ ia64_init_itm (void) itc_freq = (platform_base_freq*itc_ratio.num)/itc_ratio.den; local_cpu_data->itm_delta = (itc_freq + HZ/2) / HZ; - printk(KERN_DEBUG "CPU %d: base freq=%lu.%03luMHz, ITC ratio=%lu/%lu, " + printk(KERN_DEBUG "CPU %d: base freq=%lu.%03luMHz, ITC ratio=%u/%u, " "ITC freq=%lu.%03luMHz", smp_processor_id(), platform_base_freq / 1000000, (platform_base_freq / 1000) % 1000, itc_ratio.num, itc_ratio.den, itc_freq / 1000000, (itc_freq / 1000) % 1000); diff -r 2c2ff77fb60f -r d9db44dbe4ba xen/arch/ia64/vmx/pal_emul.c --- a/xen/arch/ia64/vmx/pal_emul.c Wed May 31 11:58:37 2006 +0200 +++ b/xen/arch/ia64/vmx/pal_emul.c Wed May 31 12:37:48 2006 +0200 @@ -196,6 +196,10 @@ pal_debug_info(VCPU *vcpu){ static struct ia64_pal_retval pal_fixed_addr(VCPU *vcpu){ + struct ia64_pal_retval result; + + result.status= -1; //unimplemented + return result; } static struct ia64_pal_retval diff -r 2c2ff77fb60f -r d9db44dbe4ba xen/arch/ia64/vmx/vmmu.c --- a/xen/arch/ia64/vmx/vmmu.c Wed May 31 11:58:37 2006 +0200 +++ b/xen/arch/ia64/vmx/vmmu.c Wed May 31 12:37:48 2006 +0200 @@ -199,8 +199,11 @@ void machine_tlb_insert(struct vcpu *d, mtlb.page_flags = tlb->page_flags & ~PAGE_FLAGS_RV_MASK; mtlb.ppn = get_mfn(d->domain,tlb->ppn); mtlb_ppn=mtlb.ppn; + +#if 0 if (mtlb_ppn == INVALID_MFN) panic_domain(vcpu_regs(d),"Machine tlb insert with invalid mfn number.\n"); +#endif psr = ia64_clear_ic(); if ( cl == ISIDE_TLB ) { diff -r 2c2ff77fb60f -r d9db44dbe4ba xen/arch/ia64/vmx/vmx_ivt.S --- a/xen/arch/ia64/vmx/vmx_ivt.S Wed May 31 11:58:37 2006 +0200 +++ b/xen/arch/ia64/vmx/vmx_ivt.S Wed May 31 12:37:48 2006 +0200 @@ -180,6 +180,7 @@ vmx_itlb_loop: st8 [r17] = r27 ;; itc.i r25 + dv_serialize_data mov r17=cr.isr mov r23=r31 mov r22=b0 @@ -253,6 +254,7 @@ vmx_dtlb_loop: st8 [r17] = r27 ;; itc.d r25 + dv_serialize_data mov r17=cr.isr mov r23=r31 mov r22=b0 diff -r 2c2ff77fb60f -r d9db44dbe4ba xen/arch/ia64/xen/irq.c --- a/xen/arch/ia64/xen/irq.c Wed May 31 11:58:37 2006 +0200 +++ b/xen/arch/ia64/xen/irq.c Wed May 31 12:37:48 2006 +0200 @@ -619,10 +619,9 @@ void process_soft_irq(void) // this is a temporary hack until real console input is implemented extern void domain_pend_keyboard_interrupt(int irq); -irqreturn_t guest_forward_keyboard_input(int irq, void *nada, struct pt_regs *regs) +void guest_forward_keyboard_input(int irq, void *nada, struct pt_regs *regs) { domain_pend_keyboard_interrupt(irq); - return 0; } void serial_input_init(void) diff -r 2c2ff77fb60f -r d9db44dbe4ba xen/arch/ia64/xen/process.c --- a/xen/arch/ia64/xen/process.c Wed May 31 11:58:37 2006 +0200 +++ b/xen/arch/ia64/xen/process.c Wed May 31 12:37:48 2006 +0200 @@ -407,8 +407,9 @@ void trap_init (void) } static fpswa_ret_t -fp_emulate (int fp_fault, void *bundle, long *ipsr, long *fpsr, long *isr, long *pr, long *ifs, - struct pt_regs *regs) +fp_emulate (int fp_fault, void *bundle, unsigned long *ipsr, + unsigned long *fpsr, unsigned long *isr, unsigned long *pr, + unsigned long *ifs, struct pt_regs *regs) { fp_state_t fp_state; fpswa_ret_t ret; @@ -437,10 +438,8 @@ fp_emulate (int fp_fault, void *bundle, * unsigned long *pifs, * void *fp_state); */ - ret = (*fpswa_interface->fpswa)((unsigned long) fp_fault, bundle, - (unsigned long *) ipsr, (unsigned long *) fpsr, - (unsigned long *) isr, (unsigned long *) pr, - (unsigned long *) ifs, &fp_state); + ret = (*fpswa_interface->fpswa)(fp_fault, bundle, + ipsr, fpsr, isr, pr, ifs, &fp_state); return ret; } diff -r 2c2ff77fb60f -r d9db44dbe4ba xen/arch/ia64/xen/vcpu.c --- a/xen/arch/ia64/xen/vcpu.c Wed May 31 11:58:37 2006 +0200 +++ b/xen/arch/ia64/xen/vcpu.c Wed May 31 12:37:48 2006 +0200 @@ -18,6 +18,7 @@ #include #include #include +#include /* FIXME: where these declarations should be there ? */ extern void getreg(unsigned long regnum, unsigned long *val, int *nat, struct pt_regs *regs); @@ -691,7 +692,6 @@ void vcpu_pend_interrupt(VCPU *vcpu, UIN if (vcpu->arch.event_callback_ip) { printf("Deprecated interface. Move to new event based solution\n"); - show_stack(0,0); return; } diff -r 2c2ff77fb60f -r d9db44dbe4ba xen/arch/ia64/xen/xentime.c --- a/xen/arch/ia64/xen/xentime.c Wed May 31 11:58:37 2006 +0200 +++ b/xen/arch/ia64/xen/xentime.c Wed May 31 12:37:48 2006 +0200 @@ -105,7 +105,7 @@ void do_settime(unsigned long secs, unsi return; } -irqreturn_t +void xen_timer_interrupt (int irq, void *dev_id, struct pt_regs *regs) { unsigned long new_itm, old_itc; @@ -134,7 +134,7 @@ xen_timer_interrupt (int irq, void *dev_ new_itm = local_cpu_data->itm_next; if (!VMX_DOMAIN(current) && !time_after(ia64_get_itc(), new_itm)) - return IRQ_HANDLED; + return; while (1) { new_itm += local_cpu_data->itm_delta; @@ -185,8 +185,6 @@ xen_timer_interrupt (int irq, void *dev_ /* double check, in case we got hit by a (slow) PMI: */ } while (time_after_eq(ia64_get_itc(), new_itm)); raise_softirq(TIMER_SOFTIRQ); - - return IRQ_HANDLED; } static struct irqaction xen_timer_irqaction = { diff -r 2c2ff77fb60f -r d9db44dbe4ba xen/include/asm-ia64/linux-xen/linux/interrupt.h --- a/xen/include/asm-ia64/linux-xen/linux/interrupt.h Wed May 31 11:58:37 2006 +0200 +++ b/xen/include/asm-ia64/linux-xen/linux/interrupt.h Wed May 31 12:37:48 2006 +0200 @@ -27,7 +27,11 @@ * IRQ_HANDLED means that we did have a valid interrupt and handled it. * IRQ_RETVAL(x) selects on the two depending on x being non-zero (for handled) */ +#ifdef XEN +typedef void irqreturn_t; +#else typedef int irqreturn_t; +#endif #define IRQ_NONE (0) #define IRQ_HANDLED (1)