From patchwork Fri Jan 27 06:16:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13118175 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A353AC54EAA for ; Fri, 27 Jan 2023 06:16:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DEF4810E3F2; Fri, 27 Jan 2023 06:16:25 +0000 (UTC) Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2239210E3F2 for ; Fri, 27 Jan 2023 06:16:22 +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 (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4P36ll1z3Cz4xGM; Fri, 27 Jan 2023 17:16:19 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1674800181; bh=VhTAOPrR41Xg1IzRQ17uQEaagP6uPDMc4j791sT8zEA=; h=Date:From:To:Cc:Subject:From; b=r6bc8cFO/RdP1CxwcD75JPkpbxG4nBrymxSzuPj7IrlcntYBSc7BPqe/cLAjWcAUs vOn+pcsfSgmTGIf6RPv2bkR4mZ3YxeyUurDRHevvW71Blik/2V2/IwJG8pEu8lUK7A FVv9XCWVoKmcH471pfx9xQuKfBUStu74i0lOZsVFUl3f5yPWYwi0jB6XtvSMtqB/Jq k/ukKGp4MV9pqXIQERVzdjlnHY7WftvIey4VecmxhyCbrBwP5iDBZsqsjL53x3isMm LN8on3aSyI7zghDPLbzztn8Bb77SdTEhdENG3zpll9V/DilUE2Ji0voEiHjM9/vBbm qKVKFBcsSKRTQ== Date: Fri, 27 Jan 2023 17:16:18 +1100 From: Stephen Rothwell To: Andrew Morton , Dave Airlie Subject: linux-next: build failure after merge of the mm tree Message-ID: <20230127171618.79cead50@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Linux Kernel Mailing List , DRI , Linux Next Mailing List , Jacek Lawrynowicz , Suren Baghdasaryan Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, After merging the mm tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/accel/ivpu/ivpu_gem.c: In function 'ivpu_bo_mmap': drivers/accel/ivpu/ivpu_gem.c:449:23: error: assignment of read-only member 'vm_flags' 449 | vma->vm_flags |= VM_PFNMAP | VM_DONTEXPAND; | ^~ Caused by commit b95a895848b9 ("mm: introduce vma->vm_flags wrapper functions") interacting with commit 647371a6609d ("accel/ivpu: Add GEM buffer object management") from the drm tree. I have applied the following merge fix patch for today. From: Stephen Rothwell Date: Fri, 27 Jan 2023 17:12:37 +1100 Subject: [PATCH] accel/ivpu: fix up for "mm: introduce vma->vm_flags wrapper functions" Signed-off-by: Stephen Rothwell --- drivers/accel/ivpu/ivpu_gem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/accel/ivpu/ivpu_gem.c b/drivers/accel/ivpu/ivpu_gem.c index d1f923971b4c..12b219dd4f36 100644 --- a/drivers/accel/ivpu/ivpu_gem.c +++ b/drivers/accel/ivpu/ivpu_gem.c @@ -446,7 +446,7 @@ static int ivpu_bo_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma) return dma_buf_mmap(obj->dma_buf, vma, 0); } - vma->vm_flags |= VM_PFNMAP | VM_DONTEXPAND; + vm_flags_set(vma, VM_PFNMAP | VM_DONTEXPAND); vma->vm_page_prot = ivpu_bo_pgprot(bo, vm_get_page_prot(vma->vm_flags)); return 0;