Module Name:    src
Committed By:   skrll
Date:           Wed Aug  2 15:57:21 UTC 2023

Modified Files:
        src/sys/arch/aarch64/include: pmap.h
        src/sys/arch/arm/include/arm32: pmap.h

Log Message:
No need to define cpu_{,set}_tlb_info here - just use the
sys/uvm/pmap/pmap_tlb.h versions.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/aarch64/include/pmap.h
cvs rdiff -u -r1.175 -r1.176 src/sys/arch/arm/include/arm32/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/aarch64/include/pmap.h
diff -u src/sys/arch/aarch64/include/pmap.h:1.58 src/sys/arch/aarch64/include/pmap.h:1.59
--- src/sys/arch/aarch64/include/pmap.h:1.58	Thu Apr 20 08:28:03 2023
+++ src/sys/arch/aarch64/include/pmap.h	Wed Aug  2 15:57:21 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.58 2023/04/20 08:28:03 skrll Exp $ */
+/* $NetBSD: pmap.h,v 1.59 2023/08/02 15:57:21 skrll Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -59,12 +59,6 @@
 /* Maximum number of ASIDs. Some CPUs have less.*/
 #define	PMAP_TLB_NUM_PIDS		65536
 #define	PMAP_TLB_BITMAP_LENGTH		PMAP_TLB_NUM_PIDS
-#define	cpu_set_tlb_info(ci, ti)        ((void)((ci)->ci_tlb_info = (ti)))
-#if PMAP_TLB_MAX > 1
-#define	cpu_tlb_info(ci)		((ci)->ci_tlb_info)
-#else
-#define	cpu_tlb_info(ci)		(&pmap_tlb0_info)
-#endif
 
 static inline tlb_asid_t
 pmap_md_tlb_asid_max(void)

Index: src/sys/arch/arm/include/arm32/pmap.h
diff -u src/sys/arch/arm/include/arm32/pmap.h:1.175 src/sys/arch/arm/include/arm32/pmap.h:1.176
--- src/sys/arch/arm/include/arm32/pmap.h:1.175	Mon Apr 24 16:32:54 2023
+++ src/sys/arch/arm/include/arm32/pmap.h	Wed Aug  2 15:57:21 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.175 2023/04/24 16:32:54 martin Exp $	*/
+/*	$NetBSD: pmap.h,v 1.176 2023/08/02 15:57:21 skrll Exp $	*/
 
 /*
  * Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -94,12 +94,7 @@
 #endif
 #define	PMAP_TLB_FLUSH_ASID_ON_RESET	arm_has_tlbiasid_p
 #define	PMAP_TLB_NUM_PIDS		256
-#define	cpu_set_tlb_info(ci, ti)        ((void)((ci)->ci_tlb_info = (ti)))
-#if PMAP_TLB_MAX > 1
-#define	cpu_tlb_info(ci)		((ci)->ci_tlb_info)
-#else
-#define	cpu_tlb_info(ci)		(&pmap_tlb0_info)
-#endif
+
 #define	pmap_md_tlb_asid_max()		(PMAP_TLB_NUM_PIDS - 1)
 #include <uvm/pmap/tlb.h>
 #include <uvm/pmap/pmap_tlb.h>

Reply via email to