Date: Tue, 9 Jun 2009 10:57:39 GMT From: Marko Zec <zec@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 163883 for review Message-ID: <200906091057.n59Avd8f067188@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=163883 Change 163883 by zec@zec_amdx4 on 2009/06/09 10:57:18 IFC @ 163880 in order to unbreak build on amd64. Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/isa/clock.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/modules/sound/sound/Makefile#4 integrate .. //depot/projects/vimage-commit2/src/sys/net/flowtable.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_gif.c#30 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/isa/clock.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.247 2009/06/09 07:26:52 ariff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.248 2009/06/09 09:47:02 bz Exp $"); /* * Routines to handle clock hardware. @@ -535,7 +535,7 @@ cpu_startprofclock(void) { - if (using_lapic_timer || !using_atrtc_clock) + if (using_lapic_timer || !using_atrtc_timer) return; atrtc_rate(RTCSA_PROF); psdiv = pscnt = psratio; @@ -545,7 +545,7 @@ cpu_stopprofclock(void) { - if (using_lapic_timer || !using_atrtc_clock) + if (using_lapic_timer || !using_atrtc_timer) return; atrtc_rate(RTCSA_NOPROF); psdiv = pscnt = 1; ==== //depot/projects/vimage-commit2/src/sys/modules/sound/sound/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/sound/sound/Makefile,v 1.23 2009/06/07 19:12:08 ariff Exp $ +# $FreeBSD: src/sys/modules/sound/sound/Makefile,v 1.25 2009/06/09 10:17:22 ariff Exp $ .PATH: ${.CURDIR}/../../../dev/sound .PATH: ${.CURDIR}/../../../dev/sound/pcm @@ -19,13 +19,13 @@ SRCS+= mixer.c sndstat.c sound.c unit.c vchan.c SRCS+= midi.c mpu401.c sequencer.c -feeder_eq_gen.h: +feeder_eq_gen.h: @ @/tools/feeder_eq_mkfilter.awk machine ${AWK} -f @/tools/feeder_eq_mkfilter.awk -- ${FEEDER_EQ_PRESETS} > ${.TARGET} -feeder_rate_gen.h: +feeder_rate_gen.h: @ @/tools/feeder_rate_mkfilter.awk machine ${AWK} -f @/tools/feeder_rate_mkfilter.awk -- ${FEEDER_RATE_PRESETS} > ${.TARGET} -snd_fxdiv_gen.h: +snd_fxdiv_gen.h: @ @/tools/snd_fxdiv_gen.awk machine ${AWK} -f @/tools/snd_fxdiv_gen.awk -- > ${.TARGET} CLEANFILES+= feeder_eq_gen.h feeder_rate_gen.h snd_fxdiv_gen.h ==== //depot/projects/vimage-commit2/src/sys/net/flowtable.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ #include "opt_mpath.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/net/flowtable.c,v 1.5 2009/04/27 22:45:19 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/net/flowtable.c,v 1.6 2009/06/09 09:50:43 bz Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -407,7 +407,7 @@ in_rtalloc_ign_wrapper(struct route *ro, uint32_t hash, u_int fib) { - in_rtalloc_ign(ro, 0, fib); + rtalloc_ign_fib(ro, 0, fib); } #endif ==== //depot/projects/vimage-commit2/src/sys/net/if_gif.c#30 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/net/if_gif.c,v 1.82 2009/06/09 02:27:59 hrs Exp $ */ +/* $FreeBSD: src/sys/net/if_gif.c,v 1.83 2009/06/09 08:09:30 hrs Exp $ */ /* $KAME: if_gif.c,v 1.87 2001/10/19 08:50:27 itojun Exp $ */ /*- @@ -912,13 +912,13 @@ case GIFSOPTS: if ((error = priv_check(curthread, PRIV_NET_GIF)) != 0) break; - if (!(error = copyin(ifr->ifr_data, &options, - sizeof(options)))) { - if ((options | GIF_OPTMASK) == GIF_OPTMASK) - sc->gif_options = options; - else - error = EINVAL; - } + error = copyin(ifr->ifr_data, &options, sizeof(options)); + if (error) + break; + if (options & ~GIF_OPTMASK) + error = EINVAL; + else + sc->gif_options = options; break; default:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906091057.n59Avd8f067188>