From patchwork Wed Feb 7 06:17:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 197762 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp2035424dyb; Tue, 6 Feb 2024 22:24:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IFjJWf3JE0ZgiYDvDdwB+RBLQaUW0/a++KFJuIf1SVHd3nQ1Q+elnPXZPFNlekk4vyduIa4 X-Received: by 2002:a05:6830:1cc:b0:6e2:bb8d:4b5b with SMTP id r12-20020a05683001cc00b006e2bb8d4b5bmr12122ota.27.1707287059512; Tue, 06 Feb 2024 22:24:19 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707287059; cv=pass; d=google.com; s=arc-20160816; b=UlSB8/udZaHUoebrIx0z2Ze9RcSJgBzoR/rirDCl57PCD0XssrXrfTdT1QI1fA9sdn 1oEInFW/+yIfm4WXUI/UTmLCeJgSh/Jx9BmLRktMjvS1pwS5xmFKscndeBjhoxXbXP6W 4v0rH8Je+nWy9a1esJ21RWuSDAW1MiO+ZYMkTqngVhZoJo6tx7gf0aA/UWrfS/P5LWlz /6+BhOjMmnuvpjO4UnC2T+FgGCuI1ZVqMIm4qR+KU09x9d+Q19BGkAK1/R5FDAvlso0m f4by3XEtU3OPP27fnIKYuuyD3QPXmR3gZX/IpdNg37SQuUk0+tQPp+VnlJBWfv4Ve9oV 5iLg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=4HrCo4Go00EXz2MqlF14s4KMx2UZHKzsjS+HN7k95S0=; fh=CWw9A/FkON+i0oREK8hXIVIQTpK4RLsdh8dTtQiCEVs=; b=BJGySz52qdDcx3fxJgiqED6AgSQ8b9Pfg3flVrHje1ciVEtqIg+Rb6krUz3BG83JhB fJBQkS5vmDMLT/V8qFbNFAsy//mrqNTiLLu4rGblArzqM/Y8iUik9BFsb5pX0YPJS/c3 5wy94Lr4rmLuBKVKS2xe79AgLRJ/bgNlVNdnl4leKiiW/vQvTOrsGGlIu2Lw9BHXKyD/ h+64QTabjtrK6CKGCmDTqeEjfl5OK0/3n3J4kMx6bMmgYroIXhv9zlscYohmkmSaWSbe o8ksHUtqO1LSiWNEwhQHBegI5GHtT15nSKJtr21PIehrp/KJ1qxLLsjmRLv2Wfca5xv+ V1Dw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=U5gwo+mc; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-56007-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56007-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au X-Forwarded-Encrypted: i=2; AJvYcCXbCiHUqWamIJPhWGf6g6uBB11apneg0A8EFAo0i1IlbMPJS+Ax1uGEZ+eKPAFBYhjSMqpNbY9rYp3cj3HFY58CSws4Gg== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id z27-20020a637e1b000000b005d988899a5csi755824pgc.504.2024.02.06.22.24.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 22:24:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-56007-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=U5gwo+mc; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-56007-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56007-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id EB0B228CA20 for ; Wed, 7 Feb 2024 06:18:00 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 12A251CF8C; Wed, 7 Feb 2024 06:17:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="U5gwo+mc" Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (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 966CF1CF8A; Wed, 7 Feb 2024 06:17:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707286668; cv=none; b=RInmz+QN71BaTisQha3I7e9EX+uCTDMOT3wI+wBmMPSOrLcGTd5jL41YuPQHnNCH/Yznfjg7KVYHCJ81i+ds9NE8xqHc3vWG6+oBrveoKTYuSAYf8t7Q48Vd0SWtRl0mZMbUInlw611jtX40E5SGrp33EaZRAExZNVsJaXDDvHI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707286668; c=relaxed/simple; bh=yk8VkfK6JqlgbwfJ8elhDe8rYDVY9GE1/9Fde6awSlE=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=HIY/5wu5ZFy19wab1oeDZxh3wgK+iV3kzsyDewyu3F3L+Bo6f7D5qyh++k8TkVxP+lknH2cIhpHo5FPZB9FuNxNTj17+9PhPCX4pKeHxVJ4TLmoxPBTzqQ8Nu8kob78lVPh3cW++F41ppSXgVlmrURbKdTpN4HKg8634EVnTEMw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=U5gwo+mc; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1707286664; bh=4HrCo4Go00EXz2MqlF14s4KMx2UZHKzsjS+HN7k95S0=; h=Date:From:To:Cc:Subject:From; b=U5gwo+mc4QkcLVjBa2BXOhjqnYCqkmCzyoHA7BS0q6iGdkLFR0ILGa8hpqdQBoSev ZqVsA0ZY+TX/Bf90mOzE9ws9mSTXkvqNPKuIvIffF4CsVkBitj/FLj/SPeZjXvyzC8 BHEczgSmwMDIaLnGBo0UXnoTLy5WpW/udtRTXnLzEb2EiT+34MtI3Ve9I3FhN5v53C TFWiTYifghrk2dNL5L40szqKAqr6xSDc97VCfip/fjH5WRruKA5ObeXGGEuAll+YiZ 1ztPBkn0EDfbIAJzcu5nOM8/eeCFj7PJUq5RgPL+wNnYpAn3k2qTau4mf1lvZLICut F6RVAK233cQig== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4TV8zq2X86z4wd0; Wed, 7 Feb 2024 17:17:41 +1100 (AEDT) Date: Wed, 7 Feb 2024 17:17:41 +1100 From: Stephen Rothwell To: Andrew Morton Cc: Kairui Song , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the mm tree Message-ID: <20240207171741.1f3f090f@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790220235775763897 X-GMAIL-MSGID: 1790220235775763897 Hi all, After merging the mm tree, today's linux-next build (x86_64 allnodconfig) failed like this: mm/memory.c: In function 'do_swap_page': mm/memory.c:4004:29: error: implicit declaration of function 'swapcache_prepare'; did you mean 'swapcache_clear'? [-Werror=implicit-function-declaration] 4004 | if (swapcache_prepare(entry)) | ^~~~~~~~~~~~~~~~~ | swapcache_clear Caused by commit 1fa5b77af107 ("mm/swap: fix race condition in direct swapin path") from the mm-unstable branch of the mm tree. # CONFIG_SWAP is not set I have applied the following patch for today: From: Stephen Rothwell Date: Wed, 7 Feb 2024 17:04:15 +1100 Subject: [PATCH] fix up for "mm/swap: fix race condition in direct swapin path" Signed-off-by: Stephen Rothwell --- include/linux/swap.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/linux/swap.h b/include/linux/swap.h index 768a9078070d..b4c389b9e4e0 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -552,6 +552,11 @@ static inline int swap_duplicate(swp_entry_t swp) return 0; } +static inline int swapcache_prepare(swp_entry_t swp) +{ + return 0; +} + static inline void swap_free(swp_entry_t swp) { }