Module Name: src
Committed By: jdolecek
Date: Sun Mar 4 23:25:35 UTC 2018
Modified Files:
src/sys/arch/x86/x86: pmap.c
Log Message:
adjust the pmap_check_inuse() fix to avoid #ifdef
To generate a diff of this commit:
cvs rdiff -u -r1.288 -r1.289 src/sys/arch/x86/x86/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/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.288 src/sys/arch/x86/x86/pmap.c:1.289
--- src/sys/arch/x86/x86/pmap.c:1.288 Sun Mar 4 23:07:58 2018
+++ src/sys/arch/x86/x86/pmap.c Sun Mar 4 23:25:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.288 2018/03/04 23:07:58 kre Exp $ */
+/* $NetBSD: pmap.c,v 1.289 2018/03/04 23:25:35 jdolecek Exp $ */
/*
* Copyright (c) 2008, 2010, 2016, 2017 The NetBSD Foundation, Inc.
@@ -170,7 +170,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.288 2018/03/04 23:07:58 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.289 2018/03/04 23:25:35 jdolecek Exp $");
#include "opt_user_ldt.h"
#include "opt_lockdebug.h"
@@ -2550,15 +2550,12 @@ pmap_check_inuse(struct pmap *pmap)
#ifdef DIAGNOSTIC
CPU_INFO_ITERATOR cii;
struct cpu_info *ci;
-#if defined(XEN) && defined(__x86_64__)
- int i;
-#endif
for (CPU_INFO_FOREACH(cii, ci)) {
if (ci->ci_pmap == pmap)
panic("destroying pmap being used");
#if defined(XEN) && defined(__x86_64__)
- for (i = 0; i < PDIR_SLOT_PTE; i++) {
+ for (int i = 0; i < PDIR_SLOT_PTE; i++) {
if (pmap->pm_pdir[i] != 0 &&
ci->ci_kpm_pdir[i] == pmap->pm_pdir[i]) {
printf("pmap_destroy(%p) pmap_kernel %p "
