summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkato <kato@FreeBSD.org>1998-01-07 09:03:42 +0000
committerkato <kato@FreeBSD.org>1998-01-07 09:03:42 +0000
commitcb8d07567670ccb930a4546963369a8e9841497e (patch)
tree9638eed857f0722278afdbbfff06794d243a0413
parent3784050a7ade8dc0017bb0d147732a03ccb07127 (diff)
downloadFreeBSD-src-cb8d07567670ccb930a4546963369a8e9841497e.zip
FreeBSD-src-cb8d07567670ccb930a4546963369a8e9841497e.tar.gz
1: Fixed compile error when WB_CACH is defined.
2: Fixed !M_EPSON_PC98 case. Reviewed by: Chiharu Shibata <chi@rd.njk.co.jp>
-rw-r--r--sys/pc98/i386/machdep.c10
-rw-r--r--sys/pc98/pc98/machdep.c10
2 files changed, 12 insertions, 8 deletions
diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c
index 9d5a5ea..4497557 100644
--- a/sys/pc98/i386/machdep.c
+++ b/sys/pc98/i386/machdep.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
- * $Id: machdep.c,v 1.66 1997/12/16 10:22:49 kato Exp $
+ * $Id: machdep.c,v 1.67 1997/12/27 02:28:25 peter Exp $
*/
#include "apm.h"
@@ -1438,15 +1438,17 @@ init386(first)
break;
default:
#ifdef WB_CACHE
- *(int *)CMAP1 = PG_V | PG_RW target_page;
+ *(int *)CMAP1 = PG_V | PG_RW | target_page;
#else
*(int *)CMAP1 = PG_V | PG_RW | PG_N | target_page;
#endif
break;
}
- }
-#else /* !PC98 */
+ } else {
+#endif /* PC98 */
*(int *)CMAP1 = PG_V | PG_RW | PG_N | target_page;
+#ifdef PC98
+ }
#endif
invltlb();
diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c
index 9d5a5ea..4497557 100644
--- a/sys/pc98/pc98/machdep.c
+++ b/sys/pc98/pc98/machdep.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
- * $Id: machdep.c,v 1.66 1997/12/16 10:22:49 kato Exp $
+ * $Id: machdep.c,v 1.67 1997/12/27 02:28:25 peter Exp $
*/
#include "apm.h"
@@ -1438,15 +1438,17 @@ init386(first)
break;
default:
#ifdef WB_CACHE
- *(int *)CMAP1 = PG_V | PG_RW target_page;
+ *(int *)CMAP1 = PG_V | PG_RW | target_page;
#else
*(int *)CMAP1 = PG_V | PG_RW | PG_N | target_page;
#endif
break;
}
- }
-#else /* !PC98 */
+ } else {
+#endif /* PC98 */
*(int *)CMAP1 = PG_V | PG_RW | PG_N | target_page;
+#ifdef PC98
+ }
#endif
invltlb();
OpenPOWER on IntegriCloud