PERFORCE change 160698 for review

[Marko Zec]

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

Change 160698 by zec at zec_amdx2 on 2009/04/16 14:06:53

	Attempt to unbreak a few obscure virtualized sysctl cases.

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/kern/kern_sysctl.c#9 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#35 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/kern/kern_sysctl.c#9 (text+ko) ====

@@ -968,7 +968,9 @@
 {
 	int error, s, tt;
 
-	tt = *(int *)oidp->oid_arg1;
+	SYSCTL_RESOLVE_V_ARG1();
+
+	tt = *(int *)arg1;
 	s = (int)((int64_t)tt * 1000 / hz);
 
 	error = sysctl_handle_int(oidp, &s, 0, req);
@@ -979,7 +981,7 @@
 	if (tt < 1)
 		return (EINVAL);
 
-	*(int *)oidp->oid_arg1 = tt;
+	*(int *)arg1 = tt;
 	return (0);
 }
 

==== //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#35 (text+ko) ====

@@ -126,7 +126,9 @@
 	INIT_VNET_INET(curvnet);
 	int error;
 
-	error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req);
+	SYSCTL_RESOLVE_V_ARG1();
+
+	error = sysctl_handle_int(oidp, arg1, arg2, req);
 	if (error == 0) {
 		RANGECHK(V_ipport_lowfirstauto, 1, IPPORT_RESERVED - 1);
 		RANGECHK(V_ipport_lowlastauto, 1, IPPORT_RESERVED - 1);