From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5C827487B9; Sat, 3 Feb 2024 04:15:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706933742; cv=none; b=SIi2swz/R7k+f6EJQVOMN3Ajtyc4PqfrfQFfbXTROgBlsuP2zxKphjzKptNGTf7V8OfSL3+2Xzf2E0BZGV0gKGQHs5rSmwo9Fu6OdCJEiCfzTapyvApVJy0mT6w4ONu5WCVwDMunvlOQ4jizwGPncseosZutQUPv1BN7h1L0uFY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706933742; c=relaxed/simple; bh=K0gu3AMOUq020bYWAGX7T6fJoOxFwUBRGaMxdJlxpEg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SzJ/+Kth1kqe0SECAiaOFrskIxNTXm2DELiTrVH5wTppTKUYPe+d/uxsKKbd5sBqPMvPYRtL7i8khZkrhm0rxS3BhTpejdlVYXe1EFEDeGj/er6jHgz2Z5q5f7MUEJ7+w8wx4+dIF8nXEHbt5tP1rhPT4JaEGCcZlIUjeu0TFc4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=dukxR6AB; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="dukxR6AB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 23568C43399; Sat, 3 Feb 2024 04:15:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1706933742; bh=K0gu3AMOUq020bYWAGX7T6fJoOxFwUBRGaMxdJlxpEg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dukxR6ABku9iOxE0FvbN1J2+L7cn4bXnjdSOCZuxzbdl3SjIBiFm//0lgreCNJSYs 3GvxBt7zKKhDtiTsWlsuyH8lONDHpapnkBlG6+GFzg1zinvft27f0BG+8P2XzCQfEI flQ7z2Z5f2FFgX+1dE6f2cqFJm9tnPc2WbMcqiEw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Stephen Rothwell , Michael Ellerman , Sasha Levin Subject: [PATCH 6.7 009/353] powerpc: pmd_move_must_withdraw() is only needed for CONFIG_TRANSPARENT_HUGEPAGE Date: Fri, 2 Feb 2024 20:02:07 -0800 Message-ID: <20240203035404.002359153@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240203035403.657508530@linuxfoundation.org> References: <20240203035403.657508530@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.7-stable review patch. If anyone has any objections, please let me know. ------------------ From: Stephen Rothwell [ Upstream commit 0d555b57ee660d8a871781c0eebf006e855e918d ] The linux-next build of powerpc64 allnoconfig fails with: arch/powerpc/mm/book3s64/pgtable.c:557:5: error: no previous prototype for 'pmd_move_must_withdraw' 557 | int pmd_move_must_withdraw(struct spinlock *new_pmd_ptl, | ^~~~~~~~~~~~~~~~~~~~~~ Caused by commit: c6345dfa6e3e ("Makefile.extrawarn: turn on missing-prototypes globally") Fix it by moving the function definition under CONFIG_TRANSPARENT_HUGEPAGE like the prototype. The function is only called when CONFIG_TRANSPARENT_HUGEPAGE=y. Signed-off-by: Stephen Rothwell [mpe: Flesh out change log from linux-next patch] Signed-off-by: Michael Ellerman Link: https://msgid.link/20231127132809.45c2b398@canb.auug.org.au Signed-off-by: Sasha Levin --- arch/powerpc/mm/book3s64/pgtable.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/powerpc/mm/book3s64/pgtable.c b/arch/powerpc/mm/book3s64/pgtable.c index be229290a6a7..3438ab72c346 100644 --- a/arch/powerpc/mm/book3s64/pgtable.c +++ b/arch/powerpc/mm/book3s64/pgtable.c @@ -542,6 +542,7 @@ void ptep_modify_prot_commit(struct vm_area_struct *vma, unsigned long addr, set_pte_at(vma->vm_mm, addr, ptep, pte); } +#ifdef CONFIG_TRANSPARENT_HUGEPAGE /* * For hash translation mode, we use the deposited table to store hash slot * information and they are stored at PTRS_PER_PMD offset from related pmd @@ -563,6 +564,7 @@ int pmd_move_must_withdraw(struct spinlock *new_pmd_ptl, return true; } +#endif /* * Does the CPU support tlbie? -- 2.43.0