From owner-svn-src-stable-9@FreeBSD.ORG Sat Oct 1 13:47:50 2011 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 75699106566B; Sat, 1 Oct 2011 13:47:50 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 647178FC16; Sat, 1 Oct 2011 13:47:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p91DloRc019982; Sat, 1 Oct 2011 13:47:50 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p91DloAl019980; Sat, 1 Oct 2011 13:47:50 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201110011347.p91DloAl019980@svn.freebsd.org> From: Gabor Kovesdan Date: Sat, 1 Oct 2011 13:47:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225902 - stable/9/share/man/man4 X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Oct 2011 13:47:50 -0000 Author: gabor Date: Sat Oct 1 13:47:50 2011 New Revision: 225902 URL: http://svn.freebsd.org/changeset/base/225902 Log: MFC: r225775 - Move misplaced reference - Sort references - s/Since/Because/ Approved by: re (kib) Modified: stable/9/share/man/man4/smp.4 Directory Properties: stable/9/share/man/man4/ (props changed) Modified: stable/9/share/man/man4/smp.4 ============================================================================== --- stable/9/share/man/man4/smp.4 Sat Oct 1 13:33:14 2011 (r225901) +++ stable/9/share/man/man4/smp.4 Sat Oct 1 13:47:50 2011 (r225902) @@ -120,25 +120,24 @@ tasks on CPUs that are closely grouped t .Pp .Fx supports hyperthreading on Intel CPU's on the i386 and AMD64 platforms. -Since using logical CPUs can cause performance penalties under certain loads, +Because using logical CPUs can cause performance penalties under certain loads, the logical CPUs can be disabled by setting the .Va machdep.hyperthreading_allowed tunable to zero. -.Xr cpuset 1 . .Sh SEE ALSO +.Xr cpuset 1 , .Xr mptable 1 , +.Xr sched_4bsd 4 , +.Xr sched_ule 4 , .Xr loader 8 , .Xr sysctl 8 , .Xr condvar 9 , .Xr msleep 9 , .Xr mtx_pool 9 , .Xr mutex 9 , -.Xr sema 9 , -.Xr sx 9 , .Xr rwlock 9 , -.Xr sched_4bsd 4 , -.Xr sched_ule 4 , -.Xr cpuset 1 +.Xr sema 9 , +.Xr sx 9 .Sh HISTORY The .Nm From owner-svn-src-stable-9@FreeBSD.ORG Sat Oct 1 19:58:36 2011 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B5BA106566C; Sat, 1 Oct 2011 19:58:36 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 413B48FC13; Sat, 1 Oct 2011 19:58:36 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p91JwaP6031689; Sat, 1 Oct 2011 19:58:36 GMT (envelope-from ume@svn.freebsd.org) Received: (from ume@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p91JwaBl031685; Sat, 1 Oct 2011 19:58:36 GMT (envelope-from ume@svn.freebsd.org) Message-Id: <201110011958.p91JwaBl031685@svn.freebsd.org> From: Hajimu UMEMOTO Date: Sat, 1 Oct 2011 19:58:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225907 - stable/9/contrib/sendmail/src X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Oct 2011 19:58:36 -0000 Author: ume Date: Sat Oct 1 19:58:35 2011 New Revision: 225907 URL: http://svn.freebsd.org/changeset/base/225907 Log: MFC r225906: Shut up warnings with Cyrus SASL 2.1.25. Approved by: re (kib) Modified: stable/9/contrib/sendmail/src/main.c stable/9/contrib/sendmail/src/sendmail.h stable/9/contrib/sendmail/src/usersmtp.c Directory Properties: stable/9/contrib/sendmail/ (props changed) Modified: stable/9/contrib/sendmail/src/main.c ============================================================================== --- stable/9/contrib/sendmail/src/main.c Sat Oct 1 18:20:10 2011 (r225906) +++ stable/9/contrib/sendmail/src/main.c Sat Oct 1 19:58:35 2011 (r225907) @@ -109,8 +109,8 @@ GIDSET_T InitialGidSet[NGROUPS_MAX]; #if SASL static sasl_callback_t srvcallbacks[] = { - { SASL_CB_VERIFYFILE, &safesaslfile, NULL }, - { SASL_CB_PROXY_POLICY, &proxy_policy, NULL }, + { SASL_CB_VERIFYFILE, (sasl_callback_ft)&safesaslfile, NULL }, + { SASL_CB_PROXY_POLICY, (sasl_callback_ft)&proxy_policy, NULL }, { SASL_CB_LIST_END, NULL, NULL } }; #endif /* SASL */ Modified: stable/9/contrib/sendmail/src/sendmail.h ============================================================================== --- stable/9/contrib/sendmail/src/sendmail.h Sat Oct 1 18:20:10 2011 (r225906) +++ stable/9/contrib/sendmail/src/sendmail.h Sat Oct 1 19:58:35 2011 (r225907) @@ -133,10 +133,15 @@ SM_UNUSED(static char SmailId[]) = "@(#) # if SASL == 2 || SASL >= 20000 # include +# include # include +# if SASL_VERSION_FULL < 0x020119 +typedef int (*sasl_callback_ft)(void); +# endif # else /* SASL == 2 || SASL >= 20000 */ # include # include +typedef int (*sasl_callback_ft)(void); # endif /* SASL == 2 || SASL >= 20000 */ # if defined(SASL_VERSION_MAJOR) && defined(SASL_VERSION_MINOR) && defined(SASL_VERSION_STEP) # define SASL_VERSION (SASL_VERSION_MAJOR * 10000) + (SASL_VERSION_MINOR * 100) + SASL_VERSION_STEP Modified: stable/9/contrib/sendmail/src/usersmtp.c ============================================================================== --- stable/9/contrib/sendmail/src/usersmtp.c Sat Oct 1 18:20:10 2011 (r225906) +++ stable/9/contrib/sendmail/src/usersmtp.c Sat Oct 1 19:58:35 2011 (r225907) @@ -524,15 +524,15 @@ static int attemptauth __P((MAILER *, MC static sasl_callback_t callbacks[] = { - { SASL_CB_GETREALM, &saslgetrealm, NULL }, + { SASL_CB_GETREALM, (sasl_callback_ft)&saslgetrealm, NULL }, #define CB_GETREALM_IDX 0 - { SASL_CB_PASS, &getsecret, NULL }, + { SASL_CB_PASS, (sasl_callback_ft)&getsecret, NULL }, #define CB_PASS_IDX 1 - { SASL_CB_USER, &getsimple, NULL }, + { SASL_CB_USER, (sasl_callback_ft)&getsimple, NULL }, #define CB_USER_IDX 2 - { SASL_CB_AUTHNAME, &getsimple, NULL }, + { SASL_CB_AUTHNAME, (sasl_callback_ft)&getsimple, NULL }, #define CB_AUTHNAME_IDX 3 - { SASL_CB_VERIFYFILE, &safesaslfile, NULL }, + { SASL_CB_VERIFYFILE, (sasl_callback_ft)&safesaslfile, NULL }, #define CB_SAFESASL_IDX 4 { SASL_CB_LIST_END, NULL, NULL } };