Deleted Added
full compact
kern_exec.c (205574) kern_exec.c (205642)
1/*-
2 * Copyright (c) 1993, David Greenman
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1993, David Greenman
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/kern/kern_exec.c 205574 2010-03-24 03:13:24Z nwhitehorn $");
28__FBSDID("$FreeBSD: head/sys/kern/kern_exec.c 205642 2010-03-25 14:24:00Z nwhitehorn $");
29
30#include "opt_hwpmc_hooks.h"
31#include "opt_kdtrace.h"
32#include "opt_ktrace.h"
33#include "opt_vm.h"
34
35#include <sys/param.h>
36#include <sys/systm.h>

--- 757 unchanged lines hidden (view full) ---

794 } else
795 PROC_UNLOCK(p);
796#else /* !HWPMC_HOOKS */
797 PROC_UNLOCK(p);
798#endif
799
800 /* Set values passed into the program in registers. */
801 if (p->p_sysent->sv_setregs)
29
30#include "opt_hwpmc_hooks.h"
31#include "opt_kdtrace.h"
32#include "opt_ktrace.h"
33#include "opt_vm.h"
34
35#include <sys/param.h>
36#include <sys/systm.h>

--- 757 unchanged lines hidden (view full) ---

794 } else
795 PROC_UNLOCK(p);
796#else /* !HWPMC_HOOKS */
797 PROC_UNLOCK(p);
798#endif
799
800 /* Set values passed into the program in registers. */
801 if (p->p_sysent->sv_setregs)
802 (*p->p_sysent->sv_setregs)(td, imgp->entry_addr,
803 (u_long)(uintptr_t)stack_base, imgp->ps_strings);
802 (*p->p_sysent->sv_setregs)(td, imgp,
803 (u_long)(uintptr_t)stack_base);
804 else
804 else
805 exec_setregs(td, imgp->entry_addr,
806 (u_long)(uintptr_t)stack_base, imgp->ps_strings);
805 exec_setregs(td, imgp, (u_long)(uintptr_t)stack_base);
807
808 vfs_mark_atime(imgp->vp, td->td_ucred);
809
810 SDT_PROBE(proc, kernel, , exec_success, args->fname, 0, 0, 0, 0);
811
812done1:
813 /*
814 * Free any resources malloc'd earlier that we didn't use.

--- 612 unchanged lines hidden ---
806
807 vfs_mark_atime(imgp->vp, td->td_ucred);
808
809 SDT_PROBE(proc, kernel, , exec_success, args->fname, 0, 0, 0, 0);
810
811done1:
812 /*
813 * Free any resources malloc'd earlier that we didn't use.

--- 612 unchanged lines hidden ---