[src/pgoyette-compat]: src/sys This hook doesn't exist for _RUMPSERVER

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

details:   https://anonhg.NetBSD.org/src/rev/f1d2a2995546
branches:  pgoyette-compat
changeset: 830769:f1d2a2995546
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Sun Sep 23 11:35:39 2018 +0000

description:
This hook doesn't exist for _RUMPSERVER

diffstat:

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

diffs (100 lines):

diff -r df23a981f3bb -r f1d2a2995546 sys/compat/netbsd32/netbsd32_kern_proc.c
--- a/sys/compat/netbsd32/netbsd32_kern_proc.c  Sun Sep 23 11:29:53 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_kern_proc.c  Sun Sep 23 11:35:39 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_kern_proc.c,v 1.1.2.1 2018/09/23 11:23:47 pgoyette Exp $      */
+/*     $NetBSD: netbsd32_kern_proc.c,v 1.1.2.2 2018/09/23 11:35:39 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.1 2018/09/23 11:23:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_kern_proc.c,v 1.1.2.2 2018/09/23 11:35:39 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_kstack.h"
@@ -139,20 +139,26 @@
        return 0;
 }
 
+#if !defined(_RUMPSERVER)
 MODULE_SET_HOOK2(kern_proc_32_hook, "kern_proc_32",
     copyin_psstrings_32, get_base32);
 MODULE_UNSET_HOOK2(kern_proc_32_hook);
+#endif
 
 void
 kern_proc_32_init(void)
 {
 
+#if !defined(_RUMPSERVER)
        kern_proc_32_hook_set();
+#endif
 }
 
 void
 kern_proc_32_fini(void)
 {
 
+#if !defined(_RUMPSERVER)
        kern_proc_32_hook_unset();
+#endif
 }
diff -r df23a981f3bb -r f1d2a2995546 sys/kern/kern_proc.c
--- a/sys/kern/kern_proc.c      Sun Sep 23 11:29:53 2018 +0000
+++ b/sys/kern/kern_proc.c      Sun Sep 23 11:35:39 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_proc.c,v 1.209.2.4 2018/09/23 11:23:47 pgoyette Exp $     */
+/*     $NetBSD: kern_proc.c,v 1.209.2.5 2018/09/23 11:35:39 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.4 2018/09/23 11:23:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.209.2.5 2018/09/23 11:35:39 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_kstack.h"
@@ -1856,6 +1856,7 @@
 /*
  * compat_netbsd32 hooks
  */
+#if !defined(_RUMP_KERNEL)
 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,
@@ -1865,13 +1866,16 @@
     (char **argv, size_t i, vaddr_t *base), (argv, i, base), enosys());
 MODULE_CALL_HOOK(kern_proc_32_hook, f2,
     (char **argv, size_t i, vaddr_t *base), (argv, i, base), enosys());
+#endif /* !defined(_RUMPKERNEL) */
 
 int
 copyin_psstrings(struct proc *p, struct ps_strings *arginfo)
 {
 
+#if !defined(_RUMP_KERNEL)
        if (p->p_flag & PK_32)
                return kern_proc_32_hook_f1_call(p, arginfo);
+#endif /* !defined(_RUMPKERNEL) */
 
        return copyin_proc(p, (void *)p->p_psstrp, arginfo, sizeof(*arginfo));
 }
@@ -2081,9 +2085,11 @@
                        i = 0;
                }
 
+#if !defined(_RUMP_KERNEL)
                if (p->p_flag & PK_32)
                        (void)kern_proc_32_hook_f2_call(argv, i++, &base);
                else
+#endif /* !defined(_RUMPKERNEL) */
                        base = (vaddr_t)argv[i++];
                loaded -= entry_len;