Module Name: src
Committed By: rmind
Date: Sat Oct 5 16:50:31 UTC 2013
Modified Files:
src/sys/arch/x86/x86: pmap.c x86_machdep.c
Log Message:
Remove some unused variables.
To generate a diff of this commit:
cvs rdiff -u -r1.179 -r1.180 src/sys/arch/x86/x86/pmap.c
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/x86/x86/x86_machdep.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/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.179 src/sys/arch/x86/x86/pmap.c:1.180
--- src/sys/arch/x86/x86/pmap.c:1.179 Tue Nov 13 14:07:42 2012
+++ src/sys/arch/x86/x86/pmap.c Sat Oct 5 16:50:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.179 2012/11/13 14:07:42 chs Exp $ */
+/* $NetBSD: pmap.c,v 1.180 2013/10/05 16:50:31 rmind Exp $ */
/*-
* Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
@@ -171,7 +171,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.179 2012/11/13 14:07:42 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.180 2013/10/05 16:50:31 rmind Exp $");
#include "opt_user_ldt.h"
#include "opt_lockdebug.h"
@@ -3549,12 +3549,10 @@ pmap_page_remove(struct vm_page *pg)
struct pv_entry *killlist = NULL;
struct vm_page *ptp;
pt_entry_t expect;
- lwp_t *l;
int count;
KASSERT(uvm_page_locked_p(pg));
- l = curlwp;
pp = VM_PAGE_TO_PP(pg);
expect = pmap_pa2pte(VM_PAGE_TO_PHYS(pg)) | PG_V;
count = SPINLOCK_BACKOFF_MIN;
Index: src/sys/arch/x86/x86/x86_machdep.c
diff -u src/sys/arch/x86/x86/x86_machdep.c:1.60 src/sys/arch/x86/x86/x86_machdep.c:1.61
--- src/sys/arch/x86/x86/x86_machdep.c:1.60 Sat Aug 31 12:26:56 2013
+++ src/sys/arch/x86/x86/x86_machdep.c Sat Oct 5 16:50:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_machdep.c,v 1.60 2013/08/31 12:26:56 jmcneill Exp $ */
+/* $NetBSD: x86_machdep.c,v 1.61 2013/10/05 16:50:31 rmind Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.60 2013/08/31 12:26:56 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.61 2013/10/05 16:50:31 rmind Exp $");
#include "opt_modular.h"
#include "opt_physmem.h"
@@ -295,14 +295,11 @@ cpu_intr_p(void)
bool
cpu_kpreempt_enter(uintptr_t where, int s)
{
- struct cpu_info *ci;
struct pcb *pcb;
lwp_t *l;
KASSERT(kpreempt_disabled());
-
l = curlwp;
- ci = curcpu();
/*
* If SPL raised, can't go. Note this implies that spin