[src/netbsd-3]: src/sys/sys Pull up following revision(s) (requested by elad ...

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

details:   https://anonhg.NetBSD.org/src/rev/704770f363b1
branches:  netbsd-3
changeset: 577120:704770f363b1
user:      tron <tron%NetBSD.org@localhost>
date:      Thu Sep 08 21:04:14 2005 +0000

description:
Pull up following revision(s) (requested by elad in ticket #740):
        sys/sys/exec.h: revision 1.111
Don't depend on #ifdef VERIFIED_EXEC

diffstat:

 sys/sys/exec.h |  6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diffs (23 lines):

diff -r 7767e91a93ca -r 704770f363b1 sys/sys/exec.h
--- a/sys/sys/exec.h    Thu Sep 08 20:12:14 2005 +0000
+++ b/sys/sys/exec.h    Thu Sep 08 21:04:14 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: exec.h,v 1.106 2005/02/03 19:20:01 perry Exp $ */
+/*     $NetBSD: exec.h,v 1.106.4.1 2005/09/08 21:04:14 tron Exp $      */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -243,13 +243,9 @@
 int    copyargs                (struct proc *, struct exec_package *,
                                    struct ps_strings *, char **, void *);
 void   setregs                 (struct lwp *, struct exec_package *, u_long);
-#ifdef VERIFIED_EXEC
 int    check_veriexec          (struct proc *, struct vnode *,
                                     struct exec_package *, int);
 int    check_exec              (struct proc *, struct exec_package *, int);
-#else
-int    check_exec              (struct proc *, struct exec_package *);
-#endif
 int    exec_init               (int);
 int    exec_read_from          (struct proc *, struct vnode *, u_long off,
                                    void *, size_t);