[src/pgoyette-compat]: src/sys Use the proper test: _RUMPKERNEL vs _RUMP_KERNEL

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

details:   https://anonhg.NetBSD.org/src/rev/02496d0231cd
branches:  pgoyette-compat
changeset: 830770:02496d0231cd
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Sun Sep 23 11:50:03 2018 +0000

description:
Use the proper test: _RUMPKERNEL vs _RUMP_KERNEL

diffstat:

 sys/compat/netbsd32/netbsd32_kern_proc.c |   9 ++-------
 sys/kern/kern_proc.c                     |  10 +++++-----
 2 files changed, 7 insertions(+), 12 deletions(-)

diffs (75 lines):

diff -r f1d2a2995546 -r 02496d0231cd sys/compat/netbsd32/netbsd32_kern_proc.c
--- a/sys/compat/netbsd32/netbsd32_kern_proc.c  Sun Sep 23 11:35:39 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_kern_proc.c  Sun Sep 23 11:50:03 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_kern_proc.c,v 1.1.2.2 2018/09/23 11:35:39 pgoyette Exp $      */
+/*     $NetBSD: netbsd32_kern_proc.c,v 1.1.2.3 2018/09/23 11:50:03 pgoyette Exp $      */
 
 /*-
  * Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_kern_proc.c,v 1.1.2.2 2018/09/23 11:35:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_kern_proc.c,v 1.1.2.3 2018/09/23 11:50:03 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_kstack.h"
@@ -71,11 +71,6 @@
 #include "opt_compat_netbsd32.h"
 #endif
 
-#if defined(__HAVE_COMPAT_NETBSD32) && !defined(COMPAT_NETBSD32) \
-    && !defined(_RUMPKERNEL)
-#define COMPAT_NETBSD32
-#endif
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff -r f1d2a2995546 -r 02496d0231cd sys/kern/kern_proc.c
--- a/sys/kern/kern_proc.c      Sun Sep 23 11:35:39 2018 +0000
+++ b/sys/kern/kern_proc.c      Sun Sep 23 11:50:03 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_proc.c,v 1.209.2.5 2018/09/23 11:35:39 pgoyette Exp $     */
+/*     $NetBSD: kern_proc.c,v 1.209.2.6 2018/09/23 11:50:03 pgoyette Exp $     */
 
 /*-
  * Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.209.2.5 2018/09/23 11:35:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.209.2.6 2018/09/23 11:50:03 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_kstack.h"
@@ -1856,7 +1856,7 @@
 /*
  * compat_netbsd32 hooks
  */
-#if !defined(_RUMP_KERNEL)
+#if !defined(_RUMPKERNEL)
 MODULE_CALL_HOOK_DECL(kern_proc_32_hook, f1,
     (struct proc *p, struct ps_strings *s), (p, s), enosys());
 MODULE_CALL_HOOK(kern_proc_32_hook, f1,
@@ -1872,7 +1872,7 @@
 copyin_psstrings(struct proc *p, struct ps_strings *arginfo)
 {
 
-#if !defined(_RUMP_KERNEL)
+#if !defined(_RUMPKERNEL)
        if (p->p_flag & PK_32)
                return kern_proc_32_hook_f1_call(p, arginfo);
 #endif /* !defined(_RUMPKERNEL) */
@@ -2085,7 +2085,7 @@
                        i = 0;
                }
 
-#if !defined(_RUMP_KERNEL)
+#if !defined(_RUMPKERNEL)
                if (p->p_flag & PK_32)
                        (void)kern_proc_32_hook_f2_call(argv, i++, &base);
                else