Commit 2eec08ff authored by Andrew Morton's avatar Andrew Morton
Browse files

Merge branch 'mm-hotfixes-stable' into mm-nonmm-stable to pick up changes 

required to merge "kho: use unsigned long for nr_pages".
parents 6ca9de36 bd587829

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -850,6 +850,7 @@ Valentin Schneider <vschneid@redhat.com> <valentin.schneider@arm.com> 
Veera Sundaram Sankaran <quic_veeras@quicinc.com> <veeras@codeaurora.org>

Veerabhadrarao Badiganti <quic_vbadigan@quicinc.com> <vbadigan@codeaurora.org>

Venkateswara Naralasetty <quic_vnaralas@quicinc.com> <vnaralas@codeaurora.org>

Viacheslav Bocharov <v@baodeep.com> <adeep@lexina.in>

Vikash Garodia <vikash.garodia@oss.qualcomm.com> <vgarodia@codeaurora.org>

Vikash Garodia <vikash.garodia@oss.qualcomm.com> <quic_vgarodia@quicinc.com>

Vincent Mailhol <mailhol@kernel.org> <mailhol.vincent@wanadoo.fr>

arch/powerpc/kvm/book3s_hv_uvmem.c

+1 −1
Original line number Diff line number Diff line
@@ -723,7 +723,7 @@ static struct page *kvmppc_uvmem_get_page(unsigned long gpa, struct kvm *kvm) 


	dpage = pfn_to_page(uvmem_pfn);

	dpage->zone_device_data = pvt;

	zone_device_page_init(dpage, 0);

	zone_device_page_init(dpage, &kvmppc_uvmem_pgmap, 0);

	return dpage;

out_clear:

	spin_lock(&kvmppc_uvmem_bitmap_lock);

drivers/gpu/drm/amd/amdkfd/kfd_migrate.c

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ svm_migrate_get_vram_page(struct svm_range *prange, unsigned long pfn) 
	page = pfn_to_page(pfn);

	svm_range_bo_ref(prange->svm_bo);

	page->zone_device_data = prange->svm_bo;

	zone_device_page_init(page, 0);

	zone_device_page_init(page, page_pgmap(page), 0);

}



static void

drivers/gpu/drm/drm_pagemap.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static void drm_pagemap_get_devmem_page(struct page *page, 
					struct drm_pagemap_zdd *zdd)

{

	page->zone_device_data = drm_pagemap_zdd_get(zdd);

	zone_device_page_init(page, 0);

	zone_device_page_init(page, page_pgmap(page), 0);

}



/**

drivers/gpu/drm/nouveau/nouveau_dmem.c

+1 −1
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ nouveau_dmem_page_alloc_locked(struct nouveau_drm *drm, bool is_large) 
			order = ilog2(DMEM_CHUNK_NPAGES);

	}



	zone_device_folio_init(folio, order);

	zone_device_folio_init(folio, page_pgmap(folio_page(folio, 0)), order);

	return page;

}