[src/trunk]: src/sys/arch undef PS after inclusion of net/netisr.h to avoid c...

[cgd <cgd%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4096925c3cd4
branches:  trunk
changeset: 494115:4096925c3cd4
user:      cgd <cgd%NetBSD.org@localhost>
date:      Sun Jul 02 05:43:43 2000 +0000

description:
undef PS after inclusion of net/netisr.h to avoid conflict w/ machine/reg.h

diffstat:

 sys/arch/atari/atari/machdep.c |  4 +++-
 sys/arch/x68k/x68k/machdep.c   |  6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diffs (46 lines):

diff -r 895ce2c55c7c -r 4096925c3cd4 sys/arch/atari/atari/machdep.c
--- a/sys/arch/atari/atari/machdep.c    Sun Jul 02 04:40:33 2000 +0000
+++ b/sys/arch/atari/atari/machdep.c    Sun Jul 02 05:43:43 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.98 2000/07/02 04:40:35 cgd Exp $ */
+/*     $NetBSD: machdep.c,v 1.99 2000/07/02 05:43:43 cgd Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -66,7 +66,9 @@
 #include <sys/queue.h>
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
+
 #include <net/netisr.h>
+#undef PS      /* XXX netccitt/pk.h conflict with machine/reg.h? */
 
 #define        MAXMEM  64*1024 /* XXX - from cmap.h */
 #include <uvm/uvm_extern.h>
diff -r 895ce2c55c7c -r 4096925c3cd4 sys/arch/x68k/x68k/machdep.c
--- a/sys/arch/x68k/x68k/machdep.c      Sun Jul 02 04:40:33 2000 +0000
+++ b/sys/arch/x68k/x68k/machdep.c      Sun Jul 02 05:43:43 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.85 2000/07/02 04:40:46 cgd Exp $ */
+/*     $NetBSD: machdep.c,v 1.86 2000/07/02 05:45:12 cgd Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -76,6 +76,9 @@
 #include <sys/core.h>
 #include <sys/kcore.h>
 
+#include <net/netisr.h>
+#undef PS      /* XXX netccitt/pk.h conflict with machine/reg.h? */
+
 #include <machine/db_machdep.h>
 #include <ddb/db_sym.h>
 #include <ddb/db_extern.h>
@@ -86,7 +89,6 @@
 #include <machine/pte.h>
 #include <machine/kcore.h>
 
-#include <net/netisr.h>
 #include <dev/cons.h>
 
 #define        MAXMEM  64*1024 /* XXX - from cmap.h */