Module Name: src
Committed By: thorpej
Date: Mon Oct 26 03:51:43 UTC 2009
Modified Files:
src/sys/arch/alpha/alpha: ipifuncs.c pmap.c
src/sys/arch/alpha/include: intr.h pmap.h
Log Message:
Garbage-collect pmap_do_reactivate() and the associated IPI -- nothing has
used them for a long time.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/alpha/alpha/ipifuncs.c
cvs rdiff -u -r1.247 -r1.248 src/sys/arch/alpha/alpha/pmap.c
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/alpha/include/intr.h
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/alpha/include/pmap.h
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/alpha/alpha/ipifuncs.c
diff -u src/sys/arch/alpha/alpha/ipifuncs.c:1.40 src/sys/arch/alpha/alpha/ipifuncs.c:1.41
--- src/sys/arch/alpha/alpha/ipifuncs.c:1.40 Mon Apr 28 20:23:10 2008
+++ src/sys/arch/alpha/alpha/ipifuncs.c Mon Oct 26 03:51:42 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ipifuncs.c,v 1.40 2008/04/28 20:23:10 martin Exp $ */
+/* $NetBSD: ipifuncs.c,v 1.41 2009/10/26 03:51:42 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: ipifuncs.c,v 1.40 2008/04/28 20:23:10 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipifuncs.c,v 1.41 2009/10/26 03:51:42 thorpej Exp $");
/*
* Interprocessor interrupt handlers.
@@ -78,7 +78,6 @@
alpha_ipi_synch_fpu,
alpha_ipi_discard_fpu,
alpha_ipi_pause,
- pmap_do_reactivate,
};
const char *ipinames[ALPHA_NIPIS] = {
@@ -90,7 +89,6 @@
"synch fpu ipi",
"discard fpu ipi",
"pause ipi",
- "pmap reactivate ipi",
};
/*
Index: src/sys/arch/alpha/alpha/pmap.c
diff -u src/sys/arch/alpha/alpha/pmap.c:1.247 src/sys/arch/alpha/alpha/pmap.c:1.248
--- src/sys/arch/alpha/alpha/pmap.c:1.247 Mon Oct 26 03:21:19 2009
+++ src/sys/arch/alpha/alpha/pmap.c Mon Oct 26 03:51:42 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.247 2009/10/26 03:21:19 thorpej Exp $ */
+/* $NetBSD: pmap.c,v 1.248 2009/10/26 03:51:42 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001, 2007, 2008 The NetBSD Foundation, Inc.
@@ -140,7 +140,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.247 2009/10/26 03:21:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.248 2009/10/26 03:51:42 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2167,29 +2167,6 @@
atomic_and_ulong(&pmap->pm_cpus, ~(1UL << cpu_number()));
}
-#if defined(MULTIPROCESSOR)
-/*
- * pmap_do_reactivate:
- *
- * Reactivate an address space when the level 1 map changes.
- * We are invoked by an interprocessor interrupt.
- */
-void
-pmap_do_reactivate(struct cpu_info *ci, struct trapframe *framep)
-{
- struct pmap *pmap;
-
- if (ci->ci_curlwp == ci->ci_data.cpu_idlelwp)
- return;
-
- pmap = ci->ci_curlwp->l_proc->p_vmspace->vm_map.pmap;
-
- pmap_asn_alloc(pmap, ci->ci_cpuid);
- if (PMAP_ISACTIVE(pmap, ci->ci_cpuid))
- PMAP_ACTIVATE(pmap, ci->ci_curlwp, ci->ci_cpuid);
-}
-#endif /* MULTIPROCESSOR */
-
/*
* pmap_zero_page: [ INTERFACE ]
*
Index: src/sys/arch/alpha/include/intr.h
diff -u src/sys/arch/alpha/include/intr.h:1.66 src/sys/arch/alpha/include/intr.h:1.67
--- src/sys/arch/alpha/include/intr.h:1.66 Mon Apr 28 20:23:11 2008
+++ src/sys/arch/alpha/include/intr.h Mon Oct 26 03:51:43 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.66 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: intr.h,v 1.67 2009/10/26 03:51:43 thorpej Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -165,9 +165,8 @@
#define ALPHA_IPI_SYNCH_FPU (1UL << 5)
#define ALPHA_IPI_DISCARD_FPU (1UL << 6)
#define ALPHA_IPI_PAUSE (1UL << 7)
-#define ALPHA_IPI_PMAP_REACTIVATE (1UL << 8)
-#define ALPHA_NIPIS 9 /* must not exceed 64 */
+#define ALPHA_NIPIS 8 /* must not exceed 64 */
struct cpu_info;
struct trapframe;
Index: src/sys/arch/alpha/include/pmap.h
diff -u src/sys/arch/alpha/include/pmap.h:1.74 src/sys/arch/alpha/include/pmap.h:1.75
--- src/sys/arch/alpha/include/pmap.h:1.74 Sun Mar 15 22:19:15 2009
+++ src/sys/arch/alpha/include/pmap.h Mon Oct 26 03:51:43 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.74 2009/03/15 22:19:15 cegger Exp $ */
+/* $NetBSD: pmap.h,v 1.75 2009/10/26 03:51:43 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001, 2007 The NetBSD Foundation, Inc.
@@ -195,8 +195,6 @@
struct cpu_info;
struct trapframe;
-void pmap_do_reactivate(struct cpu_info *, struct trapframe *);
-
void pmap_tlb_shootdown(pmap_t, vaddr_t, pt_entry_t, u_long *);
void pmap_tlb_shootnow(u_long);
void pmap_do_tlb_shootdown(struct cpu_info *, struct trapframe *);
