diff options
| author | bde <bde@FreeBSD.org> | 2001-10-29 16:31:15 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 2001-10-29 16:31:15 +0000 |
| commit | 80308906f06430dec4bf88134d9deaa5a55ce8b5 (patch) | |
| tree | f4987c9c96e6afc83239226555f8464d4d97ec73 | |
| parent | d30f6152e33559f5b07fdfb3f6ea560153c53f01 (diff) | |
| download | FreeBSD-src-80308906f06430dec4bf88134d9deaa5a55ce8b5.zip FreeBSD-src-80308906f06430dec4bf88134d9deaa5a55ce8b5.tar.gz | |
Don't set CR0_NE in cpu_setregs() for the SMP case, since setting it
is npx.c's job and setting it here breaks the edit-time option of not
setting it in npx.c. (It is not set in the right places for the SMP
case, but always setting it here is harmless because there isn't even
an edit-time option to not set it.)
| -rw-r--r-- | sys/amd64/amd64/machdep.c | 2 | ||||
| -rw-r--r-- | sys/i386/i386/machdep.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 213559c..862b0b3 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -964,7 +964,9 @@ cpu_setregs(void) unsigned int cr0; cr0 = rcr0(); +#ifdef SMP cr0 |= CR0_NE; /* Done by npxinit() */ +#endif cr0 |= CR0_MP | CR0_TS; /* Done at every execve() too. */ #ifndef I386_CPU cr0 |= CR0_WP | CR0_AM; diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index 213559c..862b0b3 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -964,7 +964,9 @@ cpu_setregs(void) unsigned int cr0; cr0 = rcr0(); +#ifdef SMP cr0 |= CR0_NE; /* Done by npxinit() */ +#endif cr0 |= CR0_MP | CR0_TS; /* Done at every execve() too. */ #ifndef I386_CPU cr0 |= CR0_WP | CR0_AM; |
