svn commit: r224417 - stable/8/sys/boot/pc98/boot2

[Marius Strobl]

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

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/8/sys/boot/pc98/boot2/boot2.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/geom/label/   (props changed)

Modified: stable/8/sys/boot/pc98/boot2/boot2.c
==============================================================================
--- stable/8/sys/boot/pc98/boot2/boot2.c	Tue Jul 26 12:57:22 2011	(r224416)
+++ stable/8/sys/boot/pc98/boot2/boot2.c	Tue Jul 26 12:57:23 2011	(r224417)
@@ -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