From owner-p4-projects@FreeBSD.ORG  Wed Jun  3 15:43:10 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 60DDB1065673; Wed,  3 Jun 2009 15:43:09 +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 21277106564A
	for <perforce@freebsd.org>; Wed,  3 Jun 2009 15:43:09 +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 EA5CC8FC15
	for <perforce@freebsd.org>; Wed,  3 Jun 2009 15:43:08 +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 n53Fh8R5068943
	for <perforce@freebsd.org>; Wed, 3 Jun 2009 15:43:08 GMT
	(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n53Fh8WX068941
	for perforce@freebsd.org; Wed, 3 Jun 2009 15:43:08 GMT
	(envelope-from zec@fer.hr)
Date: Wed, 3 Jun 2009 15:43:08 GMT
Message-Id: <200906031543.n53Fh8WX068941@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 163420 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Jun 2009 15:43:10 -0000

http://perforce.freebsd.org/chv.cgi?CH=163420

Change 163420 by zec@zec_amdx4 on 2009/06/03 15:43:03

	Fix misinntegration.

Affected files ...

.. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#41 edit

Differences ...

==== //depot/projects/vimage/src/sys/netinet6/in6_proto.c#41 (text+ko) ====

@@ -450,9 +450,6 @@
 sysctl_ip6_temppltime(SYSCTL_HANDLER_ARGS)
 {
 	INIT_VNET_INET6(curvnet);
-#ifdef VIMAGE
-	SYSCTL_RESOLVE_V_ARG1();
-#endif
 	int error = 0;
 	int old;
 
@@ -475,9 +472,6 @@
 sysctl_ip6_tempvltime(SYSCTL_HANDLER_ARGS)
 {
 	INIT_VNET_INET6(curvnet);
-#ifdef VIMAGE
-	SYSCTL_RESOLVE_V_ARG1();
-#endif
 	int error = 0;
 	int old;