Module Name: src
Committed By: christos
Date: Tue Aug 18 02:04:14 UTC 2009
Modified Files:
src/sys/compat/linux/common: linux_oldmmap.c
Log Message:
more debugging for mmap
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/sys/compat/linux/common/linux_oldmmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/common/linux_oldmmap.c
diff -u src/sys/compat/linux/common/linux_oldmmap.c:1.71 src/sys/compat/linux/common/linux_oldmmap.c:1.72
--- src/sys/compat/linux/common/linux_oldmmap.c:1.71 Wed Dec 3 07:51:11 2008
+++ src/sys/compat/linux/common/linux_oldmmap.c Mon Aug 17 22:04:14 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_oldmmap.c,v 1.71 2008/12/03 12:51:11 ad Exp $ */
+/* $NetBSD: linux_oldmmap.c,v 1.72 2009/08/18 02:04:14 christos Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_oldmmap.c,v 1.71 2008/12/03 12:51:11 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_oldmmap.c,v 1.72 2009/08/18 02:04:14 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -86,8 +86,10 @@
if ((error = copyin(SCARG(uap, lmp), &lmap, sizeof lmap)))
return error;
- if (lmap.lm_offset & PAGE_MASK)
+ if (lmap.lm_offset & PAGE_MASK) {
+ DPRINTF(("old_mmap: 0x%x\n", lmap.lm_offset));
return EINVAL;
+ }
SCARG(&nlmap,addr) = lmap.lm_addr;
SCARG(&nlmap,len) = lmap.lm_len;
@@ -95,9 +97,10 @@
SCARG(&nlmap,flags) = lmap.lm_flags;
SCARG(&nlmap,fd) = lmap.lm_fd;
SCARG(&nlmap,offset) = lmap.lm_offset;
- DPRINTF(("old_mmap(%#x, %u, %u, %u, %d, %u)\n",
+ error = linux_sys_mmap(l, &nlmap, retval);
+ DPRINTF(("old_mmap(%#x, %u, %u, %u, %d, %u) = %d\n",
lmap.lm_addr, lmap.lm_len, lmap.lm_prot, lmap.lm_flags,
- lmap.lm_fd, lmap.lm_offset));
- return linux_sys_mmap(l, &nlmap, retval);
+ lmap.lm_fd, lmap.lm_offset, error));
+ return error;
}
