Date: Thu, 9 Mar 2006 11:53:01 GMT From: soc-bushman <soc-bushman@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 93035 for review Message-ID: <200603091153.k29Br1o8083894@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=93035 Change 93035 by soc-bushman@soc-bushman_stinger on 2006/03/09 11:49:20 integration results Affected files ... .. //depot/projects/soc2005/nsswitch_cached/src/include/arpa/nameser.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/_pthread_stubs.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/include/libc_private.h#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/include/namespace.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/gettimeofday.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/mq.c#2 delete .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/recv.2#6 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/debug.h#5 edit .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/lpr/filters.ru/koi2855/Makefile#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/lpr/filters.ru/koi2alt/Makefile#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/lpr/filters/Makefile#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/portsnap/phttpget/phttpget.c#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/portsnap/portsnap/portsnap.sh#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/rpcbind/Makefile#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/Makefile#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/acpi.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/acpidump.h#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/biosmptable.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/dist.c#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/dist.h#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/install.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/menus.c#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/sysinstall.h#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/syslogd/syslogd.8#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/syslogd/syslogd.c#6 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/watchdogd/watchdogd.c#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/hostapd/driver_freebsd.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/hostapd_cli/Makefile#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/l2_packet.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/ndis_events/ndis_events.8#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/wpa_supplicant/Makefile#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#5 integrate Differences ... ==== //depot/projects/soc2005/nsswitch_cached/src/include/arpa/nameser.h#2 (text+ko) ==== @@ -50,7 +50,7 @@ /* * From: Id: nameser.h,v 8.16 1998/02/06 00:35:58 halley Exp - * $FreeBSD: src/include/arpa/nameser.h,v 1.16 2002/03/23 17:24:55 imp Exp $ + * $FreeBSD: src/include/arpa/nameser.h,v 1.17 2006/03/09 03:47:11 ume Exp $ */ #ifndef _ARPA_NAMESER_H_ @@ -413,6 +413,7 @@ #define ns_name_pack __ns_name_pack #define ns_name_compress __ns_name_compress #define ns_name_uncompress __ns_name_uncompress +#define ns_name_skip __ns_name_skip __BEGIN_DECLS u_int ns_get16(const u_char *); ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/_pthread_stubs.c#4 (text+ko) ==== @@ -25,10 +25,11 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/_pthread_stubs.c,v 1.12 2005/11/12 16:00:29 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/_pthread_stubs.c,v 1.13 2006/03/05 18:10:27 deischen Exp $"); #include <signal.h> #include <pthread.h> +#include <stdlib.h> #include "libc_private.h" @@ -52,39 +53,72 @@ static void *stub_null(void); static struct pthread *stub_self(void); static int stub_zero(void); +static int stub_true(void); +static void stub_exit(void); #define PJT_DUAL_ENTRY(entry) \ (pthread_func_t)entry, (pthread_func_t)entry pthread_func_entry_t __thr_jtable[PJT_MAX] = { - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_BROADCAST */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_DESTROY */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_INIT */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_SIGNAL */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_WAIT */ - {PJT_DUAL_ENTRY(stub_null)}, /* PJT_GETSPECIFIC */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_KEY_CREATE */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_KEY_DELETE */ - {PJT_DUAL_ENTRY(stub_main)}, /* PJT_MAIN_NP */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_DESTROY */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_INIT */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_LOCK */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_TRYLOCK */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_UNLOCK */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEXATTR_DESTROY */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEXATTR_INIT */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEXATTR_SETTYPE */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ONCE */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_DESTROY */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_INIT */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_RDLOCK */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_TRYRDLOCK */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_TRYWRLOCK */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_UNLOCK */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_WRLOCK */ - {PJT_DUAL_ENTRY(stub_self)}, /* PJT_SELF */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_SETSPECIFIC */ - {PJT_DUAL_ENTRY(stub_zero)} /* PJT_SIGMASK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATFORK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_DESTROY */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_GETDETACHSTATE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_GETGUARDSIZE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_GETINHERITSCHED */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_GETSCHEDPARAM */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_GETSCHEDPOLICY */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_GETSCOPE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_GETSTACKADDR */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_GETSTACKSIZE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_INIT */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_SETDETACHSTATE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_SETGUARDSIZE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_SETINHERITSCHED */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_SETSCHEDPARAM */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_SETSCHEDPOLICY */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_SETSCOPE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_SETSTACKADDR */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_SETSTACKSIZE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_CANCEL */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_CLEANUP_POP */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_CLEANUP_PUSH */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_BROADCAST */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_DESTROY */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_INIT */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_SIGNAL */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_TIMEDWAIT */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_WAIT */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_DETACH */ + {PJT_DUAL_ENTRY(stub_true)}, /* PJT_EQUAL */ + {PJT_DUAL_ENTRY(stub_exit)}, /* PJT_EXIT */ + {PJT_DUAL_ENTRY(stub_null)}, /* PJT_GETSPECIFIC */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_JOIN */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_KEY_CREATE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_KEY_DELETE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_KILL */ + {PJT_DUAL_ENTRY(stub_main)}, /* PJT_MAIN_NP */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEXATTR_DESTROY */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEXATTR_INIT */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEXATTR_SETTYPE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_DESTROY */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_INIT */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_LOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_TRYLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_UNLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ONCE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_DESTROY */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_INIT */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_RDLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_TRYRDLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_TRYWRLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_UNLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_WRLOCK */ + {PJT_DUAL_ENTRY(stub_self)}, /* PJT_SELF */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_SETCANCELSTATE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_SETCANCELTYPE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_SETSPECIFIC */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_SIGMASK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_TESTCANCEL */ }; /* @@ -200,6 +234,37 @@ STUB_FUNC(pthread_self, PJT_SELF, pthread_t) STUB_FUNC2(pthread_setspecific, PJT_SETSPECIFIC, int, pthread_key_t, void *) STUB_FUNC3(pthread_sigmask, PJT_SIGMASK, int, int, void *, void *) +STUB_FUNC3(pthread_atfork, PJT_ATFORK, int, void *, void *, void*) +STUB_FUNC1(pthread_attr_destroy, PJT_ATTR_DESTROY, int, void *); +STUB_FUNC2(pthread_attr_getdetachstate, PJT_ATTR_GETDETACHSTATE, int, void *, void *) +STUB_FUNC2(pthread_attr_getguardsize, PJT_ATTR_GETGUARDSIZE, int, void *, void *) +STUB_FUNC2(pthread_attr_getstackaddr, PJT_ATTR_GETSTACKADDR, int, void *, void *) +STUB_FUNC2(pthread_attr_getstacksize, PJT_ATTR_GETSTACKSIZE, int, void *, void *) +STUB_FUNC2(pthread_attr_getinheritsched, PJT_ATTR_GETINHERITSCHED, int, void *, void *) +STUB_FUNC2(pthread_attr_getschedparam, PJT_ATTR_GETSCHEDPARAM, int, void *, void *) +STUB_FUNC2(pthread_attr_getschedpolicy, PJT_ATTR_GETSCHEDPOLICY, int, void *, void *) +STUB_FUNC2(pthread_attr_getscope, PJT_ATTR_GETSCOPE, int, void *, void *) +STUB_FUNC1(pthread_attr_init, PJT_ATTR_INIT, int, void *) +STUB_FUNC2(pthread_attr_setdetachstate, PJT_ATTR_SETDETACHSTATE, int, void *, int) +STUB_FUNC2(pthread_attr_setguardsize, PJT_ATTR_SETGUARDSIZE, int, void *, size_t) +STUB_FUNC2(pthread_attr_setstackaddr, PJT_ATTR_SETSTACKADDR, int, void *, void *) +STUB_FUNC2(pthread_attr_setstacksize, PJT_ATTR_SETSTACKSIZE, int, void *, size_t) +STUB_FUNC2(pthread_attr_setinheritsched, PJT_ATTR_SETINHERITSCHED, int, void *, int) +STUB_FUNC2(pthread_attr_setschedparam, PJT_ATTR_SETSCHEDPARAM, int, void *, void *) +STUB_FUNC2(pthread_attr_setschedpolicy, PJT_ATTR_SETSCHEDPOLICY, int, void *, int) +STUB_FUNC2(pthread_attr_setscope, PJT_ATTR_SETSCOPE, int, void *, int) +STUB_FUNC1(pthread_cancel, PJT_CANCEL, int, void *) +STUB_FUNC1(pthread_cleanup_pop, PJT_CLEANUP_POP, int, int) +STUB_FUNC2(pthread_cleanup_push, PJT_CLEANUP_PUSH, void, void *, void *) +STUB_FUNC3(pthread_cond_timedwait, PJT_COND_TIMEDWAIT, int, void *, void *, void *) +STUB_FUNC1(pthread_detach, PJT_DETACH, int, void *) +STUB_FUNC2(pthread_equal, PJT_EQUAL, int, void *, void *) +STUB_FUNC1(pthread_exit, PJT_EXIT, void, void *) +STUB_FUNC2(pthread_join, PJT_JOIN, int, void *, void *) +STUB_FUNC2(pthread_kill, PJT_KILL, int, void *, int) +STUB_FUNC2(pthread_setcancelstate, PJT_SETCANCELSTATE, int, int, void *) +STUB_FUNC2(pthread_setcanceltype, PJT_SETCANCELTYPE, int, int, void *) +STUB_FUNC(pthread_testcancel, PJT_TESTCANCEL, void) static int stub_zero(void) @@ -224,3 +289,15 @@ { return (-1); } + +static int +stub_true(void) +{ + return (1); +} + +static void +stub_exit(void) +{ + exit(0); +} ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/include/libc_private.h#5 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.14 2006/01/12 07:28:20 jasone Exp $ + * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.15 2006/03/05 18:10:28 deischen Exp $ * * Private definitions for libc, libc_r and libpthread. * @@ -70,23 +70,51 @@ * libraries that reference it (libc_r, libpthread). */ typedef enum { + PJT_ATFORK, + PJT_ATTR_DESTROY, + PJT_ATTR_GETDETACHSTATE, + PJT_ATTR_GETGUARDSIZE, + PJT_ATTR_GETINHERITSCHED, + PJT_ATTR_GETSCHEDPARAM, + PJT_ATTR_GETSCHEDPOLICY, + PJT_ATTR_GETSCOPE, + PJT_ATTR_GETSTACKADDR, + PJT_ATTR_GETSTACKSIZE, + PJT_ATTR_INIT, + PJT_ATTR_SETDETACHSTATE, + PJT_ATTR_SETGUARDSIZE, + PJT_ATTR_SETINHERITSCHED, + PJT_ATTR_SETSCHEDPARAM, + PJT_ATTR_SETSCHEDPOLICY, + PJT_ATTR_SETSCOPE, + PJT_ATTR_SETSTACKADDR, + PJT_ATTR_SETSTACKSIZE, + PJT_CANCEL, + PJT_CLEANUP_POP, + PJT_CLEANUP_PUSH, PJT_COND_BROADCAST, PJT_COND_DESTROY, PJT_COND_INIT, PJT_COND_SIGNAL, + PJT_COND_TIMEDWAIT, PJT_COND_WAIT, + PJT_DETACH, + PJT_EQUAL, + PJT_EXIT, PJT_GETSPECIFIC, + PJT_JOIN, PJT_KEY_CREATE, PJT_KEY_DELETE, + PJT_KILL, PJT_MAIN_NP, + PJT_MUTEXATTR_DESTROY, + PJT_MUTEXATTR_INIT, + PJT_MUTEXATTR_SETTYPE, PJT_MUTEX_DESTROY, PJT_MUTEX_INIT, PJT_MUTEX_LOCK, PJT_MUTEX_TRYLOCK, PJT_MUTEX_UNLOCK, - PJT_MUTEXATTR_DESTROY, - PJT_MUTEXATTR_INIT, - PJT_MUTEXATTR_SETTYPE, PJT_ONCE, PJT_RWLOCK_DESTROY, PJT_RWLOCK_INIT, @@ -96,8 +124,11 @@ PJT_RWLOCK_UNLOCK, PJT_RWLOCK_WRLOCK, PJT_SELF, + PJT_SETCANCELSTATE, + PJT_SETCANCELTYPE, PJT_SETSPECIFIC, PJT_SIGMASK, + PJT_TESTCANCEL, PJT_MAX } pjt_index_t; ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/include/namespace.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/include/namespace.h,v 1.17 2005/08/03 00:43:14 deischen Exp $ + * $FreeBSD: src/lib/libc/include/namespace.h,v 1.18 2006/03/05 18:10:28 deischen Exp $ */ #ifndef _NAMESPACE_H_ @@ -81,14 +81,40 @@ #define nanosleep _nanosleep #define open _open #define poll _poll +#define pthread_atfork _pthread_atfork +#define pthread_attr_destroy _pthread_attr_destroy +#define pthread_attr_getdetachstate _pthread_attr_getdetachstate +#define pthread_attr_getguardsize _pthread_attr_getguardsize +#define pthread_attr_getstackaddr _pthread_attr_getstackaddr +#define pthread_attr_getstacksize _pthread_attr_getstacksize +#define pthread_attr_getinheritsched _pthread_attr_getinheritsched +#define pthread_attr_getschedparam _pthread_attr_getschedparam +#define pthread_attr_getschedpolicy _pthread_attr_getschedpolicy +#define pthread_attr_getscope _pthread_attr_getscope +#define pthread_attr_init _pthread_attr_init +#define pthread_attr_setdetachstate _pthread_attr_setdetachstate +#define pthread_attr_setguardsize _pthread_attr_setguardsize +#define pthread_attr_setstackaddr _pthread_attr_setstackaddr +#define pthread_attr_setstacksize _pthread_attr_setstacksize +#define pthread_attr_setinheritsched _pthread_attr_setinheritsched +#define pthread_attr_setschedparam _pthread_attr_setschedparam +#define pthread_attr_setschedpolicy _pthread_attr_setschedpolicy +#define pthread_attr_setscope _pthread_attr_setscope +#define pthread_cancel _pthread_cancel +#define pthread_cleanup_pop _pthread_cleanup_pop +#define pthread_cleanup_push _pthread_cleanup_push #define pthread_cond_broadcast _pthread_cond_broadcast #define pthread_cond_destroy _pthread_cond_destroy #define pthread_cond_init _pthread_cond_init #define pthread_cond_signal _pthread_cond_signal #define pthread_cond_timedwait _pthread_cond_timedwait #define pthread_cond_wait _pthread_cond_wait +#define pthread_detach _pthread_detach +#define pthread_equal _pthread_equal #define pthread_exit _pthread_exit #define pthread_getspecific _pthread_getspecific +#define pthread_join _pthread_join +#define pthread_kill _pthread_kill #define pthread_key_create _pthread_key_create #define pthread_key_delete _pthread_key_delete #define pthread_main_np _pthread_main_np @@ -109,8 +135,11 @@ #define pthread_rwlock_trywrlock _pthread_rwlock_trywrlock #define pthread_rwlock_unlock _pthread_rwlock_unlock #define pthread_self _pthread_self +#define pthread_setcancelstate _pthread_setcancelstate +#define pthread_setcanceltype _pthread_setcanceltype #define pthread_setspecific _pthread_setspecific #define pthread_sigmask _pthread_sigmask +#define pthread_testcancel _pthread_testcancel #define read _read #define readv _readv #define recvfrom _recvfrom ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/gettimeofday.2#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)gettimeofday.2 8.2 (Berkeley) 5/26/95 -.\" $FreeBSD: src/lib/libc/sys/gettimeofday.2,v 1.25 2004/07/02 23:52:13 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/gettimeofday.2,v 1.26 2006/03/03 13:58:43 jcamou Exp $ .\" .Dd May 26, 1995 .Dt GETTIMEOFDAY 2 @@ -82,8 +82,12 @@ .Pp .Bd -literal struct timeval { - long tv_sec; /* seconds since Jan. 1, 1970 */ - long tv_usec; /* and microseconds */ +#ifdef __alpha__ + long tv_sec; /* seconds */ +#else + time_t tv_sec; /* seconds */ +#endif + suseconds_t tv_usec; /* and microseconds */ }; struct timezone { ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/recv.2#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)recv.2 8.3 (Berkeley) 2/21/94 -.\" $FreeBSD: src/lib/libc/sys/recv.2,v 1.29 2006/02/16 09:56:31 brd Exp $ +.\" $FreeBSD: src/lib/libc/sys/recv.2,v 1.30 2006/03/05 10:32:15 brueffer Exp $ .\" .Dd February 16, 2006 .Dt RECV 2 @@ -308,7 +308,7 @@ was used to receive rights (file descriptors) that were in flight on the connection. However, the receiving program did not have enough free file -descriptor slots to accept the them. +descriptor slots to accept them. In this case the descriptors are closed, any pending data can be returned by another call to .Fn recvmsg . ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/debug.h#5 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/lpr/filters.ru/koi2855/Makefile#3 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/usr.sbin/lpr/filters.ru/koi2855/Makefile,v 1.5 2004/12/21 08:47:32 ru Exp $ +# $FreeBSD: src/usr.sbin/lpr/filters.ru/koi2855/Makefile,v 1.6 2006/03/08 22:28:12 gad Exp $ PROG= koi2855 -NO_MAN= +MAN= CFLAGS+= -I${.CURDIR}/../../common_source ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/lpr/filters.ru/koi2alt/Makefile#3 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/usr.sbin/lpr/filters.ru/koi2alt/Makefile,v 1.5 2004/12/21 08:47:32 ru Exp $ +# $FreeBSD: src/usr.sbin/lpr/filters.ru/koi2alt/Makefile,v 1.6 2006/03/08 22:28:12 gad Exp $ PROG= koi2alt -NO_MAN= +MAN= CFLAGS+= -I${.CURDIR}/../../common_source ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/lpr/filters/Makefile#3 (text+ko) ==== @@ -1,10 +1,10 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 -# $FreeBSD: src/usr.sbin/lpr/filters/Makefile,v 1.5 2004/12/21 08:47:32 ru Exp $ +# $FreeBSD: src/usr.sbin/lpr/filters/Makefile,v 1.6 2006/03/08 22:28:12 gad Exp $ BINDIR= /usr/libexec/lpr PROG= lpf -NO_MAN= +MAN= CFLAGS+= -I${.CURDIR}/../common_source ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/portsnap/phttpget/phttpget.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/usr.sbin/portsnap/phttpget/phttpget.c,v 1.8 2006/01/27 14:42:15 cperciva Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/portsnap/phttpget/phttpget.c,v 1.9 2006/03/07 19:04:16 ume Exp $"); #include <sys/types.h> #include <sys/time.h> @@ -152,7 +152,7 @@ /* Obtain username and password */ proxy_auth_user = strsep(&env_HTTP_PROXY_AUTH, ":"); - proxy_auth_pass = strsep(&env_HTTP_PROXY_AUTH, ":"); + proxy_auth_pass = env_HTTP_PROXY_AUTH; } if ((proxy_auth_user != NULL) && (proxy_auth_pass != NULL)) { ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/portsnap/portsnap/portsnap.sh#5 (text+ko) ==== @@ -25,7 +25,7 @@ # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -# $FreeBSD: src/usr.sbin/portsnap/portsnap/portsnap.sh,v 1.14 2006/01/22 23:48:07 cperciva Exp $ +# $FreeBSD: src/usr.sbin/portsnap/portsnap/portsnap.sh,v 1.15 2006/03/07 19:13:00 ume Exp $ #### Usage function -- called from command-line handling code. @@ -328,7 +328,7 @@ # Issue the SRV query and pull out the Priority, Weight, and Target fields. host -t srv "_http._tcp.${SERVERNAME}" | grep -E "^_http._tcp.${SERVERNAME} has SRV record" | - cut -f 5,6,8 -d ' ' > serverlist + cut -f 5,6,8 -d ' ' | sed -e 's/\.$//' > serverlist # If no records, give up -- we'll just use the server name we were given. if [ `wc -l < serverlist` -eq 0 ]; then ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/rpcbind/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.3 2000/06/20 13:56:43 fvdl Exp $ -# $FreeBSD: src/usr.sbin/rpcbind/Makefile,v 1.5 2003/04/04 17:49:18 obrien Exp $ +# $FreeBSD: src/usr.sbin/rpcbind/Makefile,v 1.6 2006/03/06 10:07:52 matteo Exp $ LIBCDIR= ${.CURDIR}/../../lib/libc LIBCRPCDIR= ${LIBCDIR}/rpc @@ -13,7 +13,11 @@ rpcb_svc.c rpcb_svc_com.c security.c warmstart.c util.c \ rpc_generic.c -CFLAGS+= -I${LIBCRPCDIR} -I${LIBCINCLUDE} -DPORTMAP -DINET6 -DLIBWRAP +CFLAGS+= -I${LIBCRPCDIR} -I${LIBCINCLUDE} -DPORTMAP -DLIBWRAP + +.if !defined(NO_INET6) +CFLAGS+= -DINET6 +.endif DPADD= ${LIBWRAP} ${LIBUTIL} LDADD= -lwrap -lutil ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/usr.sbin/sysinstall/Makefile,v 1.138 2006/02/28 21:49:32 jhb Exp $ +# $FreeBSD: src/usr.sbin/sysinstall/Makefile,v 1.139 2006/03/08 18:02:31 sam Exp $ .if ${MACHINE_ARCH} != "ia64" _wizard= wizard.c @@ -23,6 +23,36 @@ DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO} LDADD= -ldialog -lncurses -lutil -ldisk -lftpio +# +# When distributions have both UP and SMP kernels sysinstall +# will probe for the number of cpus on the target machine and +# automatically select which is appropriate. This can be overridden +# through the menus or both kernels can be installed (with the +# most "appropriate" one setup as /boot/kernel). For now this +# is done for i386 and amd64; for other systems support must be +# added to identify the cpu count if acpi and MPTable probing +# is insufficient. +# +# The unmber of cpus probed is passed through the environment in +# VAR_NCPUS ("ncpus") to scripts. +# +# Note that WITH_SMP is a compile time option that enables the +# builtin menus for the SMP kernel configuration. If this kernel +# is not built (see release/Makefile) then this should not be +# enabled as sysinstall may try to select an SMP kernel config +# where none is available. This option should not be needed--we +# should probe for an SMP kernel in the distribution but doing +# that is painful because of media changes and the structure of +# sysinstall so for now it's a priori. +# +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +SRCS+= acpi.c biosmptable.c +# NB: HEAD has SMP in GENERIC so only one kernel +#CFLAGS+=-DWITH_SMP +DPADD+= ${LIBDEVINFO} +LDADD+= -ldevinfo +.endif + CLEANFILES= makedevs.c rtermcap CLEANFILES+= keymap.tmp keymap.h countries.tmp countries.h ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/dist.c#5 (text+ko) ==== @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $FreeBSD: src/usr.sbin/sysinstall/dist.c,v 1.241 2006/02/28 21:49:32 jhb Exp $ + * $FreeBSD: src/usr.sbin/sysinstall/dist.c,v 1.242 2006/03/08 18:02:31 sam Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -45,6 +45,7 @@ unsigned int Dists; unsigned int SrcDists; unsigned int XOrgDists; +unsigned int KernelDists; enum _disttype { DT_TARBALL, DT_SUBDIST, DT_PACKAGE }; @@ -59,6 +60,7 @@ } my_data; } Distribution; +static Distribution KernelDistTable[]; static Distribution SrcDistTable[]; static Distribution XOrgDistTable[]; @@ -75,6 +77,7 @@ /* The top-level distribution categories */ static Distribution DistTable[] = { DTE_TARBALL("base", &Dists, BASE, "/"), + DTE_SUBDIST("kernels", &Dists, KERNEL, KernelDistTable), DTE_TARBALL("doc", &Dists, DOC, "/"), DTE_TARBALL("games", &Dists, GAMES, "/"), DTE_TARBALL("manpages", &Dists, MANPAGES, "/"), @@ -92,6 +95,15 @@ DTE_END, }; +/* The kernel distributions */ +static Distribution KernelDistTable[] = { + DTE_TARBALL("GENERIC", &KernelDists, KERNEL_GENERIC, "/boot"), +#ifdef WITH_SMP + DTE_TARBALL("SMP", &KernelDists, KERNEL_SMP, "/boot"), +#endif + DTE_END, +}; + /* The /usr/src distribution */ static Distribution SrcDistTable[] = { DTE_TARBALL("sbase", &SrcDists, SRC_BASE, "/usr/src"), @@ -149,9 +161,11 @@ Dists |= DIST_SRC; if (XOrgDists) Dists |= DIST_XORG; + if (KernelDists) + Dists |= DIST_KERNEL; if (isDebug()) { - msgDebug("Dist Masks: Dists: %0x, Srcs: %0x\n", Dists, - SrcDists); + msgDebug("Dist Masks: Dists: %0x, Srcs: %0x Kernels: %0x\n", Dists, + SrcDists, KernelDists); msgDebug("XServer: %0x\n", XOrgDists); } } @@ -162,6 +176,7 @@ Dists = 0; SrcDists = 0; XOrgDists = 0; + KernelDists = 0; return DITEM_SUCCESS | DITEM_REDRAW; } @@ -181,6 +196,9 @@ if ((cp = variable_get(VAR_DIST_X11)) != NULL) XOrgDists = atoi(cp); + if ((cp = variable_get(VAR_DIST_KERNEL)) != NULL) + KernelDists = atoi(cp); + distVerifyFlags(); return DITEM_SUCCESS | DITEM_REDRAW; } @@ -193,6 +211,17 @@ return distSetXOrg(NULL); } +static int +selectKernel(void) +{ +#ifdef WITH_SMP + /* select default kernel based on deduced cpu count */ + return NCpus > 1 ? DIST_KERNEL_SMP : DIST_KERNEL_GENERIC; +#else + return DIST_KERNEL_GENERIC; +#endif +} + int distSetDeveloper(dialogMenuItem *self) { @@ -201,6 +230,7 @@ distReset(NULL); Dists = _DIST_DEVELOPER; SrcDists = DIST_SRC_ALL; + KernelDists = selectKernel(); i = distMaybeSetPorts(self); distVerifyFlags(); return i; @@ -225,6 +255,7 @@ distReset(NULL); Dists = _DIST_DEVELOPER; SrcDists = DIST_SRC_SYS; + KernelDists = selectKernel(); i = distMaybeSetPorts(self); distVerifyFlags(); return i; @@ -248,6 +279,7 @@ distReset(NULL); Dists = _DIST_USER; + KernelDists = selectKernel(); i = distMaybeSetPorts(self); distVerifyFlags(); return i; @@ -268,7 +300,8 @@ distSetMinimum(dialogMenuItem *self) { distReset(NULL); - Dists = DIST_BASE; + Dists = DIST_BASE | DIST_KERNEL; + KernelDists = selectKernel(); distVerifyFlags(); return DITEM_SUCCESS | DITEM_REDRAW; } @@ -281,6 +314,7 @@ Dists = DIST_ALL; SrcDists = DIST_SRC_ALL; XOrgDists = DIST_XORG_ALL; + KernelDists = DIST_KERNEL_ALL; i = distMaybeSetPorts(self); distVerifyFlags(); return i | DITEM_REDRAW; @@ -434,6 +468,20 @@ return i | DITEM_RESTORE; } +int +distSetKernel(dialogMenuItem *self) +{ + int i; + + dialog_clear_norefresh(); + if (!dmenuOpenSimple(&MenuKernelDistributions, FALSE)) + i = DITEM_FAILURE; + else + i = DITEM_SUCCESS; + distVerifyFlags(); + return i | DITEM_RESTORE; +} + static Boolean got_intr = FALSE; /* timeout handler */ @@ -455,13 +503,31 @@ } /* + * translate distribution filename to lower case + * as doTARBALL does in release/Makefile + */ +static void +translateDist(char trdist[PATH_MAX], const char *dist) +{ + int j; + + /* + * translate distribution filename to lower case + * as doTARBALL does in release/Makefile + */ + for (j = 0; j < PATH_MAX-1 && dist[j] != '\0'; j++) + trdist[j] = tolower(dist[j]); + trdist[j] = '\0'; +} + +/* * Try to get distribution as multiple pieces, locating and parsing an * info file which tells us how many we need for this distribution. */ static Boolean distExtractTarball(char *path, char *dist, char *my_dir, int is_base) { - char *buf = NULL, fname[PATH_MAX]; + char *buf = NULL, trdist[PATH_MAX], fname[PATH_MAX]; struct timeval start, stop; int j, status, total, intr; int cpid, zpid, fd2, chunk, numchunks; @@ -469,14 +535,23 @@ const char *tmp; FILE *fp; + translateDist(trdist, dist); + if (isDebug()) + msgDebug("%s: path \"%s\" dist \"%s\" trdist \"%s\" " + "my_dir \"%s\" %sis_base\n", + __func__, path, dist, trdist, my_dir, is_base ? "" : "!"); + status = TRUE; numchunks = 0; - snprintf(fname, sizeof (fname), "%s/%s.inf", path, dist); + snprintf(fname, sizeof (fname), "%s/%s.inf", path, trdist); getinfo: fp = DEVICE_GET(mediaDevice, fname, TRUE); intr = check_for_interrupt(); if (fp == (FILE *)IO_ERROR || intr || !mediaDevice) { + if (isDebug()) + msgDebug("%s: fname %s fp: %p, intr: %d mediaDevice: %p\n", + __func__, fname, fp, intr, mediaDevice); /* Hard error, can't continue */ if (!msgYesNo("Unable to open %s: %s.\nReinitialize media?", fname, !intr ? "I/O error." : "User interrupt.")) { @@ -488,8 +563,10 @@ return (FALSE); } else if (fp == NULL) { /* No attributes file, so try as a single file. */ - snprintf(fname, sizeof(fname), "%s/%s.%s", path, dist, + snprintf(fname, sizeof(fname), "%s/%s.%s", path, trdist, USE_GZIP ? "tgz" : "tbz"); + if (isDebug()) + msgDebug("%s: fp is NULL (1) fname: %s\n", __func__, fname); /* * Passing TRUE as 3rd parm to get routine makes this a "probing" * get, for which errors are not considered too significant. @@ -498,6 +575,9 @@ fp = DEVICE_GET(mediaDevice, fname, TRUE); intr = check_for_interrupt(); if (fp == (FILE *)IO_ERROR || intr || !mediaDevice) { + if (isDebug()) + msgDebug("%s: fname %s fp: %p, intr: %d mediaDevice: %p\n", + __func__, fname, fp, intr, mediaDevice); /* Hard error, can't continue */ msgConfirm("Unable to open %s: %s", fname, !intr ? "I/O error" : "User interrupt"); @@ -513,8 +593,11 @@ status = mediaExtractDist(dir, dist, fp); fclose(fp); return (status); - } else + } else { + if (isDebug()) + msgDebug("%s: fp is NULL (2) fname %s\n", __func__, fname); return (FALSE); + } } if (isDebug()) @@ -523,6 +606,8 @@ dist_attr = properties_read(fileno(fp)); intr = check_for_interrupt(); if (intr || !dist_attr) { + if (isDebug()) + msgDebug("%s: intr %d dist_attr %p\n", __func__, intr, dist_attr); msgConfirm("Cannot parse information file for the %s distribution: %s\n" "Please verify that your media is valid and try again.", dist, !intr ? "I/O error" : "User interrupt"); @@ -532,8 +617,11 @@ numchunks = strtol(tmp, 0, 0); } fclose(fp); - if (!numchunks) + if (!numchunks) { + if (isDebug()) + msgDebug("%s: numchunks is zero\n", __func__); return (TRUE); + } if (isDebug()) msgDebug("Attempting to extract distribution from %u chunks.\n", @@ -562,7 +650,7 @@ tmp = index(tmp, ' '); chunksize = strtol(tmp, 0, 0); } - snprintf(fname, sizeof(fname), "%s/%s.%c%c", path, dist, (chunk / 26) + 'a', + snprintf(fname, sizeof(fname), "%s/%s.%c%c", path, trdist, (chunk / 26) + 'a', (chunk % 26) + 'a'); if (isDebug()) msgDebug("trying for piece %d of %d: %s\n", chunk + 1, numchunks, @@ -767,7 +855,7 @@ int distExtractAll(dialogMenuItem *self) { - int old_dists, retries = 0, status = DITEM_SUCCESS; + int old_dists, old_kernel, retries = 0, status = DITEM_SUCCESS; char buf[512]; WINDOW *w; @@ -781,6 +869,7 @@ return DITEM_FAILURE; old_dists = Dists; + old_kernel = KernelDists; distVerifyFlags(); dialog_clear_norefresh(); @@ -795,6 +884,9 @@ /* Only do base fixup if base dist was successfully extracted */ if ((old_dists & DIST_BASE) && !(Dists & DIST_BASE)) status |= installFixupBase(self); + /* Only do base fixup if base dist was successfully extracted */ + if ((old_dists & DIST_KERNEL) && !(Dists & DIST_KERNEL)) + status |= installFixupKernel(self, old_kernel); /* Clear any local dist flags now */ Dists &= ~DIST_LOCAL; ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/dist.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/usr.sbin/sysinstall/dist.h,v 1.65 2005/06/16 18:16:13 ru Exp $ */ +/* $FreeBSD: src/usr.sbin/sysinstall/dist.h,v 1.66 2006/03/08 18:02:32 sam Exp $ */ #ifndef _DIST_H_INCLUDE #define _DIST_H_INCLUDE @@ -19,6 +19,7 @@ #ifdef __amd64__ #define DIST_LIB32 0x01000 #endif +#define DIST_KERNEL 0x02000 #define DIST_ALL 0xFFFFF /* Subtypes for SRC distribution */ @@ -70,6 +71,11 @@ #define DIST_XORG_ALL \ (DIST_XORG_MISC_ALL | DIST_XORG_SERVER_ALL | DIST_XORG_FONTS_ALL) +/* Subtypes for KERNEL distribution */ +#define DIST_KERNEL_GENERIC 0x00001 +#define DIST_KERNEL_SMP 0x00002 +#define DIST_KERNEL_ALL 0xFFFFF + /* Canned distribution sets */ #define _DIST_XORG_FONTS_BASE \ @@ -77,7 +83,7 @@ DIST_XORG_FONTS_TT) #define _DIST_USER \ - ( DIST_BASE | DIST_DOC | DIST_MANPAGES | DIST_DICT ) + ( DIST_BASE | DIST_KERNEL | DIST_DOC | DIST_MANPAGES | DIST_DICT ) #define _DIST_DEVELOPER \ ( _DIST_USER | DIST_PROFLIBS | DIST_INFO | DIST_SRC ) ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/install.c#4 (text+ko) ==== @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $FreeBSD: src/usr.sbin/sysinstall/install.c,v 1.364 2005/12/29 19:25:17 ceri Exp $ + * $FreeBSD: src/usr.sbin/sysinstall/install.c,v 1.365 2006/03/08 18:02:32 sam Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -61,6 +61,7 @@ */ int _interactiveHack; int FixItMode = 0; +int NCpus; static void create_termcap(void); static void fixit_common(void); @@ -892,6 +893,30 @@ return DITEM_SUCCESS | DITEM_RESTORE; } +int +installFixupKernel(dialogMenuItem *self, int dists) +{ + + /* All of this is done only as init, just to be safe */ + if (RunningAsInit) { + /* + * Install something as /boot/kernel. Prefer SMP + * over generic--this should handle the case where + * both SMP and GENERIC are installed (otherwise we + * select the one kernel that was installed). + * + * NB: we assume any existing kernel has been saved + * already and the /boot/kernel we remove is empty. + */ + vsystem("rm -rf /boot/kernel"); + if (dists & DIST_KERNEL_SMP) + vsystem("mv /boot/SMP /boot/kernel"); + else + vsystem("mv /boot/GENERIC /boot/kernel"); + } + return DITEM_SUCCESS | DITEM_RESTORE; +} + #define QUEUE_YES 1 #define QUEUE_NO 0 static int @@ -1173,7 +1198,7 @@ int installVarDefaults(dialogMenuItem *self) { - char *cp; + char *cp, ncpus[10]; /* Set default startup options */ variable_set2(VAR_RELNAME, getRelname(), 0); @@ -1205,6 +1230,15 @@ variable_set2(SYSTEM_STATE, "init", 0); variable_set2(VAR_NEWFS_ARGS, "-b 16384 -f 2048", 0); variable_set2(VAR_CONSTERM, "NO", 0); +#if defined(i386) || defined(amd64) + NCpus = acpi_detect(); + if (NCpus == -1) >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200603091153.k29Br1o8083894>