From patchwork Wed Feb 15 09:16:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 57441 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp90152wrn; Wed, 15 Feb 2023 01:25:43 -0800 (PST) X-Google-Smtp-Source: AK7set9gHB8R2JZZx5aTor+ze/2CUrh+fEnTlh7apVnhgT4AAoMV+Z1Npt0InP3Ob5BenRTT+SdO X-Received: by 2002:a17:902:e38d:b0:194:58c7:ab79 with SMTP id g13-20020a170902e38d00b0019458c7ab79mr1192419ple.63.1676453142750; Wed, 15 Feb 2023 01:25:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676453142; cv=none; d=google.com; s=arc-20160816; b=zRFweeHcBeVupeyPP+k+13bZp/gkFAwmwx7IA/4W9ZsibtL9OTfxe9ZaWNSQ0fgN90 AbDCB2MrDJqQuIJ96JpPRZSJifxiPrMefW8ar9nBMarMmVTSx72AvwgW63GRECcVJhxA 4qAQF4insYFYC54uKPJ3O2LeolJsLGUrW4YB65UctYSMNbZv4xFWpYTye6nha250QX+f E1xbmzPQ9P3Z7ZYXihJHQJMCFf8Nu03OLYC9BkzRqnlD8dNl95A8SqsC06rnVn0NJ/Px cVXpebB61c3++lA/qkxmDB8KXl1lL46ZkwMl3Uj/BPMxiSbjrIdGxyG2UE8pkn9Aiez6 1xHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=gHBNRPSho8j7TQiKz2ahXw+A1T7Qw6PyN5M6yoNUIHQ=; b=CyEtW41QfU7taqOZF6inUg5W+heVaeXPf1kZNFvHfYR5miUFhBHSpy6bgeqe82JYJ3 rL8Qgh9+o0hmaqWFPfumBcbVrCHRHJ94enXyhLabjrCcRCxfKKFAVQHDu/Uc2QEU3nBp NbkMpHgKDqwQg5EcDocS6wgJqd7UA59IFxHYMcnnT26bQDhWEI0kEDAOcHhvJ4mfL13r L3lOrzXK1kJE+RCTno4OTXwYdLMz//28ZOe/0o3zzMs+BFbGvCguwckNQBmHtEAH2aX3 nBuUb7iojXstgAFij0bnlD7RiNf6f5aDFnz+0GAKMYeibJo3QmlaC0ZW7T02HWlYcgcz pfzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Is4IA3Qu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d15-20020a170902aa8f00b001945f74ad98si14857548plr.549.2023.02.15.01.25.30; Wed, 15 Feb 2023 01:25:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Is4IA3Qu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233795AbjBOJRQ (ORCPT + 99 others); Wed, 15 Feb 2023 04:17:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59562 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230489AbjBOJRN (ORCPT ); Wed, 15 Feb 2023 04:17:13 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C39181F496 for ; Wed, 15 Feb 2023 01:17:12 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 5FC02B81F5F for ; Wed, 15 Feb 2023 09:17:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0E76DC433EF; Wed, 15 Feb 2023 09:17:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676452630; bh=uNbyhfFF7dB/914brsLtnjUU5jomIQd9AeTJjXAJJSw=; h=From:To:Cc:Subject:Date:From; b=Is4IA3Qu4ylaVKqSLmbPUpibQM6Qu2KiARziWsCrFEE19iTf/oayUWKMnG3gC/b+n K6ZL5HRF5kVS5GYJzOtN/WOfVtx8bNM6jX1qteqqDubkL6au1LfaAZ5Ut2lnHB0F71 WiUL9/aMMAxpCANT9zlbtimps4IjlMqrgouB9Dp0nlPerfmirvG1VRi/e7JMkjO8a0 LMz5B0/AVisMgFlNCpPrxeS/W8qIcEEsTV77426bEp04QizLUMmezOlM1vhYbQ1Jdr R+HI/LrdlbLwWt40L6St/wssDUl0EpTHKZctX51F9NGNmr0s54Bln3otFJiTUFUN/o Mt0NPzri/d2Rw== From: Arnd Bergmann To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org Cc: Arnd Bergmann , "H. Peter Anvin" , Peter Zijlstra , Nathan Chancellor , Masahiro Yamada , Nicolas Schier , Miguel Ojeda , Nick Desaulniers , linux-kernel@vger.kernel.org Subject: [PATCH] x86: make 64-bit defconfig the default Date: Wed, 15 Feb 2023 10:16:56 +0100 Message-Id: <20230215091706.1623070-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757888530483112943?= X-GMAIL-MSGID: =?utf-8?q?1757888530483112943?= From: Arnd Bergmann Running 'make ARCH=x86 defconfig' on anything other than an x86_64 machine currently results in a 32-bit build, which is rarely what anyone wants these days. Change the default so that the 64-bit config gets used unless the user asks for i386_defconfig, uses ARCH=i386 or runs on a system that "uname -m" identifies as i386/i486/i586/i686. Signed-off-by: Arnd Bergmann --- arch/x86/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/Makefile b/arch/x86/Makefile index a27b27d1418d..cc7efb6e6e6b 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -3,10 +3,10 @@ # select defconfig based on actual architecture ifeq ($(ARCH),x86) - ifeq ($(shell uname -m),x86_64) - KBUILD_DEFCONFIG := x86_64_defconfig - else + ifeq ($(shell uname -m | sed -e 's/i.86/i386/'),i386) KBUILD_DEFCONFIG := i386_defconfig + else + KBUILD_DEFCONFIG := x86_64_defconfig endif else KBUILD_DEFCONFIG := $(ARCH)_defconfig