From 97bf178703af1a6f6ad12f4efec043a7ccaf484e Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Thu, 6 May 1999 12:47:21 +0000 Subject: [PATCH] I'm not sure why the #ifdef SMP became #if 1 (this overrode the npx probe and always succeeded as is required on SMP). Anyway, reverting this still compiles and appears ok. --- sys/amd64/amd64/fpu.c | 8 +++----- sys/amd64/isa/npx.c | 8 +++----- sys/i386/isa/npx.c | 8 +++----- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c index fa79f0b46d1a..4911f7cf75ea 100644 --- a/sys/amd64/amd64/fpu.c +++ b/sys/amd64/amd64/fpu.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 - * $Id: npx.c,v 1.67 1999/04/16 21:22:24 peter Exp $ + * $Id: npx.c,v 1.68 1999/05/06 09:44:55 bde Exp $ */ #include "npx.h" @@ -194,8 +194,7 @@ static int npx_probe(dev) device_t dev; { -/*#ifdef SMP*/ -#if 1 +#ifdef SMP return npx_probe1(dev); @@ -281,8 +280,7 @@ npx_probe1(dev) */ fninit(); -/*#ifdef SMP*/ -#if 1 +#ifdef SMP /* * Exception 16 MUST work for SMP. */ diff --git a/sys/amd64/isa/npx.c b/sys/amd64/isa/npx.c index fa79f0b46d1a..4911f7cf75ea 100644 --- a/sys/amd64/isa/npx.c +++ b/sys/amd64/isa/npx.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 - * $Id: npx.c,v 1.67 1999/04/16 21:22:24 peter Exp $ + * $Id: npx.c,v 1.68 1999/05/06 09:44:55 bde Exp $ */ #include "npx.h" @@ -194,8 +194,7 @@ static int npx_probe(dev) device_t dev; { -/*#ifdef SMP*/ -#if 1 +#ifdef SMP return npx_probe1(dev); @@ -281,8 +280,7 @@ npx_probe1(dev) */ fninit(); -/*#ifdef SMP*/ -#if 1 +#ifdef SMP /* * Exception 16 MUST work for SMP. */ diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c index fa79f0b46d1a..4911f7cf75ea 100644 --- a/sys/i386/isa/npx.c +++ b/sys/i386/isa/npx.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 - * $Id: npx.c,v 1.67 1999/04/16 21:22:24 peter Exp $ + * $Id: npx.c,v 1.68 1999/05/06 09:44:55 bde Exp $ */ #include "npx.h" @@ -194,8 +194,7 @@ static int npx_probe(dev) device_t dev; { -/*#ifdef SMP*/ -#if 1 +#ifdef SMP return npx_probe1(dev); @@ -281,8 +280,7 @@ npx_probe1(dev) */ fninit(); -/*#ifdef SMP*/ -#if 1 +#ifdef SMP /* * Exception 16 MUST work for SMP. */