Module Name: src
Committed By: skrll
Date: Thu Jul 14 05:00:51 UTC 2016
Modified Files:
src/sys/arch/arm/arm32: pmap.c
src/sys/arch/arm/include/arm32: pmap.h
src/sys/uvm/pmap: pmap.c
Log Message:
Spell PMAP_TLB_NEED_SHOOTDOWN correctly
To generate a diff of this commit:
cvs rdiff -u -r1.333 -r1.334 src/sys/arch/arm/arm32/pmap.c
cvs rdiff -u -r1.143 -r1.144 src/sys/arch/arm/include/arm32/pmap.h
cvs rdiff -u -r1.17 -r1.18 src/sys/uvm/pmap/pmap.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/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.333 src/sys/arch/arm/arm32/pmap.c:1.334
--- src/sys/arch/arm/arm32/pmap.c:1.333 Tue Jul 12 15:40:53 2016
+++ src/sys/arch/arm/arm32/pmap.c Thu Jul 14 05:00:51 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.333 2016/07/12 15:40:53 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.334 2016/07/14 05:00:51 skrll Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -217,7 +217,7 @@
#include <arm/locore.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.333 2016/07/12 15:40:53 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.334 2016/07/14 05:00:51 skrll Exp $");
//#define PMAP_DEBUG
#ifdef PMAP_DEBUG
@@ -7857,7 +7857,7 @@ pmap_md_tlb_info_attach(struct pmap_tlb_
int
pic_ipi_shootdown(void *arg)
{
-#if PMAP_NEED_TLB_SHOOTDOWN
+#if PMAP_TLB_NEED_SHOOTDOWN
pmap_tlb_shootdown_process();
#endif
return 1;
Index: src/sys/arch/arm/include/arm32/pmap.h
diff -u src/sys/arch/arm/include/arm32/pmap.h:1.143 src/sys/arch/arm/include/arm32/pmap.h:1.144
--- src/sys/arch/arm/include/arm32/pmap.h:1.143 Wed Nov 11 17:54:17 2015
+++ src/sys/arch/arm/include/arm32/pmap.h Thu Jul 14 05:00:51 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.143 2015/11/11 17:54:17 skrll Exp $ */
+/* $NetBSD: pmap.h,v 1.144 2016/07/14 05:00:51 skrll Exp $ */
/*
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -87,7 +87,7 @@
#define PMAP_TLB_MAX 1
#define PMAP_TLB_HWPAGEWALKER 1
#if PMAP_TLB_MAX > 1
-#define PMAP_NEED_TLB_SHOOTDOWN 1
+#define PMAP_TLB_NEED_SHOOTDOWN 1
#endif
#define PMAP_TLB_FLUSH_ASID_ON_RESET (arm_has_tlbiasid_p)
#define PMAP_TLB_NUM_PIDS 256
Index: src/sys/uvm/pmap/pmap.c
diff -u src/sys/uvm/pmap/pmap.c:1.17 src/sys/uvm/pmap/pmap.c:1.18
--- src/sys/uvm/pmap/pmap.c:1.17 Thu Jul 14 04:51:47 2016
+++ src/sys/uvm/pmap/pmap.c Thu Jul 14 05:00:51 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.17 2016/07/14 04:51:47 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.18 2016/07/14 05:00:51 skrll Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.17 2016/07/14 04:51:47 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.18 2016/07/14 05:00:51 skrll Exp $");
/*
* Manages physical address maps.
@@ -845,7 +845,7 @@ pmap_update(struct pmap *pmap)
PMAP_COUNT(update);
kpreempt_disable();
-#if defined(MULTIPROCESSOR) && defined(PMAP_NEED_TLB_SHOOTDOWN)
+#if defined(MULTIPROCESSOR) && defined(PMAP_TLB_NEED_SHOOTDOWN)
u_int pending = atomic_swap_uint(&pmap->pm_shootdown_pending, 0);
if (pending && pmap_tlb_shootdown_bystanders(pmap))
PMAP_COUNT(shootdown_ipis);
