From b07ec3fc388a5aeae51e8871aa89eefea3ce1e53 Mon Sep 17 00:00:00 2001 From: ad Date: Fri, 9 Feb 2007 21:55:00 +0000 Subject: Merge newlock2 to head. --- sys/compat/linux/common/linux_exec.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'sys/compat/linux/common/linux_exec.c') diff --git a/sys/compat/linux/common/linux_exec.c b/sys/compat/linux/common/linux_exec.c index d3821c2bb60..655fe4dc891 100644 --- a/sys/compat/linux/common/linux_exec.c +++ b/sys/compat/linux/common/linux_exec.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_exec.c,v 1.89 2006/11/16 01:32:42 christos Exp $ */ +/* $NetBSD: linux_exec.c,v 1.90 2007/02/09 21:55:19 ad Exp $ */ /*- * Copyright (c) 1994, 1995, 1998, 2000 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_exec.c,v 1.89 2006/11/16 01:32:42 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_exec.c,v 1.90 2007/02/09 21:55:19 ad Exp $"); #include #include @@ -52,7 +52,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux_exec.c,v 1.89 2006/11/16 01:32:42 christos Exp #include #include -#include #include #include /* For proc_reparent() */ @@ -158,7 +157,7 @@ const struct emul emul_linux = { uvm_default_mapaddr, linux_usertrap, - NULL, + 0, }; static void -- cgit