Page MenuHomeFreeBSD

D44623.id136499.diff
No OneTemporary

D44623.id136499.diff

diff --git a/sys/vm/vm.h b/sys/vm/vm.h
--- a/sys/vm/vm.h
+++ b/sys/vm/vm.h
@@ -154,6 +154,12 @@
#define SWAP_RESERVE_RLIMIT_ON (1 << 1)
#define SWAP_RESERVE_ALLOW_NONWIRED (1 << 2)
+#ifdef NUMA
+#define __numa_used
+#else
+#define __numa_used __unused
+#endif
+
#ifdef _KERNEL
struct ucred;
diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h
--- a/sys/vm/vm_page.h
+++ b/sys/vm/vm_page.h
@@ -1005,7 +1005,7 @@
}
static inline int
-vm_page_domain(vm_page_t m)
+vm_page_domain(vm_page_t m __numa_used)
{
#ifdef NUMA
int domn, segind;
diff --git a/sys/vm/vm_phys.h b/sys/vm/vm_phys.h
--- a/sys/vm/vm_phys.h
+++ b/sys/vm/vm_phys.h
@@ -89,7 +89,7 @@
bool vm_phys_is_dumpable(vm_paddr_t pa);
static inline int
-vm_phys_domain(vm_paddr_t pa)
+vm_phys_domain(vm_paddr_t pa __numa_used)
{
#ifdef NUMA
int i;
diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c
--- a/sys/vm/vm_phys.c
+++ b/sys/vm/vm_phys.c
@@ -226,7 +226,8 @@
}
int
-vm_phys_domain_match(int prefer, vm_paddr_t low, vm_paddr_t high)
+vm_phys_domain_match(int prefer __numa_used, vm_paddr_t low __numa_used,
+ vm_paddr_t high __numa_used)
{
#ifdef NUMA
domainset_t mask;
@@ -330,7 +331,7 @@
* Return affinity, or -1 if there's no affinity information.
*/
int
-vm_phys_mem_affinity(int f, int t)
+vm_phys_mem_affinity(int f __numa_used, int t __numa_used)
{
#ifdef NUMA
@@ -629,8 +630,8 @@
* Invoked by platform-dependent code prior to vm_phys_init().
*/
void
-vm_phys_register_domains(int ndomains, struct mem_affinity *affinity,
- int *locality)
+vm_phys_register_domains(int ndomains __numa_used,
+ struct mem_affinity *affinity __numa_used, int *locality __numa_used)
{
#ifdef NUMA
int i;
@@ -651,10 +652,6 @@
for (i = 0; i < vm_ndomains; i++)
DOMAINSET_SET(i, &all_domains);
-#else
- (void)ndomains;
- (void)affinity;
- (void)locality;
#endif
}

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 28, 8:41 AM (6 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32262579
Default Alt Text
D44623.id136499.diff (1 KB)

Event Timeline