From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 C981A3ED12B; Thu, 26 Feb 2026 15:11:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772118712; cv=none; b=r2TpLsR4vCxyMEew2nBCpRstKMbWNP2cWaTMlLorRE88KoaaM1blx7vGGQXZ+nTcFo4jwtjhX6p3pl0V+2HkX1jwuk0+o4WV48REcfJm6lr701aPAd6KEC4qb709UHtd4MNheyjmRM5jcXJvUupLXHOGJdconLLj+QleZzNAMTw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772118712; c=relaxed/simple; bh=jUtVm1Rf7JOGz4LmP8y/DP4SURG9c7LcQziH6LkHkZw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=utVBw7TRhHS8Nw5Ay74aqX7gSAkzRPY+wKyATxwudZJeUoL0D/P4jY181TGlBLrHRnLtrgfumRO0FJ9lTPle5didMzeXQHeF7zTr/JK0iByA6N9LCs54ugHLfWlc+Way5VaRWTAfOTtEDJ60ukB1ZusaxmKxyZ+qJl/dasZZSqA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=UWlx2aQX; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="UWlx2aQX" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=8SFAAXJP1oJfa/3lZX/8e4dND94zooHILcdc+qXS2PE=; b=UWlx2aQX7+I5jhBsL1ur96gEDD F1ApAr+kLKJJXFWZ8yGweCxQnqnlRFj8YYYWcsPkhsA55s0l4a9adlrUHJnSOJ1KmF7w/iqybktB+ SAiSzTUqnUoNLrkfktxBv6U6bDYHYCexRKVLVn3VyhGXRSC6pA43Mt2Yp62xCGaUwdvIszrjlz1fd M/N9kS7v7H/vFSRk0hXqEI/NXjCGKUg5N6UNXchlbtSCwpm/wq+Gc7kxFinGZ4QIJg7/W1/BPb8N1 pQu7+Iswt2inOesa11lKpYDfB1QcN5cNL4R72idHXrYlZubhGMLq3yBo59JEyhOZGmM6+3UHmbEId uqPGcxMQ==; Received: from [4.28.11.157] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98.2 #2 (Red Hat Linux)) id 1vvd1D-00000006PyK-4AqV; Thu, 26 Feb 2026 15:11:12 +0000 From: Christoph Hellwig To: Andrew Morton Cc: Richard Henderson , Matt Turner , Magnus Lindholm , Russell King , Catalin Marinas , Will Deacon , Huacai Chen , WANG Xuerui , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , "Christophe Leroy (CS GROUP)" , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , "David S. Miller" , Andreas Larsson , Richard Weinberger , Anton Ivanov , Johannes Berg , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Herbert Xu , Dan Williams , Chris Mason , David Sterba , Arnd Bergmann , Song Liu , Yu Kuai , Li Nan , linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, loongarch@lists.linux.dev, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org, linux-um@lists.infradead.org, linux-crypto@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-arch@vger.kernel.org, linux-raid@vger.kernel.org Subject: [PATCH 03/25] um/xor: don't override XOR_SELECT_TEMPLATE Date: Thu, 26 Feb 2026 07:10:15 -0800 Message-ID: <20260226151106.144735-4-hch@lst.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260226151106.144735-1-hch@lst.de> References: <20260226151106.144735-1-hch@lst.de> 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-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html XOR_SELECT_TEMPLATE is only ever called with a NULL argument, so all the ifdef'ery doesn't do anything. With our without this, the time travel mode should work fine on CPUs that support AVX2, as the AVX2 implementation is forced in this case, and won't work otherwise. Signed-off-by: Christoph Hellwig --- arch/um/include/asm/xor.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/arch/um/include/asm/xor.h b/arch/um/include/asm/xor.h index 647fae200c5d..c9ddedc19301 100644 --- a/arch/um/include/asm/xor.h +++ b/arch/um/include/asm/xor.h @@ -4,21 +4,11 @@ #ifdef CONFIG_64BIT #undef CONFIG_X86_32 -#define TT_CPU_INF_XOR_DEFAULT (AVX_SELECT(&xor_block_sse_pf64)) #else #define CONFIG_X86_32 1 -#define TT_CPU_INF_XOR_DEFAULT (AVX_SELECT(&xor_block_8regs)) #endif #include #include <../../x86/include/asm/xor.h> -#include - -#ifdef CONFIG_UML_TIME_TRAVEL_SUPPORT -#undef XOR_SELECT_TEMPLATE -/* pick an arbitrary one - measuring isn't possible with inf-cpu */ -#define XOR_SELECT_TEMPLATE(x) \ - (time_travel_mode == TT_MODE_INFCPU ? TT_CPU_INF_XOR_DEFAULT : x) -#endif #endif -- 2.47.3