From owner-svn-src-stable-10@FreeBSD.ORG Wed Jan 1 02:49:46 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BAFC6534; Wed, 1 Jan 2014 02:49:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9A4F61B15; Wed, 1 Jan 2014 02:49:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s012nkoi013330; Wed, 1 Jan 2014 02:49:46 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s012nkw9013326; Wed, 1 Jan 2014 02:49:46 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201401010249.s012nkw9013326@svn.freebsd.org> From: Rick Macklem Date: Wed, 1 Jan 2014 02:49:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260159 - in stable/10/sys/fs: nfs nfsserver X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jan 2014 02:49:46 -0000 Author: rmacklem Date: Wed Jan 1 02:49:45 2014 New Revision: 260159 URL: http://svnweb.freebsd.org/changeset/base/260159 Log: MFC: r259854 The NFSv4 server would call VOP_SETATTR() with a shared locked vnode when a Getattr for a file is done by a client other than the one that holds the file's delegation. This would only happen when delegations are enabled and the problem is fixed by this patch. Modified: stable/10/sys/fs/nfs/nfs_var.h stable/10/sys/fs/nfsserver/nfs_nfsdport.c stable/10/sys/fs/nfsserver/nfs_nfsdstate.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/fs/nfs/nfs_var.h ============================================================================== --- stable/10/sys/fs/nfs/nfs_var.h Wed Jan 1 01:46:56 2014 (r260158) +++ stable/10/sys/fs/nfs/nfs_var.h Wed Jan 1 02:49:45 2014 (r260159) @@ -613,7 +613,7 @@ void nfsvno_open(struct nfsrv_descript * nfsv4stateid_t *, struct nfsstate *, int *, struct nfsvattr *, int32_t *, int, NFSACL_T *, nfsattrbit_t *, struct ucred *, NFSPROC_T *, struct nfsexstuff *, vnode_t *); -void nfsvno_updfilerev(vnode_t, struct nfsvattr *, struct ucred *, +int nfsvno_updfilerev(vnode_t, struct nfsvattr *, struct ucred *, NFSPROC_T *); int nfsvno_fillattr(struct nfsrv_descript *, struct mount *, vnode_t, struct nfsvattr *, fhandle_t *, int, nfsattrbit_t *, Modified: stable/10/sys/fs/nfsserver/nfs_nfsdport.c ============================================================================== --- stable/10/sys/fs/nfsserver/nfs_nfsdport.c Wed Jan 1 01:46:56 2014 (r260158) +++ stable/10/sys/fs/nfsserver/nfs_nfsdport.c Wed Jan 1 02:49:45 2014 (r260159) @@ -1469,8 +1469,9 @@ nfsvno_open(struct nfsrv_descript *nd, s * Updates the file rev and sets the mtime and ctime * to the current clock time, returning the va_filerev and va_Xtime * values. + * Return ESTALE to indicate the vnode is VI_DOOMED. */ -void +int nfsvno_updfilerev(struct vnode *vp, struct nfsvattr *nvap, struct ucred *cred, struct thread *p) { @@ -1478,8 +1479,14 @@ nfsvno_updfilerev(struct vnode *vp, stru VATTR_NULL(&va); vfs_timestamp(&va.va_mtime); + if (NFSVOPISLOCKED(vp) != LK_EXCLUSIVE) { + NFSVOPLOCK(vp, LK_UPGRADE | LK_RETRY); + if ((vp->v_iflag & VI_DOOMED) != 0) + return (ESTALE); + } (void) VOP_SETATTR(vp, &va, cred); (void) nfsvno_getattr(vp, nvap, cred, p, 1); + return (0); } /* Modified: stable/10/sys/fs/nfsserver/nfs_nfsdstate.c ============================================================================== --- stable/10/sys/fs/nfsserver/nfs_nfsdstate.c Wed Jan 1 01:46:56 2014 (r260158) +++ stable/10/sys/fs/nfsserver/nfs_nfsdstate.c Wed Jan 1 02:49:45 2014 (r260159) @@ -4853,15 +4853,15 @@ nfsrv_checkgetattr(struct nfsrv_descript nva.na_filerev > delegfilerev) || (NFSVNO_ISSETSIZE(&nva) && nva.na_size != nvap->na_size)) { - nfsvno_updfilerev(vp, nvap, cred, p); + error = nfsvno_updfilerev(vp, nvap, cred, p); if (NFSVNO_ISSETSIZE(&nva)) nvap->na_size = nva.na_size; } - } + } else + error = 0; /* Ignore callback errors for now. */ } else { NFSUNLOCKSTATE(); } - error = 0; out: NFSEXITCODE2(error, nd); From owner-svn-src-stable-10@FreeBSD.ORG Wed Jan 1 20:22:30 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 23032E75; Wed, 1 Jan 2014 20:22:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0E3F91271; Wed, 1 Jan 2014 20:22:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s01KMTdA017534; Wed, 1 Jan 2014 20:22:29 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s01KMTCV017532; Wed, 1 Jan 2014 20:22:29 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201401012022.s01KMTCV017532@svn.freebsd.org> From: Jilles Tjoelker Date: Wed, 1 Jan 2014 20:22:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260164 - stable/10/sys/kern X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jan 2014 20:22:30 -0000 Author: jilles Date: Wed Jan 1 20:22:29 2014 New Revision: 260164 URL: http://svnweb.freebsd.org/changeset/base/260164 Log: MFC r258281: Fix siginfo_t.si_status for wait6/waitid/SIGCHLD. Per POSIX, si_status should contain the value passed to exit() for si_code==CLD_EXITED and the signal number for other si_code. This was incorrect for CLD_EXITED and CLD_DUMPED. This is still not fully POSIX-compliant (Austin group issue #594 says that the full value passed to exit() shall be returned via si_status, not just the low 8 bits) but is sufficient for a si_status-related test in libnih (upstart, Debian/kFreeBSD). PR: kern/184002 Modified: stable/10/sys/kern/kern_exit.c stable/10/sys/kern/kern_sig.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/kern/kern_exit.c ============================================================================== --- stable/10/sys/kern/kern_exit.c Wed Jan 1 20:18:03 2014 (r260163) +++ stable/10/sys/kern/kern_exit.c Wed Jan 1 20:22:29 2014 (r260164) @@ -974,16 +974,19 @@ proc_to_reap(struct thread *td, struct p * This is still a rough estimate. We will fix the * cases TRAPPED, STOPPED, and CONTINUED later. */ - if (WCOREDUMP(p->p_xstat)) + if (WCOREDUMP(p->p_xstat)) { siginfo->si_code = CLD_DUMPED; - else if (WIFSIGNALED(p->p_xstat)) + siginfo->si_status = WTERMSIG(p->p_xstat); + } else if (WIFSIGNALED(p->p_xstat)) { siginfo->si_code = CLD_KILLED; - else + siginfo->si_status = WTERMSIG(p->p_xstat); + } else { siginfo->si_code = CLD_EXITED; + siginfo->si_status = WEXITSTATUS(p->p_xstat); + } siginfo->si_pid = p->p_pid; siginfo->si_uid = p->p_ucred->cr_uid; - siginfo->si_status = p->p_xstat; /* * The si_addr field would be useful additional Modified: stable/10/sys/kern/kern_sig.c ============================================================================== --- stable/10/sys/kern/kern_sig.c Wed Jan 1 20:18:03 2014 (r260163) +++ stable/10/sys/kern/kern_sig.c Wed Jan 1 20:22:29 2014 (r260164) @@ -2959,7 +2959,7 @@ sigparent(struct proc *p, int reason, in } static void -childproc_jobstate(struct proc *p, int reason, int status) +childproc_jobstate(struct proc *p, int reason, int sig) { struct sigacts *ps; @@ -2979,7 +2979,7 @@ childproc_jobstate(struct proc *p, int r mtx_lock(&ps->ps_mtx); if ((ps->ps_flag & PS_NOCLDSTOP) == 0) { mtx_unlock(&ps->ps_mtx); - sigparent(p, reason, status); + sigparent(p, reason, sig); } else mtx_unlock(&ps->ps_mtx); } @@ -2987,6 +2987,7 @@ childproc_jobstate(struct proc *p, int r void childproc_stopped(struct proc *p, int reason) { + /* p_xstat is a plain signal number, not a full wait() status here. */ childproc_jobstate(p, reason, p->p_xstat); } @@ -3000,13 +3001,15 @@ void childproc_exited(struct proc *p) { int reason; - int status = p->p_xstat; /* convert to int */ + int xstat = p->p_xstat; /* convert to int */ + int status; - reason = CLD_EXITED; - if (WCOREDUMP(status)) - reason = CLD_DUMPED; - else if (WIFSIGNALED(status)) - reason = CLD_KILLED; + if (WCOREDUMP(xstat)) + reason = CLD_DUMPED, status = WTERMSIG(xstat); + else if (WIFSIGNALED(xstat)) + reason = CLD_KILLED, status = WTERMSIG(xstat); + else + reason = CLD_EXITED, status = WEXITSTATUS(xstat); /* * XXX avoid calling wakeup(p->p_pptr), the work is * done in exit1(). From owner-svn-src-stable-10@FreeBSD.ORG Thu Jan 2 01:40:20 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 99DFF990; Thu, 2 Jan 2014 01:40:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 84CAA1670; Thu, 2 Jan 2014 01:40:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s021eKH8038082; Thu, 2 Jan 2014 01:40:20 GMT (envelope-from scottl@svn.freebsd.org) Received: (from scottl@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s021eK0C037882; Thu, 2 Jan 2014 01:40:20 GMT (envelope-from scottl@svn.freebsd.org) Message-Id: <201401020140.s021eK0C037882@svn.freebsd.org> From: Scott Long Date: Thu, 2 Jan 2014 01:40:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260177 - stable/10/sbin/camcontrol X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jan 2014 01:40:20 -0000 Author: scottl Date: Thu Jan 2 01:40:19 2014 New Revision: 260177 URL: http://svnweb.freebsd.org/changeset/base/260177 Log: MFC r260059, r260087: Add the '-b' flag to 'camcontrol devlist'. This prints only the existing buses and their parent sims, useful for creating a sim->bus->device map. Obtained from: Netflix Modified: stable/10/sbin/camcontrol/camcontrol.8 stable/10/sbin/camcontrol/camcontrol.c Modified: stable/10/sbin/camcontrol/camcontrol.8 ============================================================================== --- stable/10/sbin/camcontrol/camcontrol.8 Wed Jan 1 22:56:49 2014 (r260176) +++ stable/10/sbin/camcontrol/camcontrol.8 Thu Jan 2 01:40:19 2014 (r260177) @@ -41,6 +41,7 @@ .Op command args .Nm .Ic devlist +.Op Fl b .Op Fl v .Nm .Ic periphlist @@ -361,6 +362,10 @@ With the .Fl v argument, SCSI bus number, adapter name and unit numbers are printed as well. +On the other hand, with the +.Fl b +argument, only the bus adapter, and unit information will be printed, and +device information will be omitted. .It Ic periphlist List all peripheral drivers attached to a given physical device (logical unit). Modified: stable/10/sbin/camcontrol/camcontrol.c ============================================================================== --- stable/10/sbin/camcontrol/camcontrol.c Wed Jan 1 22:56:49 2014 (r260176) +++ stable/10/sbin/camcontrol/camcontrol.c Thu Jan 2 01:40:19 2014 (r260177) @@ -202,7 +202,7 @@ static struct camcontrol_opts option_tab {"defects", CAM_CMD_READ_DEFECTS, CAM_ARG_NONE, readdefect_opts}, {"defectlist", CAM_CMD_READ_DEFECTS, CAM_ARG_NONE, readdefect_opts}, #endif /* MINIMALISTIC */ - {"devlist", CAM_CMD_DEVTREE, CAM_ARG_NONE, NULL}, + {"devlist", CAM_CMD_DEVTREE, CAM_ARG_NONE, "-b"}, #ifndef MINIMALISTIC {"periphlist", CAM_CMD_DEVLIST, CAM_ARG_NONE, NULL}, {"modepage", CAM_CMD_MODE_PAGE, CAM_ARG_NONE, "bdelm:P:"}, @@ -254,7 +254,7 @@ camcontrol_optret getoption(struct camco #ifndef MINIMALISTIC static int getdevlist(struct cam_device *device); #endif /* MINIMALISTIC */ -static int getdevtree(void); +static int getdevtree(int argc, char **argv, char *combinedopt); #ifndef MINIMALISTIC static int testunitready(struct cam_device *device, int retry_count, int timeout, int quiet); @@ -411,7 +411,7 @@ getdevlist(struct cam_device *device) #endif /* MINIMALISTIC */ static int -getdevtree(void) +getdevtree(int argc, char **argv, char *combinedopt) { union ccb ccb; int bufsize, fd; @@ -419,6 +419,19 @@ getdevtree(void) int need_close = 0; int error = 0; int skip_device = 0; + int busonly = 0; + int c; + + while ((c = getopt(argc, argv, combinedopt)) != -1) { + switch(c) { + case 'b': + if ((arglist & CAM_ARG_VERBOSE) == 0) + busonly = 1; + break; + default: + break; + } + } if ((fd = open(XPT_DEVICE, O_RDWR)) == -1) { warn("couldn't open %s", XPT_DEVICE); @@ -478,7 +491,8 @@ getdevtree(void) * Only print the bus information if the * user turns on the verbose flag. */ - if ((arglist & CAM_ARG_VERBOSE) == 0) + if ((busonly == 0) && + (arglist & CAM_ARG_VERBOSE) == 0) break; bus_result = @@ -489,11 +503,12 @@ getdevtree(void) need_close = 0; } - fprintf(stdout, "scbus%d on %s%d bus %d:\n", + fprintf(stdout, "scbus%d on %s%d bus %d%s\n", bus_result->path_id, bus_result->dev_name, bus_result->unit_number, - bus_result->bus_id); + bus_result->bus_id, + (busonly ? "" : ":")); break; } case DEV_MATCH_DEVICE: { @@ -501,6 +516,9 @@ getdevtree(void) char vendor[16], product[48], revision[16]; char fw[5], tmpstr[256]; + if (busonly == 1) + break; + dev_result = &ccb.cdm.matches[i].result.device_result; @@ -582,7 +600,7 @@ getdevtree(void) periph_result = &ccb.cdm.matches[i].result.periph_result; - if (skip_device != 0) + if (busonly || skip_device != 0) break; if (need_close > 1) @@ -8178,7 +8196,7 @@ main(int argc, char **argv) break; #endif /* MINIMALISTIC */ case CAM_CMD_DEVTREE: - error = getdevtree(); + error = getdevtree(argc, argv, combinedopt); break; #ifndef MINIMALISTIC case CAM_CMD_TUR: From owner-svn-src-stable-10@FreeBSD.ORG Thu Jan 2 01:44:17 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 022C0ADF; Thu, 2 Jan 2014 01:44:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E151116CA; Thu, 2 Jan 2014 01:44:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s021iGV2040853; Thu, 2 Jan 2014 01:44:16 GMT (envelope-from scottl@svn.freebsd.org) Received: (from scottl@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s021iE6N040838; Thu, 2 Jan 2014 01:44:14 GMT (envelope-from scottl@svn.freebsd.org) Message-Id: <201401020144.s021iE6N040838@svn.freebsd.org> From: Scott Long Date: Thu, 2 Jan 2014 01:44:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260178 - in stable/10/sbin: fsck_ffs fsdb X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jan 2014 01:44:17 -0000 Author: scottl Date: Thu Jan 2 01:44:14 2014 New Revision: 260178 URL: http://svnweb.freebsd.org/changeset/base/260178 Log: MFC r260068, r260069, r260076 Add the -R option to allow fsck_ffs to restart itself when too many critical errors have been detected in a particular run. Clean up the global state variables so that a restart can happen correctly. Separate the global variables in fsck_ffs and fsdb to their own file. This fixes header sharing with fscd. Correctly initialize, static-ize, and remove global variables as needed in dir.c. This fixes a problem with lost+found directories that was causing a segfault. Correctly initialize, static-ize, and remove global variables as needed in suj.c. Initialize the suj globals before allocating the disk object, not after. Also ensure that 'preen' mode doesn't conflict with 'restart' mode Obtained from: Netflix Added: stable/10/sbin/fsck_ffs/globs.c - copied unchanged from r260076, head/sbin/fsck_ffs/globs.c Modified: stable/10/sbin/fsck_ffs/Makefile stable/10/sbin/fsck_ffs/dir.c stable/10/sbin/fsck_ffs/fsck.h stable/10/sbin/fsck_ffs/fsck_ffs.8 stable/10/sbin/fsck_ffs/fsutil.c stable/10/sbin/fsck_ffs/main.c stable/10/sbin/fsck_ffs/pass1.c stable/10/sbin/fsck_ffs/pass1b.c stable/10/sbin/fsck_ffs/suj.c stable/10/sbin/fsck_ffs/utilities.c stable/10/sbin/fsdb/Makefile Modified: stable/10/sbin/fsck_ffs/Makefile ============================================================================== --- stable/10/sbin/fsck_ffs/Makefile Thu Jan 2 01:40:19 2014 (r260177) +++ stable/10/sbin/fsck_ffs/Makefile Thu Jan 2 01:44:14 2014 (r260178) @@ -7,7 +7,8 @@ LINKS+= ${BINDIR}/fsck_ffs ${BINDIR}/fsc MAN= fsck_ffs.8 MLINKS= fsck_ffs.8 fsck_ufs.8 fsck_ffs.8 fsck_4.2bsd.8 SRCS= dir.c ea.c fsutil.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c \ - pass4.c pass5.c setup.c suj.c utilities.c gjournal.c getmntopts.c + pass4.c pass5.c setup.c suj.c utilities.c gjournal.c getmntopts.c \ + globs.c DPADD= ${LIBUFS} LDADD= -lufs WARNS?= 2 Modified: stable/10/sbin/fsck_ffs/dir.c ============================================================================== --- stable/10/sbin/fsck_ffs/dir.c Thu Jan 2 01:40:19 2014 (r260177) +++ stable/10/sbin/fsck_ffs/dir.c Thu Jan 2 01:44:14 2014 (r260178) @@ -48,20 +48,14 @@ __FBSDID("$FreeBSD$"); #include "fsck.h" -const char *lfname = "lost+found"; -int lfmode = 0700; -struct dirtemplate emptydir = { +static struct dirtemplate emptydir = { 0, DIRBLKSIZ, DT_UNKNOWN, 0, "", 0, 0, DT_UNKNOWN, 0, "" }; -struct dirtemplate dirhead = { +static struct dirtemplate dirhead = { 0, 12, DT_DIR, 1, ".", 0, DIRBLKSIZ - 12, DT_DIR, 2, ".." }; -struct odirtemplate odirhead = { - 0, 12, 1, ".", - 0, DIRBLKSIZ - 12, 2, ".." -}; static int chgino(struct inodesc *); static int dircheck(struct inodesc *, struct direct *); @@ -133,6 +127,7 @@ dirscan(struct inodesc *idesc) (size_t)dsize); dirty(bp); sbdirty(); + rerun = 1; } if (n & STOP) return (n); Modified: stable/10/sbin/fsck_ffs/fsck.h ============================================================================== --- stable/10/sbin/fsck_ffs/fsck.h Thu Jan 2 01:40:19 2014 (r260177) +++ stable/10/sbin/fsck_ffs/fsck.h Thu Jan 2 01:44:14 2014 (r260178) @@ -192,15 +192,15 @@ struct bufarea { "Inode Block", \ "Directory Contents", \ "User Data" } -long readcnt[BT_NUMBUFTYPES]; -long totalreadcnt[BT_NUMBUFTYPES]; -struct timespec readtime[BT_NUMBUFTYPES]; -struct timespec totalreadtime[BT_NUMBUFTYPES]; -struct timespec startprog; - -struct bufarea sblk; /* file system superblock */ -struct bufarea *pdirbp; /* current directory contents */ -struct bufarea *pbp; /* current inode block */ +extern long readcnt[BT_NUMBUFTYPES]; +extern long totalreadcnt[BT_NUMBUFTYPES]; +extern struct timespec readtime[BT_NUMBUFTYPES]; +extern struct timespec totalreadtime[BT_NUMBUFTYPES]; +extern struct timespec startprog; + +extern struct bufarea sblk; /* file system superblock */ +extern struct bufarea *pdirbp; /* current directory contents */ +extern struct bufarea *pbp; /* current inode block */ #define dirty(bp) do { \ if (fswritefd < 0) \ @@ -219,7 +219,7 @@ struct bufarea *pbp; /* current inode b #define sblock (*sblk.b_un.b_fs) enum fixstate {DONTKNOW, NOFIX, FIX, IGNORE}; -ino_t cursnapshot; +extern ino_t cursnapshot; struct inodesc { enum fixstate id_fix; /* policy on fixing errors */ @@ -282,63 +282,64 @@ struct inoinfo { u_int i_numblks; /* size of block array in bytes */ ufs2_daddr_t i_blks[1]; /* actually longer */ } **inphead, **inpsort; -long numdirs, dirhash, listmax, inplast; -long countdirs; /* number of directories we actually found */ +extern long numdirs, dirhash, listmax, inplast; +extern long countdirs; /* number of directories we actually found */ #define MIBSIZE 3 /* size of fsck sysctl MIBs */ -int adjrefcnt[MIBSIZE]; /* MIB command to adjust inode reference cnt */ -int adjblkcnt[MIBSIZE]; /* MIB command to adjust inode block count */ -int adjndir[MIBSIZE]; /* MIB command to adjust number of directories */ -int adjnbfree[MIBSIZE]; /* MIB command to adjust number of free blocks */ -int adjnifree[MIBSIZE]; /* MIB command to adjust number of free inodes */ -int adjnffree[MIBSIZE]; /* MIB command to adjust number of free frags */ -int adjnumclusters[MIBSIZE]; /* MIB command to adjust number of free clusters */ -int freefiles[MIBSIZE]; /* MIB command to free a set of files */ -int freedirs[MIBSIZE]; /* MIB command to free a set of directories */ -int freeblks[MIBSIZE]; /* MIB command to free a set of data blocks */ -struct fsck_cmd cmd; /* sysctl file system update commands */ -char snapname[BUFSIZ]; /* when doing snapshots, the name of the file */ -char *cdevname; /* name of device being checked */ -long dev_bsize; /* computed value of DEV_BSIZE */ -long secsize; /* actual disk sector size */ -u_int real_dev_bsize; /* actual disk sector size, not overriden */ -char nflag; /* assume a no response */ -char yflag; /* assume a yes response */ -int bkgrdflag; /* use a snapshot to run on an active system */ -int bflag; /* location of alternate super block */ -int debug; /* output debugging info */ -int Eflag; /* delete empty data blocks */ -int Zflag; /* zero empty data blocks */ -int inoopt; /* trim out unused inodes */ -char ckclean; /* only do work if not cleanly unmounted */ -int cvtlevel; /* convert to newer file system format */ -int bkgrdcheck; /* determine if background check is possible */ -int bkgrdsumadj; /* whether the kernel have ability to adjust superblock summary */ -char usedsoftdep; /* just fix soft dependency inconsistencies */ -char preen; /* just fix normal inconsistencies */ -char rerun; /* rerun fsck. Only used in non-preen mode */ -int returntosingle; /* 1 => return to single user mode on exit */ -char resolved; /* cleared if unresolved changes => not clean */ -char havesb; /* superblock has been read */ -char skipclean; /* skip clean file systems if preening */ -int fsmodified; /* 1 => write done to file system */ -int fsreadfd; /* file descriptor for reading file system */ -int fswritefd; /* file descriptor for writing file system */ -int surrender; /* Give up if reads fail */ - -ufs2_daddr_t maxfsblock; /* number of blocks in the file system */ -char *blockmap; /* ptr to primary blk allocation map */ -ino_t maxino; /* number of inodes in file system */ - -ino_t lfdir; /* lost & found directory inode number */ -const char *lfname; /* lost & found directory name */ -int lfmode; /* lost & found directory creation mode */ +extern int adjrefcnt[MIBSIZE]; /* MIB command to adjust inode reference cnt */ +extern int adjblkcnt[MIBSIZE]; /* MIB command to adjust inode block count */ +extern int adjndir[MIBSIZE]; /* MIB command to adjust number of directories */ +extern int adjnbfree[MIBSIZE]; /* MIB command to adjust number of free blocks */ +extern int adjnifree[MIBSIZE]; /* MIB command to adjust number of free inodes */ +extern int adjnffree[MIBSIZE]; /* MIB command to adjust number of free frags */ +extern int adjnumclusters[MIBSIZE]; /* MIB command to adjust number of free clusters */ +extern int freefiles[MIBSIZE]; /* MIB command to free a set of files */ +extern int freedirs[MIBSIZE]; /* MIB command to free a set of directories */ +extern int freeblks[MIBSIZE]; /* MIB command to free a set of data blocks */ +extern struct fsck_cmd cmd; /* sysctl file system update commands */ +extern char snapname[BUFSIZ]; /* when doing snapshots, the name of the file */ +extern char *cdevname; /* name of device being checked */ +extern long dev_bsize; /* computed value of DEV_BSIZE */ +extern long secsize; /* actual disk sector size */ +extern u_int real_dev_bsize; /* actual disk sector size, not overriden */ +extern char nflag; /* assume a no response */ +extern char yflag; /* assume a yes response */ +extern int bkgrdflag; /* use a snapshot to run on an active system */ +extern int bflag; /* location of alternate super block */ +extern int debug; /* output debugging info */ +extern int Eflag; /* delete empty data blocks */ +extern int Zflag; /* zero empty data blocks */ +extern int inoopt; /* trim out unused inodes */ +extern char ckclean; /* only do work if not cleanly unmounted */ +extern int cvtlevel; /* convert to newer file system format */ +extern int bkgrdcheck; /* determine if background check is possible */ +extern int bkgrdsumadj; /* whether the kernel have ability to adjust superblock summary */ +extern char usedsoftdep; /* just fix soft dependency inconsistencies */ +extern char preen; /* just fix normal inconsistencies */ +extern char rerun; /* rerun fsck. Only used in non-preen mode */ +extern int returntosingle; /* 1 => return to single user mode on exit */ +extern char resolved; /* cleared if unresolved changes => not clean */ +extern char havesb; /* superblock has been read */ +extern char skipclean; /* skip clean file systems if preening */ +extern int fsmodified; /* 1 => write done to file system */ +extern int fsreadfd; /* file descriptor for reading file system */ +extern int fswritefd; /* file descriptor for writing file system */ +extern int surrender; /* Give up if reads fail */ +extern int wantrestart; /* Restart fsck on early termination */ + +extern ufs2_daddr_t maxfsblock; /* number of blocks in the file system */ +extern char *blockmap; /* ptr to primary blk allocation map */ +extern ino_t maxino; /* number of inodes in file system */ + +extern ino_t lfdir; /* lost & found directory inode number */ +extern const char *lfname; /* lost & found directory name */ +extern int lfmode; /* lost & found directory creation mode */ -ufs2_daddr_t n_blks; /* number of blocks in use */ -ino_t n_files; /* number of files in use */ +extern ufs2_daddr_t n_blks; /* number of blocks in use */ +extern ino_t n_files; /* number of files in use */ -volatile sig_atomic_t got_siginfo; /* received a SIGINFO */ -volatile sig_atomic_t got_sigalarm; /* received a SIGALRM */ +extern volatile sig_atomic_t got_siginfo; /* received a SIGINFO */ +extern volatile sig_atomic_t got_sigalarm; /* received a SIGALRM */ #define clearinode(dp) \ if (sblock.fs_magic == FS_UFS1_MAGIC) { \ @@ -346,8 +347,8 @@ volatile sig_atomic_t got_sigalarm; /* r } else { \ (dp)->dp2 = ufs2_zino; \ } -struct ufs1_dinode ufs1_zino; -struct ufs2_dinode ufs2_zino; +extern struct ufs1_dinode ufs1_zino; +extern struct ufs2_dinode ufs2_zino; #define setbmap(blkno) setbit(blockmap, blkno) #define testbmap(blkno) isset(blockmap, blkno) @@ -360,6 +361,7 @@ struct ufs2_dinode ufs2_zino; #define FOUND 0x10 #define EEXIT 8 /* Standard error exit. */ +#define ERESTART -1 int flushentry(void); /* @@ -428,6 +430,7 @@ void flush(int fd, struct bufarea *bp); void freeblk(ufs2_daddr_t blkno, long frags); void freeino(ino_t ino); void freeinodebuf(void); +void fsutilinit(void); int ftypeok(union dinode *dp); void getblk(struct bufarea *bp, ufs2_daddr_t blk, long size); struct bufarea *cgget(int cg); @@ -466,5 +469,6 @@ int setup(char *dev); void gjournal_check(const char *filesys); int suj_check(const char *filesys); void update_maps(struct cg *, struct cg*, int); +void fsckinit(void); #endif /* !_FSCK_H_ */ Modified: stable/10/sbin/fsck_ffs/fsck_ffs.8 ============================================================================== --- stable/10/sbin/fsck_ffs/fsck_ffs.8 Thu Jan 2 01:40:19 2014 (r260177) +++ stable/10/sbin/fsck_ffs/fsck_ffs.8 Thu Jan 2 01:44:14 2014 (r260178) @@ -38,7 +38,7 @@ .Nd file system consistency check and interactive repair .Sh SYNOPSIS .Nm -.Op Fl BEFfnpryZ +.Op Fl BEFfnpRryZ .Op Fl b Ar block .Op Fl c Ar level .Op Fl m Ar mode @@ -266,6 +266,11 @@ which is assumed to be affirmative; do not open the file system for writing. .It Fl p Preen file systems (see above). +.It Fl R +Instruct fsck_ffs to restart itself if it encounters certain errors that +warrant another run. It will limit itself to a maximum of 10 restarts +in a given run in order to avoid an endless loop with extremely corrupted +filesystems. .It Fl r Free up excess unused inodes. Decreasing the number of preallocated inodes reduces the Modified: stable/10/sbin/fsck_ffs/fsutil.c ============================================================================== --- stable/10/sbin/fsck_ffs/fsutil.c Thu Jan 2 01:40:19 2014 (r260177) +++ stable/10/sbin/fsck_ffs/fsutil.c Thu Jan 2 01:44:14 2014 (r260178) @@ -74,6 +74,25 @@ static struct bufarea cgblk; /* backup b static TAILQ_HEAD(buflist, bufarea) bufhead; /* head of buffer cache list */ static int numbufs; /* size of buffer cache */ static char *buftype[BT_NUMBUFTYPES] = BT_NAMES; +static struct bufarea *cgbufs; /* header for cylinder group cache */ +static int flushtries; /* number of tries to reclaim memory */ + +void +fsutilinit(void) +{ + diskreads = totaldiskreads = totalreads = 0; + bzero(&startpass, sizeof(struct timespec)); + bzero(&finishpass, sizeof(struct timespec)); + bzero(&slowio_starttime, sizeof(struct timeval)); + slowio_delay_usec = 10000; + slowio_pollcnt = 0; + bzero(&cgblk, sizeof(struct bufarea)); + TAILQ_INIT(&bufhead); + numbufs = 0; + /* buftype ? */ + cgbufs = NULL; + flushtries = 0; +} int ftypeok(union dinode *dp) Copied: stable/10/sbin/fsck_ffs/globs.c (from r260076, head/sbin/fsck_ffs/globs.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/sbin/fsck_ffs/globs.c Thu Jan 2 01:44:14 2014 (r260178, copy of r260076, head/sbin/fsck_ffs/globs.c) @@ -0,0 +1,165 @@ +/* + * Copyright (c) 1980, 1986, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#if 0 +#ifndef lint +static const char copyright[] = +"@(#) Copyright (c) 1980, 1986, 1993\n\ + The Regents of the University of California. All rights reserved.\n"; +#endif /* not lint */ + +#ifndef lint +static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/14/95"; +#endif /* not lint */ +#endif +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include "fsck.h" + +long readcnt[BT_NUMBUFTYPES]; +long totalreadcnt[BT_NUMBUFTYPES]; +struct timespec readtime[BT_NUMBUFTYPES]; +struct timespec totalreadtime[BT_NUMBUFTYPES]; +struct timespec startprog; +struct bufarea sblk; /* file system superblock */ +struct bufarea *pdirbp; /* current directory contents */ +struct bufarea *pbp; /* current inode block */ +ino_t cursnapshot; +long numdirs, dirhash, listmax, inplast; +long countdirs; /* number of directories we actually found */ +int adjrefcnt[MIBSIZE]; /* MIB command to adjust inode reference cnt */ +int adjblkcnt[MIBSIZE]; /* MIB command to adjust inode block count */ +int adjndir[MIBSIZE]; /* MIB command to adjust number of directories */ +int adjnbfree[MIBSIZE]; /* MIB command to adjust number of free blocks */ +int adjnifree[MIBSIZE]; /* MIB command to adjust number of free inodes */ +int adjnffree[MIBSIZE]; /* MIB command to adjust number of free frags */ +int adjnumclusters[MIBSIZE]; /* MIB command to adjust number of free clusters */ +int freefiles[MIBSIZE]; /* MIB command to free a set of files */ +int freedirs[MIBSIZE]; /* MIB command to free a set of directories */ +int freeblks[MIBSIZE]; /* MIB command to free a set of data blocks */ +struct fsck_cmd cmd; /* sysctl file system update commands */ +char snapname[BUFSIZ]; /* when doing snapshots, the name of the file */ +char *cdevname; /* name of device being checked */ +long dev_bsize; /* computed value of DEV_BSIZE */ +long secsize; /* actual disk sector size */ +u_int real_dev_bsize; /* actual disk sector size, not overriden */ +char nflag; /* assume a no response */ +char yflag; /* assume a yes response */ +int bkgrdflag; /* use a snapshot to run on an active system */ +int bflag; /* location of alternate super block */ +int debug; /* output debugging info */ +int Eflag; /* delete empty data blocks */ +int Zflag; /* zero empty data blocks */ +int inoopt; /* trim out unused inodes */ +char ckclean; /* only do work if not cleanly unmounted */ +int cvtlevel; /* convert to newer file system format */ +int bkgrdcheck; /* determine if background check is possible */ +int bkgrdsumadj; /* whether the kernel have ability to adjust superblock summary */ +char usedsoftdep; /* just fix soft dependency inconsistencies */ +char preen; /* just fix normal inconsistencies */ +char rerun; /* rerun fsck. Only used in non-preen mode */ +int returntosingle; /* 1 => return to single user mode on exit */ +char resolved; /* cleared if unresolved changes => not clean */ +char havesb; /* superblock has been read */ +char skipclean; /* skip clean file systems if preening */ +int fsmodified; /* 1 => write done to file system */ +int fsreadfd; /* file descriptor for reading file system */ +int fswritefd; /* file descriptor for writing file system */ +int surrender; /* Give up if reads fail */ +int wantrestart; /* Restart fsck on early termination */ +ufs2_daddr_t maxfsblock; /* number of blocks in the file system */ +char *blockmap; /* ptr to primary blk allocation map */ +ino_t maxino; /* number of inodes in file system */ +ino_t lfdir; /* lost & found directory inode number */ +const char *lfname; /* lost & found directory name */ +int lfmode; /* lost & found directory creation mode */ +ufs2_daddr_t n_blks; /* number of blocks in use */ +ino_t n_files; /* number of files in use */ +volatile sig_atomic_t got_siginfo; /* received a SIGINFO */ +volatile sig_atomic_t got_sigalarm; /* received a SIGALRM */ +struct ufs1_dinode ufs1_zino; +struct ufs2_dinode ufs2_zino; + +void +fsckinit(void) +{ + bzero(readcnt, sizeof(long) * BT_NUMBUFTYPES); + bzero(totalreadcnt, sizeof(long) * BT_NUMBUFTYPES); + bzero(readtime, sizeof(struct timespec) * BT_NUMBUFTYPES); + bzero(totalreadtime, sizeof(struct timespec) * BT_NUMBUFTYPES); + bzero(&startprog, sizeof(struct timespec));; + bzero(&sblk, sizeof(struct bufarea)); + pdirbp = NULL; + pbp = NULL; + cursnapshot = 0; + numdirs = dirhash = listmax = inplast = 0; + countdirs = 0; + bzero(adjrefcnt, sizeof(int) * MIBSIZE); + bzero(adjblkcnt, sizeof(int) * MIBSIZE); + bzero(adjndir, sizeof(int) * MIBSIZE); + bzero(adjnbfree, sizeof(int) * MIBSIZE); + bzero(adjnifree, sizeof(int) * MIBSIZE); + bzero(adjnffree, sizeof(int) * MIBSIZE); + bzero(adjnumclusters, sizeof(int) * MIBSIZE); + bzero(freefiles, sizeof(int) * MIBSIZE); + bzero(freedirs, sizeof(int) * MIBSIZE); + bzero(freeblks, sizeof(int) * MIBSIZE); + bzero(&cmd, sizeof(struct fsck_cmd)); + bzero(snapname, sizeof(char) * BUFSIZ); + cdevname = NULL; + dev_bsize = 0; + secsize = 0; + real_dev_bsize = 0; + bkgrdsumadj = 0; + usedsoftdep = 0; + rerun = 0; + returntosingle = 0; + resolved = 0; + havesb = 0; + fsmodified = 0; + fsreadfd = 0; + fswritefd = 0; + maxfsblock = 0; + blockmap = NULL; + maxino = 0; + lfdir = 0; + lfname = "lost+found"; + lfmode = 0700; + n_blks = 0; + n_files = 0; + got_siginfo = 0; + got_sigalarm = 0; + bzero(&ufs1_zino, sizeof(struct ufs1_dinode)); + bzero(&ufs2_zino, sizeof(struct ufs2_dinode)); +} Modified: stable/10/sbin/fsck_ffs/main.c ============================================================================== --- stable/10/sbin/fsck_ffs/main.c Thu Jan 2 01:40:19 2014 (r260177) +++ stable/10/sbin/fsck_ffs/main.c Thu Jan 2 01:44:14 2014 (r260178) @@ -65,6 +65,8 @@ __FBSDID("$FreeBSD$"); #include "fsck.h" +int restarts; + static void usage(void) __dead2; static int argtoi(int flag, const char *req, const char *str, int base); static int checkfilesys(char *filesys); @@ -82,7 +84,7 @@ main(int argc, char *argv[]) sync(); skipclean = 1; inoopt = 0; - while ((ch = getopt(argc, argv, "b:Bc:CdEfFm:nprSyZ")) != -1) { + while ((ch = getopt(argc, argv, "b:Bc:CdEfFm:npRrSyZ")) != -1) { switch (ch) { case 'b': skipclean = 0; @@ -138,6 +140,9 @@ main(int argc, char *argv[]) ckclean++; break; + case 'R': + wantrestart = 1; + break; case 'r': inoopt++; break; @@ -186,8 +191,12 @@ main(int argc, char *argv[]) rlimit.rlim_cur = rlimit.rlim_max; (void)setrlimit(RLIMIT_DATA, &rlimit); } - while (argc-- > 0) - (void)checkfilesys(*argv++); + while (argc > 0) { + if (checkfilesys(*argv) == ERESTART) + continue; + argc--; + argv++; + } if (returntosingle) ret = 2; @@ -228,6 +237,8 @@ checkfilesys(char *filesys) iov = NULL; iovlen = 0; errmsg[0] = '\0'; + fsutilinit(); + fsckinit(); cdevname = filesys; if (debug && ckclean) @@ -550,8 +561,12 @@ checkfilesys(char *filesys) inostathead = NULL; if (fsmodified && !preen) printf("\n***** FILE SYSTEM WAS MODIFIED *****\n"); - if (rerun) + if (rerun) { + if (wantrestart && (restarts++ < 10) && + (preen || reply("RESTART"))) + return (ERESTART); printf("\n***** PLEASE RERUN FSCK *****\n"); + } if (chkdoreload(mntp) != 0) { if (!fsmodified) return (0); @@ -654,3 +669,15 @@ usage(void) getprogname()); exit(1); } + +void +infohandler(int sig __unused) +{ + got_siginfo = 1; +} + +void +alarmhandler(int sig __unused) +{ + got_sigalarm = 1; +} Modified: stable/10/sbin/fsck_ffs/pass1.c ============================================================================== --- stable/10/sbin/fsck_ffs/pass1.c Thu Jan 2 01:40:19 2014 (r260177) +++ stable/10/sbin/fsck_ffs/pass1.c Thu Jan 2 01:44:14 2014 (r260178) @@ -68,6 +68,8 @@ pass1(void) u_int8_t *cp; int c, rebuildcg; + badblk = dupblk = lastino = 0; + /* * Set file system reserved blocks in used block map. */ @@ -463,6 +465,7 @@ pass1check(struct inodesc *idesc) ckfini(0); exit(EEXIT); } + rerun = 1; return (STOP); } } @@ -483,6 +486,7 @@ pass1check(struct inodesc *idesc) ckfini(0); exit(EEXIT); } + rerun = 1; return (STOP); } new = (struct dups *)Malloc(sizeof(struct dups)); @@ -492,6 +496,7 @@ pass1check(struct inodesc *idesc) ckfini(0); exit(EEXIT); } + rerun = 1; return (STOP); } new->dup = blkno; Modified: stable/10/sbin/fsck_ffs/pass1b.c ============================================================================== --- stable/10/sbin/fsck_ffs/pass1b.c Thu Jan 2 01:40:19 2014 (r260177) +++ stable/10/sbin/fsck_ffs/pass1b.c Thu Jan 2 01:44:14 2014 (r260178) @@ -80,8 +80,10 @@ pass1b(void) continue; idesc.id_number = inumber; if (inoinfo(inumber)->ino_state != USTATE && - (ckinode(dp, &idesc) & STOP)) + (ckinode(dp, &idesc) & STOP)) { + rerun = 1; return; + } } } } @@ -106,8 +108,10 @@ pass1bcheck(struct inodesc *idesc) if (dlp == muldup) break; } - if (muldup == 0 || duphead == muldup->next) + if (muldup == 0 || duphead == muldup->next) { + rerun = 1; return (STOP); + } } return (res); } Modified: stable/10/sbin/fsck_ffs/suj.c ============================================================================== --- stable/10/sbin/fsck_ffs/suj.c Thu Jan 2 01:40:19 2014 (r260177) +++ stable/10/sbin/fsck_ffs/suj.c Thu Jan 2 01:44:14 2014 (r260178) @@ -125,26 +125,26 @@ struct suj_cg { int sc_cgx; }; -LIST_HEAD(cghd, suj_cg) cghash[SUJ_HASHSIZE]; -LIST_HEAD(dblkhd, data_blk) dbhash[SUJ_HASHSIZE]; -struct suj_cg *lastcg; -struct data_blk *lastblk; +static LIST_HEAD(cghd, suj_cg) cghash[SUJ_HASHSIZE]; +static LIST_HEAD(dblkhd, data_blk) dbhash[SUJ_HASHSIZE]; +static struct suj_cg *lastcg; +static struct data_blk *lastblk; -TAILQ_HEAD(seghd, suj_seg) allsegs; -uint64_t oldseq; +static TAILQ_HEAD(seghd, suj_seg) allsegs; +static uint64_t oldseq; static struct uufsd *disk = NULL; static struct fs *fs = NULL; -ino_t sujino; +static ino_t sujino; /* * Summary statistics. */ -uint64_t freefrags; -uint64_t freeblocks; -uint64_t freeinos; -uint64_t freedir; -uint64_t jbytes; -uint64_t jrecs; +static uint64_t freefrags; +static uint64_t freeblocks; +static uint64_t freeinos; +static uint64_t freedir; +static uint64_t jbytes; +static uint64_t jrecs; static jmp_buf jmpbuf; @@ -155,6 +155,7 @@ static void ino_decr(ino_t); static void ino_adjust(struct suj_ino *); static void ino_build(struct suj_ino *); static int blk_isfree(ufs2_daddr_t); +static void initsuj(void); static void * errmalloc(size_t n) @@ -2413,7 +2414,7 @@ struct jextent { int je_blocks; /* Disk block count. */ }; -struct jblocks *suj_jblocks; +static struct jblocks *suj_jblocks; static struct jblocks * jblocks_create(void) @@ -2673,8 +2674,8 @@ suj_check(const char *filesys) struct suj_seg *seg; struct suj_seg *segn; + initsuj(); opendisk(filesys); - TAILQ_INIT(&allsegs); /* * Set an exit point when SUJ check failed @@ -2763,3 +2764,28 @@ suj_check(const char *filesys) return (0); } + +static void +initsuj(void) +{ + int i; + + for (i = 0; i < SUJ_HASHSIZE; i++) { + LIST_INIT(&cghash[i]); + LIST_INIT(&dbhash[i]); + } + lastcg = NULL; + lastblk = NULL; + TAILQ_INIT(&allsegs); + oldseq = 0; + disk = NULL; + fs = NULL; + sujino = 0; + freefrags = 0; + freeblocks = 0; + freeinos = 0; + freedir = 0; + jbytes = 0; + jrecs = 0; + suj_jblocks = NULL; +} Modified: stable/10/sbin/fsck_ffs/utilities.c ============================================================================== --- stable/10/sbin/fsck_ffs/utilities.c Thu Jan 2 01:40:19 2014 (r260177) +++ stable/10/sbin/fsck_ffs/utilities.c Thu Jan 2 01:44:14 2014 (r260178) @@ -108,14 +108,3 @@ retry: return (origname); } -void -infohandler(int sig __unused) -{ - got_siginfo = 1; -} - -void -alarmhandler(int sig __unused) -{ - got_sigalarm = 1; -} Modified: stable/10/sbin/fsdb/Makefile ============================================================================== --- stable/10/sbin/fsdb/Makefile Thu Jan 2 01:40:19 2014 (r260177) +++ stable/10/sbin/fsdb/Makefile Thu Jan 2 01:44:14 2014 (r260178) @@ -6,7 +6,7 @@ PROG= fsdb MAN= fsdb.8 SRCS= fsdb.c fsdbutil.c \ dir.c ea.c fsutil.c inode.c pass1.c pass1b.c pass2.c pass3.c pass4.c \ - pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c + pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c globs.c CFLAGS+= -I${.CURDIR}/../fsck_ffs WARNS?= 2 LDADD= -ledit -ltermcap From owner-svn-src-stable-10@FreeBSD.ORG Thu Jan 2 01:51:55 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 47435CA8; Thu, 2 Jan 2014 01:51:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 32377174C; Thu, 2 Jan 2014 01:51:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s021ptNT044257; Thu, 2 Jan 2014 01:51:55 GMT (envelope-from scottl@svn.freebsd.org) Received: (from scottl@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s021psf4044254; Thu, 2 Jan 2014 01:51:54 GMT (envelope-from scottl@svn.freebsd.org) Message-Id: <201401020151.s021psf4044254@svn.freebsd.org> From: Scott Long Date: Thu, 2 Jan 2014 01:51:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260179 - stable/10/sys/net X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jan 2014 01:51:55 -0000 Author: scottl Date: Thu Jan 2 01:51:54 2014 New Revision: 260179 URL: http://svnweb.freebsd.org/changeset/base/260179 Log: MFC r260070 Multi-queue NIC drivers and multi-port lagg tend to use the same lower bits of the flowid as each other, resulting in a poor distribution of packets among queues in certain cases. Work around this by adding a set of sysctls for controlling a bit-shift on the flowid when doing multi-port aggrigation in lagg and lacp. By default, lagg/lacp will now use bits 16 and higher instead of 0 and higher. Obtained from: Netflix Modified: stable/10/sys/net/ieee8023ad_lacp.c stable/10/sys/net/if_lagg.c stable/10/sys/net/if_lagg.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/net/ieee8023ad_lacp.c ============================================================================== --- stable/10/sys/net/ieee8023ad_lacp.c Thu Jan 2 01:44:14 2014 (r260178) +++ stable/10/sys/net/ieee8023ad_lacp.c Thu Jan 2 01:51:54 2014 (r260179) @@ -874,7 +874,7 @@ lacp_select_tx_port(struct lagg_softc *s } if (sc->use_flowid && (m->m_flags & M_FLOWID)) - hash = m->m_pkthdr.flowid; + hash = m->m_pkthdr.flowid >> sc->flowid_shift; else hash = lagg_hashmbuf(sc, m, lsc->lsc_hashkey); hash %= pm->pm_count; Modified: stable/10/sys/net/if_lagg.c ============================================================================== --- stable/10/sys/net/if_lagg.c Thu Jan 2 01:44:14 2014 (r260178) +++ stable/10/sys/net/if_lagg.c Thu Jan 2 01:51:54 2014 (r260179) @@ -184,6 +184,11 @@ TUNABLE_INT("net.link.lagg.default_use_f SYSCTL_INT(_net_link_lagg, OID_AUTO, default_use_flowid, CTLFLAG_RW, &def_use_flowid, 0, "Default setting for using flow id for load sharing"); +static int def_flowid_shift = 16; /* Default value for using M_FLOWID */ +TUNABLE_INT("net.link.lagg.default_flowid_shift", &def_flowid_shift); +SYSCTL_INT(_net_link_lagg, OID_AUTO, default_flowid_shift, CTLFLAG_RW, + &def_flowid_shift, 0, + "Default setting for flowid shift for load sharing"); static int lagg_modevent(module_t mod, int type, void *data) @@ -293,12 +298,17 @@ lagg_clone_create(struct if_clone *ifc, sysctl_ctx_init(&sc->ctx); snprintf(num, sizeof(num), "%u", unit); sc->use_flowid = def_use_flowid; + sc->flowid_shift = def_flowid_shift; sc->sc_oid = oid = SYSCTL_ADD_NODE(&sc->ctx, &SYSCTL_NODE_CHILDREN(_net_link, lagg), OID_AUTO, num, CTLFLAG_RD, NULL, ""); SYSCTL_ADD_INT(&sc->ctx, SYSCTL_CHILDREN(oid), OID_AUTO, - "use_flowid", CTLTYPE_INT|CTLFLAG_RW, &sc->use_flowid, sc->use_flowid, - "Use flow id for load sharing"); + "use_flowid", CTLTYPE_INT|CTLFLAG_RW, &sc->use_flowid, + sc->use_flowid, "Use flow id for load sharing"); + SYSCTL_ADD_INT(&sc->ctx, SYSCTL_CHILDREN(oid), OID_AUTO, + "flowid_shift", CTLTYPE_INT|CTLFLAG_RW, &sc->flowid_shift, + sc->flowid_shift, + "Shift flowid bits to prevent multiqueue collisions"); SYSCTL_ADD_INT(&sc->ctx, SYSCTL_CHILDREN(oid), OID_AUTO, "count", CTLTYPE_INT|CTLFLAG_RD, &sc->sc_count, sc->sc_count, "Total number of ports"); @@ -1850,7 +1860,7 @@ lagg_lb_start(struct lagg_softc *sc, str uint32_t p = 0; if (sc->use_flowid && (m->m_flags & M_FLOWID)) - p = m->m_pkthdr.flowid; + p = m->m_pkthdr.flowid >> sc->flowid_shift; else p = lagg_hashmbuf(sc, m, lb->lb_key); p %= sc->sc_count; Modified: stable/10/sys/net/if_lagg.h ============================================================================== --- stable/10/sys/net/if_lagg.h Thu Jan 2 01:44:14 2014 (r260178) +++ stable/10/sys/net/if_lagg.h Thu Jan 2 01:51:54 2014 (r260179) @@ -231,6 +231,7 @@ struct lagg_softc { struct sysctl_ctx_list ctx; /* sysctl variables */ struct sysctl_oid *sc_oid; /* sysctl tree oid */ int use_flowid; /* use M_FLOWID */ + int flowid_shift; /* shift the flowid */ }; struct lagg_port { From owner-svn-src-stable-10@FreeBSD.ORG Thu Jan 2 13:44:02 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 842FB842; Thu, 2 Jan 2014 13:44:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6FA961AD2; Thu, 2 Jan 2014 13:44:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s02Di2MY014926; Thu, 2 Jan 2014 13:44:02 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s02Di2he014925; Thu, 2 Jan 2014 13:44:02 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201401021344.s02Di2he014925@svn.freebsd.org> From: Edward Tomasz Napierala Date: Thu, 2 Jan 2014 13:44:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260190 - stable/10/usr.bin/iscsictl X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jan 2014 13:44:02 -0000 Author: trasz Date: Thu Jan 2 13:44:01 2014 New Revision: 260190 URL: http://svnweb.freebsd.org/changeset/base/260190 Log: MFC r260105: Fix typo. Sponsored by: The FreeBSD Foundation Modified: stable/10/usr.bin/iscsictl/iscsictl.8 Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.bin/iscsictl/iscsictl.8 ============================================================================== --- stable/10/usr.bin/iscsictl/iscsictl.8 Thu Jan 2 11:24:04 2014 (r260189) +++ stable/10/usr.bin/iscsictl/iscsictl.8 Thu Jan 2 13:44:01 2014 (r260190) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 30, 2013 +.Dd December 30, 2013 .Dt ISCSICTL 8 .Os .Sh NAME @@ -132,8 +132,8 @@ The .Nm utility exits 0 on success, and >0 if an error occurs. .Sh EXAMPLES -Attach to target qn.2012-06.com.example:target0, served by 192.168.1.1: -.Dl Nm Fl A Fl t Ar qn.2012-06.com.example:target0 Fl p Ar 192.168.1.1 +Attach to target iqn.2012-06.com.example:target0, served by 192.168.1.1: +.Dl Nm Fl A Fl t Ar iqn.2012-06.com.example:target0 Fl p Ar 192.168.1.1 .Pp Disconnect all iSCSI sessions: .Dl Nm Fl Ra From owner-svn-src-stable-10@FreeBSD.ORG Thu Jan 2 13:45:25 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2DCCD988; Thu, 2 Jan 2014 13:45:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 18C361ADB; Thu, 2 Jan 2014 13:45:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s02DjO8L015168; Thu, 2 Jan 2014 13:45:24 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s02DjOoc015167; Thu, 2 Jan 2014 13:45:24 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201401021345.s02DjOoc015167@svn.freebsd.org> From: Edward Tomasz Napierala Date: Thu, 2 Jan 2014 13:45:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260191 - stable/10/usr.bin/iscsictl X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jan 2014 13:45:25 -0000 Author: trasz Date: Thu Jan 2 13:45:24 2014 New Revision: 260191 URL: http://svnweb.freebsd.org/changeset/base/260191 Log: MFC r260106: The devd part never got implemented; remove for now, until someone actually needs this feature and can talk to me about how it should look like. Sponsored by: The FreeBSD Foundation Modified: stable/10/usr.bin/iscsictl/iscsictl.8 Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.bin/iscsictl/iscsictl.8 ============================================================================== --- stable/10/usr.bin/iscsictl/iscsictl.8 Thu Jan 2 13:44:01 2014 (r260190) +++ stable/10/usr.bin/iscsictl/iscsictl.8 Thu Jan 2 13:45:24 2014 (r260191) @@ -99,9 +99,6 @@ exit status does not mean that the sessi Use .Nm Fl L to check the connection status. -The initiator notifies -.Xr devd 8 -when session gets connected or disconnected. .Pp Note that in order to the iSCSI initiator to be able to connect to a target, the From owner-svn-src-stable-10@FreeBSD.ORG Thu Jan 2 13:46:33 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CA1E9ACF; Thu, 2 Jan 2014 13:46:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B59291ADF; Thu, 2 Jan 2014 13:46:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s02DkXOc015344; Thu, 2 Jan 2014 13:46:33 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s02DkXp4015343; Thu, 2 Jan 2014 13:46:33 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201401021346.s02DkXp4015343@svn.freebsd.org> From: Edward Tomasz Napierala Date: Thu, 2 Jan 2014 13:46:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260192 - stable/10/sbin/iscontrol X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jan 2014 13:46:33 -0000 Author: trasz Date: Thu Jan 2 13:46:33 2014 New Revision: 260192 URL: http://svnweb.freebsd.org/changeset/base/260192 Log: MFC r259502: Reword the part about mutual CHAP. Sponsored by: The FreeBSD Foundation Modified: stable/10/sbin/iscontrol/iscsi.conf.5 Directory Properties: stable/10/ (props changed) Modified: stable/10/sbin/iscontrol/iscsi.conf.5 ============================================================================== --- stable/10/sbin/iscontrol/iscsi.conf.5 Thu Jan 2 13:45:24 2014 (r260191) +++ stable/10/sbin/iscontrol/iscsi.conf.5 Thu Jan 2 13:46:33 2014 (r260192) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 10, 2013 +.Dd December 17, 2013 .Dt ISCSI.CONF 5 .Os .Sh NAME @@ -145,10 +145,9 @@ the chap-name, defaults to .Em hostname . .It Cm chapDigest can be MD5 or SHA1. -.It Cm tgtChapSecret/tgtChapName -same as the none -.Em tgt -counterpart, but to authenticate the target. +.It Cm tgtChapName/tgtChapSecret +name and secret used for mutual CHAP; by default, mutual CHAP +is not used. .El .Sh FILES .Bl -tag -width indent From owner-svn-src-stable-10@FreeBSD.ORG Thu Jan 2 13:48:54 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A2588D00; Thu, 2 Jan 2014 13:48:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8D7FA1AFF; Thu, 2 Jan 2014 13:48:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s02Dmsac015725; Thu, 2 Jan 2014 13:48:54 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s02DmsmK015724; Thu, 2 Jan 2014 13:48:54 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201401021348.s02DmsmK015724@svn.freebsd.org> From: Edward Tomasz Napierala Date: Thu, 2 Jan 2014 13:48:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260193 - stable/10/sbin/sysctl X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jan 2014 13:48:54 -0000 Author: trasz Date: Thu Jan 2 13:48:54 2014 New Revision: 260193 URL: http://svnweb.freebsd.org/changeset/base/260193 Log: MFC r258659: Fix warnings to not append "No error: 0". Sponsored by: The FreeBSD Foundation Modified: stable/10/sbin/sysctl/sysctl.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sbin/sysctl/sysctl.c ============================================================================== --- stable/10/sbin/sysctl/sysctl.c Thu Jan 2 13:46:33 2014 (r260192) +++ stable/10/sbin/sysctl/sysctl.c Thu Jan 2 13:48:54 2014 (r260193) @@ -201,7 +201,7 @@ parse(const char *string, int lineno) cp = buf; if (snprintf(buf, BUFSIZ, "%s", string) >= BUFSIZ) { - warn("oid too long: '%s'%s", string, line); + warnx("oid too long: '%s'%s", string, line); return (1); } bufp = strsep(&cp, "=:"); @@ -260,7 +260,7 @@ parse(const char *string, int lineno) } } else { if ((kind & CTLTYPE) == CTLTYPE_NODE) { - warn("oid '%s' isn't a leaf node%s", bufp, line); + warnx("oid '%s' isn't a leaf node%s", bufp, line); return (1); } From owner-svn-src-stable-10@FreeBSD.ORG Thu Jan 2 13:59:23 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CFD26136; Thu, 2 Jan 2014 13:59:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BBD7F1CA9; Thu, 2 Jan 2014 13:59:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s02DxNZE019522; Thu, 2 Jan 2014 13:59:23 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s02DxN4s019521; Thu, 2 Jan 2014 13:59:23 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201401021359.s02DxN4s019521@svn.freebsd.org> From: Edward Tomasz Napierala Date: Thu, 2 Jan 2014 13:59:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260195 - stable/10/bin/ps X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jan 2014 13:59:23 -0000 Author: trasz Date: Thu Jan 2 13:59:23 2014 New Revision: 260195 URL: http://svnweb.freebsd.org/changeset/base/260195 Log: MFC r256838: Don't test arrays for being NULL. Sponsored by: The FreeBSD Foundation Modified: stable/10/bin/ps/print.c Directory Properties: stable/10/ (props changed) Modified: stable/10/bin/ps/print.c ============================================================================== --- stable/10/bin/ps/print.c Thu Jan 2 13:53:53 2014 (r260194) +++ stable/10/bin/ps/print.c Thu Jan 2 13:59:23 2014 (r260195) @@ -797,8 +797,6 @@ char * emulname(KINFO *k, VARENT *ve __unused) { - if (k->ki_p->ki_emul == NULL) - return (NULL); return (strdup(k->ki_p->ki_emul)); } @@ -827,7 +825,6 @@ out: char * loginclass(KINFO *k, VARENT *ve __unused) { - char *s; /* * Don't display login class for system processes; @@ -837,8 +834,5 @@ loginclass(KINFO *k, VARENT *ve __unused if (k->ki_p->ki_flag & P_SYSTEM) { return (strdup("-")); } - s = k->ki_p->ki_loginclass; - if (s == NULL) - return (NULL); - return (strdup(s)); + return (strdup(k->ki_p->ki_loginclass)); } From owner-svn-src-stable-10@FreeBSD.ORG Thu Jan 2 15:43:23 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DC84A623; Thu, 2 Jan 2014 15:43:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C848913B4; Thu, 2 Jan 2014 15:43:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s02FhN5n060867; Thu, 2 Jan 2014 15:43:23 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s02FhNrK060866; Thu, 2 Jan 2014 15:43:23 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201401021543.s02FhNrK060866@svn.freebsd.org> From: Sergey Kandaurov Date: Thu, 2 Jan 2014 15:43:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260196 - stable/10/usr.sbin/crashinfo X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jan 2014 15:43:23 -0000 Author: pluknet Date: Thu Jan 2 15:43:23 2014 New Revision: 260196 URL: http://svnweb.freebsd.org/changeset/base/260196 Log: MFC r259870: Do not truncate the ``command'' column in ``ps'' output. Modified: stable/10/usr.sbin/crashinfo/crashinfo.sh Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/crashinfo/crashinfo.sh ============================================================================== --- stable/10/usr.sbin/crashinfo/crashinfo.sh Thu Jan 2 13:59:23 2014 (r260195) +++ stable/10/usr.sbin/crashinfo/crashinfo.sh Thu Jan 2 15:43:23 2014 (r260196) @@ -181,9 +181,9 @@ fi echo echo "------------------------------------------------------------------------" -echo "ps -axl" +echo "ps -axlww" echo -ps -M $VMCORE -N $KERNEL -axl +ps -M $VMCORE -N $KERNEL -axlww echo echo "------------------------------------------------------------------------" From owner-svn-src-stable-10@FreeBSD.ORG Thu Jan 2 16:37:24 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2909CF23; Thu, 2 Jan 2014 16:37:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1479D1997; Thu, 2 Jan 2014 16:37:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s02GbNPx081209; Thu, 2 Jan 2014 16:37:23 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s02GbNCg081208; Thu, 2 Jan 2014 16:37:23 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201401021637.s02GbNCg081208@svn.freebsd.org> From: Sergey Kandaurov Date: Thu, 2 Jan 2014 16:37:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260198 - stable/10/lib/libc/sys X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jan 2014 16:37:24 -0000 Author: pluknet Date: Thu Jan 2 16:37:23 2014 New Revision: 260198 URL: http://svnweb.freebsd.org/changeset/base/260198 Log: MFC r259872: The compile time constant limit on number of swap devices was removed in 5.2. As such, remove the EINVAL error saying so. Currently the vm.nswapdev sysctl just represents the number of added swap devices. Modified: stable/10/lib/libc/sys/swapon.2 Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libc/sys/swapon.2 ============================================================================== --- stable/10/lib/libc/sys/swapon.2 Thu Jan 2 16:27:30 2014 (r260197) +++ stable/10/lib/libc/sys/swapon.2 Thu Jan 2 16:37:23 2014 (r260198) @@ -28,7 +28,7 @@ .\" @(#)swapon.2 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd June 4, 1993 +.Dd October 4, 2013 .Dt SWAPON 2 .Os .Sh NAME @@ -98,10 +98,6 @@ Additionally, .Fn swapon can fail for the following reasons: .Bl -tag -width Er -.It Bq Er EINVAL -The system has reached the boot-time limit on the number of -swap devices, -.Va vm.nswapdev . .It Bq Er ENOTBLK The .Fa special From owner-svn-src-stable-10@FreeBSD.ORG Thu Jan 2 16:48:08 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9643161B; Thu, 2 Jan 2014 16:48:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 820681A62; Thu, 2 Jan 2014 16:48:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s02Gm8h5085206; Thu, 2 Jan 2014 16:48:08 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s02Gm8KE085205; Thu, 2 Jan 2014 16:48:08 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201401021648.s02Gm8KE085205@svn.freebsd.org> From: Sergey Kandaurov Date: Thu, 2 Jan 2014 16:48:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260201 - stable/10/sys/netinet X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jan 2014 16:48:08 -0000 Author: pluknet Date: Thu Jan 2 16:48:08 2014 New Revision: 260201 URL: http://svnweb.freebsd.org/changeset/base/260201 Log: MFC r259906: Draft-ietf-tcpm-initcwnd-05 became RFC6928. Modified: stable/10/sys/netinet/tcp_input.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/netinet/tcp_input.c ============================================================================== --- stable/10/sys/netinet/tcp_input.c Thu Jan 2 16:41:10 2014 (r260200) +++ stable/10/sys/netinet/tcp_input.c Thu Jan 2 16:48:08 2014 (r260201) @@ -162,7 +162,7 @@ SYSCTL_NODE(_net_inet_tcp, OID_AUTO, exp VNET_DEFINE(int, tcp_do_initcwnd10) = 1; SYSCTL_VNET_INT(_net_inet_tcp_experimental, OID_AUTO, initcwnd10, CTLFLAG_RW, &VNET_NAME(tcp_do_initcwnd10), 0, - "Enable draft-ietf-tcpm-initcwnd-05 (Increasing initial CWND to 10)"); + "Enable RFC 6928 (Increasing initial CWND to 10)"); VNET_DEFINE(int, tcp_do_rfc3465) = 1; SYSCTL_VNET_INT(_net_inet_tcp, OID_AUTO, rfc3465, CTLFLAG_RW, @@ -360,7 +360,7 @@ cc_conn_init(struct tcpcb *tp) * * RFC5681 Section 3.1 specifies the default conservative values. * RFC3390 specifies slightly more aggressive values. - * Draft-ietf-tcpm-initcwnd-05 increases it to ten segments. + * RFC6928 increases it to ten segments. * * If a SYN or SYN/ACK was lost and retransmitted, we have to * reduce the initial CWND to one segment as congestion is likely From owner-svn-src-stable-10@FreeBSD.ORG Fri Jan 3 12:28:33 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CEDB776E; Fri, 3 Jan 2014 12:28:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9FBE0173B; Fri, 3 Jan 2014 12:28:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s03CSXiH043943; Fri, 3 Jan 2014 12:28:33 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s03CSXY2043942; Fri, 3 Jan 2014 12:28:33 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201401031228.s03CSXY2043942@svn.freebsd.org> From: Gleb Smirnoff Date: Fri, 3 Jan 2014 12:28:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260226 - stable/10/sys/netgraph X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jan 2014 12:28:33 -0000 Author: glebius Date: Fri Jan 3 12:28:33 2014 New Revision: 260226 URL: http://svnweb.freebsd.org/changeset/base/260226 Log: Merge r259681 from head: Changes: - Reinit uio_resid and flags before every call to soreceive(). - Set maximum acceptable size of packet to IP_MAXPACKET. As for now the module doesn't support INET6. - Properly handle MSG_TRUNC return from soreceive(). PR: 184601 Modified: stable/10/sys/netgraph/ng_ksocket.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/netgraph/ng_ksocket.c ============================================================================== --- stable/10/sys/netgraph/ng_ksocket.c Fri Jan 3 12:06:54 2014 (r260225) +++ stable/10/sys/netgraph/ng_ksocket.c Fri Jan 3 12:28:33 2014 (r260226) @@ -66,6 +66,7 @@ #include #include +#include #include #ifdef NG_SEPARATE_MALLOC @@ -1043,8 +1044,7 @@ ng_ksocket_incoming2(node_p node, hook_p struct socket *so = arg1; const priv_p priv = NG_NODE_PRIVATE(node); struct ng_mesg *response; - struct uio auio; - int flags, error; + int error; KASSERT(so == priv->so, ("%s: wrong socket", __func__)); @@ -1093,20 +1093,27 @@ ng_ksocket_incoming2(node_p node, hook_p if (priv->hook == NULL) return; - /* Read and forward available mbuf's */ - auio.uio_td = NULL; - auio.uio_resid = MJUMPAGESIZE; /* XXXGL: sane limit? */ - flags = MSG_DONTWAIT; + /* Read and forward available mbufs. */ while (1) { - struct sockaddr *sa = NULL; + struct uio uio; + struct sockaddr *sa; struct mbuf *m; + int flags; - /* Try to get next packet from socket */ + /* Try to get next packet from socket. */ + uio.uio_td = NULL; + uio.uio_resid = IP_MAXPACKET; + flags = MSG_DONTWAIT; + sa = NULL; if ((error = soreceive(so, (so->so_state & SS_ISCONNECTED) ? - NULL : &sa, &auio, &m, NULL, &flags)) != 0) + NULL : &sa, &uio, &m, NULL, &flags)) != 0) break; - /* See if we got anything */ + /* See if we got anything. */ + if (flags & MSG_TRUNC) { + m_freem(m); + m = NULL; + } if (m == NULL) { if (sa != NULL) free(sa, M_SONAME); From owner-svn-src-stable-10@FreeBSD.ORG Fri Jan 3 15:54:14 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F3A48690; Fri, 3 Jan 2014 15:54:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D38AA18DD; Fri, 3 Jan 2014 15:54:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s03FsDIZ024049; Fri, 3 Jan 2014 15:54:13 GMT (envelope-from pfg@svn.freebsd.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s03FsDp4024041; Fri, 3 Jan 2014 15:54:13 GMT (envelope-from pfg@svn.freebsd.org) Message-Id: <201401031554.s03FsDp4024041@svn.freebsd.org> From: "Pedro F. Giffuni" Date: Fri, 3 Jan 2014 15:54:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260230 - in stable/10/contrib/gcc: . cp X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jan 2014 15:54:14 -0000 Author: pfg Date: Fri Jan 3 15:54:12 2014 New Revision: 260230 URL: http://svnweb.freebsd.org/changeset/base/260230 Log: MFC r259655 (partial), r259944: gcc: merge small upstream changes. Fix for PR c++/29928 Backport from mainline: 2007-04-24 Hui-May Chang * reload1.c (merge_assigned_reloads) : Do not merge a RELOAD_OTHER instruction with a RELOAD_FOR_OPERAND_ADDRESS instruction. Obtained from: gcc 4.3 (rev. r124115, 124724: GPLv2) Modified: stable/10/contrib/gcc/ChangeLog.gcc43 stable/10/contrib/gcc/cp/ChangeLog.gcc43 stable/10/contrib/gcc/cp/rtti.c stable/10/contrib/gcc/reload1.c Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/gcc/ChangeLog.gcc43 ============================================================================== --- stable/10/contrib/gcc/ChangeLog.gcc43 Fri Jan 3 15:09:59 2014 (r260229) +++ stable/10/contrib/gcc/ChangeLog.gcc43 Fri Jan 3 15:54:12 2014 (r260230) @@ -145,6 +145,11 @@ alignment for amdfam10 architecture. Increasing the max loop alignment to 24 bytes. +2007-04-24 Hui-May Chang (r124115) + + * reload1.c (merge_assigned_reloads) : Do not merge a RELOAD_OTHER + instruction with a RELOAD_FOR_OPERAND_ADDRESS instruction. + 2007-04-16 Lawrence Crowl (r123909) * doc/invoke.texi (Debugging Options): Add documentation for the Modified: stable/10/contrib/gcc/cp/ChangeLog.gcc43 ============================================================================== --- stable/10/contrib/gcc/cp/ChangeLog.gcc43 Fri Jan 3 15:09:59 2014 (r260229) +++ stable/10/contrib/gcc/cp/ChangeLog.gcc43 Fri Jan 3 15:54:12 2014 (r260230) @@ -33,6 +33,12 @@ * mangle.c (write_real_cst): Use 'unsigned long' for %lx. +2007-05-14 Paolo Carlini (r124724) + + PR c++/29928 + * rtti.c (get_tinfo_decl_dynamic, get_typeid): Try to complete the + type only if is a class type (5.2.8/4). + 2007-05-05 Geoffrey Keating (r124467) PR 31775 Modified: stable/10/contrib/gcc/cp/rtti.c ============================================================================== --- stable/10/contrib/gcc/cp/rtti.c Fri Jan 3 15:09:59 2014 (r260229) +++ stable/10/contrib/gcc/cp/rtti.c Fri Jan 3 15:54:12 2014 (r260230) @@ -238,7 +238,7 @@ get_tinfo_decl_dynamic (tree exp) /* Peel off cv qualifiers. */ type = TYPE_MAIN_VARIANT (type); - if (!VOID_TYPE_P (type)) + if (CLASS_TYPE_P (type)) type = complete_type_or_else (type, exp); if (!type) @@ -430,7 +430,7 @@ get_typeid (tree type) that is the operand of typeid are always ignored. */ type = TYPE_MAIN_VARIANT (type); - if (!VOID_TYPE_P (type)) + if (CLASS_TYPE_P (type)) type = complete_type_or_else (type, NULL_TREE); if (!type) Modified: stable/10/contrib/gcc/reload1.c ============================================================================== --- stable/10/contrib/gcc/reload1.c Fri Jan 3 15:09:59 2014 (r260229) +++ stable/10/contrib/gcc/reload1.c Fri Jan 3 15:54:12 2014 (r260230) @@ -6238,15 +6238,23 @@ merge_assigned_reloads (rtx insn) transfer_replacements (i, j); } - /* If this is now RELOAD_OTHER, look for any reloads that load - parts of this operand and set them to RELOAD_FOR_OTHER_ADDRESS - if they were for inputs, RELOAD_OTHER for outputs. Note that - this test is equivalent to looking for reloads for this operand - number. */ - /* We must take special care with RELOAD_FOR_OUTPUT_ADDRESS; it may - share registers with a RELOAD_FOR_INPUT, so we can not change it - to RELOAD_FOR_OTHER_ADDRESS. We should never need to, since we - do not modify RELOAD_FOR_OUTPUT. */ + /* If this is now RELOAD_OTHER, look for any reloads that + load parts of this operand and set them to + RELOAD_FOR_OTHER_ADDRESS if they were for inputs, + RELOAD_OTHER for outputs. Note that this test is + equivalent to looking for reloads for this operand + number. + + We must take special care with RELOAD_FOR_OUTPUT_ADDRESS; + it may share registers with a RELOAD_FOR_INPUT, so we can + not change it to RELOAD_FOR_OTHER_ADDRESS. We should + never need to, since we do not modify RELOAD_FOR_OUTPUT. + + It is possible that the RELOAD_FOR_OPERAND_ADDRESS + instruction is assigned the same register as the earlier + RELOAD_FOR_OTHER_ADDRESS instruction. Merging these two + instructions will cause the RELOAD_FOR_OTHER_ADDRESS + instruction to be deleted later on. */ if (rld[i].when_needed == RELOAD_OTHER) for (j = 0; j < n_reloads; j++) @@ -6254,6 +6262,7 @@ merge_assigned_reloads (rtx insn) && rld[j].when_needed != RELOAD_OTHER && rld[j].when_needed != RELOAD_FOR_OTHER_ADDRESS && rld[j].when_needed != RELOAD_FOR_OUTPUT_ADDRESS + && rld[j].when_needed != RELOAD_FOR_OPERAND_ADDRESS && (! conflicting_input || rld[j].when_needed == RELOAD_FOR_INPUT_ADDRESS || rld[j].when_needed == RELOAD_FOR_INPADDR_ADDRESS) From owner-svn-src-stable-10@FreeBSD.ORG Fri Jan 3 20:02:30 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ED26EE6; Fri, 3 Jan 2014 20:02:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D93501ED6; Fri, 3 Jan 2014 20:02:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s03K2Uix021281; Fri, 3 Jan 2014 20:02:30 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s03K2UBJ021280; Fri, 3 Jan 2014 20:02:30 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201401032002.s03K2UBJ021280@svn.freebsd.org> From: Konstantin Belousov Date: Fri, 3 Jan 2014 20:02:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260240 - stable/10/sys/kern X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jan 2014 20:02:31 -0000 Author: kib Date: Fri Jan 3 20:02:30 2014 New Revision: 260240 URL: http://svnweb.freebsd.org/changeset/base/260240 Log: MFC r259953: Fix accounting for the negative cache entries when reusing v_cache_dd. Modified: stable/10/sys/kern/vfs_cache.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/kern/vfs_cache.c ============================================================================== --- stable/10/sys/kern/vfs_cache.c Fri Jan 3 19:31:40 2014 (r260239) +++ stable/10/sys/kern/vfs_cache.c Fri Jan 3 20:02:30 2014 (r260240) @@ -749,16 +749,20 @@ cache_enter_time(dvp, vp, cnp, tsp, dtsp ncp->nc_flag & NCF_ISDOTDOT) { KASSERT(ncp->nc_dvp == dvp, ("wrong isdotdot parent")); - if (ncp->nc_vp != NULL) + if (ncp->nc_vp != NULL) { TAILQ_REMOVE(&ncp->nc_vp->v_cache_dst, ncp, nc_dst); - else + } else { TAILQ_REMOVE(&ncneg, ncp, nc_dst); - if (vp != NULL) + numneg--; + } + if (vp != NULL) { TAILQ_INSERT_HEAD(&vp->v_cache_dst, ncp, nc_dst); - else + } else { TAILQ_INSERT_TAIL(&ncneg, ncp, nc_dst); + numneg++; + } ncp->nc_vp = vp; CACHE_WUNLOCK(); return; @@ -894,6 +898,8 @@ cache_enter_time(dvp, vp, cnp, tsp, dtsp } if (numneg * ncnegfactor > numcache) { ncp = TAILQ_FIRST(&ncneg); + KASSERT(ncp->nc_vp == NULL, ("ncp %p vp %p on ncneg", + ncp, ncp->nc_vp)); zap = 1; } if (hold) From owner-svn-src-stable-10@FreeBSD.ORG Fri Jan 3 20:27:15 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BC972A7B; Fri, 3 Jan 2014 20:27:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8E8931067; Fri, 3 Jan 2014 20:27:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s03KRFcP029946; Fri, 3 Jan 2014 20:27:15 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s03KRFQk029945; Fri, 3 Jan 2014 20:27:15 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201401032027.s03KRFQk029945@svn.freebsd.org> From: Glen Barber Date: Fri, 3 Jan 2014 20:27:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260242 - stable/10/release/doc X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jan 2014 20:27:15 -0000 Author: gjb Date: Fri Jan 3 20:27:15 2014 New Revision: 260242 URL: http://svnweb.freebsd.org/changeset/base/260242 Log: MFC r259792: Remove references to SUP_UPDATE and CVS_UPDATE. Include base svn when evaluating if svn(1) exists. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/release/doc/Makefile ============================================================================== --- stable/10/release/doc/Makefile Fri Jan 3 20:02:59 2014 (r260241) +++ stable/10/release/doc/Makefile Fri Jan 3 20:27:15 2014 (r260242) @@ -12,31 +12,27 @@ SUBDIR+= share/xml RELN_ROOT?= ${.CURDIR} +.if exists(/usr/local/bin/svn) SVN?= /usr/local/bin/svn +.elif exists(/usr/bin/svn) +SVN?= /usr/bin/svn +.else +SVN?= /usr/bin/svnlite +.endif + SVNFLAGS?= -r HEAD update: -.if (defined(CVS_UPDATE) || defined(SUP_UPDATE)) && !defined(SVN_UPDATE) - @echo "--------------------------------------------------------------" - @echo "CVS_UPDATE and SUP_UPDATE are no longer supported." - @echo "Please see: https://wiki.freebsd.org/CvsIsDeprecated" - @echo "--------------------------------------------------------------" - @exit 1 -.endif -.if defined(SVN_UPDATE) -. if !exists(${SVN}) +.if !exists(${SVN}) @echo "--------------------------------------------------------------" @echo ">>> Updating ${RELN_ROOT} requires ${SVN}." @echo "--------------------------------------------------------------" @exit 1 -. endif +.endif @echo "--------------------------------------------------------------" - @echo ">>> Updating ${.CURDIR} using Subversion" + @echo ">>> Updating ${.CURDIR}" @echo "--------------------------------------------------------------" @(cd ${.CURDIR} && ${SVN} update ${SVNFLAGS}) -.else - @echo "Error: Please define SVN_UPDATE first." -.endif .include "${RELN_ROOT}/share/mk/doc.relnotes.mk" .include "${DOC_PREFIX}/share/mk/doc.subdir.mk" From owner-svn-src-stable-10@FreeBSD.ORG Fri Jan 3 20:47:52 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 80B0819E; Fri, 3 Jan 2014 20:47:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6C61511BC; Fri, 3 Jan 2014 20:47:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s03KlqQv038048; Fri, 3 Jan 2014 20:47:52 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s03KlqlX038047; Fri, 3 Jan 2014 20:47:52 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201401032047.s03KlqlX038047@svn.freebsd.org> From: Alexander Motin Date: Fri, 3 Jan 2014 20:47:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260244 - stable/10/sys/kern X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jan 2014 20:47:52 -0000 Author: mav Date: Fri Jan 3 20:47:51 2014 New Revision: 260244 URL: http://svnweb.freebsd.org/changeset/base/260244 Log: MFC r259464: Fix periodic per-CPU timers startup on boot. Modified: stable/10/sys/kern/kern_clocksource.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/kern/kern_clocksource.c ============================================================================== --- stable/10/sys/kern/kern_clocksource.c Fri Jan 3 20:45:56 2014 (r260243) +++ stable/10/sys/kern/kern_clocksource.c Fri Jan 3 20:47:51 2014 (r260244) @@ -234,7 +234,8 @@ handleevents(sbintime_t now, int fake) if (!busy) { state->idle = 0; state->nextevent = t; - loadtimer(now, 0); + loadtimer(now, (fake == 2) && + (timer->et_flags & ET_FLAGS_PERCPU)); } ET_HW_UNLOCK(state); return (done); From owner-svn-src-stable-10@FreeBSD.ORG Fri Jan 3 23:36:04 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 683E031B; Fri, 3 Jan 2014 23:36:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 53E1C1CF4; Fri, 3 Jan 2014 23:36:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s03Na4GQ003443; Fri, 3 Jan 2014 23:36:04 GMT (envelope-from peter@svn.freebsd.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s03Na4nc003442; Fri, 3 Jan 2014 23:36:04 GMT (envelope-from peter@svn.freebsd.org) Message-Id: <201401032336.s03Na4nc003442@svn.freebsd.org> From: Peter Wemm Date: Fri, 3 Jan 2014 23:36:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260249 - stable/10/share/i18n/esdb/UTF X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jan 2014 23:36:04 -0000 Author: peter Date: Fri Jan 3 23:36:03 2014 New Revision: 260249 URL: http://svnweb.freebsd.org/changeset/base/260249 Log: Revert r258396 : teach iconv about a WCHAR_T pseudo-type Modified: stable/10/share/i18n/esdb/UTF/UTF.alias Modified: stable/10/share/i18n/esdb/UTF/UTF.alias ============================================================================== --- stable/10/share/i18n/esdb/UTF/UTF.alias Fri Jan 3 23:35:01 2014 (r260248) +++ stable/10/share/i18n/esdb/UTF/UTF.alias Fri Jan 3 23:36:03 2014 (r260249) @@ -28,7 +28,6 @@ 16LE utf16le 32-INTERNAL ucs-4-internal -32-INTERNAL wchar_t 32-SWAPPED ucs-4-swapped From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 17:22:54 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 72888A48; Sat, 4 Jan 2014 17:22:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5D4AF1168; Sat, 4 Jan 2014 17:22:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04HMs80014944; Sat, 4 Jan 2014 17:22:54 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04HMsDc014943; Sat, 4 Jan 2014 17:22:54 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401041722.s04HMsDc014943@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 17:22:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260263 - in stable: 10/contrib/libc++/include 9/contrib/libc++/include X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 17:22:54 -0000 Author: dim Date: Sat Jan 4 17:22:53 2014 New Revision: 260263 URL: http://svnweb.freebsd.org/changeset/base/260263 Log: MFC r260015: In libc++'s type_traits header, avoid warnings (activated by our use of -Wsystem-headers) about potential keyword compatibility problems, by adding a __libcpp prefix to the applicable identifiers. Upstream is still debating about this, but we need it now, to be able to import clang 3.4. Modified: stable/10/contrib/libc++/include/type_traits Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/9/contrib/libc++/include/type_traits Directory Properties: stable/9/contrib/libc++/ (props changed) Modified: stable/10/contrib/libc++/include/type_traits ============================================================================== --- stable/10/contrib/libc++/include/type_traits Sat Jan 4 17:09:41 2014 (r260262) +++ stable/10/contrib/libc++/include/type_traits Sat Jan 4 17:22:53 2014 (r260263) @@ -280,53 +280,53 @@ template using remove_cv_t = // is_void -template struct __is_void : public false_type {}; -template <> struct __is_void : public true_type {}; +template struct __libcpp_is_void : public false_type {}; +template <> struct __libcpp_is_void : public true_type {}; template struct _LIBCPP_TYPE_VIS is_void - : public __is_void::type> {}; + : public __libcpp_is_void::type> {}; // __is_nullptr_t -template struct ____is_nullptr_t : public false_type {}; -template <> struct ____is_nullptr_t : public true_type {}; +template struct __libcpp___is_nullptr : public false_type {}; +template <> struct __libcpp___is_nullptr : public true_type {}; template struct _LIBCPP_TYPE_VIS __is_nullptr_t - : public ____is_nullptr_t::type> {}; + : public __libcpp___is_nullptr::type> {}; // is_integral -template struct __is_integral : public false_type {}; -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; +template struct __libcpp_is_integral : public false_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; #endif // _LIBCPP_HAS_NO_UNICODE_CHARS -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; template struct _LIBCPP_TYPE_VIS is_integral - : public __is_integral::type> {}; + : public __libcpp_is_integral::type> {}; // is_floating_point -template struct __is_floating_point : public false_type {}; -template <> struct __is_floating_point : public true_type {}; -template <> struct __is_floating_point : public true_type {}; -template <> struct __is_floating_point : public true_type {}; +template struct __libcpp_is_floating_point : public false_type {}; +template <> struct __libcpp_is_floating_point : public true_type {}; +template <> struct __libcpp_is_floating_point : public true_type {}; +template <> struct __libcpp_is_floating_point : public true_type {}; template struct _LIBCPP_TYPE_VIS is_floating_point - : public __is_floating_point::type> {}; + : public __libcpp_is_floating_point::type> {}; // is_array @@ -339,11 +339,11 @@ template struct // is_pointer -template struct __is_pointer : public false_type {}; -template struct __is_pointer<_Tp*> : public true_type {}; +template struct __libcpp_is_pointer : public false_type {}; +template struct __libcpp_is_pointer<_Tp*> : public true_type {}; template struct _LIBCPP_TYPE_VIS is_pointer - : public __is_pointer::type> {}; + : public __libcpp_is_pointer::type> {}; // is_reference @@ -419,29 +419,29 @@ template ::value || is_reference<_Tp>::value || is_same<_Tp, nullptr_t>::value > -struct __is_function +struct __libcpp_is_function : public integral_constant(__is_function_imp::__source<_Tp>())) == 1> {}; -template struct __is_function<_Tp, true> : public false_type {}; +template struct __libcpp_is_function<_Tp, true> : public false_type {}; template struct _LIBCPP_TYPE_VIS is_function - : public __is_function<_Tp> {}; + : public __libcpp_is_function<_Tp> {}; // is_member_function_pointer -template struct __is_member_function_pointer : public false_type {}; -template struct __is_member_function_pointer<_Tp _Up::*> : public is_function<_Tp> {}; +template struct __libcpp_is_member_function_pointer : public false_type {}; +template struct __libcpp_is_member_function_pointer<_Tp _Up::*> : public is_function<_Tp> {}; template struct _LIBCPP_TYPE_VIS is_member_function_pointer - : public __is_member_function_pointer::type> {}; + : public __libcpp_is_member_function_pointer::type> {}; // is_member_pointer -template struct __is_member_pointer : public false_type {}; -template struct __is_member_pointer<_Tp _Up::*> : public true_type {}; +template struct __libcpp_is_member_pointer : public false_type {}; +template struct __libcpp_is_member_pointer<_Tp _Up::*> : public true_type {}; template struct _LIBCPP_TYPE_VIS is_member_pointer - : public __is_member_pointer::type> {}; + : public __libcpp_is_member_pointer::type> {}; // is_member_object_pointer @@ -640,11 +640,11 @@ template struct ___is_signed<_Tp, false> : public true_type {}; // floating point template ::value> -struct __is_signed : public ___is_signed<_Tp> {}; +struct __libcpp_is_signed : public ___is_signed<_Tp> {}; -template struct __is_signed<_Tp, false> : public false_type {}; +template struct __libcpp_is_signed<_Tp, false> : public false_type {}; -template struct _LIBCPP_TYPE_VIS is_signed : public __is_signed<_Tp> {}; +template struct _LIBCPP_TYPE_VIS is_signed : public __libcpp_is_signed<_Tp> {}; // is_unsigned @@ -655,11 +655,11 @@ template struct ___is_unsigned<_Tp, false> : public false_type {}; // floating point template ::value> -struct __is_unsigned : public ___is_unsigned<_Tp> {}; +struct __libcpp_is_unsigned : public ___is_unsigned<_Tp> {}; -template struct __is_unsigned<_Tp, false> : public false_type {}; +template struct __libcpp_is_unsigned<_Tp, false> : public false_type {}; -template struct _LIBCPP_TYPE_VIS is_unsigned : public __is_unsigned<_Tp> {}; +template struct _LIBCPP_TYPE_VIS is_unsigned : public __libcpp_is_unsigned<_Tp> {}; // rank From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 17:27:49 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CC76CCD6; Sat, 4 Jan 2014 17:27:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B4F8A1188; Sat, 4 Jan 2014 17:27:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04HRnZn015554; Sat, 4 Jan 2014 17:27:49 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04HRkRP015534; Sat, 4 Jan 2014 17:27:46 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401041727.s04HRkRP015534@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 17:27:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260264 - in stable: 10/lib/libiconv_modules/BIG5 10/lib/libiconv_modules/DECHanyu 10/lib/libiconv_modules/EUC 10/lib/libiconv_modules/EUCTW 10/lib/libiconv_modules/GBK2K 10/lib/libicon... X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 17:27:50 -0000 Author: dim Date: Sat Jan 4 17:27:43 2014 New Revision: 260264 URL: http://svnweb.freebsd.org/changeset/base/260264 Log: MFC r260003: In libiconv_modules, surround unused static _citrus_XXX_pack_state() and _citrus_XXX_unpack_state() functions with #if 0, for now. Modified: stable/10/lib/libiconv_modules/BIG5/citrus_big5.c stable/10/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c stable/10/lib/libiconv_modules/EUC/citrus_euc.c stable/10/lib/libiconv_modules/EUCTW/citrus_euctw.c stable/10/lib/libiconv_modules/GBK2K/citrus_gbk2k.c stable/10/lib/libiconv_modules/HZ/citrus_hz.c stable/10/lib/libiconv_modules/ISO2022/citrus_iso2022.c stable/10/lib/libiconv_modules/JOHAB/citrus_johab.c stable/10/lib/libiconv_modules/MSKanji/citrus_mskanji.c stable/10/lib/libiconv_modules/UES/citrus_ues.c stable/10/lib/libiconv_modules/UTF7/citrus_utf7.c stable/10/lib/libiconv_modules/UTF8/citrus_utf8.c stable/10/lib/libiconv_modules/VIQR/citrus_viqr.c stable/10/lib/libiconv_modules/ZW/citrus_zw.c Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/9/lib/libiconv_modules/BIG5/citrus_big5.c stable/9/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c stable/9/lib/libiconv_modules/EUC/citrus_euc.c stable/9/lib/libiconv_modules/EUCTW/citrus_euctw.c stable/9/lib/libiconv_modules/GBK2K/citrus_gbk2k.c stable/9/lib/libiconv_modules/HZ/citrus_hz.c stable/9/lib/libiconv_modules/ISO2022/citrus_iso2022.c stable/9/lib/libiconv_modules/JOHAB/citrus_johab.c stable/9/lib/libiconv_modules/MSKanji/citrus_mskanji.c stable/9/lib/libiconv_modules/UES/citrus_ues.c stable/9/lib/libiconv_modules/UTF7/citrus_utf7.c stable/9/lib/libiconv_modules/UTF8/citrus_utf8.c stable/9/lib/libiconv_modules/VIQR/citrus_viqr.c stable/9/lib/libiconv_modules/ZW/citrus_zw.c Directory Properties: stable/9/lib/libiconv_modules/ (props changed) Modified: stable/10/lib/libiconv_modules/BIG5/citrus_big5.c ============================================================================== --- stable/10/lib/libiconv_modules/BIG5/citrus_big5.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/10/lib/libiconv_modules/BIG5/citrus_big5.c Sat Jan 4 17:27:43 2014 (r260264) @@ -123,6 +123,7 @@ _citrus_BIG5_init_state(_BIG5EncodingInf memset(s, 0, sizeof(*s)); } +#if 0 static __inline void /*ARGSUSED*/ _citrus_BIG5_pack_state(_BIG5EncodingInfo * __restrict ei __unused, @@ -142,6 +143,7 @@ _citrus_BIG5_unpack_state(_BIG5EncodingI memcpy((void *)s, pspriv, sizeof(*s)); } +#endif static __inline int _citrus_BIG5_check(_BIG5EncodingInfo *ei, unsigned int c) Modified: stable/10/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c ============================================================================== --- stable/10/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/10/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c Sat Jan 4 17:27:43 2014 (r260264) @@ -78,6 +78,7 @@ _citrus_DECHanyu_init_state(_DECHanyuEnc psenc->chlen = 0; } +#if 0 static __inline void /*ARGSUSED*/ _citrus_DECHanyu_pack_state(_DECHanyuEncodingInfo * __restrict ei __unused, @@ -96,6 +97,7 @@ _citrus_DECHanyu_unpack_state(_DECHanyuE memcpy((void *)psenc, pspriv, sizeof(*psenc)); } +#endif static void /*ARGSUSED*/ Modified: stable/10/lib/libiconv_modules/EUC/citrus_euc.c ============================================================================== --- stable/10/lib/libiconv_modules/EUC/citrus_euc.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/10/lib/libiconv_modules/EUC/citrus_euc.c Sat Jan 4 17:27:43 2014 (r260264) @@ -169,6 +169,7 @@ _citrus_EUC_init_state(_EUCEncodingInfo memset(s, 0, sizeof(*s)); } +#if 0 static __inline void /*ARGSUSED*/ _citrus_EUC_pack_state(_EUCEncodingInfo *ei __unused, void *pspriv, @@ -186,6 +187,7 @@ _citrus_EUC_unpack_state(_EUCEncodingInf memcpy((void *)s, pspriv, sizeof(*s)); } +#endif static int _citrus_EUC_mbrtowc_priv(_EUCEncodingInfo *ei, wchar_t *pwc, const char **s, Modified: stable/10/lib/libiconv_modules/EUCTW/citrus_euctw.c ============================================================================== --- stable/10/lib/libiconv_modules/EUCTW/citrus_euctw.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/10/lib/libiconv_modules/EUCTW/citrus_euctw.c Sat Jan 4 17:27:43 2014 (r260264) @@ -136,6 +136,7 @@ _citrus_EUCTW_init_state(_EUCTWEncodingI memset(s, 0, sizeof(*s)); } +#if 0 static __inline void /*ARGSUSED*/ _citrus_EUCTW_pack_state(_EUCTWEncodingInfo * __restrict ei __unused, @@ -153,6 +154,7 @@ _citrus_EUCTW_unpack_state(_EUCTWEncodin memcpy((void *)s, pspriv, sizeof(*s)); } +#endif static int /*ARGSUSED*/ Modified: stable/10/lib/libiconv_modules/GBK2K/citrus_gbk2k.c ============================================================================== --- stable/10/lib/libiconv_modules/GBK2K/citrus_gbk2k.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/10/lib/libiconv_modules/GBK2K/citrus_gbk2k.c Sat Jan 4 17:27:43 2014 (r260264) @@ -80,6 +80,7 @@ _citrus_GBK2K_init_state(_GBK2KEncodingI memset(s, 0, sizeof(*s)); } +#if 0 static __inline void /*ARGSUSED*/ _citrus_GBK2K_pack_state(_GBK2KEncodingInfo * __restrict ei __unused, @@ -97,6 +98,7 @@ _citrus_GBK2K_unpack_state(_GBK2KEncodin memcpy((void *)s, pspriv, sizeof(*s)); } +#endif static __inline bool _mb_singlebyte(int c) Modified: stable/10/lib/libiconv_modules/HZ/citrus_hz.c ============================================================================== --- stable/10/lib/libiconv_modules/HZ/citrus_hz.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/10/lib/libiconv_modules/HZ/citrus_hz.c Sat Jan 4 17:27:43 2014 (r260264) @@ -153,6 +153,7 @@ _citrus_HZ_init_state(_HZEncodingInfo * psenc->inuse = INIT0(ei); } +#if 0 static __inline void /*ARGSUSED*/ _citrus_HZ_pack_state(_HZEncodingInfo * __restrict ei __unused, @@ -170,6 +171,7 @@ _citrus_HZ_unpack_state(_HZEncodingInfo memcpy((void *)psenc, pspriv, sizeof(*psenc)); } +#endif static int _citrus_HZ_mbrtowc_priv(_HZEncodingInfo * __restrict ei, Modified: stable/10/lib/libiconv_modules/ISO2022/citrus_iso2022.c ============================================================================== --- stable/10/lib/libiconv_modules/ISO2022/citrus_iso2022.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/10/lib/libiconv_modules/ISO2022/citrus_iso2022.c Sat Jan 4 17:27:43 2014 (r260264) @@ -444,6 +444,7 @@ _citrus_ISO2022_init_state(_ISO2022Encod s->flags |= _ISO2022STATE_FLAG_INITIALIZED; } +#if 0 static __inline void /*ARGSUSED*/ _citrus_ISO2022_pack_state(_ISO2022EncodingInfo * __restrict ei __unused, @@ -461,6 +462,7 @@ _citrus_ISO2022_unpack_state(_ISO2022Enc memcpy((void *)s, pspriv, sizeof(*s)); } +#endif static int /*ARGSUSED*/ Modified: stable/10/lib/libiconv_modules/JOHAB/citrus_johab.c ============================================================================== --- stable/10/lib/libiconv_modules/JOHAB/citrus_johab.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/10/lib/libiconv_modules/JOHAB/citrus_johab.c Sat Jan 4 17:27:43 2014 (r260264) @@ -80,6 +80,7 @@ _citrus_JOHAB_init_state(_JOHABEncodingI psenc->chlen = 0; } +#if 0 static __inline void /*ARGSUSED*/ _citrus_JOHAB_pack_state(_JOHABEncodingInfo * __restrict ei __unused, @@ -97,6 +98,7 @@ _citrus_JOHAB_unpack_state(_JOHABEncodin memcpy((void *)psenc, pspriv, sizeof(*psenc)); } +#endif static void /*ARGSUSED*/ Modified: stable/10/lib/libiconv_modules/MSKanji/citrus_mskanji.c ============================================================================== --- stable/10/lib/libiconv_modules/MSKanji/citrus_mskanji.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/10/lib/libiconv_modules/MSKanji/citrus_mskanji.c Sat Jan 4 17:27:43 2014 (r260264) @@ -130,6 +130,7 @@ _citrus_MSKanji_init_state(_MSKanjiEncod s->chlen = 0; } +#if 0 static __inline void /*ARGSUSED*/ _citrus_MSKanji_pack_state(_MSKanjiEncodingInfo * __restrict ei __unused, @@ -147,6 +148,7 @@ _citrus_MSKanji_unpack_state(_MSKanjiEnc memcpy((void *)s, pspriv, sizeof(*s)); } +#endif static int /*ARGSUSED*/ Modified: stable/10/lib/libiconv_modules/UES/citrus_ues.c ============================================================================== --- stable/10/lib/libiconv_modules/UES/citrus_ues.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/10/lib/libiconv_modules/UES/citrus_ues.c Sat Jan 4 17:27:43 2014 (r260264) @@ -75,6 +75,7 @@ _citrus_UES_init_state(_UESEncodingInfo psenc->chlen = 0; } +#if 0 static __inline void /*ARGSUSED*/ _citrus_UES_pack_state(_UESEncodingInfo * __restrict ei __unused, @@ -92,6 +93,7 @@ _citrus_UES_unpack_state(_UESEncodingInf memcpy((void *)psenc, pspriv, sizeof(*psenc)); } +#endif static __inline int to_int(int ch) Modified: stable/10/lib/libiconv_modules/UTF7/citrus_utf7.c ============================================================================== --- stable/10/lib/libiconv_modules/UTF7/citrus_utf7.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/10/lib/libiconv_modules/UTF7/citrus_utf7.c Sat Jan 4 17:27:43 2014 (r260264) @@ -87,6 +87,7 @@ _citrus_UTF7_init_state(_UTF7EncodingInf memset((void *)s, 0, sizeof(*s)); } +#if 0 static __inline void /*ARGSUSED*/ _citrus_UTF7_pack_state(_UTF7EncodingInfo * __restrict ei __unused, @@ -104,6 +105,7 @@ _citrus_UTF7_unpack_state(_UTF7EncodingI memcpy((void *)s, pspriv, sizeof(*s)); } +#endif static const char base64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" Modified: stable/10/lib/libiconv_modules/UTF8/citrus_utf8.c ============================================================================== --- stable/10/lib/libiconv_modules/UTF8/citrus_utf8.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/10/lib/libiconv_modules/UTF8/citrus_utf8.c Sat Jan 4 17:27:43 2014 (r260264) @@ -156,6 +156,7 @@ _citrus_UTF8_init_state(_UTF8EncodingInf s->chlen = 0; } +#if 0 static __inline void /*ARGSUSED*/ _citrus_UTF8_pack_state(_UTF8EncodingInfo *ei __unused, void *pspriv, @@ -173,6 +174,7 @@ _citrus_UTF8_unpack_state(_UTF8EncodingI memcpy((void *)s, pspriv, sizeof(*s)); } +#endif static int _citrus_UTF8_mbrtowc_priv(_UTF8EncodingInfo *ei, wchar_t *pwc, const char **s, Modified: stable/10/lib/libiconv_modules/VIQR/citrus_viqr.c ============================================================================== --- stable/10/lib/libiconv_modules/VIQR/citrus_viqr.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/10/lib/libiconv_modules/VIQR/citrus_viqr.c Sat Jan 4 17:27:43 2014 (r260264) @@ -230,6 +230,7 @@ _citrus_VIQR_init_state(_VIQREncodingInf psenc->chlen = 0; } +#if 0 static __inline void /*ARGSUSED*/ _citrus_VIQR_pack_state(_VIQREncodingInfo * __restrict ei __unused, @@ -247,6 +248,7 @@ _citrus_VIQR_unpack_state(_VIQREncodingI memcpy((void *)psenc, pspriv, sizeof(*psenc)); } +#endif static int _citrus_VIQR_mbrtowc_priv(_VIQREncodingInfo * __restrict ei, Modified: stable/10/lib/libiconv_modules/ZW/citrus_zw.c ============================================================================== --- stable/10/lib/libiconv_modules/ZW/citrus_zw.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/10/lib/libiconv_modules/ZW/citrus_zw.c Sat Jan 4 17:27:43 2014 (r260264) @@ -85,6 +85,7 @@ _citrus_ZW_init_state(_ZWEncodingInfo * psenc->charset = NONE; } +#if 0 static __inline void /*ARGSUSED*/ _citrus_ZW_pack_state(_ZWEncodingInfo * __restrict ei __unused, @@ -102,6 +103,7 @@ _citrus_ZW_unpack_state(_ZWEncodingInfo memcpy((void *)psenc, pspriv, sizeof(*psenc)); } +#endif static int _citrus_ZW_mbrtowc_priv(_ZWEncodingInfo * __restrict ei, From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 17:33:07 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1E3C9E6; Sat, 4 Jan 2014 17:33:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 09D821207; Sat, 4 Jan 2014 17:33:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04HX6F7018829; Sat, 4 Jan 2014 17:33:06 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04HX6Uv018828; Sat, 4 Jan 2014 17:33:06 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401041733.s04HX6Uv018828@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 17:33:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260265 - in stable: 10/sys/dev/sk 7/sys/dev/sk 8/sys/dev/sk 9/sys/dev/sk X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 17:33:07 -0000 Author: dim Date: Sat Jan 4 17:33:05 2014 New Revision: 260265 URL: http://svnweb.freebsd.org/changeset/base/260265 Log: MFC r260016: Remove superfluous old-style rcsid[] from if_sk.c. There is already an __FBSDID() at the top of the file. Modified: stable/10/sys/dev/sk/if_sk.c Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/7/sys/dev/sk/if_sk.c stable/8/sys/dev/sk/if_sk.c stable/9/sys/dev/sk/if_sk.c Directory Properties: stable/7/sys/ (props changed) stable/8/sys/ (props changed) stable/9/sys/ (props changed) Modified: stable/10/sys/dev/sk/if_sk.c ============================================================================== --- stable/10/sys/dev/sk/if_sk.c Sat Jan 4 17:27:43 2014 (r260264) +++ stable/10/sys/dev/sk/if_sk.c Sat Jan 4 17:33:05 2014 (r260265) @@ -138,11 +138,6 @@ MODULE_DEPEND(sk, miibus, 1, 1, 1); /* "device miibus" required. See GENERIC if you get errors here. */ #include "miibus_if.h" -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - static const struct sk_type sk_devs[] = { { VENDORID_SK, From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 17:36:13 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B467E6A6; Sat, 4 Jan 2014 17:36:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A08C1122E; Sat, 4 Jan 2014 17:36:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04HaD7L019304; Sat, 4 Jan 2014 17:36:13 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04HaDWk019303; Sat, 4 Jan 2014 17:36:13 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401041736.s04HaDWk019303@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 17:36:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260266 - stable/10/sys/sys X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 17:36:13 -0000 Author: dim Date: Sat Jan 4 17:36:13 2014 New Revision: 260266 URL: http://svnweb.freebsd.org/changeset/base/260266 Log: MFC r260017: Mark unused static inline functions defined by the PCTRIE_DEFINE() macro as __unused, so warnings about them are avoided. Modified: stable/10/sys/sys/pctrie.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/sys/pctrie.h ============================================================================== --- stable/10/sys/sys/pctrie.h Sat Jan 4 17:33:05 2014 (r260265) +++ stable/10/sys/sys/pctrie.h Sat Jan 4 17:36:13 2014 (r260266) @@ -83,14 +83,14 @@ name##_PCTRIE_LOOKUP_LE(struct pctrie *p return name##_PCTRIE_VAL2PTR(pctrie_lookup_le(ptree, key)); \ } \ \ -static __inline struct type * \ +static __inline __unused struct type * \ name##_PCTRIE_LOOKUP_GE(struct pctrie *ptree, uint64_t key) \ { \ \ return name##_PCTRIE_VAL2PTR(pctrie_lookup_ge(ptree, key)); \ } \ \ -static __inline void \ +static __inline __unused void \ name##_PCTRIE_RECLAIM(struct pctrie *ptree) \ { \ \ From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 17:54:08 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AD332CF0; Sat, 4 Jan 2014 17:54:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9604E1357; Sat, 4 Jan 2014 17:54:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04Hs8fY026531; Sat, 4 Jan 2014 17:54:08 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04Hs6jn026521; Sat, 4 Jan 2014 17:54:06 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401041754.s04Hs6jn026521@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 17:54:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260268 - in stable/10/sys: conf modules/drm2/radeonkms modules/ibcore modules/ipoib modules/mlx4 modules/mlx4ib modules/mlxen modules/mthca ofed/drivers/infiniband/hw/mlx4 ofed/drivers... X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 17:54:08 -0000 Author: dim Date: Sat Jan 4 17:54:06 2014 New Revision: 260268 URL: http://svnweb.freebsd.org/changeset/base/260268 Log: MFC r260020: For sys/dev/drm2/radeon, only use -fms-extensions with gcc. This flag is only to stop gcc complaining about anonymous unions, which clang does not do. For clang 3.4 however, -fms-extensions enables the Microsoft __wchar_t type, which clashes with our own types.h. MFC r260102: Similar to r260020, only use -fms-extensions with gcc, for all other modules which require this flag to compile. Use a GCC_MS_EXTENSIONS variable, defined in kern.pre.mk, which can be used to easily supply the flag (or not), depending on the compiler type. Modified: stable/10/sys/conf/kern.pre.mk stable/10/sys/modules/drm2/radeonkms/Makefile stable/10/sys/modules/ibcore/Makefile stable/10/sys/modules/ipoib/Makefile stable/10/sys/modules/mlx4/Makefile stable/10/sys/modules/mlx4ib/Makefile stable/10/sys/modules/mlxen/Makefile stable/10/sys/modules/mthca/Makefile stable/10/sys/ofed/drivers/infiniband/hw/mlx4/Makefile stable/10/sys/ofed/drivers/net/mlx4/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/conf/kern.pre.mk ============================================================================== --- stable/10/sys/conf/kern.pre.mk Sat Jan 4 17:52:43 2014 (r260267) +++ stable/10/sys/conf/kern.pre.mk Sat Jan 4 17:54:06 2014 (r260268) @@ -99,6 +99,8 @@ ASM_CFLAGS= -x assembler-with-cpp -DLOCO .if ${COMPILER_TYPE} == "clang" CLANG_NO_IAS= -no-integrated-as +.else +GCC_MS_EXTENSIONS= -fms-extensions .endif .if defined(PROFLEVEL) && ${PROFLEVEL} >= 1 @@ -157,7 +159,7 @@ NORMAL_LINT= ${LINT} ${LINTFLAGS} ${CFLA # Infiniband C flags. Correct include paths and omit errors that linux # does not honor. OFEDINCLUDES= -I$S/ofed/include/ -OFEDNOERR= -Wno-cast-qual -Wno-pointer-arith -fms-extensions +OFEDNOERR= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS} OFEDCFLAGS= ${CFLAGS:N-I*} ${OFEDINCLUDES} ${CFLAGS:M-I*} ${OFEDNOERR} OFED_C_NOIMP= ${CC} -c -o ${.TARGET} ${OFEDCFLAGS} ${WERROR} ${PROF} OFED_C= ${OFED_C_NOIMP} ${.IMPSRC} Modified: stable/10/sys/modules/drm2/radeonkms/Makefile ============================================================================== --- stable/10/sys/modules/drm2/radeonkms/Makefile Sat Jan 4 17:52:43 2014 (r260267) +++ stable/10/sys/modules/drm2/radeonkms/Makefile Sat Jan 4 17:54:06 2014 (r260268) @@ -1,5 +1,7 @@ # $FreeBSD$ +.include + .PATH: ${.CURDIR}/../../../dev/drm2/radeon KMOD = radeonkms @@ -101,7 +103,6 @@ SRCS += \ iicbus_if.h \ pci_if.h -CFLAGS += -I${.CURDIR}/../../../dev/drm2/radeon \ - -fms-extensions +CFLAGS += -I${.CURDIR}/../../../dev/drm2/radeon ${GCC_MS_EXTENSIONS} .include Modified: stable/10/sys/modules/ibcore/Makefile ============================================================================== --- stable/10/sys/modules/ibcore/Makefile Sat Jan 4 17:52:43 2014 (r260267) +++ stable/10/sys/modules/ibcore/Makefile Sat Jan 4 17:54:06 2014 (r260268) @@ -20,4 +20,4 @@ CFLAGS+= -DINET6 -DINET -DOFED .include -CFLAGS+= -Wno-cast-qual -Wno-pointer-arith -fms-extensions +CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS} Modified: stable/10/sys/modules/ipoib/Makefile ============================================================================== --- stable/10/sys/modules/ipoib/Makefile Sat Jan 4 17:52:43 2014 (r260267) +++ stable/10/sys/modules/ipoib/Makefile Sat Jan 4 17:54:06 2014 (r260268) @@ -28,4 +28,4 @@ opt_inet6.h: .include -CFLAGS+= -Wno-cast-qual -Wno-pointer-arith -fms-extensions +CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS} Modified: stable/10/sys/modules/mlx4/Makefile ============================================================================== --- stable/10/sys/modules/mlx4/Makefile Sat Jan 4 17:52:43 2014 (r260267) +++ stable/10/sys/modules/mlx4/Makefile Sat Jan 4 17:54:06 2014 (r260268) @@ -26,4 +26,4 @@ opt_inet6.h: .include -CFLAGS+= -Wno-cast-qual -Wno-pointer-arith -fms-extensions +CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS} Modified: stable/10/sys/modules/mlx4ib/Makefile ============================================================================== --- stable/10/sys/modules/mlx4ib/Makefile Sat Jan 4 17:52:43 2014 (r260267) +++ stable/10/sys/modules/mlx4ib/Makefile Sat Jan 4 17:54:06 2014 (r260268) @@ -31,4 +31,4 @@ opt_inet6.h: .include -CFLAGS+= -Wno-cast-qual -Wno-pointer-arith -fms-extensions +CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS} Modified: stable/10/sys/modules/mlxen/Makefile ============================================================================== --- stable/10/sys/modules/mlxen/Makefile Sat Jan 4 17:52:43 2014 (r260267) +++ stable/10/sys/modules/mlxen/Makefile Sat Jan 4 17:54:06 2014 (r260268) @@ -25,4 +25,4 @@ opt_inet6.h: .include -CFLAGS+= -Wno-cast-qual -Wno-pointer-arith -fms-extensions +CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS} Modified: stable/10/sys/modules/mthca/Makefile ============================================================================== --- stable/10/sys/modules/mthca/Makefile Sat Jan 4 17:52:43 2014 (r260267) +++ stable/10/sys/modules/mthca/Makefile Sat Jan 4 17:54:06 2014 (r260268) @@ -28,4 +28,4 @@ opt_inet6.h: .include -CFLAGS+= -Wno-cast-qual -Wno-pointer-arith -fms-extensions +CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS} Modified: stable/10/sys/ofed/drivers/infiniband/hw/mlx4/Makefile ============================================================================== --- stable/10/sys/ofed/drivers/infiniband/hw/mlx4/Makefile Sat Jan 4 17:52:43 2014 (r260267) +++ stable/10/sys/ofed/drivers/infiniband/hw/mlx4/Makefile Sat Jan 4 17:54:06 2014 (r260268) @@ -28,4 +28,4 @@ opt_inet6.h: .include -CFLAGS+= -Wno-cast-qual -Wno-pointer-arith -fms-extensions +CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS} Modified: stable/10/sys/ofed/drivers/net/mlx4/Makefile ============================================================================== --- stable/10/sys/ofed/drivers/net/mlx4/Makefile Sat Jan 4 17:52:43 2014 (r260267) +++ stable/10/sys/ofed/drivers/net/mlx4/Makefile Sat Jan 4 17:54:06 2014 (r260268) @@ -30,5 +30,5 @@ opt_inet6.h: .include -CFLAGS+= -Wno-cast-qual -Wno-pointer-arith -fms-extensions +CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS} From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 17:59:41 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8B37C15B; Sat, 4 Jan 2014 17:59:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 755BE138A; Sat, 4 Jan 2014 17:59:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04HxfEw027312; Sat, 4 Jan 2014 17:59:41 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04HxfQI027311; Sat, 4 Jan 2014 17:59:41 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401041759.s04HxfQI027311@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 17:59:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260270 - in stable: 10/sys/modules/drm2/i915kms 9/sys/modules/drm2/i915kms X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 17:59:41 -0000 Author: dim Date: Sat Jan 4 17:59:40 2014 New Revision: 260270 URL: http://svnweb.freebsd.org/changeset/base/260270 Log: MFC r260019: For some files under sys/dev/drm2/i915, turn off warnings about unused functions and variables, since they are contributed code. Modified: stable/10/sys/modules/drm2/i915kms/Makefile Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/9/sys/modules/drm2/i915kms/Makefile Directory Properties: stable/9/sys/ (props changed) Modified: stable/10/sys/modules/drm2/i915kms/Makefile ============================================================================== --- stable/10/sys/modules/drm2/i915kms/Makefile Sat Jan 4 17:56:19 2014 (r260269) +++ stable/10/sys/modules/drm2/i915kms/Makefile Sat Jan 4 17:59:40 2014 (r260270) @@ -38,3 +38,8 @@ SRCS += device_if.h bus_if.h pci_if.h ii opt_compat.h .include + +CWARNFLAGS.i915_debug.c= -Wno-unused-function +CWARNFLAGS.intel_lvds.c= -Wno-unused +CWARNFLAGS.intel_tv.c= -Wno-unused +CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 18:19:54 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0093FBEA; Sat, 4 Jan 2014 18:19:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C5E9C158A; Sat, 4 Jan 2014 18:19:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04IJrm9035920; Sat, 4 Jan 2014 18:19:53 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04IJrjC035918; Sat, 4 Jan 2014 18:19:53 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401041819.s04IJrjC035918@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 18:19:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260272 - in stable/10/sys: conf modules/ath X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 18:19:54 -0000 Author: dim Date: Sat Jan 4 18:19:53 2014 New Revision: 260272 URL: http://svnweb.freebsd.org/changeset/base/260272 Log: MFC r260025: Disable warning about unused functions for ar9300_reset.c for now. Modified: stable/10/sys/conf/files stable/10/sys/modules/ath/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/conf/files ============================================================================== --- stable/10/sys/conf/files Sat Jan 4 18:10:15 2014 (r260271) +++ stable/10/sys/conf/files Sat Jan 4 18:19:53 2014 (r260272) @@ -1045,7 +1045,7 @@ contrib/dev/ath/ath_hal/ar9300/ar9300_re contrib/dev/ath/ath_hal/ar9300/ar9300_recv_ds.c optional ath_hal | ath_ar9300 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal" contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c optional ath_hal | ath_ar9300 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal ${NO_WSOMETIMES_UNINITIALIZED}" + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal ${NO_WSOMETIMES_UNINITIALIZED} -Wno-unused-function" contrib/dev/ath/ath_hal/ar9300/ar9300_stub.c optional ath_hal | ath_ar9300 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal" contrib/dev/ath/ath_hal/ar9300/ar9300_stub_funcs.c optional ath_hal | ath_ar9300 \ Modified: stable/10/sys/modules/ath/Makefile ============================================================================== --- stable/10/sys/modules/ath/Makefile Sat Jan 4 18:10:15 2014 (r260271) +++ stable/10/sys/modules/ath/Makefile Sat Jan 4 18:19:53 2014 (r260272) @@ -166,4 +166,4 @@ CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T} # AR9300 HAL build overrides, as there's still some code to tidy up CWARNFLAGS.ar9300_eeprom.c= ${NO_WCONSTANT_CONVERSION} -CWARNFLAGS.ar9300_reset.c= ${NO_WSOMETIMES_UNINITIALIZED} +CWARNFLAGS.ar9300_reset.c= ${NO_WSOMETIMES_UNINITIALIZED} -Wno-unused-function From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 18:24:46 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AF282F0E; Sat, 4 Jan 2014 18:24:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8095A1610; Sat, 4 Jan 2014 18:24:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04IOkpS039378; Sat, 4 Jan 2014 18:24:46 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04IOkVC039376; Sat, 4 Jan 2014 18:24:46 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401041824.s04IOkVC039376@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 18:24:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260273 - in stable: 10/sys/conf 10/sys/modules/wlan 9/sys/conf 9/sys/modules/wlan X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 18:24:46 -0000 Author: dim Date: Sat Jan 4 18:24:45 2014 New Revision: 260273 URL: http://svnweb.freebsd.org/changeset/base/260273 Log: MFC r260026: Disable warning about unused functions for ieee80211_crypto.c and ieee80211_mesh.c for now. Modified: stable/10/sys/conf/files stable/10/sys/modules/wlan/Makefile Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/9/sys/conf/files stable/9/sys/modules/wlan/Makefile Directory Properties: stable/9/sys/ (props changed) Modified: stable/10/sys/conf/files ============================================================================== --- stable/10/sys/conf/files Sat Jan 4 18:19:53 2014 (r260272) +++ stable/10/sys/conf/files Sat Jan 4 18:24:45 2014 (r260273) @@ -3110,7 +3110,8 @@ net80211/ieee80211_ageq.c optional wlan net80211/ieee80211_adhoc.c optional wlan net80211/ieee80211_ageq.c optional wlan net80211/ieee80211_amrr.c optional wlan | wlan_amrr -net80211/ieee80211_crypto.c optional wlan +net80211/ieee80211_crypto.c optional wlan \ + compile-with "${NORMAL_C} -Wno-unused-function" net80211/ieee80211_crypto_ccmp.c optional wlan wlan_ccmp net80211/ieee80211_crypto_none.c optional wlan net80211/ieee80211_crypto_tkip.c optional wlan wlan_tkip @@ -3123,7 +3124,8 @@ net80211/ieee80211_ht.c optional wlan net80211/ieee80211_hwmp.c optional wlan ieee80211_support_mesh net80211/ieee80211_input.c optional wlan net80211/ieee80211_ioctl.c optional wlan -net80211/ieee80211_mesh.c optional wlan ieee80211_support_mesh +net80211/ieee80211_mesh.c optional wlan ieee80211_support_mesh \ + compile-with "${NORMAL_C} -Wno-unused-function" net80211/ieee80211_monitor.c optional wlan net80211/ieee80211_node.c optional wlan net80211/ieee80211_output.c optional wlan Modified: stable/10/sys/modules/wlan/Makefile ============================================================================== --- stable/10/sys/modules/wlan/Makefile Sat Jan 4 18:19:53 2014 (r260272) +++ stable/10/sys/modules/wlan/Makefile Sat Jan 4 18:24:45 2014 (r260273) @@ -31,3 +31,7 @@ opt_ddb.h: .endif .include + +CWARNFLAGS.ieee80211_crypto.c= -Wno-unused-function +CWARNFLAGS.ieee80211_mesh.c= -Wno-unused-function +CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 18:33:28 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ED9E6421; Sat, 4 Jan 2014 18:33:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CD34316A7; Sat, 4 Jan 2014 18:33:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04IXSjK043120; Sat, 4 Jan 2014 18:33:28 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04IXSuo043118; Sat, 4 Jan 2014 18:33:28 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401041833.s04IXSuo043118@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 18:33:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260274 - in stable/10/sys: conf modules/ipfilter X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 18:33:29 -0000 Author: dim Date: Sat Jan 4 18:33:28 2014 New Revision: 260274 URL: http://svnweb.freebsd.org/changeset/base/260274 Log: MFC r260039: Turn off warnings about unused variables for a bunch of files under contrib/ipfilter. Modified: stable/10/sys/conf/files stable/10/sys/modules/ipfilter/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/conf/files ============================================================================== --- stable/10/sys/conf/files Sat Jan 4 18:24:45 2014 (r260273) +++ stable/10/sys/conf/files Sat Jan 4 18:33:28 2014 (r260274) @@ -459,39 +459,39 @@ contrib/dev/acpica/components/utilities/ contrib/dev/acpica/components/utilities/utxfinit.c optional acpi #contrib/dev/acpica/components/utilities/utxfmutex.c optional acpi contrib/ipfilter/netinet/fil.c optional ipfilter inet \ - compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN} -I$S/contrib/ipfilter" + compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN} -Wno-unused -I$S/contrib/ipfilter" contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet \ - compile-with "${NORMAL_C} -I$S/contrib/ipfilter" + compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter" contrib/ipfilter/netinet/ip_fil_freebsd.c optional ipfilter inet \ - compile-with "${NORMAL_C} -I$S/contrib/ipfilter" + compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter" contrib/ipfilter/netinet/ip_frag.c optional ipfilter inet \ - compile-with "${NORMAL_C} -I$S/contrib/ipfilter" + compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter" contrib/ipfilter/netinet/ip_log.c optional ipfilter inet \ compile-with "${NORMAL_C} -I$S/contrib/ipfilter" contrib/ipfilter/netinet/ip_nat.c optional ipfilter inet \ - compile-with "${NORMAL_C} -I$S/contrib/ipfilter" + compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter" contrib/ipfilter/netinet/ip_proxy.c optional ipfilter inet \ - compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN} -I$S/contrib/ipfilter" + compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN} -Wno-unused -I$S/contrib/ipfilter" contrib/ipfilter/netinet/ip_state.c optional ipfilter inet \ - compile-with "${NORMAL_C} -I$S/contrib/ipfilter" + compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter" contrib/ipfilter/netinet/ip_lookup.c optional ipfilter inet \ - compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN} -Wno-error -I$S/contrib/ipfilter" + compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN} -Wno-unused -Wno-error -I$S/contrib/ipfilter" contrib/ipfilter/netinet/ip_pool.c optional ipfilter inet \ - compile-with "${NORMAL_C} -I$S/contrib/ipfilter" + compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter" contrib/ipfilter/netinet/ip_htable.c optional ipfilter inet \ - compile-with "${NORMAL_C} -I$S/contrib/ipfilter" + compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter" contrib/ipfilter/netinet/ip_sync.c optional ipfilter inet \ - compile-with "${NORMAL_C} -I$S/contrib/ipfilter" + compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter" contrib/ipfilter/netinet/mlfk_ipl.c optional ipfilter inet \ compile-with "${NORMAL_C} -I$S/contrib/ipfilter" contrib/ipfilter/netinet/ip_nat6.c optional ipfilter inet \ - compile-with "${NORMAL_C} -I$S/contrib/ipfilter" + compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter" contrib/ipfilter/netinet/ip_rules.c optional ipfilter inet \ compile-with "${NORMAL_C} -I$S/contrib/ipfilter" contrib/ipfilter/netinet/ip_scan.c optional ipfilter inet \ - compile-with "${NORMAL_C} -I$S/contrib/ipfilter" + compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter" contrib/ipfilter/netinet/ip_dstlist.c optional ipfilter inet \ - compile-with "${NORMAL_C} -I$S/contrib/ipfilter" + compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter" contrib/ipfilter/netinet/radix_ipf.c optional ipfilter inet \ compile-with "${NORMAL_C} -I$S/contrib/ipfilter" contrib/libfdt/fdt.c optional fdt Modified: stable/10/sys/modules/ipfilter/Makefile ============================================================================== --- stable/10/sys/modules/ipfilter/Makefile Sat Jan 4 18:24:45 2014 (r260273) +++ stable/10/sys/modules/ipfilter/Makefile Sat Jan 4 18:33:28 2014 (r260274) @@ -28,7 +28,18 @@ CFLAGS+= -DIPFILTER=1 -DIPFILTER_LKM -DI .include -CWARNFLAGS.fil.c= ${NO_WSELF_ASSIGN} -CWARNFLAGS.ip_proxy.c= ${NO_WSELF_ASSIGN} -CWARNFLAGS.ip_lookup.c= ${NO_WSELF_ASSIGN} +CWARNFLAGS.fil.c= ${NO_WSELF_ASSIGN} -Wno-unused +CWARNFLAGS.ip_auth.c= -Wno-unused +CWARNFLAGS.ip_fil_freebsd.c= -Wno-unused +CWARNFLAGS.ip_frag.c= -Wno-unused +CWARNFLAGS.ip_htable.c= -Wno-unused +CWARNFLAGS.ip_dstlist.c= -Wno-unused +CWARNFLAGS.ip_lookup.c= ${NO_WSELF_ASSIGN} -Wno-unused +CWARNFLAGS.ip_nat.c= -Wno-unused +CWARNFLAGS.ip_nat6.c= -Wno-unused +CWARNFLAGS.ip_pool.c= -Wno-unused +CWARNFLAGS.ip_proxy.c= ${NO_WSELF_ASSIGN} -Wno-unused +CWARNFLAGS.ip_scan.c= -Wno-unused +CWARNFLAGS.ip_state.c= -Wno-unused +CWARNFLAGS.ip_sync.c= -Wno-unused CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 18:48:30 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D3600B88; Sat, 4 Jan 2014 18:48:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BDAD01788; Sat, 4 Jan 2014 18:48:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04ImUsw047750; Sat, 4 Jan 2014 18:48:30 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04ImUGT047749; Sat, 4 Jan 2014 18:48:30 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401041848.s04ImUGT047749@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 18:48:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260275 - in stable: 10/sys/dev/en 7/sys/dev/en 8/sys/dev/en 9/sys/dev/en X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 18:48:30 -0000 Author: dim Date: Sat Jan 4 18:48:29 2014 New Revision: 260275 URL: http://svnweb.freebsd.org/changeset/base/260275 Log: MFC r260038: In sys/dev/en/midway.c, #if 0 an unused static function. Modified: stable/10/sys/dev/en/midway.c Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/7/sys/dev/en/midway.c stable/8/sys/dev/en/midway.c stable/9/sys/dev/en/midway.c Directory Properties: stable/7/sys/ (props changed) stable/8/sys/ (props changed) stable/9/sys/ (props changed) Modified: stable/10/sys/dev/en/midway.c ============================================================================== --- stable/10/sys/dev/en/midway.c Sat Jan 4 18:33:28 2014 (r260274) +++ stable/10/sys/dev/en/midway.c Sat Jan 4 18:48:29 2014 (r260275) @@ -343,6 +343,7 @@ en_k2sz(int k) } #define en_log2(X) en_k2sz(X) +#if 0 /* * en_b2sz: convert a DMA burst code to its byte size */ @@ -364,6 +365,7 @@ en_b2sz(int b) } return (0); } +#endif /* * en_sz2b: convert a burst size (bytes) to DMA burst code From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 18:53:32 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E5A802D1; Sat, 4 Jan 2014 18:53:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CFFBB182D; Sat, 4 Jan 2014 18:53:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04IrWQe051057; Sat, 4 Jan 2014 18:53:32 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04IrWoh051056; Sat, 4 Jan 2014 18:53:32 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401041853.s04IrWoh051056@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 18:53:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260276 - in stable: 10/sys/dev/mcd 7/sys/dev/mcd 8/sys/dev/mcd 9/sys/dev/mcd X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 18:53:33 -0000 Author: dim Date: Sat Jan 4 18:53:31 2014 New Revision: 260276 URL: http://svnweb.freebsd.org/changeset/base/260276 Log: MFC r260040: In sys/dev/mcd/mcd.c, mark the static const COPYRIGHT string as __used, so it ends up in the object file, and no warnings are emitted about it being actually unused. Modified: stable/10/sys/dev/mcd/mcd.c Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/7/sys/dev/mcd/mcd.c stable/8/sys/dev/mcd/mcd.c stable/9/sys/dev/mcd/mcd.c Directory Properties: stable/7/sys/ (props changed) stable/8/sys/ (props changed) stable/9/sys/ (props changed) Modified: stable/10/sys/dev/mcd/mcd.c ============================================================================== --- stable/10/sys/dev/mcd/mcd.c Sat Jan 4 18:48:29 2014 (r260275) +++ stable/10/sys/dev/mcd/mcd.c Sat Jan 4 18:53:31 2014 (r260276) @@ -44,7 +44,7 @@ #include __FBSDID("$FreeBSD$"); -static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; +static const char __used COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; #include #include From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 18:58:20 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0F93E8A4; Sat, 4 Jan 2014 18:58:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EE6B8185A; Sat, 4 Jan 2014 18:58:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04IwJCp051753; Sat, 4 Jan 2014 18:58:19 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04IwJdC051752; Sat, 4 Jan 2014 18:58:19 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401041858.s04IwJdC051752@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 18:58:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260277 - in stable: 10/sys/dev/my 7/sys/dev/my 8/sys/dev/my 9/sys/dev/my X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 18:58:20 -0000 Author: dim Date: Sat Jan 4 18:58:18 2014 New Revision: 260277 URL: http://svnweb.freebsd.org/changeset/base/260277 Log: MFC r260042: Remove superfluous old-style rcsid[] from if_my.c. There is already an __FBSDID() at the top of the file. Modified: stable/10/sys/dev/my/if_my.c Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/7/sys/dev/my/if_my.c stable/8/sys/dev/my/if_my.c stable/9/sys/dev/my/if_my.c Directory Properties: stable/7/sys/ (props changed) stable/8/sys/ (props changed) stable/9/sys/ (props changed) Modified: stable/10/sys/dev/my/if_my.c ============================================================================== --- stable/10/sys/dev/my/if_my.c Sat Jan 4 18:53:31 2014 (r260276) +++ stable/10/sys/dev/my/if_my.c Sat Jan 4 18:58:18 2014 (r260277) @@ -80,11 +80,6 @@ static int MY_USEIOSPACE = 1; #include -#ifndef lint -static const char rcsid[] = -"$Id: if_my.c,v 1.16 2003/04/15 06:37:25 mdodd Exp $"; -#endif - /* * Various supported device vendors/types and their names. */ From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 19:04:56 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 43087DA0; Sat, 4 Jan 2014 19:04:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1347518D8; Sat, 4 Jan 2014 19:04:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04J4tZ3055443; Sat, 4 Jan 2014 19:04:55 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04J4t2h055439; Sat, 4 Jan 2014 19:04:55 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401041904.s04J4t2h055439@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 19:04:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260278 - in stable: 10/sys/netgraph/netflow 7/sys/netgraph/netflow 8/sys/netgraph/netflow 9/sys/netgraph/netflow X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 19:04:56 -0000 Author: dim Date: Sat Jan 4 19:04:53 2014 New Revision: 260278 URL: http://svnweb.freebsd.org/changeset/base/260278 Log: MFC r260048: In sys/netgraph/netflow, use __FBSDID() instead of old-style rcs_id[]. Modified: stable/10/sys/netgraph/netflow/netflow.c stable/10/sys/netgraph/netflow/netflow_v9.c stable/10/sys/netgraph/netflow/ng_netflow.c Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/7/sys/netgraph/netflow/netflow.c stable/7/sys/netgraph/netflow/ng_netflow.c stable/8/sys/netgraph/netflow/netflow.c stable/8/sys/netgraph/netflow/netflow_v9.c stable/8/sys/netgraph/netflow/ng_netflow.c stable/9/sys/netgraph/netflow/netflow.c stable/9/sys/netgraph/netflow/netflow_v9.c stable/9/sys/netgraph/netflow/ng_netflow.c Directory Properties: stable/7/sys/ (props changed) stable/8/sys/ (props changed) stable/9/sys/ (props changed) Modified: stable/10/sys/netgraph/netflow/netflow.c ============================================================================== --- stable/10/sys/netgraph/netflow/netflow.c Sat Jan 4 18:58:18 2014 (r260277) +++ stable/10/sys/netgraph/netflow/netflow.c Sat Jan 4 19:04:53 2014 (r260278) @@ -28,8 +28,8 @@ * $SourceForge: netflow.c,v 1.41 2004/09/05 11:41:10 glebius Exp $ */ -static const char rcs_id[] = - "@(#) $FreeBSD$"; +#include +__FBSDID("$FreeBSD$"); #include "opt_inet6.h" #include "opt_route.h" Modified: stable/10/sys/netgraph/netflow/netflow_v9.c ============================================================================== --- stable/10/sys/netgraph/netflow/netflow_v9.c Sat Jan 4 18:58:18 2014 (r260277) +++ stable/10/sys/netgraph/netflow/netflow_v9.c Sat Jan 4 19:04:53 2014 (r260278) @@ -26,8 +26,8 @@ * $FreeBSD$ */ -static const char rcs_id[] = - "@(#) $FreeBSD$"; +#include +__FBSDID("$FreeBSD$"); #include "opt_inet6.h" #include "opt_route.h" Modified: stable/10/sys/netgraph/netflow/ng_netflow.c ============================================================================== --- stable/10/sys/netgraph/netflow/ng_netflow.c Sat Jan 4 18:58:18 2014 (r260277) +++ stable/10/sys/netgraph/netflow/ng_netflow.c Sat Jan 4 19:04:53 2014 (r260278) @@ -28,8 +28,8 @@ * $SourceForge: ng_netflow.c,v 1.30 2004/09/05 11:37:43 glebius Exp $ */ -static const char rcs_id[] = - "@(#) $FreeBSD$"; +#include +__FBSDID("$FreeBSD$"); #include "opt_inet6.h" #include "opt_route.h" From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 19:13:27 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4B06640F; Sat, 4 Jan 2014 19:13:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 36802198B; Sat, 4 Jan 2014 19:13:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04JDRLM059365; Sat, 4 Jan 2014 19:13:27 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04JDRud059364; Sat, 4 Jan 2014 19:13:27 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401041913.s04JDRud059364@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 19:13:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260279 - in stable: 10/sys/dev/tpm 8/sys/dev/tpm 9/sys/dev/tpm X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 19:13:27 -0000 Author: dim Date: Sat Jan 4 19:13:25 2014 New Revision: 260279 URL: http://svnweb.freebsd.org/changeset/base/260279 Log: MFC r260054: In sys/dev/tpm/tpm.c, #if 0 an unused static function. Modified: stable/10/sys/dev/tpm/tpm.c Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/8/sys/dev/tpm/tpm.c stable/9/sys/dev/tpm/tpm.c Directory Properties: stable/8/sys/ (props changed) stable/9/sys/ (props changed) Modified: stable/10/sys/dev/tpm/tpm.c ============================================================================== --- stable/10/sys/dev/tpm/tpm.c Sat Jan 4 19:04:53 2014 (r260278) +++ stable/10/sys/dev/tpm/tpm.c Sat Jan 4 19:13:25 2014 (r260279) @@ -1138,6 +1138,7 @@ tpm_legacy_in(bus_space_tag_t iot, bus_s return bus_space_read_1(iot, ioh, 1); } +#if 0 /* Write single byte using legacy interface. */ static inline void tpm_legacy_out(bus_space_tag_t iot, bus_space_handle_t ioh, int reg, u_int8_t v) @@ -1145,6 +1146,7 @@ tpm_legacy_out(bus_space_tag_t iot, bus_ bus_space_write_1(iot, ioh, 0, reg); bus_space_write_1(iot, ioh, 1, v); } +#endif /* Probe for TPM using legacy interface. */ int From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 19:51:58 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 966BCD16; Sat, 4 Jan 2014 19:51:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 81D271CC5; Sat, 4 Jan 2014 19:51:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04JpvLA073997; Sat, 4 Jan 2014 19:51:57 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04JpvAC073996; Sat, 4 Jan 2014 19:51:57 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201401041951.s04JpvAC073996@svn.freebsd.org> From: Gleb Smirnoff Date: Sat, 4 Jan 2014 19:51:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260280 - stable/10/sys/vm X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 19:51:58 -0000 Author: glebius Date: Sat Jan 4 19:51:57 2014 New Revision: 260280 URL: http://svnweb.freebsd.org/changeset/base/260280 Log: Merge r258690 by mav from head: Fix bug introduced at r252226, when udata argument passed to bucket_alloc() was used without making sure first that it was really passed for us. On some of my systems this bug made user argument passed by ZFS code to uma_zalloc_arg() unexpectedly block UMA per-CPU caches for those zones. Modified: stable/10/sys/vm/uma_core.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/vm/uma_core.c ============================================================================== --- stable/10/sys/vm/uma_core.c Sat Jan 4 19:13:25 2014 (r260279) +++ stable/10/sys/vm/uma_core.c Sat Jan 4 19:51:57 2014 (r260280) @@ -366,12 +366,13 @@ bucket_alloc(uma_zone_t zone, void *udat * buckets via the allocation path or bucket allocations in the * free path. */ - if ((uintptr_t)udata & UMA_ZFLAG_BUCKET) - return (NULL); if ((zone->uz_flags & UMA_ZFLAG_BUCKET) == 0) udata = (void *)(uintptr_t)zone->uz_flags; - else + else { + if ((uintptr_t)udata & UMA_ZFLAG_BUCKET) + return (NULL); udata = (void *)((uintptr_t)udata | UMA_ZFLAG_BUCKET); + } if ((uintptr_t)udata & UMA_ZFLAG_CACHEONLY) flags |= M_NOVM; ubz = bucket_zone_lookup(zone->uz_count); From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 21:18:55 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EF506E41; Sat, 4 Jan 2014 21:18:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DAE5811E4; Sat, 4 Jan 2014 21:18:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04LIt0l005639; Sat, 4 Jan 2014 21:18:55 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04LItcF005638; Sat, 4 Jan 2014 21:18:55 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401042118.s04LItcF005638@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 21:18:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260284 - in stable: 10/sys/dev/usb/wlan 8/sys/dev/usb/wlan 9/sys/dev/usb/wlan X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 21:18:56 -0000 Author: dim Date: Sat Jan 4 21:18:54 2014 New Revision: 260284 URL: http://svnweb.freebsd.org/changeset/base/260284 Log: MFC r260055: In sys/dev/usb/wlan/if_urtw.c, #if 0 a static const variable, which has been unused since r198194. Modified: stable/10/sys/dev/usb/wlan/if_urtw.c Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/8/sys/dev/usb/wlan/if_urtw.c stable/9/sys/dev/usb/wlan/if_urtw.c Directory Properties: stable/8/sys/ (props changed) stable/9/sys/ (props changed) Modified: stable/10/sys/dev/usb/wlan/if_urtw.c ============================================================================== --- stable/10/sys/dev/usb/wlan/if_urtw.c Sat Jan 4 21:18:22 2014 (r260283) +++ stable/10/sys/dev/usb/wlan/if_urtw.c Sat Jan 4 21:18:54 2014 (r260284) @@ -477,6 +477,7 @@ static struct urtw_pair urtw_ratetable[] { 96, 10 }, { 108, 11 } }; +#if 0 static const uint8_t urtw_8187b_reg_table[][3] = { { 0xf0, 0x32, 0 }, { 0xf1, 0x32, 0 }, { 0xf2, 0x00, 0 }, { 0xf3, 0x00, 0 }, { 0xf4, 0x32, 0 }, { 0xf5, 0x43, 0 }, @@ -510,6 +511,7 @@ static const uint8_t urtw_8187b_reg_tabl { 0x4c, 0x00, 2 }, { 0x9f, 0x00, 3 }, { 0x8c, 0x01, 0 }, { 0x8d, 0x10, 0 }, { 0x8e, 0x08, 0 }, { 0x8f, 0x00, 0 } }; +#endif static usb_callback_t urtw_bulk_rx_callback; static usb_callback_t urtw_bulk_tx_callback; From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 21:23:50 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8861F448; Sat, 4 Jan 2014 21:23:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 73D811256; Sat, 4 Jan 2014 21:23:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04LNoUj008908; Sat, 4 Jan 2014 21:23:50 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04LNoxG008907; Sat, 4 Jan 2014 21:23:50 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401042123.s04LNoxG008907@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 21:23:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260286 - in stable: 10/sys/dev/vxge/vxgehal 9/sys/dev/vxge/vxgehal X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 21:23:50 -0000 Author: dim Date: Sat Jan 4 21:23:49 2014 New Revision: 260286 URL: http://svnweb.freebsd.org/changeset/base/260286 Log: MFC r260056: In sys/dev/vxge/vxgehal/vxgehal-ring.c, #if 0 an unused static function. Modified: stable/10/sys/dev/vxge/vxgehal/vxgehal-ring.c Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/9/sys/dev/vxge/vxgehal/vxgehal-ring.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/10/sys/dev/vxge/vxgehal/vxgehal-ring.c ============================================================================== --- stable/10/sys/dev/vxge/vxgehal/vxgehal-ring.c Sat Jan 4 21:19:20 2014 (r260285) +++ stable/10/sys/dev/vxge/vxgehal/vxgehal-ring.c Sat Jan 4 21:23:49 2014 (r260286) @@ -62,6 +62,7 @@ __hal_ring_block_memblock_idx_set( VXGE_HAL_RING_MEMBLOCK_IDX_OFFSET))) = memblock_idx; } +#if 0 /* * __hal_ring_block_next_pointer - Returns the dma address of next block * @block: RxD block @@ -76,6 +77,7 @@ __hal_ring_block_next_pointer( return (dma_addr_t)*((u64 *) ((void *)((u8 *) block + VXGE_HAL_RING_NEXT_BLOCK_POINTER_OFFSET))); } +#endif /* * __hal_ring_block_next_pointer_set - Sets the next block pointer in RxD block From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 21:32:55 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5E0969D5; Sat, 4 Jan 2014 21:32:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2F18812F3; Sat, 4 Jan 2014 21:32:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04LWtav012799; Sat, 4 Jan 2014 21:32:55 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04LWt46012798; Sat, 4 Jan 2014 21:32:55 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401042132.s04LWt46012798@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 21:32:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260287 - in stable: 10/sys/dev/scc 7/sys/dev/scc 8/sys/dev/scc 9/sys/dev/scc X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 21:32:55 -0000 Author: dim Date: Sat Jan 4 21:32:53 2014 New Revision: 260287 URL: http://svnweb.freebsd.org/changeset/base/260287 Log: MFC r260057: In sys/dev/scc, remove unused static function scc_setmreg(). While here, invoke scc_getmreg() in two more places where it can be used. Reviewed by: marcel Modified: stable/10/sys/dev/scc/scc_dev_z8530.c Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/7/sys/dev/scc/scc_dev_z8530.c stable/8/sys/dev/scc/scc_dev_z8530.c stable/9/sys/dev/scc/scc_dev_z8530.c Directory Properties: stable/7/sys/ (props changed) stable/8/sys/ (props changed) stable/9/sys/ (props changed) Modified: stable/10/sys/dev/scc/scc_dev_z8530.c ============================================================================== --- stable/10/sys/dev/scc/scc_dev_z8530.c Sat Jan 4 21:23:49 2014 (r260286) +++ stable/10/sys/dev/scc/scc_dev_z8530.c Sat Jan 4 21:32:53 2014 (r260287) @@ -66,15 +66,6 @@ struct scc_class scc_z8530_class = { }; /* Multiplexed I/O. */ -static __inline void -scc_setmreg(struct scc_bas *bas, int ch, int reg, int val) -{ - - scc_setreg(bas, ch + REG_CTRL, reg); - scc_barrier(bas); - scc_setreg(bas, ch + REG_CTRL, val); -} - static __inline uint8_t scc_getmreg(struct scc_bas *bas, int ch, int reg) { @@ -146,9 +137,7 @@ z8530_bfe_ipend(struct scc_softc *sc) if (ip & IP_TIB) ch[1]->ch_ipend |= SER_INT_TXIDLE; if (ip & IP_SIA) { - scc_setreg(bas, CHAN_A + REG_CTRL, CR_RSTXSI); - scc_barrier(bas); - bes = scc_getreg(bas, CHAN_A + REG_CTRL); + bes = scc_getmreg(bas, CHAN_A, CR_RSTXSI); if (bes & BES_BRK) ch[0]->ch_ipend |= SER_INT_BREAK; sig = ch[0]->ch_hwsig; @@ -164,9 +153,7 @@ z8530_bfe_ipend(struct scc_softc *sc) ch[0]->ch_ipend |= SER_INT_OVERRUN; } if (ip & IP_SIB) { - scc_setreg(bas, CHAN_B + REG_CTRL, CR_RSTXSI); - scc_barrier(bas); - bes = scc_getreg(bas, CHAN_B + REG_CTRL); + bes = scc_getmreg(bas, CHAN_B, CR_RSTXSI); if (bes & BES_BRK) ch[1]->ch_ipend |= SER_INT_BREAK; sig = ch[1]->ch_hwsig; From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 21:45:53 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5BF902AB; Sat, 4 Jan 2014 21:45:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 473E113AE; Sat, 4 Jan 2014 21:45:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04Ljrds016919; Sat, 4 Jan 2014 21:45:53 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04LjrlO016918; Sat, 4 Jan 2014 21:45:53 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401042145.s04LjrlO016918@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 21:45:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260289 - in stable: 10/sys/amd64/amd64 7/sys/amd64/amd64 8/sys/amd64/amd64 9/sys/amd64/amd64 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 21:45:53 -0000 Author: dim Date: Sat Jan 4 21:45:52 2014 New Revision: 260289 URL: http://svnweb.freebsd.org/changeset/base/260289 Log: MFC r260103: In sys/amd64/amd64/pmap.c, remove static function pmap_is_current(), which has been unused since r189415. Reviewed by: alc Modified: stable/10/sys/amd64/amd64/pmap.c Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/7/sys/amd64/amd64/pmap.c stable/8/sys/amd64/amd64/pmap.c stable/9/sys/amd64/amd64/pmap.c Directory Properties: stable/7/sys/ (props changed) stable/8/sys/ (props changed) stable/9/sys/ (props changed) Modified: stable/10/sys/amd64/amd64/pmap.c ============================================================================== --- stable/10/sys/amd64/amd64/pmap.c Sat Jan 4 21:38:41 2014 (r260288) +++ stable/10/sys/amd64/amd64/pmap.c Sat Jan 4 21:45:52 2014 (r260289) @@ -1767,16 +1767,6 @@ pmap_invalidate_cache_pages(vm_page_t *p } /* - * Are we current address space or kernel? - */ -static __inline int -pmap_is_current(pmap_t pmap) -{ - return (pmap == kernel_pmap || - (pmap->pm_pml4[PML4PML4I] & PG_FRAME) == (PML4pml4e[0] & PG_FRAME)); -} - -/* * Routine: pmap_extract * Function: * Extract the physical page address associated From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 22:00:12 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 15538986; Sat, 4 Jan 2014 22:00:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E9A7714C2; Sat, 4 Jan 2014 22:00:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04M0B7K021680; Sat, 4 Jan 2014 22:00:11 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04M0AOY021668; Sat, 4 Jan 2014 22:00:10 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401042200.s04M0AOY021668@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 22:00:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260291 - in stable: 10/sys/boot/i386 10/sys/boot/i386/boot2 10/sys/boot/i386/gptboot 10/sys/boot/i386/gptzfsboot 10/sys/boot/i386/zfsboot 10/sys/boot/pc98/boot2 7/sys/boot/i386 7/sys/b... X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 22:00:12 -0000 Author: dim Date: Sat Jan 4 22:00:07 2014 New Revision: 260291 URL: http://svnweb.freebsd.org/changeset/base/260291 Log: MFC r260095: For sys/boot/i386 and sys/boot/pc98, separate flags to be passed directly to the linker (LD_FLAGS) from flags passed indirectly, via the compiler driver (LDFLAGS). This is because several Makefiles under sys/boot/i386 and sys/boot/pc98 use ${LD} directly to link, and the normal LDFLAGS value should not be used in these cases. Modified: stable/10/sys/boot/i386/Makefile.inc stable/10/sys/boot/i386/boot2/Makefile stable/10/sys/boot/i386/gptboot/Makefile stable/10/sys/boot/i386/gptzfsboot/Makefile stable/10/sys/boot/i386/zfsboot/Makefile stable/10/sys/boot/pc98/boot2/Makefile Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/7/sys/boot/i386/Makefile.inc stable/7/sys/boot/i386/boot2/Makefile stable/7/sys/boot/i386/gptboot/Makefile stable/7/sys/boot/i386/gptzfsboot/Makefile stable/7/sys/boot/i386/zfsboot/Makefile stable/7/sys/boot/pc98/boot2/Makefile stable/8/sys/boot/i386/Makefile.inc stable/8/sys/boot/i386/boot2/Makefile stable/8/sys/boot/i386/gptboot/Makefile stable/8/sys/boot/i386/gptzfsboot/Makefile stable/8/sys/boot/i386/zfsboot/Makefile stable/8/sys/boot/pc98/boot2/Makefile stable/9/sys/boot/i386/Makefile.inc stable/9/sys/boot/i386/boot2/Makefile stable/9/sys/boot/i386/gptboot/Makefile stable/9/sys/boot/i386/gptzfsboot/Makefile stable/9/sys/boot/i386/zfsboot/Makefile stable/9/sys/boot/pc98/boot2/Makefile Directory Properties: stable/7/sys/ (props changed) stable/8/sys/ (props changed) stable/9/sys/ (props changed) Modified: stable/10/sys/boot/i386/Makefile.inc ============================================================================== --- stable/10/sys/boot/i386/Makefile.inc Sat Jan 4 21:55:06 2014 (r260290) +++ stable/10/sys/boot/i386/Makefile.inc Sat Jan 4 22:00:07 2014 (r260291) @@ -13,7 +13,8 @@ LDFLAGS+= -nostdlib .if ${MACHINE_CPUARCH} == "amd64" CFLAGS+= -m32 ACFLAGS+= -m32 -LDFLAGS+= -m elf_i386_fbsd +# LD_FLAGS is passed directly to ${LD}, not via ${CC}: +LD_FLAGS+= -m elf_i386_fbsd AFLAGS+= --32 .endif Modified: stable/10/sys/boot/i386/boot2/Makefile ============================================================================== --- stable/10/sys/boot/i386/boot2/Makefile Sat Jan 4 21:55:06 2014 (r260290) +++ stable/10/sys/boot/i386/boot2/Makefile Sat Jan 4 22:00:07 2014 (r260291) @@ -44,7 +44,7 @@ CFLAGS.gcc+= -fno-guess-branch-probabili -fno-unit-at-a-time \ -mno-align-long-strings \ -LDFLAGS=-static -N --gc-sections +LD_FLAGS=-static -N --gc-sections # Pick up ../Makefile.inc early. .include @@ -60,7 +60,7 @@ boot1: boot1.out objcopy -S -O binary boot1.out ${.TARGET} boot1.out: boot1.o - ${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o + ${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o CLEANFILES+= boot2 boot2.ld boot2.ldr boot2.bin boot2.out boot2.o \ boot2.s boot2.s.tmp boot2.h sio.o @@ -81,7 +81,7 @@ boot2.bin: boot2.out objcopy -S -O binary boot2.out ${.TARGET} boot2.out: ${BTXCRT} boot2.o sio.o - ${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} + ${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} boot2.o: boot2.s ${CC} ${ACFLAGS} -c boot2.s Modified: stable/10/sys/boot/i386/gptboot/Makefile ============================================================================== --- stable/10/sys/boot/i386/gptboot/Makefile Sat Jan 4 21:55:06 2014 (r260290) +++ stable/10/sys/boot/i386/gptboot/Makefile Sat Jan 4 22:00:07 2014 (r260291) @@ -37,7 +37,7 @@ CFLAGS= -DBOOTPROG=\"gptboot\" \ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ -Winline --param max-inline-insns-single=100 -LDFLAGS=-static -N --gc-sections +LD_FLAGS=-static -N --gc-sections # Pick up ../Makefile.inc early. .include @@ -54,7 +54,7 @@ gptldr.bin: gptldr.out objcopy -S -O binary gptldr.out ${.TARGET} gptldr.out: gptldr.o - ${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} gptldr.o + ${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} gptldr.o CLEANFILES+= gptboot.bin gptboot.out gptboot.o sio.o gpt.o crc32.o drv.o \ cons.o util.o @@ -63,7 +63,7 @@ gptboot.bin: gptboot.out objcopy -S -O binary gptboot.out ${.TARGET} gptboot.out: ${BTXCRT} gptboot.o sio.o gpt.o crc32.o drv.o cons.o util.o - ${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND} + ${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND} gptboot.o: ${.CURDIR}/../../common/ufsread.c Modified: stable/10/sys/boot/i386/gptzfsboot/Makefile ============================================================================== --- stable/10/sys/boot/i386/gptzfsboot/Makefile Sat Jan 4 21:55:06 2014 (r260290) +++ stable/10/sys/boot/i386/gptzfsboot/Makefile Sat Jan 4 22:00:07 2014 (r260291) @@ -34,7 +34,7 @@ CFLAGS= -DBOOTPROG=\"gptzfsboot\" \ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ -Winline --param max-inline-insns-single=100 -LDFLAGS=-static -N --gc-sections +LD_FLAGS=-static -N --gc-sections # Pick up ../Makefile.inc early. .include @@ -51,7 +51,7 @@ gptldr.bin: gptldr.out objcopy -S -O binary gptldr.out ${.TARGET} gptldr.out: gptldr.o - ${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} gptldr.o + ${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} gptldr.o CLEANFILES+= gptzfsboot.bin gptzfsboot.out zfsboot.o sio.o cons.o \ drv.o gpt.o util.o @@ -60,7 +60,7 @@ gptzfsboot.bin: gptzfsboot.out objcopy -S -O binary gptzfsboot.out ${.TARGET} gptzfsboot.out: ${BTXCRT} zfsboot.o sio.o gpt.o drv.o cons.o util.o - ${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND} + ${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND} zfsboot.o: ${.CURDIR}/../../zfs/zfsimpl.c Modified: stable/10/sys/boot/i386/zfsboot/Makefile ============================================================================== --- stable/10/sys/boot/i386/zfsboot/Makefile Sat Jan 4 21:55:06 2014 (r260290) +++ stable/10/sys/boot/i386/zfsboot/Makefile Sat Jan 4 22:00:07 2014 (r260291) @@ -31,7 +31,7 @@ CFLAGS= -DBOOTPROG=\"zfsboot\" \ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ -Winline --param max-inline-insns-single=100 -LDFLAGS=-static -N --gc-sections +LD_FLAGS=-static -N --gc-sections # Pick up ../Makefile.inc early. .include @@ -47,7 +47,7 @@ zfsboot1: zfsldr.out objcopy -S -O binary zfsldr.out ${.TARGET} zfsldr.out: zfsldr.o - ${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} zfsldr.o + ${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} zfsldr.o CLEANFILES+= zfsboot2 zfsboot.ld zfsboot.ldr zfsboot.bin zfsboot.out \ zfsboot.o zfsboot.s zfsboot.s.tmp sio.o cons.o drv.o util.o @@ -73,7 +73,7 @@ zfsboot.bin: zfsboot.out objcopy -S -O binary zfsboot.out ${.TARGET} zfsboot.out: ${BTXCRT} zfsboot.o sio.o drv.o cons.o util.o - ${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND} + ${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND} SRCS= zfsboot.c Modified: stable/10/sys/boot/pc98/boot2/Makefile ============================================================================== --- stable/10/sys/boot/pc98/boot2/Makefile Sat Jan 4 21:55:06 2014 (r260290) +++ stable/10/sys/boot/pc98/boot2/Makefile Sat Jan 4 22:00:07 2014 (r260291) @@ -50,7 +50,7 @@ CFLAGS= -Os \ # Initialize the bi_bios_geom using the BIOS geometry #CFLAGS+= -DGET_BIOSGEOM -LDFLAGS=-static -N --gc-sections +LD_FLAGS=-static -N --gc-sections # Pick up ../Makefile.inc early. .include @@ -68,7 +68,7 @@ boot1: boot1.out objcopy -S -O binary boot1.out ${.TARGET} boot1.out: boot1.o - ${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o + ${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o CLEANFILES+= boot2 boot2.ld boot2.ldr boot2.bin boot2.out boot2.o \ boot2.s boot2.s.tmp boot2.h sio.o @@ -89,7 +89,7 @@ boot2.bin: boot2.out objcopy -S -O binary boot2.out ${.TARGET} boot2.out: ${BTXCRT} boot2.o sio.o - ${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} + ${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} boot2.o: boot2.s From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 22:13:17 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D5F2B262; Sat, 4 Jan 2014 22:13:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C1DB215DB; Sat, 4 Jan 2014 22:13:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04MDH01028518; Sat, 4 Jan 2014 22:13:17 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04MDHg1028515; Sat, 4 Jan 2014 22:13:17 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401042213.s04MDHg1028515@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 22:13:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260293 - in stable: 10/sys/conf 10/sys/modules/ibcore 9/sys/conf X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 22:13:17 -0000 Author: dim Date: Sat Jan 4 22:13:16 2014 New Revision: 260293 URL: http://svnweb.freebsd.org/changeset/base/260293 Log: MFC r260104: For sys/ofed/drivers/infiniband/core/cm.c, disable warning about unused functions for now. Modified: stable/10/sys/conf/files stable/10/sys/modules/ibcore/Makefile Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/9/sys/conf/files Directory Properties: stable/9/sys/ (props changed) Modified: stable/10/sys/conf/files ============================================================================== --- stable/10/sys/conf/files Sat Jan 4 22:09:53 2014 (r260292) +++ stable/10/sys/conf/files Sat Jan 4 22:13:16 2014 (r260293) @@ -3440,7 +3440,7 @@ ofed/drivers/infiniband/core/mad.c opti compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" ofed/drivers/infiniband/core/cm.c optional ofed \ no-depend \ - compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" + compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/ -Wno-unused-function" ofed/drivers/infiniband/core/cma.c optional ofed \ no-depend \ compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" Modified: stable/10/sys/modules/ibcore/Makefile ============================================================================== --- stable/10/sys/modules/ibcore/Makefile Sat Jan 4 22:09:53 2014 (r260292) +++ stable/10/sys/modules/ibcore/Makefile Sat Jan 4 22:13:16 2014 (r260293) @@ -21,3 +21,6 @@ CFLAGS+= -DINET6 -DINET -DOFED .include CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS} + +CWARNFLAGS.cm.c= -Wno-unused-function +CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 23:00:57 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B53DB3F7; Sat, 4 Jan 2014 23:00:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A0959190F; Sat, 4 Jan 2014 23:00:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04N0vKc046709; Sat, 4 Jan 2014 23:00:57 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04N0vhF046706; Sat, 4 Jan 2014 23:00:57 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401042300.s04N0vhF046706@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 23:00:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260297 - in stable/10/sys: conf modules/mlx4 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 23:00:57 -0000 Author: dim Date: Sat Jan 4 23:00:56 2014 New Revision: 260297 URL: http://svnweb.freebsd.org/changeset/base/260297 Log: MFC r260111: For sys/ofed/drivers/infiniband/hw/mlx4/mcg.c, disable warning about unused variables for now. Modified: stable/10/sys/conf/files stable/10/sys/modules/mlx4/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/conf/files ============================================================================== --- stable/10/sys/conf/files Sat Jan 4 22:30:18 2014 (r260296) +++ stable/10/sys/conf/files Sat Jan 4 23:00:56 2014 (r260297) @@ -3548,7 +3548,7 @@ ofed/drivers/infiniband/hw/mlx4/alias_GU compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/infiniband/hw/mlx4/" ofed/drivers/infiniband/hw/mlx4/mcg.c optional mlx4ib \ no-depend obj-prefix "mlx4ib_" \ - compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/infiniband/hw/mlx4/" + compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/infiniband/hw/mlx4/ -Wno-unused" ofed/drivers/infiniband/hw/mlx4/sysfs.c optional mlx4ib \ no-depend obj-prefix "mlx4ib_" \ compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/infiniband/hw/mlx4/" Modified: stable/10/sys/modules/mlx4/Makefile ============================================================================== --- stable/10/sys/modules/mlx4/Makefile Sat Jan 4 22:30:18 2014 (r260296) +++ stable/10/sys/modules/mlx4/Makefile Sat Jan 4 23:00:56 2014 (r260297) @@ -27,3 +27,6 @@ opt_inet6.h: .include CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS} + +CWARNFLAGS.mcg.c= -Wno-unused +CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 23:12:03 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 56A4C6D8; Sat, 4 Jan 2014 23:12:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2797F199F; Sat, 4 Jan 2014 23:12:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04NC3aU051328; Sat, 4 Jan 2014 23:12:03 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04NC3Kt051327; Sat, 4 Jan 2014 23:12:03 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401042312.s04NC3Kt051327@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 23:12:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260298 - in stable: 10/sys/dev/sound/pci 7/sys/dev/sound/pci 8/sys/dev/sound/pci 9/sys/dev/sound/pci X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 23:12:03 -0000 Author: dim Date: Sat Jan 4 23:12:01 2014 New Revision: 260298 URL: http://svnweb.freebsd.org/changeset/base/260298 Log: MFC r260112: In sys/dev/sound/pci/maestro.c, #if 0 two unused static functions. Modified: stable/10/sys/dev/sound/pci/maestro.c Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/7/sys/dev/sound/pci/maestro.c stable/8/sys/dev/sound/pci/maestro.c stable/9/sys/dev/sound/pci/maestro.c Directory Properties: stable/7/sys/ (props changed) stable/8/sys/ (props changed) stable/9/sys/ (props changed) Modified: stable/10/sys/dev/sound/pci/maestro.c ============================================================================== --- stable/10/sys/dev/sound/pci/maestro.c Sat Jan 4 23:00:56 2014 (r260297) +++ stable/10/sys/dev/sound/pci/maestro.c Sat Jan 4 23:12:01 2014 (r260298) @@ -207,9 +207,11 @@ SYSCTL_UINT(_debug_maestro, OID_AUTO, po static void agg_sleep(struct agg_info*, const char *wmesg, int msec); +#if 0 static __inline u_int32_t agg_rd(struct agg_info*, int, int size); static __inline void agg_wr(struct agg_info*, int, u_int32_t data, int size); +#endif static int agg_rdcodec(struct agg_info*, int); static int agg_wrcodec(struct agg_info*, int, u_int32_t); @@ -286,6 +288,7 @@ agg_sleep(struct agg_info *sc, const cha /* I/O port */ +#if 0 static __inline u_int32_t agg_rd(struct agg_info *sc, int regno, int size) { @@ -300,12 +303,14 @@ agg_rd(struct agg_info *sc, int regno, i return ~(u_int32_t)0; } } +#endif #define AGG_RD(sc, regno, size) \ bus_space_read_##size( \ ((struct agg_info*)(sc))->st, \ ((struct agg_info*)(sc))->sh, (regno)) +#if 0 static __inline void agg_wr(struct agg_info *sc, int regno, u_int32_t data, int size) { @@ -321,6 +326,7 @@ agg_wr(struct agg_info *sc, int regno, u break; } } +#endif #define AGG_WR(sc, regno, data, size) \ bus_space_write_##size( \ From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 23:31:35 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3816C36A; Sat, 4 Jan 2014 23:31:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 236571AEB; Sat, 4 Jan 2014 23:31:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04NVZu8058990; Sat, 4 Jan 2014 23:31:35 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04NVYe0058989; Sat, 4 Jan 2014 23:31:35 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201401042331.s04NVYe0058989@svn.freebsd.org> From: Alexander Motin Date: Sat, 4 Jan 2014 23:31:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260299 - stable/10/sys/kern X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 23:31:35 -0000 Author: mav Date: Sat Jan 4 23:31:34 2014 New Revision: 260299 URL: http://svnweb.freebsd.org/changeset/base/260299 Log: MFC r259232: Create own free list for each of the first 32 possible allocation sizes. In case of 4K allocation quantum that means for allocations up to 128K. With growth of memory fragmentation these lists may grow to quite a large sizes (tenths and hundreds of thousands items). Having in one list items of different sizes in worst case may require full linear list traversal, that may be very expensive. Having lists for items of single size means that unless user specify some alignment or border requirements (that are very rare cases) first item found on the list should satisfy the request. While running SPEC NFS benchmark on top of ZFS on 24-core machine with 84GB RAM this change reduces CPU time spent in vmem_xalloc() from 8% and lock congestion spinning around it from 20% to invisible levels. And that all is by the cost of just 26 more pointers per vmem instance. If at some point our kernel will start to actively use KVA allocations with odd sizes above 128K, something may need to be done to bigger lists also. Modified: stable/10/sys/kern/subr_vmem.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/kern/subr_vmem.c ============================================================================== --- stable/10/sys/kern/subr_vmem.c Sat Jan 4 23:12:01 2014 (r260298) +++ stable/10/sys/kern/subr_vmem.c Sat Jan 4 23:31:34 2014 (r260299) @@ -70,7 +70,10 @@ __FBSDID("$FreeBSD$"); #include #include -#define VMEM_MAXORDER (sizeof(vmem_size_t) * NBBY) +#define VMEM_OPTORDER 5 +#define VMEM_OPTVALUE (1 << VMEM_OPTORDER) +#define VMEM_MAXORDER \ + (VMEM_OPTVALUE - 1 + sizeof(vmem_size_t) * NBBY - VMEM_OPTORDER) #define VMEM_HASHSIZE_MIN 16 #define VMEM_HASHSIZE_MAX 131072 @@ -200,8 +203,10 @@ static LIST_HEAD(, vmem) vmem_list = LIS #define VMEM_CROSS_P(addr1, addr2, boundary) \ ((((addr1) ^ (addr2)) & -(boundary)) != 0) -#define ORDER2SIZE(order) ((vmem_size_t)1 << (order)) -#define SIZE2ORDER(size) ((int)flsl(size) - 1) +#define ORDER2SIZE(order) ((order) < VMEM_OPTVALUE ? ((order) + 1) : \ + (vmem_size_t)1 << ((order) - (VMEM_OPTVALUE - VMEM_OPTORDER - 1))) +#define SIZE2ORDER(size) ((size) <= VMEM_OPTVALUE ? ((size) - 1) : \ + (flsl(size) + (VMEM_OPTVALUE - VMEM_OPTORDER - 2))) /* * Maximum number of boundary tags that may be required to satisfy an @@ -334,11 +339,14 @@ bt_free(vmem_t *vm, bt_t *bt) /* * freelist[0] ... [1, 1] - * freelist[1] ... [2, 3] - * freelist[2] ... [4, 7] - * freelist[3] ... [8, 15] + * freelist[1] ... [2, 2] * : - * freelist[n] ... [(1 << n), (1 << (n + 1)) - 1] + * freelist[29] ... [30, 30] + * freelist[30] ... [31, 31] + * freelist[31] ... [32, 63] + * freelist[33] ... [64, 127] + * : + * freelist[n] ... [(1 << (n - 26)), (1 << (n - 25)) - 1] * : */ @@ -979,6 +987,7 @@ vmem_init(vmem_t *vm, const char *name, int i; MPASS(quantum > 0); + MPASS((quantum & (quantum - 1)) == 0); bzero(vm, sizeof(*vm)); @@ -988,8 +997,7 @@ vmem_init(vmem_t *vm, const char *name, LIST_INIT(&vm->vm_freetags); strlcpy(vm->vm_name, name, sizeof(vm->vm_name)); vm->vm_quantum_mask = quantum - 1; - vm->vm_quantum_shift = SIZE2ORDER(quantum); - MPASS(ORDER2SIZE(vm->vm_quantum_shift) == quantum); + vm->vm_quantum_shift = flsl(quantum) - 1; vm->vm_nbusytag = 0; vm->vm_size = 0; vm->vm_inuse = 0; From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 23:35:34 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EE9A166B; Sat, 4 Jan 2014 23:35:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C0A931B09; Sat, 4 Jan 2014 23:35:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04NZYIv059798; Sat, 4 Jan 2014 23:35:34 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04NZYLN059796; Sat, 4 Jan 2014 23:35:34 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201401042335.s04NZYLN059796@svn.freebsd.org> From: Alexander Motin Date: Sat, 4 Jan 2014 23:35:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260300 - stable/10/sys/vm X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 23:35:35 -0000 Author: mav Date: Sat Jan 4 23:35:34 2014 New Revision: 260300 URL: http://svnweb.freebsd.org/changeset/base/260300 Log: MFC r258336: Implement soft pressure on UMA cache bucket sizes. Every time system detects low memory condition decrease bucket sizes for each zone by one item. As result, higher memory pressure will push to smaller bucket sizes and so smaller per-CPU caches and so more efficient memory use. Before this change there was no force to oppose buckets growth as result of practically inevitable zone lock conflicts, and after some run time per-CPU caches could consume enough RAM to kill the system. Modified: stable/10/sys/vm/uma_core.c stable/10/sys/vm/uma_int.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/vm/uma_core.c ============================================================================== --- stable/10/sys/vm/uma_core.c Sat Jan 4 23:31:34 2014 (r260299) +++ stable/10/sys/vm/uma_core.c Sat Jan 4 23:35:34 2014 (r260300) @@ -702,6 +702,13 @@ bucket_cache_drain(uma_zone_t zone) bucket_free(zone, bucket, NULL); ZONE_LOCK(zone); } + + /* + * Shrink further bucket sizes. Price of single zone lock collision + * is probably lower then price of global cache drain. + */ + if (zone->uz_count > zone->uz_count_min) + zone->uz_count--; } static void @@ -1462,6 +1469,7 @@ zone_ctor(void *mem, int size, void *uda zone->uz_fails = 0; zone->uz_sleeps = 0; zone->uz_count = 0; + zone->uz_count_min = 0; zone->uz_flags = 0; zone->uz_warning = NULL; timevalclear(&zone->uz_ratecheck); @@ -1553,6 +1561,7 @@ out: zone->uz_count = bucket_select(zone->uz_size); else zone->uz_count = BUCKET_MAX; + zone->uz_count_min = zone->uz_count; return (0); } Modified: stable/10/sys/vm/uma_int.h ============================================================================== --- stable/10/sys/vm/uma_int.h Sat Jan 4 23:31:34 2014 (r260299) +++ stable/10/sys/vm/uma_int.h Sat Jan 4 23:35:34 2014 (r260300) @@ -300,7 +300,8 @@ struct uma_zone { volatile u_long uz_fails; /* Total number of alloc failures */ volatile u_long uz_frees; /* Total number of frees */ uint64_t uz_sleeps; /* Total number of alloc sleeps */ - uint16_t uz_count; /* Highest amount of items in bucket */ + uint16_t uz_count; /* Amount of items in full bucket */ + uint16_t uz_count_min; /* Minimal amount of items there */ /* The next three fields are used to print a rate-limited warnings. */ const char *uz_warning; /* Warning to print on failure */ From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 23:37:02 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3F08D87C; Sat, 4 Jan 2014 23:37:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2B7731B16; Sat, 4 Jan 2014 23:37:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04Nb2rN060056; Sat, 4 Jan 2014 23:37:02 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04Nb237060055; Sat, 4 Jan 2014 23:37:02 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201401042337.s04Nb237060055@svn.freebsd.org> From: Alexander Motin Date: Sat, 4 Jan 2014 23:37:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260301 - stable/10/sys/vm X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 23:37:02 -0000 Author: mav Date: Sat Jan 4 23:37:01 2014 New Revision: 260301 URL: http://svnweb.freebsd.org/changeset/base/260301 Log: MFC r258337: Add two new UMA bucket zones to store 3 and 9 items per bucket. These new buckets make bucket size self-tuning more soft and precise. Without them there are buckets for 1, 5, 13, 29, ... items. While at bigger sizes difference about 2x is fine, at smallest ones it is 5x and 2.6x respectively. New buckets make that line look like 1, 3, 5, 9, 13, 29, reducing jumps between steps, making algorithm work softer, allocating and freeing memory in better fitting chunks. Otherwise there is quite a big gap between allocating 128K and 5x128K of RAM at once. Modified: stable/10/sys/vm/uma_core.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/vm/uma_core.c ============================================================================== --- stable/10/sys/vm/uma_core.c Sat Jan 4 23:35:34 2014 (r260300) +++ stable/10/sys/vm/uma_core.c Sat Jan 4 23:37:01 2014 (r260301) @@ -207,7 +207,9 @@ struct uma_bucket_zone { struct uma_bucket_zone bucket_zones[] = { { NULL, "4 Bucket", BUCKET_SIZE(4), 4096 }, + { NULL, "6 Bucket", BUCKET_SIZE(6), 3072 }, { NULL, "8 Bucket", BUCKET_SIZE(8), 2048 }, + { NULL, "12 Bucket", BUCKET_SIZE(12), 1536 }, { NULL, "16 Bucket", BUCKET_SIZE(16), 1024 }, { NULL, "32 Bucket", BUCKET_SIZE(32), 512 }, { NULL, "64 Bucket", BUCKET_SIZE(64), 256 }, From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 23:38:07 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 748F7B62; Sat, 4 Jan 2014 23:38:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 600B01B25; Sat, 4 Jan 2014 23:38:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04Nc7XH060349; Sat, 4 Jan 2014 23:38:07 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04Nc7Nx060347; Sat, 4 Jan 2014 23:38:07 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201401042338.s04Nc7Nx060347@svn.freebsd.org> From: Alexander Motin Date: Sat, 4 Jan 2014 23:38:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260302 - stable/10/sys/vm X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 23:38:07 -0000 Author: mav Date: Sat Jan 4 23:38:06 2014 New Revision: 260302 URL: http://svnweb.freebsd.org/changeset/base/260302 Log: MFC r258338: Grow UMA zone bucket size also on lock congestion during item free. Lock congestion is the same, whether it happens on alloc or free, so handle it equally. Now that we have back pressure, there is no problem to grow buckets a bit faster. Any way growth is much slower then in 9.x. Modified: stable/10/sys/vm/uma_core.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/vm/uma_core.c ============================================================================== --- stable/10/sys/vm/uma_core.c Sat Jan 4 23:37:01 2014 (r260301) +++ stable/10/sys/vm/uma_core.c Sat Jan 4 23:38:06 2014 (r260302) @@ -2531,6 +2531,7 @@ uma_zfree_arg(uma_zone_t zone, void *ite { uma_cache_t cache; uma_bucket_t bucket; + int lockfail; int cpu; #ifdef UMA_DEBUG_ALLOC_1 @@ -2615,7 +2616,12 @@ zfree_start: if (zone->uz_count == 0 || bucketdisable) goto zfree_item; - ZONE_LOCK(zone); + lockfail = 0; + if (ZONE_TRYLOCK(zone) == 0) { + /* Record contention to size the buckets. */ + ZONE_LOCK(zone); + lockfail = 1; + } critical_enter(); cpu = curcpu; cache = &zone->uz_cpu[cpu]; @@ -2649,7 +2655,12 @@ zfree_start: /* We are no longer associated with this CPU. */ critical_exit(); - /* And the zone.. */ + /* + * We bump the uz count when the cache size is insufficient to + * handle the working set. + */ + if (lockfail && zone->uz_count < BUCKET_MAX) + zone->uz_count++; ZONE_UNLOCK(zone); #ifdef UMA_DEBUG_ALLOC From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 23:39:40 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 13EE6D70; Sat, 4 Jan 2014 23:39:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F2BF41B31; Sat, 4 Jan 2014 23:39:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04NddcH060601; Sat, 4 Jan 2014 23:39:39 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04NddU8060600; Sat, 4 Jan 2014 23:39:39 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201401042339.s04NddU8060600@svn.freebsd.org> From: Alexander Motin Date: Sat, 4 Jan 2014 23:39:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260303 - stable/10/sys/vm X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 23:39:40 -0000 Author: mav Date: Sat Jan 4 23:39:39 2014 New Revision: 260303 URL: http://svnweb.freebsd.org/changeset/base/260303 Log: MFC r258340, r258497: Implement mechanism to safely but slowly purge UMA per-CPU caches. This is a last resort for very low memory condition in case other measures to free memory were ineffective. Sequentially cycle through all CPUs and extract per-CPU cache buckets into zone cache from where they can be freed. Modified: stable/10/sys/vm/uma_core.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/vm/uma_core.c ============================================================================== --- stable/10/sys/vm/uma_core.c Sat Jan 4 23:38:06 2014 (r260302) +++ stable/10/sys/vm/uma_core.c Sat Jan 4 23:39:39 2014 (r260303) @@ -75,6 +75,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -685,6 +686,90 @@ cache_drain(uma_zone_t zone) ZONE_UNLOCK(zone); } +static void +cache_shrink(uma_zone_t zone) +{ + + if (zone->uz_flags & UMA_ZFLAG_INTERNAL) + return; + + ZONE_LOCK(zone); + zone->uz_count = (zone->uz_count_min + zone->uz_count) / 2; + ZONE_UNLOCK(zone); +} + +static void +cache_drain_safe_cpu(uma_zone_t zone) +{ + uma_cache_t cache; + uma_bucket_t b1, b2; + + if (zone->uz_flags & UMA_ZFLAG_INTERNAL) + return; + + b1 = b2 = NULL; + ZONE_LOCK(zone); + critical_enter(); + cache = &zone->uz_cpu[curcpu]; + if (cache->uc_allocbucket) { + if (cache->uc_allocbucket->ub_cnt != 0) + LIST_INSERT_HEAD(&zone->uz_buckets, + cache->uc_allocbucket, ub_link); + else + b1 = cache->uc_allocbucket; + cache->uc_allocbucket = NULL; + } + if (cache->uc_freebucket) { + if (cache->uc_freebucket->ub_cnt != 0) + LIST_INSERT_HEAD(&zone->uz_buckets, + cache->uc_freebucket, ub_link); + else + b2 = cache->uc_freebucket; + cache->uc_freebucket = NULL; + } + critical_exit(); + ZONE_UNLOCK(zone); + if (b1) + bucket_free(zone, b1, NULL); + if (b2) + bucket_free(zone, b2, NULL); +} + +/* + * Safely drain per-CPU caches of a zone(s) to alloc bucket. + * This is an expensive call because it needs to bind to all CPUs + * one by one and enter a critical section on each of them in order + * to safely access their cache buckets. + * Zone lock must not be held on call this function. + */ +static void +cache_drain_safe(uma_zone_t zone) +{ + int cpu; + + /* + * Polite bucket sizes shrinking was not enouth, shrink aggressively. + */ + if (zone) + cache_shrink(zone); + else + zone_foreach(cache_shrink); + + CPU_FOREACH(cpu) { + thread_lock(curthread); + sched_bind(curthread, cpu); + thread_unlock(curthread); + + if (zone) + cache_drain_safe_cpu(zone); + else + zone_foreach(cache_drain_safe_cpu); + } + thread_lock(curthread); + sched_unbind(curthread); + thread_unlock(curthread); +} + /* * Drain the cached buckets from a zone. Expects a locked zone on entry. */ @@ -3070,6 +3155,10 @@ uma_reclaim(void) #endif bucket_enable(); zone_foreach(zone_drain); + if (vm_page_count_min()) { + cache_drain_safe(NULL); + zone_foreach(zone_drain); + } /* * Some slabs may have been freed but this zone will be visited early * we visit again so that we can free pages that are empty once other From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 23:40:48 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 46CC7E9C; Sat, 4 Jan 2014 23:40:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 328AB1B34; Sat, 4 Jan 2014 23:40:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04NemY6062883; Sat, 4 Jan 2014 23:40:48 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04NemuT062882; Sat, 4 Jan 2014 23:40:48 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201401042340.s04NemuT062882@svn.freebsd.org> From: Alexander Motin Date: Sat, 4 Jan 2014 23:40:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260304 - stable/10/sys/vm X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 23:40:48 -0000 Author: mav Date: Sat Jan 4 23:40:47 2014 New Revision: 260304 URL: http://svnweb.freebsd.org/changeset/base/260304 Log: MFC r258691: Don't count bucket allocation failures for UMA zones as their own failures. There are good reasons for this to happen, such as recursion prevention, etc. and they are not fatal since buckets are just an optimization mechanism. Real bucket allocation failures are any way counted by the bucket zones themselves, and we don't need double accounting there. Modified: stable/10/sys/vm/uma_core.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/vm/uma_core.c ============================================================================== --- stable/10/sys/vm/uma_core.c Sat Jan 4 23:39:39 2014 (r260303) +++ stable/10/sys/vm/uma_core.c Sat Jan 4 23:40:47 2014 (r260304) @@ -2510,7 +2510,7 @@ zone_alloc_bucket(uma_zone_t zone, void /* Don't wait for buckets, preserve caller's NOVM setting. */ bucket = bucket_alloc(zone, udata, M_NOWAIT | (flags & M_NOVM)); if (bucket == NULL) - goto out; + return (NULL); max = MIN(bucket->ub_entries, zone->uz_count); bucket->ub_cnt = zone->uz_import(zone->uz_arg, bucket->ub_bucket, @@ -2541,10 +2541,8 @@ zone_alloc_bucket(uma_zone_t zone, void } } -out: - if (bucket == NULL || bucket->ub_cnt == 0) { - if (bucket != NULL) - bucket_free(zone, bucket, udata); + if (bucket->ub_cnt == 0) { + bucket_free(zone, bucket, udata); atomic_add_long(&zone->uz_fails, 1); return (NULL); } From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 23:42:25 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 55761207; Sat, 4 Jan 2014 23:42:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3F2BC1CA3; Sat, 4 Jan 2014 23:42:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04NgP8l064134; Sat, 4 Jan 2014 23:42:25 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04NgP1G064133; Sat, 4 Jan 2014 23:42:25 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201401042342.s04NgP1G064133@svn.freebsd.org> From: Alexander Motin Date: Sat, 4 Jan 2014 23:42:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260305 - stable/10/sys/vm X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 23:42:25 -0000 Author: mav Date: Sat Jan 4 23:42:24 2014 New Revision: 260305 URL: http://svnweb.freebsd.org/changeset/base/260305 Log: MFC r258693: Make UMA to not blindly force offpage slab header allocation for large (> PAGE_SIZE) zones. If zone is not multiple to PAGE_SIZE, there may be enough space for the header at the last page, so we may avoid extra header memory allocation and hash table update/lookup. ZFS creates bunch of odd-sized UMA zones (5120, 6144, 7168, 10240, 14336). This change gives good use to at least some of otherwise lost memory there. Modified: stable/10/sys/vm/uma_core.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/vm/uma_core.c ============================================================================== --- stable/10/sys/vm/uma_core.c Sat Jan 4 23:40:47 2014 (r260304) +++ stable/10/sys/vm/uma_core.c Sat Jan 4 23:42:24 2014 (r260305) @@ -1318,6 +1318,7 @@ keg_small_init(uma_keg_t keg) static void keg_large_init(uma_keg_t keg) { + u_int shsize; KASSERT(keg != NULL, ("Keg is null in keg_large_init")); KASSERT((keg->uk_flags & UMA_ZFLAG_CACHEONLY) == 0, @@ -1334,8 +1335,21 @@ keg_large_init(uma_keg_t keg) if (keg->uk_flags & UMA_ZFLAG_INTERNAL) return; - keg->uk_flags |= UMA_ZONE_OFFPAGE; - if ((keg->uk_flags & UMA_ZONE_VTOSLAB) == 0) + /* Check whether we have enough space to not do OFFPAGE. */ + if ((keg->uk_flags & UMA_ZONE_OFFPAGE) == 0) { + shsize = sizeof(struct uma_slab); + if (keg->uk_flags & UMA_ZONE_REFCNT) + shsize += keg->uk_ipers * sizeof(uint32_t); + if (shsize & UMA_ALIGN_PTR) + shsize = (shsize & ~UMA_ALIGN_PTR) + + (UMA_ALIGN_PTR + 1); + + if ((PAGE_SIZE * keg->uk_ppera) - keg->uk_rsize < shsize) + keg->uk_flags |= UMA_ZONE_OFFPAGE; + } + + if ((keg->uk_flags & UMA_ZONE_OFFPAGE) && + (keg->uk_flags & UMA_ZONE_VTOSLAB) == 0) keg->uk_flags |= UMA_ZONE_HASH; } From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 23:43:18 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B7A8443A; Sat, 4 Jan 2014 23:43:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 97FCB1CAE; Sat, 4 Jan 2014 23:43:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04NhI8G064278; Sat, 4 Jan 2014 23:43:18 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04NhIpF064277; Sat, 4 Jan 2014 23:43:18 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201401042343.s04NhIpF064277@svn.freebsd.org> From: Alexander Motin Date: Sat, 4 Jan 2014 23:43:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260306 - stable/10/sys/vm X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 23:43:18 -0000 Author: mav Date: Sat Jan 4 23:43:18 2014 New Revision: 260306 URL: http://svnweb.freebsd.org/changeset/base/260306 Log: MFC r258716: - Add bucket size column to `show uma` DDB command. - Add `show umacache` command to show alike stats for cache-only UMA zones. Modified: stable/10/sys/vm/uma_core.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/vm/uma_core.c ============================================================================== --- stable/10/sys/vm/uma_core.c Sat Jan 4 23:42:24 2014 (r260305) +++ stable/10/sys/vm/uma_core.c Sat Jan 4 23:43:18 2014 (r260306) @@ -131,6 +131,10 @@ static int bucketdisable = 1; /* Linked list of all kegs in the system */ static LIST_HEAD(,uma_keg) uma_kegs = LIST_HEAD_INITIALIZER(uma_kegs); +/* Linked list of all cache-only zones in the system */ +static LIST_HEAD(,uma_zone) uma_cachezones = + LIST_HEAD_INITIALIZER(uma_cachezones); + /* This mutex protects the keg list */ static struct mtx_padalign uma_mtx; @@ -1590,6 +1594,9 @@ zone_ctor(void *mem, int size, void *uda zone->uz_release = arg->release; zone->uz_arg = arg->arg; zone->uz_lockptr = &zone->uz_lock; + mtx_lock(&uma_mtx); + LIST_INSERT_HEAD(&uma_cachezones, zone, uz_link); + mtx_unlock(&uma_mtx); goto out; } @@ -3467,8 +3474,8 @@ DB_SHOW_COMMAND(uma, db_show_uma) uma_zone_t z; int cachefree; - db_printf("%18s %8s %8s %8s %12s %8s\n", "Zone", "Size", "Used", "Free", - "Requests", "Sleeps"); + db_printf("%18s %8s %8s %8s %12s %8s %8s\n", "Zone", "Size", "Used", + "Free", "Requests", "Sleeps", "Bucket"); LIST_FOREACH(kz, &uma_kegs, uk_link) { LIST_FOREACH(z, &kz->uk_zones, uz_link) { if (kz->uk_flags & UMA_ZFLAG_INTERNAL) { @@ -3484,13 +3491,35 @@ DB_SHOW_COMMAND(uma, db_show_uma) cachefree += kz->uk_free; LIST_FOREACH(bucket, &z->uz_buckets, ub_link) cachefree += bucket->ub_cnt; - db_printf("%18s %8ju %8jd %8d %12ju %8ju\n", z->uz_name, - (uintmax_t)kz->uk_size, + db_printf("%18s %8ju %8jd %8d %12ju %8ju %8u\n", + z->uz_name, (uintmax_t)kz->uk_size, (intmax_t)(allocs - frees), cachefree, - (uintmax_t)allocs, sleeps); + (uintmax_t)allocs, sleeps, z->uz_count); if (db_pager_quit) return; } } } + +DB_SHOW_COMMAND(umacache, db_show_umacache) +{ + uint64_t allocs, frees; + uma_bucket_t bucket; + uma_zone_t z; + int cachefree; + + db_printf("%18s %8s %8s %8s %12s %8s\n", "Zone", "Size", "Used", "Free", + "Requests", "Bucket"); + LIST_FOREACH(z, &uma_cachezones, uz_link) { + uma_zone_sumstat(z, &cachefree, &allocs, &frees, NULL); + LIST_FOREACH(bucket, &z->uz_buckets, ub_link) + cachefree += bucket->ub_cnt; + db_printf("%18s %8ju %8jd %8d %12ju %8u\n", + z->uz_name, (uintmax_t)z->uz_size, + (intmax_t)(allocs - frees), cachefree, + (uintmax_t)allocs, z->uz_count); + if (db_pager_quit) + return; + } +} #endif From owner-svn-src-stable-10@FreeBSD.ORG Sat Jan 4 23:45:56 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 379E76B7; Sat, 4 Jan 2014 23:45:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 186751CCE; Sat, 4 Jan 2014 23:45:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04Njt8m064787; Sat, 4 Jan 2014 23:45:55 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04Njt8j064786; Sat, 4 Jan 2014 23:45:55 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201401042345.s04Njt8j064786@svn.freebsd.org> From: Alexander Motin Date: Sat, 4 Jan 2014 23:45:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260307 - stable/10/tools/tools/umastat X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 23:45:56 -0000 Author: mav Date: Sat Jan 4 23:45:55 2014 New Revision: 260307 URL: http://svnweb.freebsd.org/changeset/base/260307 Log: MFC r258256, r258390: Fix umastat build on present kernel. Modified: stable/10/tools/tools/umastat/umastat.c Directory Properties: stable/10/ (props changed) Modified: stable/10/tools/tools/umastat/umastat.c ============================================================================== --- stable/10/tools/tools/umastat/umastat.c Sat Jan 4 23:43:18 2014 (r260306) +++ stable/10/tools/tools/umastat/umastat.c Sat Jan 4 23:45:55 2014 (r260307) @@ -117,7 +117,9 @@ static const struct flaginfo { u_int32_t fi_flag; const char *fi_name; } flaginfo[] = { - { UMA_ZFLAG_PRIVALLOC, "privalloc" }, + { UMA_ZFLAG_MULTI, "multi" }, + { UMA_ZFLAG_DRAINING, "draining" }, + { UMA_ZFLAG_BUCKET, "bucket" }, { UMA_ZFLAG_INTERNAL, "internal" }, { UMA_ZFLAG_FULL, "full" }, { UMA_ZFLAG_CACHEONLY, "cacheonly" }, @@ -133,6 +135,10 @@ static const struct flaginfo { { UMA_ZONE_SECONDARY, "secondary" }, { UMA_ZONE_REFCNT, "refcnt" }, { UMA_ZONE_MAXBUCKET, "maxbucket" }, + { UMA_ZONE_CACHESPREAD, "cachespread" }, + { UMA_ZONE_VTOSLAB, "vtoslab" }, + { UMA_ZONE_NODUMP, "nodump" }, + { UMA_ZONE_PCPU, "pcpu" }, }; static const int flaginfo_count = sizeof(flaginfo) / sizeof(struct flaginfo); @@ -364,14 +370,15 @@ main(int argc, char *argv[]) } printf("Keg {\n"); - printf(" uk_recurse = %d\n", kz.uk_recurse); uma_print_keg_align(&kz, " "); printf(" uk_pages = %d\n", kz.uk_pages); printf(" uk_free = %d\n", kz.uk_free); + printf(" uk_reserve = %d\n", kz.uk_reserve); printf(" uk_size = %d\n", kz.uk_size); printf(" uk_rsize = %d\n", kz.uk_rsize); printf(" uk_maxpages = %d\n", kz.uk_maxpages); + printf(" uk_slabsize = %d\n", kz.uk_slabsize); printf(" uk_pgoff = %d\n", kz.uk_pgoff); printf(" uk_ppera = %d\n", kz.uk_ppera); printf(" uk_ipers = %d\n", kz.uk_ipers); @@ -414,21 +421,18 @@ main(int argc, char *argv[]) } printf(" Zone {\n"); printf(" uz_name = \"%s\";\n", name); - printf(" uz_allocs = %ju;\n", + printf(" uz_allocs = %lu;\n", uzp_userspace->uz_allocs); - printf(" uz_frees = %ju;\n", + printf(" uz_frees = %lu;\n", uzp_userspace->uz_frees); - printf(" uz_fails = %ju;\n", + printf(" uz_fails = %lu;\n", uzp_userspace->uz_fails); - printf(" uz_fills = %u;\n", - uzp_userspace->uz_fills); + printf(" uz_sleeps = %ju;\n", + uzp_userspace->uz_sleeps); printf(" uz_count = %u;\n", uzp_userspace->uz_count); uma_print_bucketlist(kvm, (void *) - &uzp_userspace->uz_full_bucket, "uz_full_bucket", - " "); - uma_print_bucketlist(kvm, (void *) - &uzp_userspace->uz_free_bucket, "uz_free_bucket", + &uzp_userspace->uz_buckets, "uz_buckets", " "); if (!(kz.uk_flags & UMA_ZFLAG_INTERNAL)) {