From cd70197aa97908f96b0a5c517dec2c3f820ecb97 Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 1 Sep 2010 15:24:47 +0000
Subject: [PATCH] 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)
---
 sys/boot/pc98/boot2/boot2.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sys/boot/pc98/boot2/boot2.c b/sys/boot/pc98/boot2/boot2.c
index e35b42536c2..54082ad207f 100644
--- a/sys/boot/pc98/boot2/boot2.c
+++ b/sys/boot/pc98/boot2/boot2.c
@@ -187,9 +187,8 @@ xfsread(ino_t inode, void *buf, size_t nbyte)
 static inline uint32_t
 memsize(void)
 {
-    u_char *p = (u_char *)PTOV(0x401);
-
-    return *p * 128 * 1024 + *(u_int16_t *)(p + (0x594 - 0x401)) * 1024 * 1024;
+    return (*(u_char *)PTOV(0x401) * 128 * 1024 +
+	*(uint16_t *)PTOV(0x594) * 1024 * 1024);
 }
 
 static inline void