From patchwork Sun Jan 28 08:53:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helge Deller X-Patchwork-Id: 193111 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2395:b0:106:343:edcb with SMTP id gw21csp851858dyb; Sun, 28 Jan 2024 00:54:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IEli9opZ+KfDcmV5vhISok6s0Un8y9ByuYQJcVlsbseJll2cHpCiH/q+c8BHGG4YDuddBc8 X-Received: by 2002:a05:6402:34cb:b0:55d:2b7:8ce9 with SMTP id w11-20020a05640234cb00b0055d02b78ce9mr2019559edc.8.1706432054996; Sun, 28 Jan 2024 00:54:14 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706432054; cv=pass; d=google.com; s=arc-20160816; b=eKbVskZ4ToOgwUkplamUsLsTFn8Hp/Wd/naAdFe17jjEm+Rg09qbL9upX0tAT96WEL lx6sqFLwHY+D1HCkHSU5WAcvTKBR48a9P8MoXQECGwATsVKG/kpZXgi+qdj3nievQ8Ke p+X8QDDea0oTftu/sXH/XhbgyJq3k+oJNvissbBgxoHdbT8n7krzLbg3gQVQHIXp1S1/ kM1sMd1Fn2o7JGDXM9NgwrD6SN45D6Iy6cY9gfWo090hhQjoNd/d4mO8Kf55tFg2sBcK APhkMPq43oIm6usRs66F5gizyh63fP8igMu35Ai0Zj3xaA+bPaH7XpYqXw10Bfwp+joJ nBwg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-disposition:mime-version:list-unsubscribe:list-subscribe :list-id:precedence:message-id:subject:cc:to:from:date :dkim-signature; bh=jljTOegKUxbS3RjTtdp4RK3UPyLHVeqkmhmtsJS6S7A=; fh=mhSIyCl47xm63MrKcDfoiL0f7N26oy7RCwEItuG8FQA=; b=sQXU19y4L5Fo3NMaCkVOH3Ze3m62UM8Et6HgHYneLYqEnZa0tk0cxQSKH+HOJKIEkl vbsB4WUAIf9GhRjeYExqYeRWUBhCKqY8jrTnhGfSyqTLbhCj9vJOPyHCRRc0TEWiUSls G8naFLfbM+VxMzseqNR8iPWzsaUvKUGshc1IkOl0tYhkeBrDS7Q8IIGbIVwLktyou+N5 ke2YkfCOzG/7VrUUTG4OiyloS/RwvLmKnkf0XZyLhThOCpsnn7jWuwY8HWQaPRRHlHeM 1Bqhh1Pcg3/krGj/U9pbB+PE+9f1UwYr+M+zynK+DMoFqLypvQJg6FkOMT+xXAz9WVTd uO1Q== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=G9OkGm2k; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-41568-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-41568-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id z24-20020a50cd18000000b0055eb2651a44si1351759edi.247.2024.01.28.00.54.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jan 2024 00:54:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-41568-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=G9OkGm2k; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-41568-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-41568-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org 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 am.mirrors.kernel.org (Postfix) with ESMTPS id 9AE6B1F222E7 for ; Sun, 28 Jan 2024 08:54:14 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3E77014A87; Sun, 28 Jan 2024 08:54:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="G9OkGm2k" 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 4AA07DDC4; Sun, 28 Jan 2024 08:53:59 +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=1706432040; cv=none; b=TmJF0vq3roFlv1K99RyB5wIsALo6vaBGLROA21VQT0tLrKM2XpMmCw7YwY7AJjFP4/r/5dCPCVsNXhNCu4greTXiyPfDUGF4odAdxMbbHNMS/Vz0FonKqWiZJlb8qnuyiSfvPJy3A2XLOhaL9s06k9PChW98iCPLOVO6pYvkGjQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706432040; c=relaxed/simple; bh=qCDdwLKf3bT6cGGaU4frMAHoDwbySJE5/GyHOk7wHgg=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=CeX4DdbKGMDVvV1HZ/Q9dpkBpj6TmMx9FDZ/iob6z75+CzHlBzy8BbcrGFMS5EuvvmYWOFXTTN7ckcQz+R30XeQDyi47zmKtTwfvxKykRajzyqpyQNUkZJeXmFa0UAf/TEsVHxD5N1PFvCy1tCM1gcdf0pF9rrJcmEOOJ9hyA8o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=G9OkGm2k; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 67774C433F1; Sun, 28 Jan 2024 08:53:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706432039; bh=qCDdwLKf3bT6cGGaU4frMAHoDwbySJE5/GyHOk7wHgg=; h=Date:From:To:Cc:Subject:From; b=G9OkGm2kEYH4gtzh31ggEe5BqfS6B6LMQy+ElheFFabiGciApVqloUDURStdBSnW3 uNO+cEx1HKbpoWvh4eqyuAPAIeug+LIN44/jPyOhBEXupka+3uz/j6S9bxhD+eoB5I chR7MnQpwf0EQTRXcocVMpH2EzPmgncyohuGAWlyC50GAhmlDya6TmXxXIVEvD28gU GHosdvIEkpa2e6P//D6gAF9zlyCjWh7Pl/Gwg7FC7ysTLL8GghiAO+bBCedE/8eBL+ O8XHg7E+q0x84A8VuZLxs62SCUhIggTsBya7pvK0ypqut7L09SXHaAvSyCH4bz1BH6 np+mscw0MUuFA== Date: Sun, 28 Jan 2024 09:53:55 +0100 From: Helge Deller To: Kent Overstreet , linux-bcachefs@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-parisc@vger.kernel.org Subject: [PATCH] bcachefs: Fix build on parisc by avoiding __multi3() Message-ID: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789323698289171377 X-GMAIL-MSGID: 1789323698289171377 The gcc compiler on paric does support the __int128 type, although the architecture does not have native 128-bit support. The effect is, that the bcachefs u128_square() function will pull in the libgcc __multi3() helper, which breaks the kernel build when bcachefs is built as module since this function isn't currently exported in arch/parisc/kernel/parisc_ksyms.c. The build failure can be seen in the latest debian kernel build at: https://buildd.debian.org/status/fetch.php?pkg=linux&arch=hppa&ver=6.7.1-1%7Eexp1&stamp=1706132569&raw=0 We prefer to not export that symbol, so fall back to the optional 64-bit implementation provided by bcachefs and thus avoid usage of __multi3(). Signed-off-by: Helge Deller Cc: Kent Overstreet diff --git a/fs/bcachefs/mean_and_variance.h b/fs/bcachefs/mean_and_variance.h index b2be565bb8f2..64df11ab422b 100644 --- a/fs/bcachefs/mean_and_variance.h +++ b/fs/bcachefs/mean_and_variance.h @@ -17,7 +17,7 @@ * Rust and rustc has issues with u128. */ -#if defined(__SIZEOF_INT128__) && defined(__KERNEL__) +#if defined(__SIZEOF_INT128__) && defined(__KERNEL__) && !defined(CONFIG_PARISC) typedef struct { unsigned __int128 v;