Module Name: src
Committed By: andvar
Date: Fri Mar 15 07:09:37 UTC 2024
Modified Files:
src/sys/uvm: uvm_fault.c uvm_pager.c uvm_swap.h uvm_swapstub.c
Log Message:
Fix !VMSWAP build:
Added __unused for few local variables, which are used in VMSWAP block only.
Adjust !VMSWAP uvm_swap_stats() definition to make it build with compat code.
Copied "int (*uvm_swap_stats50)(...)" definition from uvm_swap to uvm_swapstub
to avoid missing uvm_swap_stats50 reference on linking.
Fixes INSTALL_CPMBR1400, INSTALL_ZYXELKX evbmips kernel configs as a result.
Reviewed by simon and phone in IRC (thanks).
To generate a diff of this commit:
cvs rdiff -u -r1.236 -r1.237 src/sys/uvm/uvm_fault.c
cvs rdiff -u -r1.130 -r1.131 src/sys/uvm/uvm_pager.c
cvs rdiff -u -r1.26 -r1.27 src/sys/uvm/uvm_swap.h
cvs rdiff -u -r1.8 -r1.9 src/sys/uvm/uvm_swapstub.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/uvm/uvm_fault.c
diff -u src/sys/uvm/uvm_fault.c:1.236 src/sys/uvm/uvm_fault.c:1.237
--- src/sys/uvm/uvm_fault.c:1.236 Tue Sep 19 22:14:25 2023
+++ src/sys/uvm/uvm_fault.c Fri Mar 15 07:09:37 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_fault.c,v 1.236 2023/09/19 22:14:25 ad Exp $ */
+/* $NetBSD: uvm_fault.c,v 1.237 2024/03/15 07:09:37 andvar Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.236 2023/09/19 22:14:25 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.237 2024/03/15 07:09:37 andvar Exp $");
#include "opt_uvmhist.h"
@@ -273,7 +273,7 @@ uvmfault_anonget(struct uvm_faultinfo *u
{
struct vm_page *pg;
krw_t lock_type;
- int error;
+ int error __unused; /* used for VMSWAP */
UVMHIST_FUNC(__func__); UVMHIST_CALLED(maphist);
KASSERT(rw_lock_held(anon->an_lock));
Index: src/sys/uvm/uvm_pager.c
diff -u src/sys/uvm/uvm_pager.c:1.130 src/sys/uvm/uvm_pager.c:1.131
--- src/sys/uvm/uvm_pager.c:1.130 Sun Oct 18 18:22:29 2020
+++ src/sys/uvm/uvm_pager.c Fri Mar 15 07:09:37 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pager.c,v 1.130 2020/10/18 18:22:29 chs Exp $ */
+/* $NetBSD: uvm_pager.c,v 1.131 2024/03/15 07:09:37 andvar Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pager.c,v 1.130 2020/10/18 18:22:29 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pager.c,v 1.131 2024/03/15 07:09:37 andvar Exp $");
#include "opt_uvmhist.h"
#include "opt_readahead.h"
@@ -330,7 +330,7 @@ uvm_aio_aiodone_pages(struct vm_page **p
struct vm_page *pg;
krwlock_t *slock;
int pageout_done; /* number of PG_PAGEOUT pages processed */
- int swslot;
+ int swslot __unused; /* used for VMSWAP */
int i;
bool swap;
UVMHIST_FUNC(__func__); UVMHIST_CALLED(ubchist);
@@ -405,7 +405,7 @@ uvm_aio_aiodone_pages(struct vm_page **p
*/
if (error) {
- int slot;
+ int slot __unused; /* used for VMSWAP */
if (!write) {
pg->flags |= PG_RELEASED;
continue;
Index: src/sys/uvm/uvm_swap.h
diff -u src/sys/uvm/uvm_swap.h:1.26 src/sys/uvm/uvm_swap.h:1.27
--- src/sys/uvm/uvm_swap.h:1.26 Sat Sep 5 16:30:13 2020
+++ src/sys/uvm/uvm_swap.h Fri Mar 15 07:09:37 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_swap.h,v 1.26 2020/09/05 16:30:13 riastradh Exp $ */
+/* $NetBSD: uvm_swap.h,v 1.27 2024/03/15 07:09:37 andvar Exp $ */
/*
* Copyright (c) 1997 Matthew R. Green
@@ -58,7 +58,7 @@ int uvm_swap_stats(char *, int,
#else /* defined(VMSWAP) */
#define uvm_swapisfull() true
-#define uvm_swap_stats(c, l, f, count, retval) (__used f, *retval = 0, ENOSYS)
+#define uvm_swap_stats(c, l, f, count, retval) (void)(f), (*retval = 0, ENOSYS)
#endif /* defined(VMSWAP) */
void uvm_swap_shutdown(struct lwp *);
Index: src/sys/uvm/uvm_swapstub.c
diff -u src/sys/uvm/uvm_swapstub.c:1.8 src/sys/uvm/uvm_swapstub.c:1.9
--- src/sys/uvm/uvm_swapstub.c:1.8 Tue Feb 18 06:18:13 2014
+++ src/sys/uvm/uvm_swapstub.c Fri Mar 15 07:09:37 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_swapstub.c,v 1.8 2014/02/18 06:18:13 pooka Exp $ */
+/* $NetBSD: uvm_swapstub.c,v 1.9 2024/03/15 07:09:37 andvar Exp $ */
/*-
* Copyright (c)2005 YAMAMOTO Takashi,
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_swapstub.c,v 1.8 2014/02/18 06:18:13 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_swapstub.c,v 1.9 2024/03/15 07:09:37 andvar Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,6 +40,9 @@ __KERNEL_RCSID(0, "$NetBSD: uvm_swapstub
#include <uvm/uvm.h>
+int (*uvm_swap_stats50)(const struct sys_swapctl_args *, register_t *) =
+ (void *)enosys;
+
void
uvm_swap_init(void)
{
