From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E88C3C43331 for ; Thu, 26 Mar 2020 08:03:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BBEA620719 for ; Thu, 26 Mar 2020 08:03:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585209824; bh=3iEIDWyogjMy2tYC7OIPgWJHsUKnk1Zj20fZn+PrygI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FfKd4il8D2RddnV2B8xgh19Yoty27XW+vJKbmbfyYK74PrIxBAxh5szAolWoNCu55 S7FCy0LFUjLcGkyl5gredMgdl7M2DVK2W4x6qW2MtKmuvugyPitamfRuJuwraV4ttD 3CLV1WfAllzZoGG/WpdiL7WqwhHDwL4BydcYk4yg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727705AbgCZIDn (ORCPT ); Thu, 26 Mar 2020 04:03:43 -0400 Received: from conuserg-11.nifty.com ([210.131.2.78]:18420 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726138AbgCZIDn (ORCPT ); Thu, 26 Mar 2020 04:03:43 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-11.nifty.com with ESMTP id 02Q81Wpb002183; Thu, 26 Mar 2020 17:01:47 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com 02Q81Wpb002183 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1585209708; bh=wgorDE+vuGrrNUy/MBlmElwy0rVwDu2lUfcQoJ7WdJo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i1RAe6MWq0MbOIMo6iw8A45d72zOQX8JgToxfZZh9LlPJ5GIMGYer91+Z6PVKkwAu rmFxdO1ArjMEbnFRK3u/4/ZvLTxu4o4QExRbhHrG3xDDSzFkHVA+e2v91zeTTuaepG tKd6WmaEnA6OJqi4ANX1id/gnHVsHLSZji/QLm7pV0oY64NWpib/k6sF7kNWSG1TGL i2wGyH9PXI72dRnX6ywd13U6copo7Mmheo2iSh3yIDK8rRfmnZ6eVy0QoBA5tIee7X JqOpJvjVLKDw1JcqKP/81xNNHvq6RtDVAYefbzyp10AZ3QVE5NK9sQzQZchhGPqJCx /EdJ8dLCa8ogg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Thomas Gleixner , Nick Desaulniers , Borislav Petkov , Peter Zijlstra , "H . Peter Anvin" , x86@kernel.org, "Jason A . Donenfeld" , clang-built-linux@googlegroups.com, Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v2 08/16] x86: replace arch macros from compiler with CONFIG_X86_{32,64} Date: Thu, 26 Mar 2020 17:00:56 +0900 Message-Id: <20200326080104.27286-9-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200326080104.27286-1-masahiroy@kernel.org> References: <20200326080104.27286-1-masahiroy@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If the intention is to check i386/x86_64 excluding UML, testing CONFIG_X86_{32,64} is simpler. The reason for checking __i386__ / __x86_64__ was perhaps because lib/raid6/algos.c is built not only for the kernel but also for testing the library code from userspace. However, lib/raid6/test/Makefile passes -DCONFIG_X86_{32,64} for this case. So, I do not see a reason to not use CONFIG option here. Signed-off-by: Masahiro Yamada Acked-by: H. Peter Anvin (Intel) --- Changes in v2: None kernel/signal.c | 2 +- lib/raid6/algos.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/signal.c b/kernel/signal.c index 5b2396350dd1..db557e1629e5 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__) +#ifdef 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 df08664d3432..b5a02326cfb7 100644 --- a/lib/raid6/algos.c +++ b/lib/raid6/algos.c @@ -29,7 +29,7 @@ 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_32 #ifdef CONFIG_AS_AVX512 &raid6_avx512x2, &raid6_avx512x1, @@ -45,7 +45,7 @@ const struct raid6_calls * const raid6_algos[] = { &raid6_mmxx2, &raid6_mmxx1, #endif -#if defined(__x86_64__) && !defined(__arch_um__) +#ifdef CONFIG_X86_64 #ifdef CONFIG_AS_AVX512 &raid6_avx512x4, &raid6_avx512x2, -- 2.17.1