Module Name: src
Committed By: martin
Date: Mon Mar 10 13:47:45 UTC 2014
Modified Files:
src/sys/arch/ia64/ia64: cpu.c pmap.c trap.c
Log Message:
Remove unused variables
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/ia64/ia64/cpu.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/ia64/ia64/pmap.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/ia64/ia64/trap.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/ia64/ia64/cpu.c
diff -u src/sys/arch/ia64/ia64/cpu.c:1.11 src/sys/arch/ia64/ia64/cpu.c:1.12
--- src/sys/arch/ia64/ia64/cpu.c:1.11 Sun Feb 17 06:46:23 2013
+++ src/sys/arch/ia64/ia64/cpu.c Mon Mar 10 13:47:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.11 2013/02/17 06:46:23 kiyohara Exp $ */
+/* $NetBSD: cpu.c,v 1.12 2014/03/10 13:47:45 martin Exp $ */
/*
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.11 2013/02/17 06:46:23 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.12 2014/03/10 13:47:45 martin Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -117,7 +117,7 @@ identifycpu(struct cpu_softc *sc)
uint64_t vendor[3];
const char *family_name, *model_name;
uint64_t features, tmp;
- int number, revision, model, family, archrev;
+ int revision, model, family;
char bitbuf[32];
extern uint64_t processor_frequency;
@@ -129,11 +129,11 @@ identifycpu(struct cpu_softc *sc)
vendor[2] = '\0';
tmp = ia64_get_cpuid(3);
- number = (tmp >> 0) & 0xff;
+ /* number = (tmp >> 0) & 0xff; */
revision = (tmp >> 8) & 0xff;
model = (tmp >> 16) & 0xff;
family = (tmp >> 24) & 0xff;
- archrev = (tmp >> 32) & 0xff;
+ /* archrev = (tmp >> 32) & 0xff; */
family_name = model_name = "unknown";
switch (family) {
Index: src/sys/arch/ia64/ia64/pmap.c
diff -u src/sys/arch/ia64/ia64/pmap.c:1.31 src/sys/arch/ia64/ia64/pmap.c:1.32
--- src/sys/arch/ia64/ia64/pmap.c:1.31 Sun Mar 24 06:56:14 2013
+++ src/sys/arch/ia64/ia64/pmap.c Mon Mar 10 13:47:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.31 2013/03/24 06:56:14 kiyohara Exp $ */
+/* $NetBSD: pmap.c,v 1.32 2014/03/10 13:47:45 martin Exp $ */
/*-
@@ -85,7 +85,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.31 2013/03/24 06:56:14 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.32 2014/03/10 13:47:45 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1097,8 +1097,6 @@ pmap_protect(pmap_t pmap, vaddr_t sva, v
{
pmap_t oldpmap;
struct ia64_lpte *pte;
- vaddr_t pa;
- struct vm_page *pg;
if ((prot & VM_PROT_READ) == VM_PROT_NONE) {
pmap_remove(pmap, sva, eva);
@@ -1125,8 +1123,6 @@ pmap_protect(pmap_t pmap, vaddr_t sva, v
if (pmap_prot(pte) != prot) {
if (pmap_managed(pte)) {
- pa = pmap_ppn(pte);
- pg = PHYS_TO_VM_PAGE(pa);
if (pmap_dirty(pte))
pmap_clear_dirty(pte);
if (pmap_accessed(pte)) {
@@ -1154,9 +1150,7 @@ pmap_extract(pmap_t pmap, vaddr_t va, pa
{
struct ia64_lpte *pte;
pmap_t oldpmap;
- paddr_t pa;
- pa = 0;
mutex_enter(&pmap->pm_slock);
oldpmap = pmap_install(pmap); /*XXX: isn't this a little inefficient ?*/
pte = pmap_find_vhpt(va);
Index: src/sys/arch/ia64/ia64/trap.c
diff -u src/sys/arch/ia64/ia64/trap.c:1.12 src/sys/arch/ia64/ia64/trap.c:1.13
--- src/sys/arch/ia64/ia64/trap.c:1.12 Sat Jan 12 08:42:53 2013
+++ src/sys/arch/ia64/ia64/trap.c Mon Mar 10 13:47:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.12 2013/01/12 08:42:53 kiyohara Exp $ */
+/* $NetBSD: trap.c,v 1.13 2014/03/10 13:47:45 martin Exp $ */
/*-
* Copyright (c) 2005 Marcel Moolenaar
@@ -61,7 +61,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.12 2013/01/12 08:42:53 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.13 2014/03/10 13:47:45 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -382,7 +382,6 @@ trap(int vector, struct trapframe *tf)
struct lwp *l;
uint64_t ucode;
int sig, user;
- u_int sticks;
ksiginfo_t ksi;
user = TRAPF_USERMODE(tf) ? 1 : 0;
@@ -397,11 +396,9 @@ trap(int vector, struct trapframe *tf)
if (user) {
ia64_set_fpsr(IA64_FPSR_DEFAULT);
p = l->l_proc;
- sticks = p->p_sticks;
l->l_md.md_tf = tf;
LWP_CACHE_CREDS(l, p);
} else {
- sticks = 0; /* XXX bogus -Wuninitialized warning */
p = NULL;
}
sig = 0;
