From owner-svn-src-stable-7@FreeBSD.ORG Mon Apr 29 11:36:59 2013 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 998E2ADB; Mon, 29 Apr 2013 11:36:59 +0000 (UTC) (envelope-from pluknet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 8BD131DF4; Mon, 29 Apr 2013 11:36:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3TBaxoJ080562; Mon, 29 Apr 2013 11:36:59 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3TBaxg6080561; Mon, 29 Apr 2013 11:36:59 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201304291136.r3TBaxg6080561@svn.freebsd.org> From: Sergey Kandaurov Date: Mon, 29 Apr 2013 11:36:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r250047 - stable/7/tools/tools/umastat X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.14 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: Mon, 29 Apr 2013 11:36:59 -0000 Author: pluknet Date: Mon Apr 29 11:36:59 2013 New Revision: 250047 URL: http://svnweb.freebsd.org/changeset/base/250047 Log: Fix build. - pass a format string to printf - catch up with constifying uz_name Modified: stable/7/tools/tools/umastat/umastat.c Directory Properties: stable/7/tools/tools/umastat/ (props changed) Modified: stable/7/tools/tools/umastat/umastat.c ============================================================================== --- stable/7/tools/tools/umastat/umastat.c Mon Apr 29 11:36:22 2013 (r250046) +++ stable/7/tools/tools/umastat/umastat.c Mon Apr 29 11:36:59 2013 (r250047) @@ -79,7 +79,7 @@ kread(kvm_t *kvm, void *kvm_pointer, voi } static int -kread_string(kvm_t *kvm, void *kvm_pointer, char *buffer, int buflen) +kread_string(kvm_t *kvm, const void *kvm_pointer, char *buffer, int buflen) { ssize_t ret; int i; @@ -151,7 +151,7 @@ uma_print_keg_flags(struct uma_keg *ukp, if (ukp->uk_flags & flaginfo[i].fi_flag) { if (count++ > 0) printf(" | "); - printf(flaginfo[i].fi_name); + printf("%s", flaginfo[i].fi_name); } } From owner-svn-src-stable-7@FreeBSD.ORG Mon Apr 29 20:32:09 2013 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id D6E32777; Mon, 29 Apr 2013 20:32:09 +0000 (UTC) (envelope-from pluknet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C8C441DF7; Mon, 29 Apr 2013 20:32:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3TKW9rH072117; Mon, 29 Apr 2013 20:32:09 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3TKW9ug072115; Mon, 29 Apr 2013 20:32:09 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201304292032.r3TKW9ug072115@svn.freebsd.org> From: Sergey Kandaurov Date: Mon, 29 Apr 2013 20:32:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r250065 - stable/7/share/man/man4 X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.14 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: Mon, 29 Apr 2013 20:32:09 -0000 Author: pluknet Date: Mon Apr 29 20:32:09 2013 New Revision: 250065 URL: http://svnweb.freebsd.org/changeset/base/250065 Log: MFC r248253: Add missed `_load' to the `if_foo_load="YES"' line. PR: docs/176915 Submitted by: Dmitry Afanasiev Modified: stable/7/share/man/man4/cas.4 stable/7/share/man/man4/sge.4 Directory Properties: stable/7/share/man/man4/ (props changed) Modified: stable/7/share/man/man4/cas.4 ============================================================================== --- stable/7/share/man/man4/cas.4 Mon Apr 29 20:31:25 2013 (r250064) +++ stable/7/share/man/man4/cas.4 Mon Apr 29 20:32:09 2013 (r250065) @@ -44,7 +44,7 @@ Alternatively, to load the driver as a module at boot time, place the following line in .Xr loader.conf 5 : .Bd -literal -offset indent -if_cas="YES" +if_cas_load="YES" .Ed .Sh DESCRIPTION The Modified: stable/7/share/man/man4/sge.4 ============================================================================== --- stable/7/share/man/man4/sge.4 Mon Apr 29 20:31:25 2013 (r250064) +++ stable/7/share/man/man4/sge.4 Mon Apr 29 20:32:09 2013 (r250065) @@ -43,7 +43,7 @@ Alternatively, to load the driver as a module at boot time, place the following line in .Xr loader.conf 5 : .Bd -literal -offset indent -if_sge="YES" +if_sge_load="YES" .Ed .Sh DESCRIPTION The From owner-svn-src-stable-7@FreeBSD.ORG Wed May 1 18:06:55 2013 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id CA7B1F38; Wed, 1 May 2013 18:06:55 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A1CB61D21; Wed, 1 May 2013 18:06:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r41I6tow049927; Wed, 1 May 2013 18:06:55 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r41I6tt8049924; Wed, 1 May 2013 18:06:55 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201305011806.r41I6tt8049924@svn.freebsd.org> From: Dimitry Andric Date: Wed, 1 May 2013 18:06:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r250151 - in stable: 6/sys/boot/i386/btx/btx 6/sys/boot/pc98/btx/btx 7/sys/boot/i386/btx/btx 7/sys/boot/pc98/btx/btx 8/sys/boot/i386/btx/btx 8/sys/boot/pc98/btx/btx 9/sys/boot/i386/btx/... X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.14 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, 01 May 2013 18:06:55 -0000 Author: dim Date: Wed May 1 18:06:53 2013 New Revision: 250151 URL: http://svnweb.freebsd.org/changeset/base/250151 Log: MFC r249846: When rebooting (exiting) from the BTX loader, make sure to restore the GDT from the correct segment, otherwise a triple fault would be caused. In some virtual environments (VMware, VirtualBox, etc) this could lead to a unhandled error or hang in the guest emulation software. Thanks to avg and jhb for a few hints in the right direction. Noticed by: Jeremy Chadwick (and many others) Modified: stable/7/sys/boot/i386/btx/btx/btx.S stable/7/sys/boot/pc98/btx/btx/btx.S Directory Properties: stable/7/sys/ (props changed) Changes in other areas also in this revision: Modified: stable/6/sys/boot/i386/btx/btx/btx.S stable/6/sys/boot/pc98/btx/btx/btx.S stable/8/sys/boot/i386/btx/btx/btx.S stable/8/sys/boot/pc98/btx/btx/btx.S stable/9/sys/boot/i386/btx/btx/btx.S stable/9/sys/boot/pc98/btx/btx/btx.S Directory Properties: stable/6/sys/ (props changed) stable/8/sys/ (props changed) stable/8/sys/boot/ (props changed) stable/9/sys/ (props changed) stable/9/sys/boot/ (props changed) Modified: stable/7/sys/boot/i386/btx/btx/btx.S ============================================================================== --- stable/7/sys/boot/i386/btx/btx/btx.S Wed May 1 17:59:41 2013 (r250150) +++ stable/7/sys/boot/i386/btx/btx/btx.S Wed May 1 18:06:53 2013 (r250151) @@ -246,7 +246,7 @@ exit: cli # Disable interrupts /* * Restore the GDT in case we caught a kernel trap. */ - lgdt gdtdesc # Set GDT + lgdt %cs:gdtdesc # Set GDT /* * To 16 bits. */ Modified: stable/7/sys/boot/pc98/btx/btx/btx.S ============================================================================== --- stable/7/sys/boot/pc98/btx/btx/btx.S Wed May 1 17:59:41 2013 (r250150) +++ stable/7/sys/boot/pc98/btx/btx/btx.S Wed May 1 18:06:53 2013 (r250151) @@ -246,7 +246,7 @@ exit: cli # Disable interrupts /* * Restore the GDT in case we caught a kernel trap. */ - lgdt gdtdesc # Set GDT + lgdt %cs:gdtdesc # Set GDT /* * To 16 bits. */