Module Name: src
Committed By: kre
Date: Tue Aug 9 12:17:04 UTC 2016
Modified Files:
src/sys/uvm: uvm_mmap.c
Log Message:
The only error that can occur from munlock() on NetBSD is ENOMEM.
Make it be that way.
To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 src/sys/uvm/uvm_mmap.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/uvm/uvm_mmap.c
diff -u src/sys/uvm/uvm_mmap.c:1.161 src/sys/uvm/uvm_mmap.c:1.162
--- src/sys/uvm/uvm_mmap.c:1.161 Sun Aug 7 10:07:58 2016
+++ src/sys/uvm/uvm_mmap.c Tue Aug 9 12:17:04 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_mmap.c,v 1.161 2016/08/07 10:07:58 maxv Exp $ */
+/* $NetBSD: uvm_mmap.c,v 1.162 2016/08/09 12:17:04 kre Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.161 2016/08/07 10:07:58 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.162 2016/08/09 12:17:04 kre Exp $");
#include "opt_compat_netbsd.h"
#include "opt_pax.h"
@@ -862,9 +862,10 @@ sys_munlock(struct lwp *l, const struct
error = uvm_map_pageable(&p->p_vmspace->vm_map, addr, addr+size, true,
0);
- if (error == EFAULT)
- error = ENOMEM;
- return error;
+ if (error)
+ return ENOMEM;
+
+ return 0;
}
/*
