kernel build: machdep.c

[Russell Jackson]

On Wed, May 05, 2004 at 01:31:44PM +0200, Maxime Henrion wrote:
> Russell Jackson wrote:
> > Tonights kernel seems to be broken with:
> > 
> > /usr/src/sys/i386/i386/machdep.c:2812: error: conflicting types for
> > `ioapic_set_
> > polarity'
> > machine/apicvar.h:145: error: previous declaration of
> > `ioapic_set_polarity'
> > /usr/src/sys/i386/i386/machdep.c:2818: error: conflicting types for
> > `ioapic_set_
> > triggermode'
> > machine/apicvar.h:147: error: previous declaration of
> > `ioapic_set_triggermode'
> > /usr/src/sys/i386/i386/machdep.c:2840: error: conflicting types for
> > `lapic_set_l
> > vt_polarity'
> > machine/apicvar.h:165: error: previous declaration of
> > `lapic_set_lvt_polarity'
> > /usr/src/sys/i386/i386/machdep.c:2846: error: conflicting types for
> > `lapic_set_l
> > vt_triggermode'
> > machine/apicvar.h:167: error: previous declaration of
> > `lapic_set_lvt_triggermode
> > '
> 
> The attached patch should fix this issue.  Please let me know if it does.
> 
> Cheers,
> Maxime

> Index: machdep.c
> ===================================================================
> RCS file: /space2/ncvs/src/sys/i386/i386/machdep.c,v
> retrieving revision 1.586
> diff -u -p -r1.586 machdep.c
> --- machdep.c	2 Feb 2004 23:22:24 -0000	1.586
> +++ machdep.c	5 May 2004 13:51:34 -0000
> @@ -2808,13 +2808,13 @@ ioapic_set_nmi(void *cookie, u_int pin)
>  }
>  
>  int
> -ioapic_set_polarity(void *cookie, u_int pin, char activehi)
> +ioapic_set_polarity(void *cookie, u_int pin, enum intr_polarity pol)
>  {
>  	return (ENXIO);
>  }
>  
>  int
> -ioapic_set_triggermode(void *cookie, u_int pin, char edgetrigger)
> +ioapic_set_triggermode(void *cookie, u_int pin, enum intr_trigger trigger)
>  {
>  	return (ENXIO);
>  }
> @@ -2836,13 +2836,13 @@ lapic_set_lvt_mode(u_int apic_id, u_int 
>  }
>  
>  int
> -lapic_set_lvt_polarity(u_int apic_id, u_int lvt, u_char activehi)
> +lapic_set_lvt_polarity(u_int apic_id, u_int lvt, enum intr_polarity pol)
>  {
>  	return (ENXIO);
>  }
>  
>  int
> -lapic_set_lvt_triggermode(u_int apic_id, u_int lvt, u_char edgetrigger)
> +lapic_set_lvt_triggermode(u_int apic_id, u_int lvt, enum intr_trigger trigger)
>  {
>  	return (ENXIO);
>  }

> _______________________________________________
> freebsd-current at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-current
> To unsubscribe, send any mail to "freebsd-current-unsubscribe at freebsd.org"

Indeed, it does. Thanks.

-- 
Russell A. Jackson (rjackson at cserv62.csub.edu)