diff options
| author | Mauro Carvalho Chehab <mchehab@kernel.org> | 2023-11-23 10:50:46 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@kernel.org> | 2023-11-23 10:50:54 +0100 |
| commit | 0181f7a307fe9796018f61334c3c4e6c1784ebb6 (patch) | |
| tree | 307a3480b10c9d22e79ffa4d09186069ec6002b4 /mm/filemap.c | |
| parent | 3c9202e88ffad78f57a418bace2d25f7824a7e4b (diff) | |
| parent | 98b1cc82c4affc16f5598d4fa14b1858671b2263 (diff) | |
| download | linux-stable-0181f7a307fe9796018f61334c3c4e6c1784ebb6.tar.gz linux-stable-0181f7a307fe9796018f61334c3c4e6c1784ebb6.tar.bz2 linux-stable-0181f7a307fe9796018f61334c3c4e6c1784ebb6.zip | |
Merge tag 'v6.7-rc2' into media_stage
Linux 6.7-rc2
* tag 'v6.7-rc2': (325 commits)
Linux 6.7-rc2
prctl: Disable prctl(PR_SET_MDWE) on parisc
parisc/power: Fix power soft-off when running on qemu
parisc: Replace strlcpy() with strscpy()
NFSD: Fix checksum mismatches in the duplicate reply cache
NFSD: Fix "start of NFS reply" pointer passed to nfsd_cache_update()
NFSD: Update nfsd_cache_append() to use xdr_stream
nfsd: fix file memleak on client_opens_release
dm-crypt: start allocating with MAX_ORDER
dm-verity: don't use blocking calls from tasklets
dm-bufio: fix no-sleep mode
dm-delay: avoid duplicate logic
dm-delay: fix bugs introduced by kthread mode
dm-delay: fix a race between delay_presuspend and delay_bio
drm/amdgpu/gmc9: disable AGP aperture
drm/amdgpu/gmc10: disable AGP aperture
drm/amdgpu/gmc11: disable AGP aperture
drm/amdgpu: add a module parameter to control the AGP aperture
drm/amdgpu/gmc11: fix logic typo in AGP check
drm/amd/display: Fix encoder disable logic
...
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Diffstat (limited to 'mm/filemap.c')
| -rw-r--r-- | mm/filemap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 9710f43a89ac..32eedf3afd45 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3443,7 +3443,7 @@ static vm_fault_t filemap_map_folio_range(struct vm_fault *vmf, * handled in the specific fault path, and it'll prohibit the * fault-around logic. */ - if (!pte_none(vmf->pte[count])) + if (!pte_none(ptep_get(&vmf->pte[count]))) goto skip; count++; |