Module Name: src
Committed By: riastradh
Date: Sat Aug 20 23:49:48 UTC 2022
Modified Files:
src/sys/arch/amd64/include: pmap_private.h
src/sys/arch/i386/include: pmap_private.h
Log Message:
{amd64,i386}/pmap_private.h: Fix minor whitespace issues.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amd64/include/pmap_private.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/i386/include/pmap_private.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/amd64/include/pmap_private.h
diff -u src/sys/arch/amd64/include/pmap_private.h:1.2 src/sys/arch/amd64/include/pmap_private.h:1.3
--- src/sys/arch/amd64/include/pmap_private.h:1.2 Sat Aug 20 23:49:31 2022
+++ src/sys/arch/amd64/include/pmap_private.h Sat Aug 20 23:49:48 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_private.h,v 1.2 2022/08/20 23:49:31 riastradh Exp $ */
+/* $NetBSD: pmap_private.h,v 1.3 2022/08/20 23:49:48 riastradh Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -202,6 +202,7 @@ extern bool svs_pcid;
#undef _MACHINE_PMAP_PRIVATE_H_X86
#ifndef XENPV
+
#define pmap_pa2pte(a) (a)
#define pmap_pte2pa(a) ((a) & PTE_FRAME)
#define pmap_pte_set(p, n) do { *(p) = (n); } while (0)
@@ -213,7 +214,9 @@ extern bool svs_pcid;
#define pmap_pte_clearbits(p, b) \
atomic_and_ulong((volatile unsigned long *)p, ~(b))
#define pmap_pte_flush() /* nothing */
+
#else
+
extern kmutex_t pte_lock;
static __inline pt_entry_t
@@ -247,7 +250,6 @@ pmap_pte_cas(volatile pt_entry_t *ptep,
xpq_queue_pte_update(xpmap_ptetomach(__UNVOLATILE(ptep)), n);
xpq_flush_queue();
}
-
mutex_exit(&pte_lock);
return opte;
}
@@ -291,6 +293,7 @@ pmap_pte_flush(void)
xpq_flush_queue();
splx(s);
}
+
#endif
#ifdef __HAVE_DIRECT_MAP
Index: src/sys/arch/i386/include/pmap_private.h
diff -u src/sys/arch/i386/include/pmap_private.h:1.2 src/sys/arch/i386/include/pmap_private.h:1.3
--- src/sys/arch/i386/include/pmap_private.h:1.2 Sat Aug 20 23:49:31 2022
+++ src/sys/arch/i386/include/pmap_private.h Sat Aug 20 23:49:48 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_private.h,v 1.2 2022/08/20 23:49:31 riastradh Exp $ */
+/* $NetBSD: pmap_private.h,v 1.3 2022/08/20 23:49:48 riastradh Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -260,6 +260,7 @@
#undef _MACHINE_PMAP_PRIVATE_H_X86
#ifndef XENPV
+
#define pmap_pa2pte(a) (a)
#define pmap_pte2pa(a) ((a) & PTE_FRAME)
#define pmap_pte_set(p, n) do { *(p) = (n); } while (0)
@@ -284,6 +285,7 @@
#endif /* PAE */
#else /* XENPV */
+
extern kmutex_t pte_lock;
static __inline pt_entry_t
@@ -297,6 +299,7 @@ pmap_pte2pa(pt_entry_t pte)
{
return xpmap_mtop_masked(pte & PTE_FRAME);
}
+
static __inline void
pmap_pte_set(pt_entry_t *pte, pt_entry_t npte)
{
@@ -327,8 +330,7 @@ pmap_pte_testset(volatile pt_entry_t *pt
mutex_enter(&pte_lock);
opte = *pte;
- xpq_queue_pte_update(xpmap_ptetomach(__UNVOLATILE(pte)),
- npte);
+ xpq_queue_pte_update(xpmap_ptetomach(__UNVOLATILE(pte)), npte);
xpq_flush_queue();
mutex_exit(&pte_lock);
return opte;
@@ -345,7 +347,7 @@ pmap_pte_setbits(volatile pt_entry_t *pt
static __inline void
pmap_pte_clearbits(volatile pt_entry_t *pte, pt_entry_t bits)
-{
+{
mutex_enter(&pte_lock);
xpq_queue_pte_update(xpmap_ptetomach(__UNVOLATILE(pte)),
(*pte) & ~bits);
