From patchwork Wed Feb 20 06:44:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 10821385 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 99B7D1575 for ; Wed, 20 Feb 2019 06:44:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 723542AA9B for ; Wed, 20 Feb 2019 06:44:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 621502B225; Wed, 20 Feb 2019 06:44:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 94F342AA9B for ; Wed, 20 Feb 2019 06:44:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DC5D4891C5; Wed, 20 Feb 2019 06:44:16 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id 54E90891C4 for ; Wed, 20 Feb 2019 06:44:14 +0000 (UTC) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 4447P46Bjtz9s71; Wed, 20 Feb 2019 17:44:08 +1100 (AEDT) Date: Wed, 20 Feb 2019 17:44:07 +1100 From: Stephen Rothwell To: Andrew Morton , Dave Airlie , DRI Subject: linux-next: build failure after merge of the akpm-current tree Message-ID: <20190220174407.753d94e5@canb.auug.org.au> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1550645051; bh=uHPdZHcpyvkz6p4H6WndNmTY0y02BuAfJIeLjWUeTBY=; h=Date:From:To:Cc:Subject:From; b=pvg0OAkqNJ+KHXf/mCj+6FcvOBZ/dfO8T82yhz0grDKOZEwCXz1mmOILaljOmWSOf sEfO87lVT9Ee/bQ60zHtdLpbu77+ZO+dMQZBKbbHAkkuWw/ilt0DK8FpzYgdSxH2EY lZSsfwJrz0YMNEZJzb68YvPcHFc233CwGymZnwGRbC2L2gmiaF4L7JdcJMEzH/9mdJ 6i5Vl7N8uUxCIt5EbVS79xo57VC0BWDUeced8PTcfUANq93Kkv/TqP0fqDrUpsVMne LAUp3Uk++d7VmVDikXjjIedbBYeYaJE91gMY2zuqrOAfTlUdDkAZgzNBy6Y1YvOCxT +ZGqt/sus9V7g== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Souptick Joarder , =?utf-8?b?SsOpcsO0bWU=?= Glisse , Linux Next Mailing List , Linux Kernel Mailing List , Ben Skeggs Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 *)'} 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 *)'} [-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 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 --- drivers/gpu/drm/nouveau/nouveau_dmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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,