Date: Sat, 19 Apr 2025 03:25:35 +0100 From: Nuno Teixeira <eduardo@freebsd.org> To: Doug Moore <dougm@freebsd.org> Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: a3a88ed22cb1 - main - vm_page: drop prev and next Message-ID: <CAFDf7UJTBaGZXaTV4N9rV9Zi25PB8_D0Gsy0VZXkqaArX74N5Q@mail.gmail.com> In-Reply-To: <202504181927.53IJRsoQ035803@gitrepo.freebsd.org> References: <202504181927.53IJRsoQ035803@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--0000000000005037080633185a8e
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Hello,
graphics/drm-61-kmod is failing to build and maybe related to some of this
commits.
Could you take a look and check if it related?
Thanks
```
cc -O2 -pipe -fno-strict-aliasing -DLINUXKPI_VERSION=3D60100
'-DKBUILD_MODNAME=3D"i915kms"' '-DLINUXKPI_PARAM_PREFIX=3Di915_'
-DDRM_SYSCTL_PARAM_PREFIX=3D_i915kms -DCONFIG_DRM_AMDGPU_CIK
-DCONFIG_DRM_AMDGPU_SI -DCONFIG_DRM_AMD_DC -DCONFIG_DRM_AMD_DC_SI
-DCONFIG_AMD_PMC -DCONFIG_DRM_I915_FORCE_PROBE=3D'"*"'
-DCONFIG_DRM_I915_REQUEST_TIMEOUT=3D20000 -DCONFIG_DRM_I915_CAPTURE_ERROR
-DCONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=3D250
-DCONFIG_DRM_I915_STOP_TIMEOUT=3D100 -DCONFIG_DRM_I915_PREEMPT_TIMEOUT=3D64=
0
-DCONFIG_DRM_I915_HEARTBEAT_INTERVAL=3D2500
-DCONFIG_DRM_I915_TIMESLICE_DURATION=3D1
-DCONFIG_DRM_I915_MAX_REQUEST_BUSYWAIT=3D8000
-DCONFIG_DRM_I915_FENCE_TIMEOUT=3D10000 -DCONFIG_DRM_MIPI_DSI
-DCONFIG_DRM_PANEL_ORIENTATION_QUIRKS -DCONFIG_APERTURE_HELPERS
-DCONFIG_DRM_FBDEV_EMULATION -DCONFIG_DRM_FBDEV_OVERALLOC=3D100
-DCONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG -DCONFIG_BACKLIGHT_CLASS_DEVICE
-DCONFIG_DEBUG_FS -DCONFIG_DMI -DCONFIG_FB -DCONFIG_MTRR -DCONFIG_PCI
-DCONFIG_PM -DCONFIG_PM_SLEEP -DCONFIG_SMP -DCONFIG_SUSPEND -DCONFIG_ACPI
-DCONFIG_ACPI_SLEEP -DCONFIG_X86 -DCONFIG_X86_PAT -DCONFIG_64BIT
-DCONFIG_AS_MOVNTDQA -DCONFIG_COMPAT -DCONFIG_X86_64
-DCONFIG_DRM_AMD_DC_DCN -DCONFIG_DRM_AMD_DC_DCN3_0
-DCONFIG_DRM_AMD_DC_DCN3_01 -DCONFIG_DRM_AMD_DC_DCN3_02
-DCONFIG_DRM_AMD_DC_DCN3_1 -Werror
-D_KERNEL -DKLD_MODULE -nostdinc
-I/wrkdirs/usr/ports/graphics/drm-61-kmod/work/drm-kmod-drm_v6.1.128_1/lin=
uxkpi/gplv2/include
-I/wrkdirs/usr/ports/graphics/drm-61-kmod/work/drm-kmod-drm_v6.1.128_1/linu=
xkpi/bsd/include
-I/usr/src/sys/compat/linuxkpi/common/include
-I/usr/src/sys/compat/linuxkpi/dummy/include
-I/wrkdirs/usr/ports/graphics/drm-61-kmod/work/drm-kmod-drm_v6.1.128_1/incl=
ude
-I/wrkdirs/usr/ports/graphics/drm-61-kmod/work/drm-kmod-drm_v6.1.128_1/incl=
ude/drm
-I/wrkdirs/usr/ports/graphics/drm-61-kmod/work/drm-kmod-drm_v6.1.128_1/incl=
ude/uapi
-I/wrkdirs/usr/ports/graphics/drm-61-kmod/work/drm-kmod-drm_v6.1.128_1/driv=
ers/gpu
-I/wrkdirs/usr/ports/graphics/drm-61-kmod/work/drm-kmod-drm_v6.1.128_1/driv=
ers/gpu/drm/i915
-I/wrkdirs/usr/ports/graphics/drm-61-kmod/work/drm-kmod-drm_v6.1.128_1/driv=
ers/gpu/drm/i915/display
-include
/wrkdirs/usr/ports/graphics/drm-61-kmod/work/drm-kmod-drm_v6.1.128_1/obj/wr=
kdirs/usr/ports/graphics/drm-61-kmod/work/drm-kmod-drm_v6.1.128_1/i915/opt_=
global.h
-I. -I/usr/src/sys -I/usr/src/sys/contrib/ck/include -fno-common
-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
-fdebug-prefix-map=3D./machine=3D/usr/src/sys/amd64/include
-fdebug-prefix-map=3D./x86=3D/usr/src/sys/x86/include
-fdebug-prefix-map=3D./i386=3D/usr/src/sys/i386/include -MD
-MF.depend.i915_gem_stolen.o -MTi915_gem_stolen.o -mcmodel=3Dkernel
-mno-red-zone -mno-mmx -mno-sse -msoft-float
-fno-asynchronous-unwind-tables -ffreestanding -fwrapv -fstack-protector
-Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wcast-qual
-Wundef -Wno-pointer-sign -D__printf__=3D__freebsd_kprintf__
-Wmissing-include-dirs -fdiagnostics-show-option -Wno-unknown-pragmas
-Wswitch -Wno-error=3Dtautological-compare -Wno-error=3Dempty-body
-Wno-error=3Dparentheses-equality -Wno-error=3Dunused-function
-Wno-error=3Dpointer-sign -Wno-error=3Dshift-negative-value
-Wno-address-of-packed-member -Wno-format-zero-length -Wno-pointer-arith
-Wno-format -Wno-cast-qual -mno-aes -mno-avx -std=3Dgnu17 -c
/wrkdirs/usr/ports/graphics/drm-61-kmod/work/drm-kmod-drm_v6.1.128_1/driver=
s/gpu/drm/i915/gem/i915_gem_stolen.c
-o i915_gem_stolen.o
--- i915_gem_mman.o ---
/wrkdirs/usr/ports/graphics/drm-61-kmod/work/drm-kmod-drm_v6.1.128_1/driver=
s/gpu/drm/i915/gem/i915_gem_mman.c:171:77:
error: call to undeclared function 'vm_page_next'; ISO C99 and later do not
support implicit function declarations
[-Werror,-Wimplicit-function-declaration]
171 | for (vm_page_t page =3D
vm_page_find_least(vmobj, 0); page !=3D NULL; page =3D vm_page_next(page)) =
{
|
^
/wrkdirs/usr/ports/graphics/drm-61-kmod/work/drm-kmod-drm_v6.1.128_1/driver=
s/gpu/drm/i915/gem/i915_gem_mman.c:171:75:
error: incompatible integer to pointer conversion assigning to 'vm_page_t'
(aka 'struct vm_page *') from 'int' [-Wint-conversion]
171 | for (vm_page_t page =3D
vm_page_find_least(vmobj, 0); page !=3D NULL; page =3D vm_page_next(page)) =
{
|
^ ~~~~~~~~~~~~~~~~~~
2 errors generated.
*** [i915_gem_mman.o] Error code 1
make[1]: stopped making "all" in
/wrkdirs/usr/ports/graphics/drm-61-kmod/work/drm-kmod-drm_v6.1.128_1/i915
make[1]: 1 error
```
Doug Moore <dougm@freebsd.org> escreveu (sexta, 18/04/2025 =C3=A0(s) 20:28)=
:
> The branch main has been updated by dougm:
>
> URL:
> https://cgit.FreeBSD.org/src/commit/?id=3Da3a88ed22cb111da3336f64ec3ba581=
5a8278f88
>
> commit a3a88ed22cb111da3336f64ec3ba5815a8278f88
> Author: Doug Moore <dougm@FreeBSD.org>
> AuthorDate: 2025-04-18 19:26:56 +0000
> Commit: Doug Moore <dougm@FreeBSD.org>
> CommitDate: 2025-04-18 19:26:56 +0000
>
> vm_page: drop prev and next
>
> Functions vm_page_prev() and vm_page_next() are no longer
> invoked. Remove them.
>
> Reviewed by: kib
> Differential Revision: https://reviews.freebsd.org/D49892
> ---
> sys/vm/vm_page.c | 40 ----------------------------------------
> sys/vm/vm_page.h | 2 --
> 2 files changed, 42 deletions(-)
>
> diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
> index 65d278caf3fd..db91b7bab2ab 100644
> --- a/sys/vm/vm_page.c
> +++ b/sys/vm/vm_page.c
> @@ -1894,46 +1894,6 @@ vm_page_find_least(vm_object_t object, vm_pindex_t
> pindex)
> return (m);
> }
>
> -/*
> - * Returns the given page's successor (by pindex) within the object if i=
t
> is
> - * resident; if none is found, NULL is returned.
> - *
> - * The object must be locked.
> - */
> -vm_page_t
> -vm_page_next(vm_page_t m)
> -{
> - vm_page_t next;
> -
> - VM_OBJECT_ASSERT_LOCKED(m->object);
> - if ((next =3D TAILQ_NEXT(m, listq)) !=3D NULL) {
> - MPASS(next->object =3D=3D m->object);
> - if (next->pindex !=3D m->pindex + 1)
> - next =3D NULL;
> - }
> - return (next);
> -}
> -
> -/*
> - * Returns the given page's predecessor (by pindex) within the object if
> it is
> - * resident; if none is found, NULL is returned.
> - *
> - * The object must be locked.
> - */
> -vm_page_t
> -vm_page_prev(vm_page_t m)
> -{
> - vm_page_t prev;
> -
> - VM_OBJECT_ASSERT_LOCKED(m->object);
> - if ((prev =3D TAILQ_PREV(m, pglist, listq)) !=3D NULL) {
> - MPASS(prev->object =3D=3D m->object);
> - if (prev->pindex !=3D m->pindex - 1)
> - prev =3D NULL;
> - }
> - return (prev);
> -}
> -
> /*
> * Uses the page mnew as a replacement for an existing page at index
> * pindex which must be already present in the object.
> diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h
> index 0a40b42ffb62..bf2e850612d7 100644
> --- a/sys/vm/vm_page.h
> +++ b/sys/vm/vm_page.h
> @@ -664,12 +664,10 @@ bool vm_page_iter_rename(struct pctrie_iter
> *old_pages, vm_page_t m,
> void vm_page_launder(vm_page_t m);
> vm_page_t vm_page_lookup(vm_object_t, vm_pindex_t);
> vm_page_t vm_page_lookup_unlocked(vm_object_t, vm_pindex_t);
> -vm_page_t vm_page_next(vm_page_t m);
> void vm_page_pqbatch_drain(void);
> void vm_page_pqbatch_submit(vm_page_t m, uint8_t queue);
> bool vm_page_pqstate_commit(vm_page_t m, vm_page_astate_t *old,
> vm_page_astate_t new);
> -vm_page_t vm_page_prev(vm_page_t m);
> bool vm_page_ps_test(vm_page_t m, int psind, int flags, vm_page_t skip_m=
);
> void vm_page_putfake(vm_page_t m);
> void vm_page_readahead_finish(vm_page_t m);
>
>
--=20
Nuno Teixeira
FreeBSD UNIX: <eduardo@FreeBSD.org> Web: https://FreeBSD.org
--0000000000005037080633185a8e
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
<div dir=3D"ltr"><div>Hello,</div><div><br></div><div>graphics/drm-61-kmod =
is failing to build and maybe related to some of this commits.<br></div><di=
v>Could you take a look and check if it related?<br><br></div><div>Thanks<b=
r><br>```</div><div>cc =C2=A0-O2 -pipe -fno-strict-aliasing -DLINUXKPI_VERS=
ION=3D60100 '-DKBUILD_MODNAME=3D"i915kms"' '-DLINUXKP=
I_PARAM_PREFIX=3Di915_' -DDRM_SYSCTL_PARAM_PREFIX=3D_i915kms -DCONFIG_D=
RM_AMDGPU_CIK -DCONFIG_DRM_AMDGPU_SI -DCONFIG_DRM_AMD_DC -DCONFIG_DRM_AMD_D=
C_SI -DCONFIG_AMD_PMC -DCONFIG_DRM_I915_FORCE_PROBE=3D'"*"=
9; -DCONFIG_DRM_I915_REQUEST_TIMEOUT=3D20000 -DCONFIG_DRM_I915_CAPTURE_ERRO=
R -DCONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=3D250 -DCONFIG_DRM_I915_STOP_TIME=
OUT=3D100 -DCONFIG_DRM_I915_PREEMPT_TIMEOUT=3D640 -DCONFIG_DRM_I915_HEARTBE=
AT_INTERVAL=3D2500 -DCONFIG_DRM_I915_TIMESLICE_DURATION=3D1 -DCONFIG_DRM_I9=
15_MAX_REQUEST_BUSYWAIT=3D8000 -DCONFIG_DRM_I915_FENCE_TIMEOUT=3D10000 -DCO=
NFIG_DRM_MIPI_DSI -DCONFIG_DRM_PANEL_ORIENTATION_QUIRKS -DCONFIG_APERTURE_H=
ELPERS -DCONFIG_DRM_FBDEV_EMULATION -DCONFIG_DRM_FBDEV_OVERALLOC=3D100 -DCO=
NFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG -DCONFIG_BACKLIGHT_CLASS_DEVICE -DCONFIG_DE=
BUG_FS -DCONFIG_DMI -DCONFIG_FB -DCONFIG_MTRR -DCONFIG_PCI -DCONFIG_PM -DCO=
NFIG_PM_SLEEP -DCONFIG_SMP -DCONFIG_SUSPEND -DCONFIG_ACPI -DCONFIG_ACPI_SLE=
EP -DCONFIG_X86 -DCONFIG_X86_PAT -DCONFIG_64BIT -DCONFIG_AS_MOVNTDQA -DCONF=
IG_COMPAT -DCONFIG_X86_64 -DCONFIG_DRM_AMD_DC_DCN -DCONFIG_DRM_AMD_DC_DCN3_=
0 -DCONFIG_DRM_AMD_DC_DCN3_01 -DCONFIG_DRM_AMD_DC_DCN3_02 -DCONFIG_DRM_AMD_=
DC_DCN3_1 =C2=A0-Werror<br>-D_KERNEL -DKLD_MODULE -nostdinc =C2=A0-I/wrkdir=
s/usr/ports/graphics/drm-61-kmod/work/drm-kmod-drm_v6.1.128_1/linuxkpi/gplv=
2/include -I/wrkdirs/usr/ports/graphics/drm-61-kmod/work/drm-kmod-drm_v6.1.=
128_1/linuxkpi/bsd/include -I/usr/src/sys/compat/linuxkpi/common/include -I=
/usr/src/sys/compat/linuxkpi/dummy/include -I/wrkdirs/usr/ports/graphics/dr=
m-61-kmod/work/drm-kmod-drm_v6.1.128_1/include -I/wrkdirs/usr/ports/graphic=
s/drm-61-kmod/work/drm-kmod-drm_v6.1.128_1/include/drm -I/wrkdirs/usr/ports=
/graphics/drm-61-kmod/work/drm-kmod-drm_v6.1.128_1/include/uapi -I/wrkdirs/=
usr/ports/graphics/drm-61-kmod/work/drm-kmod-drm_v6.1.128_1/drivers/gpu -I/=
wrkdirs/usr/ports/graphics/drm-61-kmod/work/drm-kmod-drm_v6.1.128_1/drivers=
/gpu/drm/i915 -I/wrkdirs/usr/ports/graphics/drm-61-kmod/work/drm-kmod-drm_v=
6.1.128_1/drivers/gpu/drm/i915/display -include /wrkdirs/usr/ports/graphics=
/drm-61-kmod/work/drm-kmod-drm_v6.1.128_1/obj/wrkdirs/usr/ports/graphics/dr=
m-61-kmod/work/drm-kmod-drm_v6.1.128_1/i915/opt_global.h -I. -I/usr/src/sys=
-I/usr/src/sys/contrib/ck/include -fno-common =C2=A0-fno-omit-frame-pointe=
r -mno-omit-leaf-frame-pointer -fdebug-prefix-map=3D./machine=3D/usr/src/sy=
s/amd64/include -fdebug-prefix-map=3D./x86=3D/usr/src/sys/x86/include -fdeb=
ug-prefix-map=3D./i386=3D/usr/src/sys/i386/include =C2=A0 =C2=A0-MD =C2=A0-=
MF.depend.i915_gem_stolen.o -MTi915_gem_stolen.o -mcmodel=3Dkernel -mno-red=
-zone -mno-mmx -mno-sse -msoft-float =C2=A0-fno-asynchronous-unwind-tables =
-ffreestanding -fwrapv -fstack-protector =C2=A0-Wall -Wstrict-prototypes -W=
missing-prototypes -Wpointer-arith -Wcast-qual -Wundef -Wno-pointer-sign -D=
__printf__=3D__freebsd_kprintf__ -Wmissing-include-dirs -fdiagnostics-show-=
option -Wno-unknown-pragmas -Wswitch -Wno-error=3Dtautological-compare -Wno=
-error=3Dempty-body -Wno-error=3Dparentheses-equality -Wno-error=3Dunused-f=
unction -Wno-error=3Dpointer-sign -Wno-error=3Dshift-negative-value -Wno-ad=
dress-of-packed-member -Wno-format-zero-length -Wno-pointer-arith -Wno-form=
at -Wno-cast-qual =C2=A0 -mno-aes -mno-avx =C2=A0-std=3Dgnu17 -c /wrkdirs/u=
sr/ports/graphics/drm-61-kmod/work/drm-kmod-drm_v6.1.128_1/drivers/gpu/drm/=
i915/gem/i915_gem_stolen.c -o i915_gem_stolen.o<br>--- i915_gem_mman.o ---<=
br>/wrkdirs/usr/ports/graphics/drm-61-kmod/work/drm-kmod-drm_v6.1.128_1/dri=
vers/gpu/drm/i915/gem/i915_gem_mman.c:171:77: error: call to undeclared fun=
ction 'vm_page_next'; ISO C99 and later do not support implicit fun=
ction declarations [-Werror,-Wimplicit-function-declaration]<br>=C2=A0 171 =
| =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 for (vm_page_t page =3D vm_page_find_least(vmobj, 0); page !=3D =
NULL; page =3D vm_page_next(page)) {<br>=C2=A0 =C2=A0 =C2=A0 | =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0^<br>/wrkdirs/usr/ports/graphics/drm-=
61-kmod/work/drm-kmod-drm_v6.1.128_1/drivers/gpu/drm/i915/gem/i915_gem_mman=
.c:171:75: error: incompatible integer to pointer conversion assigning to &=
#39;vm_page_t' (aka 'struct vm_page *') from 'int' [-Wi=
nt-conversion]<br>=C2=A0 171 | =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 for (vm_page_t page =3D vm_page_f=
ind_least(vmobj, 0); page !=3D NULL; page =3D vm_page_next(page)) {<br>=C2=
=A0 =C2=A0 =C2=A0 | =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0^ ~~~~~~~~~~~~~~=
~~~~<br>2 errors generated.<br>*** [i915_gem_mman.o] Error code 1<br><br>ma=
ke[1]: stopped making "all" in /wrkdirs/usr/ports/graphics/drm-61=
-kmod/work/drm-kmod-drm_v6.1.128_1/i915<br>make[1]: 1 error</div><div>```</=
div></div><br><div class=3D"gmail_quote gmail_quote_container"><div dir=3D"=
ltr" class=3D"gmail_attr">Doug Moore <<a href=3D"mailto:dougm@freebsd.or=
g">dougm@freebsd.org</a>> escreveu (sexta, 18/04/2025 =C3=A0(s) 20:28):<=
br></div><blockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8e=
x;border-left:1px solid rgb(204,204,204);padding-left:1ex">The branch main =
has been updated by dougm:<br>
<br>
URL: <a href=3D"https://cgit.FreeBSD.org/src/commit/?id=3Da3a88ed22cb111da3=
336f64ec3ba5815a8278f88" rel=3D"noreferrer" target=3D"_blank">https://cgit.=
FreeBSD.org/src/commit/?id=3Da3a88ed22cb111da3336f64ec3ba5815a8278f88</a><b=
r>
<br>
commit a3a88ed22cb111da3336f64ec3ba5815a8278f88<br>
Author:=C2=A0 =C2=A0 =C2=A0Doug Moore <dougm@FreeBSD.org><br>
AuthorDate: 2025-04-18 19:26:56 +0000<br>
Commit:=C2=A0 =C2=A0 =C2=A0Doug Moore <dougm@FreeBSD.org><br>
CommitDate: 2025-04-18 19:26:56 +0000<br>
<br>
=C2=A0 =C2=A0 vm_page: drop prev and next<br>
<br>
=C2=A0 =C2=A0 Functions vm_page_prev() and vm_page_next() are no longer<br>
=C2=A0 =C2=A0 invoked. Remove them.<br>
<br>
=C2=A0 =C2=A0 Reviewed by:=C2=A0 =C2=A0 kib<br>
=C2=A0 =C2=A0 Differential Revision:=C2=A0 <a href=3D"https://reviews.freeb=
sd.org/D49892" rel=3D"noreferrer" target=3D"_blank">https://reviews.freebsd=
.org/D49892</a><br>
---<br>
=C2=A0sys/vm/vm_page.c | 40 ----------------------------------------<br>
=C2=A0sys/vm/vm_page.h |=C2=A0 2 --<br>
=C2=A02 files changed, 42 deletions(-)<br>
<br>
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c<br>
index 65d278caf3fd..db91b7bab2ab 100644<br>
--- a/sys/vm/vm_page.c<br>
+++ b/sys/vm/vm_page.c<br>
@@ -1894,46 +1894,6 @@ vm_page_find_least(vm_object_t object, vm_pindex_t p=
index)<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 return (m);<br>
=C2=A0}<br>
<br>
-/*<br>
- * Returns the given page's successor (by pindex) within the object if=
it is<br>
- * resident; if none is found, NULL is returned.<br>
- *<br>
- * The object must be locked.<br>
- */<br>
-vm_page_t<br>
-vm_page_next(vm_page_t m)<br>
-{<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0vm_page_t next;<br>
-<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0VM_OBJECT_ASSERT_LOCKED(m->object);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0if ((next =3D TAILQ_NEXT(m, listq)) !=3D NULL) =
{<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0MPASS(next->obje=
ct =3D=3D m->object);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (next->pindex=
!=3D m->pindex + 1)<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0next =3D NULL;<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0}<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0return (next);<br>
-}<br>
-<br>
-/*<br>
- * Returns the given page's predecessor (by pindex) within the object =
if it is<br>
- * resident; if none is found, NULL is returned.<br>
- *<br>
- * The object must be locked.<br>
- */<br>
-vm_page_t<br>
-vm_page_prev(vm_page_t m)<br>
-{<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0vm_page_t prev;<br>
-<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0VM_OBJECT_ASSERT_LOCKED(m->object);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0if ((prev =3D TAILQ_PREV(m, pglist, listq)) !=
=3D NULL) {<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0MPASS(prev->obje=
ct =3D=3D m->object);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (prev->pindex=
!=3D m->pindex - 1)<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0prev =3D NULL;<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0}<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0return (prev);<br>
-}<br>
-<br>
=C2=A0/*<br>
=C2=A0 * Uses the page mnew as a replacement for an existing page at index<=
br>
=C2=A0 * pindex which must be already present in the object.<br>
diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h<br>
index 0a40b42ffb62..bf2e850612d7 100644<br>
--- a/sys/vm/vm_page.h<br>
+++ b/sys/vm/vm_page.h<br>
@@ -664,12 +664,10 @@ bool vm_page_iter_rename(struct pctrie_iter *old_page=
s, vm_page_t m,<br>
=C2=A0void vm_page_launder(vm_page_t m);<br>
=C2=A0vm_page_t vm_page_lookup(vm_object_t, vm_pindex_t);<br>
=C2=A0vm_page_t vm_page_lookup_unlocked(vm_object_t, vm_pindex_t);<br>
-vm_page_t vm_page_next(vm_page_t m);<br>
=C2=A0void vm_page_pqbatch_drain(void);<br>
=C2=A0void vm_page_pqbatch_submit(vm_page_t m, uint8_t queue);<br>
=C2=A0bool vm_page_pqstate_commit(vm_page_t m, vm_page_astate_t *old,<br>
=C2=A0 =C2=A0 =C2=A0vm_page_astate_t new);<br>
-vm_page_t vm_page_prev(vm_page_t m);<br>
=C2=A0bool vm_page_ps_test(vm_page_t m, int psind, int flags, vm_page_t ski=
p_m);<br>
=C2=A0void vm_page_putfake(vm_page_t m);<br>
=C2=A0void vm_page_readahead_finish(vm_page_t m);<br>
<br>
</blockquote></div><div><br clear=3D"all"></div><br><span class=3D"gmail_si=
gnature_prefix">-- </span><br><div dir=3D"ltr" class=3D"gmail_signature"><d=
iv dir=3D"ltr"><div><font color=3D"#888888">Nuno Teixeira</font></div><div>=
<div><font color=3D"#888888">
FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 <a h=
ref=3D"https://FreeBSD.org" rel=3D"noreferrer" target=3D"_blank">https://Fr=
eeBSD.org</a><br></font></div></div></div></div>
--0000000000005037080633185a8e--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFDf7UJTBaGZXaTV4N9rV9Zi25PB8_D0Gsy0VZXkqaArX74N5Q>