From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-184.mta0.migadu.com (out-184.mta0.migadu.com [91.218.175.184]) (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 494F62EC54C for ; Thu, 16 Jul 2026 08:51:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.184 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784191918; cv=none; b=F7P56FBRmk+7t6TxvEtg1EIFw9yMP/Nm/czcZxaRz9/S3zBH+kVKmZ66OtMDltVPWAH5GaW0xshfr/ncDZMA2x6/qUU1zuUqcYHVauv5mEi7Gaf/JFg834VEcq+x+7g4hrsZTQz/e3rK6QTMGzmxwvvvbOpCgvALgxOna3+wQdI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784191918; c=relaxed/simple; bh=UrYvQDEfI4QDkE/MFal+p4SEljPJC23l3Bsy4Kaizcw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=rpeN3YK1SV4NMdrJvLZAK274616+XayYJLBsUAzvEh4HSkewgfuHL13HRUW+84ZRURbWtOKQwp+iXfQBw2YDGgkdYWAzFhCC4kM2MI3DZhCEgu1C5d8eaXbFv4OvsWnrz8AW7Ky/LlRYPiaHoaST7u+dlyXccVrDLV/qeCMaQhA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=QNpHKPv/; arc=none smtp.client-ip=91.218.175.184 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="QNpHKPv/" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1784191915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ieFHcUmBstm4JquA2KOTnYDeotRMO94aM5PXII9CKpI=; b=QNpHKPv/4C2/CgfAR/uRZkEgQ96PDHp+EmbfQJsM0E61VtRN3i3BON5kLBZyT1d8vumWzQ XZ1xRAIbxVJ81Y9gh/fkN7Benw/j+zhF/g1vLBUelMy2AOWLPoxG/sQtdvyJzUGKP25xgw /iRgsby3ghTFdeUeDppvNlAemV08fw4= From: Hongfu Li To: akpm@linux-foundation.org, chrisl@kernel.org, kasong@tencent.com, shikemeng@huaweicloud.com, nphamcs@gmail.com, baoquan.he@linux.dev, baohua@kernel.org, youngjun.park@lge.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, hongfu.li@linux.dev, Hongfu Li Subject: [PATCH] mm/swap: Fix swap_cluster_lock() !CONFIG_SWAP stub signature mismatch Date: Thu, 16 Jul 2026 16:51:31 +0800 Message-ID: <20260716085131.68378-1-hongfu.li@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT From: Hongfu Li The !CONFIG_SWAP stub for swap_cluster_lock() has mismatched prototype: it has an extra unused irq argument and uses pgoff_t instead of unsigned long for offset. All callers are under CONFIG_SWAP so the extra parameter is dead. Sync the stub signature with the real function. Fixes: 8578e0c00dcf ("mm, swap: use the swap table for the swap cache and switch API") Signed-off-by: Hongfu Li --- mm/swap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/swap.h b/mm/swap.h index 77d2d14eda42..2c4667662601 100644 --- a/mm/swap.h +++ b/mm/swap.h @@ -337,7 +337,7 @@ static inline unsigned int folio_swap_flags(struct folio *folio) #else /* CONFIG_SWAP */ struct swap_iocb; static inline struct swap_cluster_info *swap_cluster_lock( - struct swap_info_struct *si, pgoff_t offset, bool irq) + struct swap_info_struct *si, unsigned long offset) { return NULL; } -- 2.54.0