| Message ID | 20190220174407.753d94e5@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: build failure after merge of the akpm-current tree | expand |
diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nouveau/nouveau_dmem.c index 8be7a83ced9b..e2539f64de60 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dmem.c +++ b/drivers/gpu/drm/nouveau/nouveau_dmem.c @@ -261,7 +261,7 @@ static const struct migrate_vma_ops nouveau_dmem_fault_migrate_ops = { .finalize_and_map = nouveau_dmem_fault_finalize_and_map, }; -static int +static vm_fault_t nouveau_dmem_fault(struct hmm_devmem *devmem, struct vm_area_struct *vma, unsigned long addr,
Hi all, After merging the akpm-current tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/nouveau/nouveau_dmem.c:299:11: error: initialization of 'vm_fault_t (*)(struct hmm_devmem *, struct vm_area_struct *, long unsigned int, const struct page *, unsigned int, pmd_t *)' {aka 'unsigned int (*)(struct hmm_devmem *, struct vm_area_struct *, long unsigned int, const struct page *, unsigned int, struct <anonymous> *)'} from incompatible pointer type 'int (*)(struct hmm_devmem *, struct vm_area_struct *, long unsigned int, const struct page *, unsigned int, pmd_t *)' {aka 'int (*)(struct hmm_devmem *, struct vm_area_struct *, long unsigned int, const struct page *, unsigned int, struct <anonymous> *)'} [-Werror=incompatible-pointer-types] .fault = nouveau_dmem_fault, ^~~~~~~~~~~~~~~~~~ drivers/gpu/drm/nouveau/nouveau_dmem.c:299:11: note: (near initialization for 'nouveau_dmem_devmem_ops.fault') Caused by commit 5be73b690875 ("drm/nouveau/dmem: device memory helpers for SVM") from the drm tree interacting with commit ed814eb7f91d ("mm/hmm: convert to use vm_fault_t") from the akpm-current tree. I added this merge fix patch: From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Wed, 20 Feb 2019 17:36:18 +1100 Subject: [PATCH] drm/nouveau/dmem: update for struct hmm_devmem_ops member change Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- drivers/gpu/drm/nouveau/nouveau_dmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)