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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
