From owner-svn-src-stable-7@FreeBSD.ORG  Tue Jul 26 12:57:22 2011
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
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 BA3361065676;
	Tue, 26 Jul 2011 12:57:22 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 887B48FC18;
	Tue, 26 Jul 2011 12:57:22 +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 p6QCvMZC008477;
	Tue, 26 Jul 2011 12:57:22 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6QCvMhI008475;
	Tue, 26 Jul 2011 12:57:22 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201107261257.p6QCvMhI008475@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Tue, 26 Jul 2011 12:57:22 +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: r224416 - stable/7/sys/boot/pc98/boot2
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
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Jul 2011 12:57:23 -0000

Author: marius
Date: Tue Jul 26 12:57:22 2011
New Revision: 224416
URL: http://svn.freebsd.org/changeset/base/224416

Log:
  MFC: r212064, r212098
  
  Use a cleaner expression to retrieve the memory size in pc98's boot2.c,
  which also avoids NULL pointer arithmetic, as suggested by jhb.  The
  available space goes from 11 bytes to 7.
  
  Reviewed by:	nyan
  Approved by:	rpaulo (mentor)

Modified:
  stable/7/sys/boot/pc98/boot2/boot2.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/boot/pc98/boot2/boot2.c
==============================================================================
--- stable/7/sys/boot/pc98/boot2/boot2.c	Tue Jul 26 10:50:33 2011	(r224415)
+++ stable/7/sys/boot/pc98/boot2/boot2.c	Tue Jul 26 12:57:22 2011	(r224416)
@@ -187,9 +187,8 @@ xfsread(ino_t inode, void *buf, size_t n
 static inline uint32_t
 memsize(void)
 {
-    u_char *p = (u_char *)PTOV(0);
-
-    return *(p + 0x401) * 128 * 1024 + *(u_int16_t *)(p + 0x594) * 1024 * 1024;
+    return (*(u_char *)PTOV(0x401) * 128 * 1024 +
+	*(uint16_t *)PTOV(0x594) * 1024 * 1024);
 }
 
 static inline void