From owner-svn-src-stable-7@FreeBSD.ORG Sun Jul 10 22:09:54 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 30A1F10656D4; Sun, 10 Jul 2011 22:09:54 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 204418FC22; Sun, 10 Jul 2011 22:09:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6AM9s8A063530; Sun, 10 Jul 2011 22:09:54 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6AM9sqQ063528; Sun, 10 Jul 2011 22:09:54 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201107102209.p6AM9sqQ063528@svn.freebsd.org> From: Pyun YongHyeon Date: Sun, 10 Jul 2011 22:09:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r223916 - stable/7/share/man/man4 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2011 22:09:54 -0000 Author: yongari Date: Sun Jul 10 22:09:53 2011 New Revision: 223916 URL: http://svn.freebsd.org/changeset/base/223916 Log: MFC r223683: Document two known hardware errata which requires manual link configuration. Submitted by: Aries Lee (arieslee <> jmicron com) Modified: stable/7/share/man/man4/jme.4 Directory Properties: stable/7/share/man/man4/ (props changed) Modified: stable/7/share/man/man4/jme.4 ============================================================================== --- stable/7/share/man/man4/jme.4 Sun Jul 10 22:09:34 2011 (r223915) +++ stable/7/share/man/man4/jme.4 Sun Jul 10 22:09:53 2011 (r223916) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 20, 2010 +.Dd June 29, 2011 .Dt JME 4 .Os .Sh NAME @@ -178,3 +178,17 @@ address once station address is reprogra It is highly recommended not to reprogram station address and it is responsibility of administrator to store original station address into a safe place when station address should be changed. +.Pp +There are two known 1000baseT link establishment issues with JMC25x. +If the full mask revision number of JMC25x controller is less than +or equal to 4 and link partner enabled IEEE 802.3az Energy Efficient +Ethernet feature, the controller would not be able to establish a +1000baseT link. +Also if the length of cable is longer than 120 meters, controller +can not establish a 1000baseT link. +The known workaround for the issue is to force manual link +configuration with 100baseTX instead of relying on auto-negotiation. +The full mask revision number of controller could be checked with +verbose kernel boot option. +Use lower nibble of chip revision number to get full mask revision of +the controller. From owner-svn-src-stable-7@FreeBSD.ORG Tue Jul 12 14:28:14 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2A6FD1065674; Tue, 12 Jul 2011 14:28:14 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1AC888FC20; Tue, 12 Jul 2011 14:28:14 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6CESDNB042699; Tue, 12 Jul 2011 14:28:13 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6CESDOF042697; Tue, 12 Jul 2011 14:28:13 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201107121428.p6CESDOF042697@svn.freebsd.org> From: John Baldwin Date: Tue, 12 Jul 2011 14:28:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r223956 - stable/7/usr.bin/top X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jul 2011 14:28:14 -0000 Author: jhb Date: Tue Jul 12 14:28:13 2011 New Revision: 223956 URL: http://svn.freebsd.org/changeset/base/223956 Log: MFC 182966: Display the sum of the runtime of all the threads in a process when it's multithreaded instead of picking the time of the first thread found. Modified: stable/7/usr.bin/top/machine.c Directory Properties: stable/7/usr.bin/top/ (props changed) Modified: stable/7/usr.bin/top/machine.c ============================================================================== --- stable/7/usr.bin/top/machine.c Tue Jul 12 14:18:54 2011 (r223955) +++ stable/7/usr.bin/top/machine.c Tue Jul 12 14:28:13 2011 (r223956) @@ -726,6 +726,7 @@ get_process_info(struct system_info *si, prev_pp = pp; } else { prev_pp->ki_pctcpu += pp->ki_pctcpu; + prev_pp->ki_runtime += pp->ki_runtime; } } From owner-svn-src-stable-7@FreeBSD.ORG Tue Jul 12 23:48:58 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7D7641065676; Tue, 12 Jul 2011 23:48:58 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6DC408FC0A; Tue, 12 Jul 2011 23:48:58 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6CNmwU9060348; Tue, 12 Jul 2011 23:48:58 GMT (envelope-from obrien@svn.freebsd.org) Received: (from obrien@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6CNmwpZ060346; Tue, 12 Jul 2011 23:48:58 GMT (envelope-from obrien@svn.freebsd.org) Message-Id: <201107122348.p6CNmwpZ060346@svn.freebsd.org> From: "David E. O'Brien" Date: Tue, 12 Jul 2011 23:48:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r223970 - stable/7/usr.bin/wall X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jul 2011 23:48:58 -0000 Author: obrien Date: Tue Jul 12 23:48:57 2011 New Revision: 223970 URL: http://svn.freebsd.org/changeset/base/223970 Log: MFC: + r223940 (as r223969): If one's message is longer than the buffer size, then we reset 'cnt' at the wrong point and the actual column # get out of sync across the buffer size. + r175346: Handle wrapping correctly when \r appears in the input, and don't remove the \r from the output. For lines longer than 79 characters, don't drop every 80th character. Modified: stable/7/usr.bin/wall/wall.c Directory Properties: stable/7/usr.bin/wall/ (props changed) Modified: stable/7/usr.bin/wall/wall.c ============================================================================== --- stable/7/usr.bin/wall/wall.c Tue Jul 12 23:39:56 2011 (r223969) +++ stable/7/usr.bin/wall/wall.c Tue Jul 12 23:48:57 2011 (r223970) @@ -251,17 +251,26 @@ makemsg(char *fname) err(1, "can't read %s", fname); setegid(egid); } - while (fgets(lbuf, sizeof(lbuf), stdin)) - for (cnt = 0, p = lbuf; (ch = *p) != '\0'; ++p, ++cnt) { + cnt = 0; + while (fgets(lbuf, sizeof(lbuf), stdin)) { + for (p = lbuf; (ch = *p) != '\0'; ++p, ++cnt) { if (ch == '\r') { + putc('\r', fp); cnt = 0; - } else if (cnt == 79 || ch == '\n') { + continue; + } else if (ch == '\n') { for (; cnt < 79; ++cnt) putc(' ', fp); putc('\r', fp); putc('\n', fp); + break; + } + if (cnt == 79) { + putc('\r', fp); + putc('\n', fp); cnt = 0; - } else if (((ch & 0x80) && ch < 0xA0) || + } + if (((ch & 0x80) && ch < 0xA0) || /* disable upper controls */ (!isprint(ch) && !isspace(ch) && ch != '\a' && ch != '\b') @@ -290,11 +299,10 @@ makemsg(char *fname) cnt = 0; } } - putc(ch, fp); - } else { - putc(ch, fp); } + putc(ch, fp); } + } (void)fprintf(fp, "%79s\r\n", " "); rewind(fp); From owner-svn-src-stable-7@FreeBSD.ORG Wed Jul 13 04:30:16 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 693D6106564A; Wed, 13 Jul 2011 04:30:16 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5890C8FC2B; Wed, 13 Jul 2011 04:30:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6D4UGb0068984; Wed, 13 Jul 2011 04:30:16 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6D4UGoX068982; Wed, 13 Jul 2011 04:30:16 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201107130430.p6D4UGoX068982@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Wed, 13 Jul 2011 04:30:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r223973 - stable/7/sbin/ipfw X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jul 2011 04:30:16 -0000 Author: ae Date: Wed Jul 13 04:30:16 2011 New Revision: 223973 URL: http://svn.freebsd.org/changeset/base/223973 Log: MFC r223661: Improve error reporting. Use corresponding error message when file to be preprocessed is missing. Also suggest to use absolute pathname if -p option is specified. PR: bin/156653 Modified: stable/7/sbin/ipfw/main.c Directory Properties: stable/7/sbin/ipfw/ (props changed) Modified: stable/7/sbin/ipfw/main.c ============================================================================== --- stable/7/sbin/ipfw/main.c Wed Jul 13 04:27:47 2011 (r223972) +++ stable/7/sbin/ipfw/main.c Wed Jul 13 04:30:16 2011 (r223973) @@ -204,7 +204,7 @@ ipfw_main(int oldac, char **oldav) save_av = av; optind = optreset = 1; /* restart getopt() */ - while ((ch = getopt(ac, av, "abcdefhinNqs:STtv")) != -1) + while ((ch = getopt(ac, av, "abcdefhinNp:qs:STtv")) != -1) switch (ch) { case 'a': do_acct = 1; @@ -248,6 +248,10 @@ ipfw_main(int oldac, char **oldav) co.do_resolv = 1; break; + case 'p': + errx(EX_USAGE, "An absolute pathname must be used " + "with -p option."); + case 'q': co.do_quiet = 1; break; @@ -527,9 +531,12 @@ main(int ac, char *av[]) * as a file to be preprocessed. */ - if (ac > 1 && av[ac - 1][0] == '/' && access(av[ac - 1], R_OK) == 0) - ipfw_readfile(ac, av); - else { + if (ac > 1 && av[ac - 1][0] == '/') { + if (access(av[ac - 1], R_OK) == 0) + ipfw_readfile(ac, av); + else + err(EX_USAGE, "pathname: %s", av[ac - 1]); + } else { if (ipfw_main(ac, av)) { errx(EX_USAGE, "usage: ipfw [options]\n" From owner-svn-src-stable-7@FreeBSD.ORG Wed Jul 13 17:09:16 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EB5F4106566C; Wed, 13 Jul 2011 17:09:15 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DA2528FC0A; Wed, 13 Jul 2011 17:09:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6DH9F9c092762; Wed, 13 Jul 2011 17:09:15 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6DH9Fo6092758; Wed, 13 Jul 2011 17:09:15 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <201107131709.p6DH9Fo6092758@svn.freebsd.org> From: Sean Bruno Date: Wed, 13 Jul 2011 17:09:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r223982 - in stable/7: sbin/umount sys/nfsclient X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jul 2011 17:09:16 -0000 Author: sbruno Date: Wed Jul 13 17:09:15 2011 New Revision: 223982 URL: http://svn.freebsd.org/changeset/base/223982 Log: MFC r222541, r222464, r222466 Modify the umount(8) command so that it doesn't do a sync(2) syscall before unmount(2) for the "-f" case. This avoids a forced dismount from getting stuck for an NFS mountpoint in sync() when the server is not responsive. With this commit, forced dismounts should normally work for the NFS clients, but can take up to about 1minute to complete. Add a check for MNTK_UNMOUNTF at the beginning of nfs_sync() in the old NFS client so that a forced dismount doesn't get stuck in the VFS_SYNC() call that happens before VFS_UNMOUNT() in dounmount(). Analagous to r222329 for the new NFS client. An additional change is needed before forced dismounts will work. Add a sentence to the umount.8 man page to clarify the behaviour for forced dismount when used on an NFS mount point. Requested by Jeremy Chadwick. This is a content change Modified: stable/7/sbin/umount/umount.8 stable/7/sbin/umount/umount.c stable/7/sys/nfsclient/nfs_vfsops.c Modified: stable/7/sbin/umount/umount.8 ============================================================================== --- stable/7/sbin/umount/umount.8 Wed Jul 13 14:10:28 2011 (r223981) +++ stable/7/sbin/umount/umount.8 Wed Jul 13 17:09:15 2011 (r223982) @@ -28,7 +28,7 @@ .\" @(#)umount.8 8.2 (Berkeley) 5/8/95 .\" $FreeBSD$ .\" -.Dd July 18, 2003 +.Dd May 31, 2011 .Dt UMOUNT 8 .Os .Sh NAME @@ -77,6 +77,9 @@ The file system is forcibly unmounted. Active special devices continue to work, but all other files return errors if further accesses are attempted. The root file system cannot be forcibly unmounted. +For NFS, a forced dismount can take up to 1 minute or more to +complete against an unresponsive server and may throw away +data not yet written to the server for this case. .It Fl h Ar host Only file systems mounted from the specified host will be unmounted. Modified: stable/7/sbin/umount/umount.c ============================================================================== --- stable/7/sbin/umount/umount.c Wed Jul 13 14:10:28 2011 (r223981) +++ stable/7/sbin/umount/umount.c Wed Jul 13 17:09:15 2011 (r223982) @@ -90,9 +90,6 @@ main(int argc, char *argv[]) struct statfs *mntbuf, *sfs; struct addrinfo hints; - /* Start disks transferring immediately. */ - sync(); - all = errs = 0; while ((ch = getopt(argc, argv, "AaF:fh:t:v")) != -1) switch (ch) { @@ -127,6 +124,9 @@ main(int argc, char *argv[]) argc -= optind; argv += optind; + /* Start disks transferring immediately. */ + if ((fflag & MNT_FORCE) == 0) + sync(); if ((argc == 0 && !all) || (argc != 0 && all)) usage(); Modified: stable/7/sys/nfsclient/nfs_vfsops.c ============================================================================== --- stable/7/sys/nfsclient/nfs_vfsops.c Wed Jul 13 14:10:28 2011 (r223981) +++ stable/7/sys/nfsclient/nfs_vfsops.c Wed Jul 13 17:09:15 2011 (r223982) @@ -1297,10 +1297,19 @@ nfs_sync(struct mount *mp, int waitfor, struct vnode *vp, *mvp; int error, allerror = 0; + MNT_ILOCK(mp); + /* + * If a forced dismount is in progress, return from here so that + * the umount(2) syscall doesn't get stuck in VFS_SYNC() before + * calling VFS_UNMOUNT(). + */ + if ((mp->mnt_kern_flag & MNTK_UNMOUNTF) != 0) { + MNT_IUNLOCK(mp); + return (EBADF); + } /* * Force stale buffer cache information to be flushed. */ - MNT_ILOCK(mp); loop: MNT_VNODE_FOREACH(vp, mp, mvp) { VI_LOCK(vp); From owner-svn-src-stable-7@FreeBSD.ORG Thu Jul 14 19:25:43 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 10DEA1065678; Thu, 14 Jul 2011 19:25:43 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DC5C68FC16; Thu, 14 Jul 2011 19:25:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6EJPgAS042799; Thu, 14 Jul 2011 19:25:42 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6EJPgwP042796; Thu, 14 Jul 2011 19:25:42 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201107141925.p6EJPgwP042796@svn.freebsd.org> From: John Baldwin Date: Thu, 14 Jul 2011 19:25:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r224038 - stable/7/contrib/top X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jul 2011 19:25:43 -0000 Author: jhb Date: Thu Jul 14 19:25:42 2011 New Revision: 224038 URL: http://svn.freebsd.org/changeset/base/224038 Log: MFC 223870,223937: - Note that -a, -C, -H, -j, and -z are also toggles. - Add a leading space to the status messages output after toggling the 'C' and 'H' flags at runtime. This matches messages output for other toggles which leave the first column in the message blank to hold the cursor. Modified: stable/7/contrib/top/top.X stable/7/contrib/top/top.c Directory Properties: stable/7/contrib/top/ (props changed) Modified: stable/7/contrib/top/top.X ============================================================================== --- stable/7/contrib/top/top.X Thu Jul 14 19:25:30 2011 (r224037) +++ stable/7/contrib/top/top.X Thu Jul 14 19:25:42 2011 (r224038) @@ -197,11 +197,15 @@ a user to set his or her own defaults. can also be specified in the environment variable .BR TOP . The options +.BR \-a , +.BR \-C , +.BR \-H , .BR \-I , +.BR \-j , .BR \-S , -.BR \-u , +.BR \-t , and -.B \-t +.B \-u are actually toggles. A second specification of any of these options will negate the first. Thus a user who has the environment variable .B TOP Modified: stable/7/contrib/top/top.c ============================================================================== --- stable/7/contrib/top/top.c Thu Jul 14 19:25:30 2011 (r224037) +++ stable/7/contrib/top/top.c Thu Jul 14 19:25:42 2011 (r224038) @@ -1013,7 +1013,7 @@ restart: case CMD_thrtog: ps.thread = !ps.thread; new_message(MT_standout | MT_delayed, - "Displaying threads %s", + " Displaying threads %s", ps.thread ? "separately" : "as a count"); header_text = format_header(uname_field); reset_display(); @@ -1022,7 +1022,7 @@ restart: case CMD_wcputog: ps.wcpu = !ps.wcpu; new_message(MT_standout | MT_delayed, - "Displaying %sCPU", + " Displaying %sCPU", ps.wcpu ? "W" : ""); header_text = format_header(uname_field); reset_display();