Module Name: src
Committed By: maxv
Date: Sat Jun 28 15:52:45 UTC 2014
Modified Files:
src/sys/uvm: uvm_swap.c
Log Message:
This KASSERT can trigger a panic too easily, if SCARG(uap, cmd)=SWAP_OFF and
SCARG(uap, arg)=NULL. The same KASSERT is already in the SWAP_ON switch case,
so just delete it here.
To generate a diff of this commit:
cvs rdiff -u -r1.169 -r1.170 src/sys/uvm/uvm_swap.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_swap.c
diff -u src/sys/uvm/uvm_swap.c:1.169 src/sys/uvm/uvm_swap.c:1.170
--- src/sys/uvm/uvm_swap.c:1.169 Sun Jun 22 19:09:39 2014
+++ src/sys/uvm/uvm_swap.c Sat Jun 28 15:52:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_swap.c,v 1.169 2014/06/22 19:09:39 maxv Exp $ */
+/* $NetBSD: uvm_swap.c,v 1.170 2014/06/28 15:52:45 maxv Exp $ */
/*
* Copyright (c) 1995, 1996, 1997, 2009 Matthew R. Green
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.169 2014/06/22 19:09:39 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.170 2014/06/28 15:52:45 maxv Exp $");
#include "opt_uvmhist.h"
#include "opt_compat_netbsd.h"
@@ -565,7 +565,6 @@ sys_swapctl(struct lwp *l, const struct
if (SCARG(uap, cmd) == SWAP_ON &&
copystr("miniroot", userpath, SWAP_PATH_MAX, &len))
panic("swapctl: miniroot copy failed");
- KASSERT(len > 0);
} else {
struct pathbuf *pb;
