summaryrefslogtreecommitdiffstats
path: root/sys/pc98
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2001-01-19 13:19:02 +0000
committerpeter <peter@FreeBSD.org>2001-01-19 13:19:02 +0000
commit0d5e4203646605af5d85b82fda8b6bbe855a0754 (patch)
treefbc91ed02313d3df875f43c3c5c7433b639d294c /sys/pc98
parente40f66ac0254285aa9181a7226cc6749db01c5e6 (diff)
downloadFreeBSD-src-0d5e4203646605af5d85b82fda8b6bbe855a0754.zip
FreeBSD-src-0d5e4203646605af5d85b82fda8b6bbe855a0754.tar.gz
Use #ifdef DEV_NPX from opt_npx.h instead of #if NNPX > 0 from npx.h
Diffstat (limited to 'sys/pc98')
-rw-r--r--sys/pc98/i386/machdep.c8
-rw-r--r--sys/pc98/pc98/machdep.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c
index efe0efd..ce1260e 100644
--- a/sys/pc98/i386/machdep.c
+++ b/sys/pc98/i386/machdep.c
@@ -39,7 +39,6 @@
*/
#include "apm.h"
-#include "npx.h"
#include "opt_atalk.h"
#include "opt_compat.h"
#include "opt_cpu.h"
@@ -48,6 +47,7 @@
#include "opt_ipx.h"
#include "opt_maxmem.h"
#include "opt_msgbuf.h"
+#include "opt_npx.h"
#include "opt_perfmon.h"
#include "opt_user_ldt.h"
#include "opt_userconfig.h"
@@ -1111,7 +1111,7 @@ setregs(p, entry, stack, ps_strings)
*/
load_cr0(rcr0() | CR0_MP | CR0_TS);
-#if NNPX > 0
+#ifdef DEV_NPX
/* Initialize the npx (if any) for the current process. */
npxinit(__INITIAL_NPXCW__);
#endif
@@ -1455,7 +1455,7 @@ getmemsize(int first)
int pa_indx;
int pg_n;
int speculative_mprobe;
-#if NNPX > 0
+#ifdef DEV_NPX
int msize;
#endif
unsigned under16;
@@ -1497,7 +1497,7 @@ getmemsize(int first)
speculative_mprobe = FALSE;
#endif
-#if NNPX > 0
+#ifdef DEV_NPX
if (resource_int_value("npx", 0, "msize", &msize) == 0) {
if (msize != 0) {
Maxmem = msize / 4;
diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c
index efe0efd..ce1260e 100644
--- a/sys/pc98/pc98/machdep.c
+++ b/sys/pc98/pc98/machdep.c
@@ -39,7 +39,6 @@
*/
#include "apm.h"
-#include "npx.h"
#include "opt_atalk.h"
#include "opt_compat.h"
#include "opt_cpu.h"
@@ -48,6 +47,7 @@
#include "opt_ipx.h"
#include "opt_maxmem.h"
#include "opt_msgbuf.h"
+#include "opt_npx.h"
#include "opt_perfmon.h"
#include "opt_user_ldt.h"
#include "opt_userconfig.h"
@@ -1111,7 +1111,7 @@ setregs(p, entry, stack, ps_strings)
*/
load_cr0(rcr0() | CR0_MP | CR0_TS);
-#if NNPX > 0
+#ifdef DEV_NPX
/* Initialize the npx (if any) for the current process. */
npxinit(__INITIAL_NPXCW__);
#endif
@@ -1455,7 +1455,7 @@ getmemsize(int first)
int pa_indx;
int pg_n;
int speculative_mprobe;
-#if NNPX > 0
+#ifdef DEV_NPX
int msize;
#endif
unsigned under16;
@@ -1497,7 +1497,7 @@ getmemsize(int first)
speculative_mprobe = FALSE;
#endif
-#if NNPX > 0
+#ifdef DEV_NPX
if (resource_int_value("npx", 0, "msize", &msize) == 0) {
if (msize != 0) {
Maxmem = msize / 4;
OpenPOWER on IntegriCloud