Module Name: src
Committed By: pooka
Date: Tue Nov 13 20:10:03 UTC 2012
Modified Files:
src/sys/kern: kern_tc.c
src/sys/rump/librump/rumpkern: lwproc.c scheduler.c vm.c
src/sys/secmodel/suser: secmodel_suser.c
Log Message:
kill some -Wunused-but-set-variable warnings
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/kern/kern_tc.c
cvs rdiff -u -r1.18 -r1.19 src/sys/rump/librump/rumpkern/lwproc.c
cvs rdiff -u -r1.29 -r1.30 src/sys/rump/librump/rumpkern/scheduler.c
cvs rdiff -u -r1.130 -r1.131 src/sys/rump/librump/rumpkern/vm.c
cvs rdiff -u -r1.39 -r1.40 src/sys/secmodel/suser/secmodel_suser.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/kern/kern_tc.c
diff -u src/sys/kern/kern_tc.c:1.43 src/sys/kern/kern_tc.c:1.44
--- src/sys/kern/kern_tc.c:1.43 Tue Feb 21 15:41:24 2012
+++ src/sys/kern/kern_tc.c Tue Nov 13 20:10:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_tc.c,v 1.43 2012/02/21 15:41:24 martin Exp $ */
+/* $NetBSD: kern_tc.c,v 1.44 2012/11/13 20:10:02 pooka Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
#include <sys/cdefs.h>
/* __FBSDID("$FreeBSD: src/sys/kern/kern_tc.c,v 1.166 2005/09/19 22:16:31 andre Exp $"); */
-__KERNEL_RCSID(0, "$NetBSD: kern_tc.c,v 1.43 2012/02/21 15:41:24 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_tc.c,v 1.44 2012/11/13 20:10:02 pooka Exp $");
#ifdef _KERNEL_OPT
#include "opt_ntp.h"
@@ -935,7 +935,10 @@ pps_event(struct pps_state *pps, int eve
struct bintime bt;
struct timespec ts, *tsp, *osp;
u_int64_t tcount, *pcount;
- int foff, fhard;
+ int foff;
+#ifdef PPS_SYNC
+ int fhard;
+#endif
pps_seq_t *pseq;
KASSERT(mutex_owned(&timecounter_lock));
@@ -950,14 +953,18 @@ pps_event(struct pps_state *pps, int eve
tsp = &pps->ppsinfo.assert_timestamp;
osp = &pps->ppsparam.assert_offset;
foff = pps->ppsparam.mode & PPS_OFFSETASSERT;
+#ifdef PPS_SYNC
fhard = pps->kcmode & PPS_CAPTUREASSERT;
+#endif
pcount = &pps->ppscount[0];
pseq = &pps->ppsinfo.assert_sequence;
} else {
tsp = &pps->ppsinfo.clear_timestamp;
osp = &pps->ppsparam.clear_offset;
foff = pps->ppsparam.mode & PPS_OFFSETCLEAR;
+#ifdef PPS_SYNC
fhard = pps->kcmode & PPS_CAPTURECLEAR;
+#endif
pcount = &pps->ppscount[1];
pseq = &pps->ppsinfo.clear_sequence;
}
Index: src/sys/rump/librump/rumpkern/lwproc.c
diff -u src/sys/rump/librump/rumpkern/lwproc.c:1.18 src/sys/rump/librump/rumpkern/lwproc.c:1.19
--- src/sys/rump/librump/rumpkern/lwproc.c:1.18 Sun May 1 02:52:42 2011
+++ src/sys/rump/librump/rumpkern/lwproc.c Tue Nov 13 20:10:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: lwproc.c,v 1.18 2011/05/01 02:52:42 pgoyette Exp $ */
+/* $NetBSD: lwproc.c,v 1.19 2012/11/13 20:10:02 pooka Exp $ */
/*
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lwproc.c,v 1.18 2011/05/01 02:52:42 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lwproc.c,v 1.19 2012/11/13 20:10:02 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -179,7 +179,6 @@ static void
lwproc_freelwp(struct lwp *l)
{
struct proc *p;
- bool freeproc;
p = l->l_proc;
mutex_enter(p->p_lock);
@@ -195,7 +194,6 @@ lwproc_freelwp(struct lwp *l)
KASSERT(p != &proc0);
p->p_stat = SDEAD;
}
- freeproc = p->p_nlwps == 0;
cv_broadcast(&p->p_lwpcv); /* nobody sleeps on this in rump? */
kauth_cred_free(l->l_cred);
mutex_exit(p->p_lock);
Index: src/sys/rump/librump/rumpkern/scheduler.c
diff -u src/sys/rump/librump/rumpkern/scheduler.c:1.29 src/sys/rump/librump/rumpkern/scheduler.c:1.30
--- src/sys/rump/librump/rumpkern/scheduler.c:1.29 Sat Sep 15 17:15:01 2012
+++ src/sys/rump/librump/rumpkern/scheduler.c Tue Nov 13 20:10:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: scheduler.c,v 1.29 2012/09/15 17:15:01 pooka Exp $ */
+/* $NetBSD: scheduler.c,v 1.30 2012/11/13 20:10:02 pooka Exp $ */
/*
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scheduler.c,v 1.29 2012/09/15 17:15:01 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scheduler.c,v 1.30 2012/11/13 20:10:02 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -127,7 +127,6 @@ getnextcpu(void)
void
rump_cpus_bootstrap(int *nump)
{
- struct rumpcpu *rcpu;
struct cpu_info *ci;
int num = *nump;
int i;
@@ -139,7 +138,6 @@ rump_cpus_bootstrap(int *nump)
}
for (i = 0; i < num; i++) {
- rcpu = &rcpu_storage[i];
ci = &rump_cpus[i];
ci->ci_index = i;
}
@@ -514,14 +512,14 @@ void
kpreempt_disable(void)
{
- KPREEMPT_DISABLE(curlwp);
+ //KPREEMPT_DISABLE(curlwp);
}
void
kpreempt_enable(void)
{
- KPREEMPT_ENABLE(curlwp);
+ //KPREEMPT_ENABLE(curlwp);
}
void
Index: src/sys/rump/librump/rumpkern/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.130 src/sys/rump/librump/rumpkern/vm.c:1.131
--- src/sys/rump/librump/rumpkern/vm.c:1.130 Fri Jul 27 09:06:01 2012
+++ src/sys/rump/librump/rumpkern/vm.c Tue Nov 13 20:10:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vm.c,v 1.130 2012/07/27 09:06:01 pooka Exp $ */
+/* $NetBSD: vm.c,v 1.131 2012/11/13 20:10:02 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.130 2012/07/27 09:06:01 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.131 2012/11/13 20:10:02 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -1004,7 +1004,6 @@ uvm_pageout(void *arg)
struct vm_page *pg;
struct pool *pp, *pp_first;
int cleaned, skip, skipped;
- int waspaging;
bool succ;
bool lockrunning;
@@ -1021,7 +1020,6 @@ uvm_pageout(void *arg)
cv_wait(&pdaemoncv, &pdaemonmtx);
uvmexp.pdwoke++;
- waspaging = uvmexp.paging;
/* tell the world that we are hungry */
kernel_map->flags |= VM_MAP_WANTVA;
Index: src/sys/secmodel/suser/secmodel_suser.c
diff -u src/sys/secmodel/suser/secmodel_suser.c:1.39 src/sys/secmodel/suser/secmodel_suser.c:1.40
--- src/sys/secmodel/suser/secmodel_suser.c:1.39 Tue Mar 13 18:41:02 2012
+++ src/sys/secmodel/suser/secmodel_suser.c Tue Nov 13 20:10:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel_suser.c,v 1.39 2012/03/13 18:41:02 elad Exp $ */
+/* $NetBSD: secmodel_suser.c,v 1.40 2012/11/13 20:10:03 pooka Exp $ */
/*-
* Copyright (c) 2006 Elad Efrat <[email protected]>
* All rights reserved.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: secmodel_suser.c,v 1.39 2012/03/13 18:41:02 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_suser.c,v 1.40 2012/11/13 20:10:03 pooka Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -467,13 +467,11 @@ int
secmodel_suser_process_cb(kauth_cred_t cred, kauth_action_t action,
void *cookie, void *arg0, void *arg1, void *arg2, void *arg3)
{
- struct proc *p;
bool isroot;
int result;
isroot = suser_isroot(cred);
result = KAUTH_RESULT_DEFER;
- p = arg0;
switch (action) {
case KAUTH_PROCESS_SIGNAL:
