From owner-p4-projects@FreeBSD.ORG Tue Jun 9 10:35:17 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D00861065677; Tue, 9 Jun 2009 10:35:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8F7671065670 for ; Tue, 9 Jun 2009 10:35:16 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7E4B38FC25 for ; Tue, 9 Jun 2009 10:35:16 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n59AZGCD065518 for ; Tue, 9 Jun 2009 10:35:16 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n59AZG4H065516 for perforce@freebsd.org; Tue, 9 Jun 2009 10:35:16 GMT (envelope-from zec@fer.hr) Date: Tue, 9 Jun 2009 10:35:16 GMT Message-Id: <200906091035.n59AZG4H065516@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 163881 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Jun 2009 10:35:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=163881 Change 163881 by zec@zec_amdx4 on 2009/06/09 10:35:07 IFC @ 163880 in order to unbreak build on amd64. Affected files ... .. //depot/projects/vimage/src/sys/amd64/isa/clock.c#13 integrate .. //depot/projects/vimage/src/sys/modules/sound/sound/Makefile#5 integrate .. //depot/projects/vimage/src/sys/net/flowtable.c#3 integrate .. //depot/projects/vimage/src/sys/net/if_gif.c#32 integrate Differences ... ==== //depot/projects/vimage/src/sys/amd64/isa/clock.c#13 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__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/src/sys/modules/sound/sound/Makefile#5 (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/src/sys/net/flowtable.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ #include "opt_mpath.h" #include -__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 #include @@ -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/src/sys/net/if_gif.c#32 (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: