From bb54fedfd0cd0f9a035b0baf8680417bb66bf6da Mon Sep 17 00:00:00 2001
From: miod <miod@openbsd.org>
Date: Mon, 12 Sep 2022 19:28:19 +0000
Subject: [PATCH] Drop orphaned pv_flags values.

---
 sys/arch/arm/arm/pmap7.c    |  9 +--------
 sys/arch/arm/include/pmap.h | 14 ++++----------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/sys/arch/arm/arm/pmap7.c b/sys/arch/arm/arm/pmap7.c
index d4eb442a7dc..c4af1c8f72d 100644
--- a/sys/arch/arm/arm/pmap7.c
+++ b/sys/arch/arm/arm/pmap7.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap7.c,v 1.64 2022/09/10 20:35:28 miod Exp $	*/
+/*	$OpenBSD: pmap7.c,v 1.65 2022/09/12 19:28:19 miod Exp $	*/
 /*	$NetBSD: pmap.c,v 1.147 2004/01/18 13:03:50 scw Exp $	*/
 
 /*
@@ -951,13 +951,6 @@ pmap_clean_page(struct vm_page *pg)
 		if (pv->pv_pmap != pmap_kernel() && pv->pv_pmap != pm)
 			continue;
 
-		/*
-		 * The page is mapped non-cacheable in 
-		 * this map.  No need to flush the cache.
-		 */
-		if (pv->pv_flags & PVF_NC) /* XXX ought to be pg attr */
-			break;
-
 		if (PV_BEEN_EXECD(pv->pv_flags))
 			cpu_icache_sync_range(pv->pv_va, PAGE_SIZE);
 	}
diff --git a/sys/arch/arm/include/pmap.h b/sys/arch/arm/include/pmap.h
index f2a34d59fe9..213ff352f6f 100644
--- a/sys/arch/arm/include/pmap.h
+++ b/sys/arch/arm/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.50 2022/09/08 10:21:45 miod Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.51 2022/09/12 19:28:19 miod Exp $	*/
 /*	$NetBSD: pmap.h,v 1.76 2003/09/06 09:10:46 rearnsha Exp $	*/
 
 /*
@@ -212,21 +212,15 @@ typedef struct pv_addr {
  * Flags that indicate attributes of pages or mappings of pages.
  *
  * The PVF_MOD and PVF_REF flags are stored in the mdpage for each
- * page.  PVF_WIRED, PVF_WRITE, and PVF_NC are kept in individual
- * pv_entry's for each page.  They live in the same "namespace" so
- * that we can clear multiple attributes at a time.
- *
- * Note the "non-cacheable" flag generally means the page has
- * multiple mappings in a given address space.
+ * page.  PVF_WIRED and PVF_WRITE are kept in individual pv_entry's
+ * for each page.  They live in the same "namespace" so that we can
+ * clear multiple attributes at a time.
  */
 #define	PVF_MOD		0x01		/* page is modified */
 #define	PVF_REF		0x02		/* page is referenced */
 #define	PVF_WIRED	0x04		/* mapping is wired */
 #define	PVF_WRITE	0x08		/* mapping is writable */
 #define	PVF_EXEC	0x10		/* mapping is executable */
-#define	PVF_UNC		0x20		/* mapping is 'user' non-cacheable */
-#define	PVF_KNC		0x40		/* mapping is 'kernel' non-cacheable */
-#define	PVF_NC		(PVF_UNC|PVF_KNC)
 
 /*
  * Commonly referenced structures
-- 
2.20.1