Return-Path: Received: from conuserg-08.nifty.com ([210.131.2.75]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jQnW4-0001QD-GP for linux-um@lists.infradead.org; Tue, 21 Apr 2020 07:40:26 +0000 From: Masahiro Yamada Subject: [PATCH 1/2] x86: check CONFIG options instead of __arch_um__ Date: Tue, 21 Apr 2020 16:39:46 +0900 Message-Id: <20200421073947.586662-1-masahiroy@kernel.org> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-um" Errors-To: linux-um-bounces+geert=linux-m68k.org@lists.infradead.org To: x86@kernel.org, Ingo Molnar , Thomas Gleixner , Borislav Petkov , "H . Peter Anvin" Cc: "Jason A . Donenfeld" , Richard Weinberger , Masahiro Yamada , linux-um@lists.infradead.org, linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org, Jeff Dike , Anton Ivanov If the intention is to check i386/x86_64 excluding UML, we can use CONFIG options instead. There are only some users of __arch_um__. This commit replaces them, then removes the __arch_um__ definition. The original reason for checking __i386__ / __x86_64__ was perhaps because lib/raid6/algos.c is built not only for the kernel but also for the user-space test program. However, lib/raid6/test/Makefile passes -DCONFIG_X86, -DCONFIG_X86_32, and -DCONFIG_X86_64 for this case. So, I do not see a good reason to not use CONFIG options here. What is confusing is, CONFIG_X86_{32,64} is defined not only in arch/x86/Kconfig, but also in arch/x86/um/Kconfig. To exlucde UML, we need to check CONFIG_X86 too. Signed-off-by: Masahiro Yamada Acked-by: H. Peter Anvin (Intel) --- arch/um/Makefile | 2 +- kernel/signal.c | 2 +- lib/raid6/algos.c | 6 ++++-- lib/raid6/x86.h | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/arch/um/Makefile b/arch/um/Makefile index d2daa206872d..064fbed7a4e9 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -62,7 +62,7 @@ KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/um # # These apply to USER_CFLAGS to. -KBUILD_CFLAGS += $(CFLAGS) $(CFLAGS-y) -D__arch_um__ \ +KBUILD_CFLAGS += $(CFLAGS) $(CFLAGS-y) \ $(ARCH_INCLUDE) $(MODE_INCLUDE) -Dvmap=kernel_vmap \ -Dlongjmp=kernel_longjmp -Dsetjmp=kernel_setjmp \ -Din6addr_loopback=kernel_in6addr_loopback \ diff --git a/kernel/signal.c b/kernel/signal.c index 713104884414..1af3ad707b02 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -1246,7 +1246,7 @@ static void print_fatal_signal(int signr) struct pt_regs *regs = signal_pt_regs(); pr_info("potentially unexpected fatal signal %d.\n", signr); -#if defined(__i386__) && !defined(__arch_um__) +#if defined(CONFIG_X86) && defined(CONFIG_X86_32) pr_info("code at %08lx: ", regs->ip); { int i; diff --git a/lib/raid6/algos.c b/lib/raid6/algos.c index 6d5e5000fdd7..978fa19efbbf 100644 --- a/lib/raid6/algos.c +++ b/lib/raid6/algos.c @@ -29,7 +29,8 @@ struct raid6_calls raid6_call; EXPORT_SYMBOL_GPL(raid6_call); const struct raid6_calls * const raid6_algos[] = { -#if defined(__i386__) && !defined(__arch_um__) +#ifdef CONFIG_X86 +#if defined(CONFIG_X86_32) #ifdef CONFIG_AS_AVX512 &raid6_avx512x2, &raid6_avx512x1, @@ -43,7 +44,7 @@ const struct raid6_calls * const raid6_algos[] = { &raid6_mmxx2, &raid6_mmxx1, #endif -#if defined(__x86_64__) && !defined(__arch_um__) +#if defined(CONFIG_X86_64) #ifdef CONFIG_AS_AVX512 &raid6_avx512x4, &raid6_avx512x2, @@ -56,6 +57,7 @@ const struct raid6_calls * const raid6_algos[] = { &raid6_sse2x2, &raid6_sse2x1, #endif +#endif /* CONFIG_X86 */ #ifdef CONFIG_ALTIVEC &raid6_vpermxor8, &raid6_vpermxor4, diff --git a/lib/raid6/x86.h b/lib/raid6/x86.h index 9a6ff37115e7..0436b32f7709 100644 --- a/lib/raid6/x86.h +++ b/lib/raid6/x86.h @@ -14,7 +14,7 @@ #ifndef LINUX_RAID_RAID6X86_H #define LINUX_RAID_RAID6X86_H -#if (defined(__i386__) || defined(__x86_64__)) && !defined(__arch_um__) +#ifdef CONFIG_X86 #ifdef __KERNEL__ /* Real code */ -- 2.25.1 _______________________________________________ linux-um mailing list linux-um@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-um